Merge branch '2.17'

FasterXML · Dec 16, 2023 · 3794e55 · 3794e55
2 parents 0c25dc2 + 6a3771f
commit 3794e55
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 31 deletions.
diff --git a/base/src/main/java/tools/jackson/jaxrs/base/ProviderBase.java b/base/src/main/java/tools/jackson/jaxrs/base/ProviderBase.java
@@ -14,11 +14,11 @@
 
 import tools.jackson.databind.*;
 import tools.jackson.databind.type.TypeFactory;
+import tools.jackson.databind.util.SimpleLookupCache;
 
 import tools.jackson.jaxrs.base.ProviderBase;
 import tools.jackson.jaxrs.cfg.*;
 import tools.jackson.jaxrs.util.ClassKey;
-import tools.jackson.jaxrs.util.LRUMap;
 
 public abstract class ProviderBase<
     THIS extends ProviderBase<THIS, MAPPER, EP_CONFIG, MAPPER_CONFIG>,
@@ -140,14 +140,14 @@ public abstract class ProviderBase<
     /**
      * Cache for resolved endpoint configurations when reading JSON data
      */
-    protected final LRUMap<AnnotationBundleKey, EP_CONFIG> _readers
-        = new LRUMap<AnnotationBundleKey, EP_CONFIG>(16, 120);
+    protected final SimpleLookupCache<AnnotationBundleKey, EP_CONFIG> _readers
+        = new SimpleLookupCache<AnnotationBundleKey, EP_CONFIG>(16, 120);
 
     /**
      * Cache for resolved endpoint configurations when writing JSON data
      */
-    protected final LRUMap<AnnotationBundleKey, EP_CONFIG> _writers
-        = new LRUMap<AnnotationBundleKey, EP_CONFIG>(16, 120);
+    protected final SimpleLookupCache<AnnotationBundleKey, EP_CONFIG> _writers
+        = new SimpleLookupCache<AnnotationBundleKey, EP_CONFIG>(16, 120);
 
     protected final AtomicReference<IOException> _noContentExceptionRef
         = new AtomicReference<IOException>();

diff --git a/base/src/main/java/tools/jackson/jaxrs/util/LRUMap.java b/base/src/main/java/tools/jackson/jaxrs/util/LRUMap.java
diff --git a/release-notes/VERSION-2.x b/release-notes/VERSION-2.x
@@ -14,6 +14,10 @@ Sub-modules:
 
 -
 
+2.16.1 (not yet released)
+
+#178: Deprecate local `LRUMap`, use `jackson-databind` provided one instead
+
 2.16.0 (15-Nov-2023)
 
 No changes since 2.15