Merge branch '2.17' into 2.18

FasterXML · Apr 4, 2024 · 6ae060d · 6ae060d
2 parents 475ad0f + 4fd047c
commit 6ae060d
Show file tree

Hide file tree

Showing 8 changed files with 131 additions and 38 deletions.
diff --git a/base/src/main/java/com/fasterxml/jackson/jakarta/rs/cfg/MapperConfiguratorBase.java b/base/src/main/java/com/fasterxml/jackson/jakarta/rs/cfg/MapperConfiguratorBase.java
@@ -81,27 +81,27 @@ public MapperConfiguratorBase(MAPPER mapper, Annotations[] defaultAnnotations)
     /**********************************************************************
      */
 
-    public synchronized final void setMapper(MAPPER m) {
+    public final void setMapper(MAPPER m) {
         _mapper = m;
     }
 
-    public synchronized final void setAnnotationsToUse(Annotations[] annotationsToUse) {
+    public final void setAnnotationsToUse(Annotations[] annotationsToUse) {
         _setAnnotations(mapper(), annotationsToUse);
     }
 
-    public synchronized final void configure(DeserializationFeature f, boolean state) {
+    public final void configure(DeserializationFeature f, boolean state) {
         mapper().configure(f, state);
     }
 
-    public synchronized final void configure(SerializationFeature f, boolean state) {
+    public final void configure(SerializationFeature f, boolean state) {
         mapper().configure(f, state);
     }
 
-    public synchronized final void configure(JsonParser.Feature f, boolean state) {
+    public final void configure(JsonParser.Feature f, boolean state) {
         mapper().configure(f, state);
     }
 
-    public synchronized final void configure(JsonGenerator.Feature f, boolean state) {
+    public final void configure(JsonGenerator.Feature f, boolean state) {
         mapper().configure(f, state);
     }
 

diff --git a/cbor/src/main/java/com/fasterxml/jackson/jakarta/rs/cbor/CBORMapperConfigurator.java b/cbor/src/main/java/com/fasterxml/jackson/jakarta/rs/cbor/CBORMapperConfigurator.java
@@ -1,6 +1,7 @@
 package com.fasterxml.jackson.jakarta.rs.cbor;
 
 import java.util.*;
+import java.util.concurrent.locks.ReentrantLock;
 
 import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.databind.introspect.JacksonAnnotationIntrospector;
@@ -19,6 +20,8 @@
 public class CBORMapperConfigurator
     extends MapperConfiguratorBase<CBORMapperConfigurator, ObjectMapper>
 {
+    private final ReentrantLock _lock = new ReentrantLock();
+
     public CBORMapperConfigurator(ObjectMapper mapper, Annotations[] defAnnotations)
     {
         super(mapper, defAnnotations);
@@ -28,17 +31,24 @@ public CBORMapperConfigurator(ObjectMapper mapper, Annotations[] defAnnotations)
      * Method that locates, configures and returns {@link ObjectMapper} to use
      */
     @Override
-    public synchronized ObjectMapper getConfiguredMapper() {
+    public ObjectMapper getConfiguredMapper() {
         // important: should NOT call mapper(); needs to return null
         // if no instance has been passed or constructed
         return _mapper;
     }
 
     @Override
-    public synchronized ObjectMapper getDefaultMapper() {
+    public ObjectMapper getDefaultMapper() {
         if (_defaultMapper == null) {
-            _defaultMapper = new ObjectMapper(new CBORFactory());
-            _setAnnotations(_defaultMapper, _defaultAnnotationsToUse);
+            _lock.lock();
+            try {
+                if (_defaultMapper == null) {
+                    _defaultMapper = new ObjectMapper(new CBORFactory());
+                    _setAnnotations(_defaultMapper, _defaultAnnotationsToUse);
+                }
+            } finally {
+                _lock.unlock();
+            }
         }
         return _defaultMapper;
     }
@@ -58,8 +68,15 @@ public synchronized ObjectMapper getDefaultMapper() {
     protected ObjectMapper mapper()
     {
         if (_mapper == null) {
-            _mapper = new ObjectMapper(new CBORFactory());
-            _setAnnotations(_mapper, _defaultAnnotationsToUse);
+            _lock.lock();
+            try {
+                if (_mapper == null) {
+                    _mapper = new ObjectMapper(new CBORFactory());
+                    _setAnnotations(_mapper, _defaultAnnotationsToUse);
+                }
+            } finally {
+                _lock.unlock();
+            }
         }
         return _mapper;
     }

diff --git a/json/src/main/java/com/fasterxml/jackson/jakarta/rs/json/JsonMapperConfigurator.java b/json/src/main/java/com/fasterxml/jackson/jakarta/rs/json/JsonMapperConfigurator.java
@@ -1,6 +1,7 @@
 package com.fasterxml.jackson.jakarta.rs.json;
 
 import java.util.*;
+import java.util.concurrent.locks.ReentrantLock;
 
 import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.databind.introspect.JacksonAnnotationIntrospector;
@@ -18,6 +19,8 @@
 public class JsonMapperConfigurator
     extends MapperConfiguratorBase<JsonMapperConfigurator, ObjectMapper>
 {
+    private final ReentrantLock _lock = new ReentrantLock();
+
     public JsonMapperConfigurator(ObjectMapper mapper, Annotations[] defAnnotations)
     {
         super(mapper, defAnnotations);
@@ -27,18 +30,25 @@ public JsonMapperConfigurator(ObjectMapper mapper, Annotations[] defAnnotations)
      * Method that locates, configures and returns {@link ObjectMapper} to use
      */
     @Override
-    public synchronized ObjectMapper getConfiguredMapper() {
+    public ObjectMapper getConfiguredMapper() {
         /* important: should NOT call mapper(); needs to return null
          * if no instance has been passed or constructed
          */
         return _mapper;
     }
 
     @Override
-    public synchronized ObjectMapper getDefaultMapper() {
+    public ObjectMapper getDefaultMapper() {
         if (_defaultMapper == null) {
-            _defaultMapper = new ObjectMapper();
-            _setAnnotations(_defaultMapper, _defaultAnnotationsToUse);
+            _lock.lock();
+            try {
+                if (_defaultMapper == null) {
+                    _defaultMapper = new ObjectMapper();
+                    _setAnnotations(_defaultMapper, _defaultAnnotationsToUse);
+                }
+            } finally {
+                _lock.unlock();
+            }
         }
         return _defaultMapper;
     }
@@ -58,8 +68,15 @@ public synchronized ObjectMapper getDefaultMapper() {
     protected ObjectMapper mapper()
     {
         if (_mapper == null) {
-            _mapper = new ObjectMapper();
-            _setAnnotations(_mapper, _defaultAnnotationsToUse);
+            _lock.lock();
+            try {
+                if (_mapper == null) {
+                    _mapper = new ObjectMapper();
+                    _setAnnotations(_mapper, _defaultAnnotationsToUse);
+                }
+            } finally {
+                _lock.unlock();
+            }
         }
         return _mapper;
     }

diff --git a/release-notes/CREDITS-2.x b/release-notes/CREDITS-2.x
@@ -9,6 +9,8 @@ PJ Fanning (@pjfanning)
 * Contributed #12: Remove unnecessary synchronization from endpoint
   reader/writer caches
  (2.14.2)
+* Contributed #26: Replace synchronized blocks with `ReentrantLock`s
+ (2.17.1)
 
 Steven Schlansker (@stevenschlansker)
 

diff --git a/release-notes/VERSION-2.x b/release-notes/VERSION-2.x
@@ -14,6 +14,11 @@ Sub-modules:
 
 No changes since 2.17
 
+2.17.1 (not yet released)
+
+#26: Replace synchronized blocks with `ReentrantLock`s
+ (contributed by @pjfanning)
+
 2.17.0 (12-Mar-2024)
 
 * Upgrade Woodstox to 6.6.1

diff --git a/smile/src/main/java/com/fasterxml/jackson/jakarta/rs/smile/SmileMapperConfigurator.java b/smile/src/main/java/com/fasterxml/jackson/jakarta/rs/smile/SmileMapperConfigurator.java
@@ -1,6 +1,7 @@
 package com.fasterxml.jackson.jakarta.rs.smile;
 
 import java.util.*;
+import java.util.concurrent.locks.ReentrantLock;
 
 import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.databind.introspect.JacksonAnnotationIntrospector;
@@ -20,6 +21,8 @@
 public class SmileMapperConfigurator
     extends MapperConfiguratorBase<SmileMapperConfigurator, ObjectMapper>
 {
+    private final ReentrantLock _lock = new ReentrantLock();
+
     public SmileMapperConfigurator(ObjectMapper mapper, Annotations[] defAnnotations) {
         super(mapper, defAnnotations);
     }
@@ -28,17 +31,24 @@ public SmileMapperConfigurator(ObjectMapper mapper, Annotations[] defAnnotations
      * Method that locates, configures and returns {@link ObjectMapper} to use
      */
     @Override
-    public synchronized ObjectMapper getConfiguredMapper() {
+    public ObjectMapper getConfiguredMapper() {
         // important: should NOT call mapper(); needs to return null
         // if no instance has been passed or constructed
         return _mapper;
     }
 
     @Override
-    public synchronized ObjectMapper getDefaultMapper() {
+    public ObjectMapper getDefaultMapper() {
         if (_defaultMapper == null) {
-            _defaultMapper = new SmileMapper();
-            _setAnnotations(_defaultMapper, _defaultAnnotationsToUse);
+            _lock.lock();
+            try {
+                if (_defaultMapper == null) {
+                    _defaultMapper = new SmileMapper();
+                    _setAnnotations(_defaultMapper, _defaultAnnotationsToUse);
+                }
+            } finally {
+                _lock.unlock();
+            }
         }
         return _defaultMapper;
     }
@@ -58,8 +68,15 @@ public synchronized ObjectMapper getDefaultMapper() {
     protected ObjectMapper mapper()
     {
         if (_mapper == null) {
-            _mapper = new SmileMapper();
-            _setAnnotations(_mapper, _defaultAnnotationsToUse);
+            _lock.lock();
+            try {
+                if (_mapper == null) {
+                    _mapper = new SmileMapper();
+                    _setAnnotations(_mapper, _defaultAnnotationsToUse);
+                }
+            } finally {
+                _lock.unlock();
+            }
         }
         return _mapper;
     }

diff --git a/xml/src/main/java/com/fasterxml/jackson/jakarta/rs/xml/XMLMapperConfigurator.java b/xml/src/main/java/com/fasterxml/jackson/jakarta/rs/xml/XMLMapperConfigurator.java
@@ -1,6 +1,7 @@
 package com.fasterxml.jackson.jakarta.rs.xml;
 
 import java.util.*;
+import java.util.concurrent.locks.ReentrantLock;
 
 import com.fasterxml.jackson.databind.*;
 
@@ -20,6 +21,8 @@
 public class XMLMapperConfigurator
     extends MapperConfiguratorBase<XMLMapperConfigurator, XmlMapper>
 {
+    private final ReentrantLock _lock = new ReentrantLock();
+
     /*
     /**********************************************************
     /* Construction
@@ -35,21 +38,28 @@ public XMLMapperConfigurator(XmlMapper mapper, Annotations[] defAnnotations)
      * Method that locates, configures and returns {@link XmlMapper} to use
      */
     @Override
-    public synchronized XmlMapper getConfiguredMapper() {
+    public XmlMapper getConfiguredMapper() {
         /* important: should NOT call mapper(); needs to return null
          * if no instance has been passed or constructed
          */
         return _mapper;
     }
 
     @Override
-    public synchronized XmlMapper getDefaultMapper()
+    public XmlMapper getDefaultMapper()
     {
         if (_defaultMapper == null) {
-            // 10-Oct-2012, tatu: Better do things explicitly...
-            JacksonXmlModule module = getConfiguredModule();
-            _defaultMapper = (module == null) ? new XmlMapper() : new XmlMapper(module);
-            _setAnnotations(_defaultMapper, _defaultAnnotationsToUse);
+            _lock.lock();
+            try {
+                if (_defaultMapper == null) {
+                    // 10-Oct-2012, tatu: Better do things explicitly...
+                    JacksonXmlModule module = getConfiguredModule();
+                    _defaultMapper = (module == null) ? new XmlMapper() : new XmlMapper(module);
+                    _setAnnotations(_defaultMapper, _defaultAnnotationsToUse);
+                }
+            } finally {
+                _lock.unlock();
+            }
         }
         return _defaultMapper;
     }
@@ -74,8 +84,15 @@ protected JacksonXmlModule getConfiguredModule()
     protected XmlMapper mapper()
     {
         if (_mapper == null) {
-            _mapper = new XmlMapper();
-            _setAnnotations(_mapper, _defaultAnnotationsToUse);
+            _lock.lock();
+            try {
+                if (_mapper == null) {
+                    _mapper = new XmlMapper();
+                    _setAnnotations(_mapper, _defaultAnnotationsToUse);
+                }
+            } finally {
+                _lock.unlock();
+            }
         }
         return _mapper;
     }

diff --git a/yaml/src/main/java/com/fasterxml/jackson/jakarta/rs/yaml/YAMLMapperConfigurator.java b/yaml/src/main/java/com/fasterxml/jackson/jakarta/rs/yaml/YAMLMapperConfigurator.java
@@ -10,6 +10,7 @@
 import com.fasterxml.jackson.module.jakarta.xmlbind.JakartaXmlBindAnnotationIntrospector;
 
 import java.util.ArrayList;
+import java.util.concurrent.locks.ReentrantLock;
 
 /**
  * Helper class used to encapsulate details of configuring an
@@ -18,6 +19,9 @@
  */
 public class YAMLMapperConfigurator
         extends MapperConfiguratorBase<YAMLMapperConfigurator, YAMLMapper> {
+
+    private ReentrantLock _lock = new ReentrantLock();
+
     /*
     /**********************************************************
     /* Construction
@@ -32,18 +36,25 @@ public YAMLMapperConfigurator(YAMLMapper mapper, Annotations[] defAnnotations) {
      * Method that locates, configures and returns {@link YAMLMapper} to use
      */
     @Override
-    public synchronized YAMLMapper getConfiguredMapper() {
+    public YAMLMapper getConfiguredMapper() {
         /* important: should NOT call mapper(); needs to return null
          * if no instance has been passed or constructed
          */
         return _mapper;
     }
 
     @Override
-    public synchronized YAMLMapper getDefaultMapper() {
+    public YAMLMapper getDefaultMapper() {
         if (_defaultMapper == null) {
-            _defaultMapper = new YAMLMapper(); //tarik: maybe there is better default config?
-            _setAnnotations(_defaultMapper, _defaultAnnotationsToUse);
+            _lock.lock();
+            try {
+                if (_defaultMapper == null) {
+                    _defaultMapper = new YAMLMapper();
+                    _setAnnotations(_defaultMapper, _defaultAnnotationsToUse);
+                }
+            } finally {
+                _lock.unlock();
+            }
         }
         return _defaultMapper;
     }
@@ -62,8 +73,15 @@ public synchronized YAMLMapper getDefaultMapper() {
     @Override
     protected YAMLMapper mapper() {
         if (_mapper == null) {
-            _mapper = new YAMLMapper();
-            _setAnnotations(_mapper, _defaultAnnotationsToUse);
+            _lock.lock();
+            try {
+                if (_mapper == null) {
+                    _mapper = new YAMLMapper();
+                    _setAnnotations(_mapper, _defaultAnnotationsToUse);
+                }
+            } finally {
+                _lock.unlock();
+            }
         }
         return _mapper;
     }