HCOLL-81 extend support for mapForkey to all maps.

src/main/java/net/openhft/chronicle/map/ChronicleMap.java

@@ -166,7 +166,7 @@ public interface ChronicleMap<K, V> extends ConcurrentMap<K, V>, ChronicleHash {
      * defaultValueProvider.}
      *
      * <p>If the {@code ChronicleMap} is off-heap updatable, i. e. created via {@link
-     * ChronicleMapBuilder} builder (values are {@link Byteable}), there is one more option of
+     * ChronicleMapBuilder} builder (values are {@tlink Byteable}), there is one more option of
      * what to do if the key is absent in the map, see {@link ChronicleMapBuilder#prepareValueBytesOnAcquire(PrepareValueBytes)}.
      * By default, value bytes are just zeroed out, no default value, either provided for key or constant, is
      * put for the absent key.
@@ -182,5 +182,16 @@ public interface ChronicleMap<K, V> extends ConcurrentMap<K, V>, ChronicleHash {
     @NotNull
     WriteContext<K, V> acquireUsingLocked(@NotNull K key, @NotNull V usingValue);
 
+    /**
+     * Apply a mapping to the value returned by a key and return a result.
+     * A read lock is assumed.
+     *
+     * @param key      to apply the mapping to
+     * @param function to calculate a result
+     * @param <R>      return type.
+     * @return the result of the function.
+     */
+    <R> R mapForKey(K key, @NotNull Function<? super V, R> function);
+
 }
 

src/main/java/net/openhft/chronicle/map/StatelessChronicleMap.java

@@ -458,7 +458,7 @@ class StatelessChronicleMap<K, V> implements ChronicleMap<K, V>, Closeable {
     }
 
 
-    public synchronized <R> R mapForKey(K key, @NotNull Function<V, R> function) {
+    public synchronized <R> R mapForKey(K key, @NotNull Function<? super V, R> function) {
 
         final ThreadLocalCopies local = keyValueSerializer.threadLocalCopies();
         final long sizeLocation = writeEventAnSkip(MAP_FOR_KEY);
@@ -471,7 +471,7 @@ class StatelessChronicleMap<K, V> implements ChronicleMap<K, V>, Closeable {
     }
 
 
-    private <R> void writeObject(@NotNull Function<V, R> function) {
+    private <R> void writeObject(@NotNull Object function) {
         long start = bytes.position();
         for (; ; ) {
             try {

src/main/java/net/openhft/chronicle/map/VanillaChronicleMap.java

@@ -34,8 +34,6 @@ import net.openhft.lang.model.constraints.Nullable;
 import net.openhft.lang.threadlocal.Provider;
 import net.openhft.lang.threadlocal.ThreadLocalCopies;
 import org.jetbrains.annotations.NotNull;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import java.io.File;
 import java.io.IOException;
@@ -56,9 +54,6 @@ class VanillaChronicleMap<K, KI, MKI extends MetaBytesInterop<K, KI>,
         V, VW, MVW extends MetaBytesWriter<V, VW>> extends AbstractMap<K, V>
         implements ChronicleMap<K, V>, Serializable {
 
-
-    private static final Logger LOG = LoggerFactory.getLogger(VanillaChronicleMap.class);
-
     /**
      * Because DirectBitSet implementations couldn't find more than 64 continuous clear or set bits.
      */
@@ -372,6 +367,14 @@ class VanillaChronicleMap<K, KI, MKI extends MetaBytesInterop<K, KI>,
         }
     }
 
+    @Override
+    public <R> R mapForKey(K key, @NotNull Function<? super V, R> function) {
+        try (Context<K, V> entry = lookupUsing(key, null,
+                LockType.READ_LOCK, false)) {
+            return function.apply(entry.value());
+        }
+    }
+
     @NotNull
     @Override
     public WriteContext<K, V> acquireUsingLocked(@NotNull K key, @NotNull V usingValue) {

src/test/java/net/openhft/chronicle/map/ReplicationCheckingMap.java

@@ -244,6 +244,11 @@ public class ReplicationCheckingMap<K, V> implements ChronicleMap<K, V> {
         return map1.getUsing(key, usingValue);
     }
 
+    @Override
+    public <R> R mapForKey(K key, @NotNull Function<? super V, R> function) {
+        return map1.mapForKey(key, function);
+    }
+
     @Override
     public V acquireUsing(@NotNull K key,  V usingValue) {
         return map1.acquireUsing(key, usingValue);

src/test/java/net/openhft/chronicle/map/StatelessClientTest.java

@@ -35,15 +35,15 @@ import java.util.Set;
  */
 public class StatelessClientTest {
 
-
-    public static final int SIZE = 100000;
+    public static final int SIZE = 2500;
 
 
-    static class StringBuilderToStringFunction implements Function<StringBuilder, String> {
+    enum ToString implements Function<Object, String> {
+        INSTANCE;
 
         @Override
-        public String apply(StringBuilder stringBuilder) {
-            return stringBuilder.toString();
+        public String apply(Object obj) {
+            return obj.toString();
         }
     }
 
@@ -63,8 +63,7 @@ public class StatelessClientTest {
                     .class, StringBuilder.class)
                     .statelessClient(new InetSocketAddress("localhost", 8056)).create()) {
 
-                String actual = (String) ((StatelessChronicleMap) statelessMap).mapForKey(10, new
-                        StringBuilderToStringFunction());
+                String actual = statelessMap.mapForKey(10, ToString.INSTANCE);
 
                 Assert.assertEquals("Hello World", actual);
             }
@@ -87,8 +86,7 @@ public class StatelessClientTest {
                     .class, StringBuilder.class)
                     .statelessClient(new InetSocketAddress("localhost", 8056)).create()) {
 
-                String actual = (String) ((StatelessChronicleMap) statelessMap).mapForKey(11, new
-                        StringBuilderToStringFunction());
+                String actual = statelessMap.mapForKey(11, ToString.INSTANCE);
 
                 Assert.assertEquals("", actual);
             }

src/test/java/net/openhft/chronicle/map/jrs166/map/StatelessChronicleMapTest.java

@@ -19,10 +19,7 @@
 package net.openhft.chronicle.map.jrs166.map;
 
 import net.openhft.chronicle.hash.replication.TcpTransportAndNetworkConfig;
-import net.openhft.chronicle.map.ChronicleMap;
-import net.openhft.chronicle.map.ChronicleMapBuilder;
-import net.openhft.chronicle.map.ReadContext;
-import net.openhft.chronicle.map.WriteContext;
+import net.openhft.chronicle.map.*;
 import net.openhft.chronicle.map.jrs166.JSR166TestCase;
 import org.jetbrains.annotations.NotNull;
 import org.junit.Ignore;
@@ -169,6 +166,11 @@ public class StatelessChronicleMapTest extends JSR166TestCase {
             throw new UnsupportedOperationException();
         }
 
+        @Override
+        public <R> R mapForKey(K key, @NotNull Function<? super V, R> function) {
+            return d.mapForKey(key, function);
+        }
+
         @Override
         public V putIfAbsent(K key, V value) {
             return d.putIfAbsent(key, value);