Minor post-merge cleanup

Author: cowtowncoder

src/main/java/com/fasterxml/jackson/databind/ser/SerializerCache.java

@@ -5,7 +5,6 @@
 import com.fasterxml.jackson.core.util.Snapshottable;
 import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.databind.ser.impl.ReadOnlyClassToSerializerMap;
-import com.fasterxml.jackson.databind.util.LookupCache;
 import com.fasterxml.jackson.databind.util.SimpleLookupCache;
 import com.fasterxml.jackson.databind.util.TypeKey;
 
@@ -41,7 +40,7 @@ public final class SerializerCache
      * NOTE: keys are of various types (see below for key types), in addition to
      * basic {@link JavaType} used for "untyped" serializers.
      */
-    private final LookupCache<TypeKey, JsonSerializer<Object>> _sharedMap;
+    private final SimpleLookupCache<TypeKey, JsonSerializer<Object>> _sharedMap;
 
     /**
      * Most recent read-only instance, created from _sharedMap, if any.
@@ -61,7 +60,7 @@ public SerializerCache(int maxCached) {
         _readOnlyMap = new AtomicReference<ReadOnlyClassToSerializerMap>();
     }
 
-    protected SerializerCache(LookupCache<TypeKey, JsonSerializer<Object>> shared) {
+    protected SerializerCache(SimpleLookupCache<TypeKey, JsonSerializer<Object>> shared) {
         _sharedMap = shared;
         _readOnlyMap = new AtomicReference<ReadOnlyClassToSerializerMap>();
     }

src/main/java/com/fasterxml/jackson/databind/ser/impl/ReadOnlyClassToSerializerMap.java

@@ -3,7 +3,7 @@
 import com.fasterxml.jackson.databind.JavaType;
 import com.fasterxml.jackson.databind.JsonSerializer;
 import com.fasterxml.jackson.databind.ser.SerializerCache;
-import com.fasterxml.jackson.databind.util.LookupCache;
+import com.fasterxml.jackson.databind.util.SimpleLookupCache;
 import com.fasterxml.jackson.databind.util.TypeKey;
 
 /**
@@ -27,7 +27,7 @@ public final class ReadOnlyClassToSerializerMap
     private final int _mask;
 
     protected ReadOnlyClassToSerializerMap(SerializerCache shared,
-            LookupCache<TypeKey, JsonSerializer<Object>> src)
+            SimpleLookupCache<TypeKey, JsonSerializer<Object>> src)
     {
         _sharedCache = shared;
         _size = findSize(src.size());
@@ -55,7 +55,7 @@ private final static int findSize(int size)
      * Factory method for constructing an instance.
      */
     public static ReadOnlyClassToSerializerMap from(SerializerCache shared,
-            LookupCache<TypeKey, JsonSerializer<Object>> src) {
+            SimpleLookupCache<TypeKey, JsonSerializer<Object>> src) {
         return new ReadOnlyClassToSerializerMap(shared, src);
     }
 

src/main/java/com/fasterxml/jackson/databind/util/LookupCache.java

@@ -2,23 +2,33 @@
 
 import com.fasterxml.jackson.core.util.Snapshottable;
 
-import java.util.function.BiConsumer;
-
 /**
  * An interface describing the required API for the Jackson-Databind Type cache.
+ *<p>
+ * Note that while interface itself does not specify synchronization requirements for
+ * implementations, specific use cases do. Typically implementations are
+ * expected to be thread-safe, that is, to handle synchronization.
  *
  * @see com.fasterxml.jackson.databind.type.TypeFactory#withCache(LookupCache<java.lang.Object,com.fasterxml.jackson.databind.JavaType>)
  * @see SimpleLookupCache
  */
 public interface LookupCache <K,V>
-        extends Snapshottable<LookupCache<K,V>> {
-
-    void contents(BiConsumer<K,V> consumer);
+    extends Snapshottable<LookupCache<K,V>>
+{
+    // 17-Sep-2019, tatu: There is one usage, by `ReadOnlyClassToSerializerMap`, so
+    //    for now NOT exposed, but can reconsider if it proves generally useful
+    
+//    void contents(BiConsumer<K,V> consumer);
 
+    /**
+     * @return Number of entries currently in cache: may be approximate, only
+     *    to be used for diagnostics, metrics reporting
+     */
     int size();
 
     /**
      * NOTE: key is of type Object only to retain binary backwards-compatibility
+     *
      * @param key
      * @return value associated with key (can return null)
      */
@@ -28,5 +38,8 @@ public interface LookupCache <K,V>
 
     V putIfAbsent(K key, V value);
 
+    /**
+     * Method for removing all contents this cache has.
+     */
     void clear();
 }

src/main/java/com/fasterxml/jackson/databind/util/SimpleLookupCache.java

@@ -52,22 +52,16 @@ protected Object readResolve() {
     }
 
     @Override
-    public LookupCache<K, V> snapshot() {
+    public SimpleLookupCache<K,V> snapshot() {
         return new SimpleLookupCache<K,V>(_initialEntries, _maxEntries);
     }
 
-    @Override
-    public void contents(BiConsumer<K,V> consumer) {
-        for (Map.Entry<K,V> entry : _map.entrySet()) {
-            consumer.accept(entry.getKey(), entry.getValue());
-        }
-    }
-
     /*
     /**********************************************************************
-    /* Public API
+    /* Public API, basic lookup/additions
     /**********************************************************************
      */
+
     @Override
     public V put(K key, V value) {
         if (_map.size() >= _maxEntries) {
@@ -103,4 +97,16 @@ public V putIfAbsent(K key, V value) {
 
     @Override
     public int size() { return _map.size(); }
+
+    /*
+    /**********************************************************************
+    /* Extended API
+    /**********************************************************************
+     */
+    
+    public void contents(BiConsumer<K,V> consumer) {
+        for (Map.Entry<K,V> entry : _map.entrySet()) {
+            consumer.accept(entry.getKey(), entry.getValue());
+        }
+    }
 }

src/test/java/com/fasterxml/jackson/databind/util/UnlimitedLookupCache.java

@@ -1,8 +1,6 @@
 package com.fasterxml.jackson.databind.util;
 
-import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
-import java.util.function.BiConsumer;
 
 /**
  * A LookupCache implementation that has no synchronization (like SimpleLookupCache does)
@@ -26,12 +24,14 @@ public LookupCache<K, V> snapshot() {
         return new UnlimitedLookupCache<K,V>(_initialEntries, _maxEntries);
     }
 
+    /*
     @Override
     public void contents(BiConsumer<K, V> consumer) {
         for (Map.Entry<K,V> entry : _map.entrySet()) {
             consumer.accept(entry.getKey(), entry.getValue());
         }
     }
+    */
 
     @Override
     public int size() {

src/test/java/com/fasterxml/jackson/databind/util/UnlimitedLookupCacheTest.java

@@ -2,7 +2,6 @@
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JavaType;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.type.TypeFactory;
 import org.junit.Test;
 
@@ -28,7 +27,8 @@ public void testCache() {
     public void testCompatibility() throws JsonProcessingException {
         UnlimitedLookupCache<Object, JavaType> cache = new UnlimitedLookupCache<>(4, 10);
         TypeFactory tf = TypeFactory.defaultInstance().withCache(cache);
-
+        assertNotNull(tf); // just to get rid of warning
+        
         //TODO find way to inject the `tf` instance into an ObjectMapper (via MapperBuilder?)
 
         //ObjectMapper mapper = new ObjectMapper();