introduced newKeyInstance and newValueInstance

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

@@ -247,5 +247,14 @@ public interface ChronicleMap<K, V> extends ConcurrentMap<K, V>, ChronicleHash {
      */
     void putAll(File fromFile) throws IOException;
 
+    /**
+     * @return a new empty instance based on the Value type
+     */
+    V newValueInstance();
+
+    /**
+     * @return a new empty instance based on the Key type
+     */
+    K newKeyInstance();
 }
 

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

@@ -69,26 +69,8 @@ public final class ChronicleMapBuilder<K, V> implements ChronicleMapBuilderI<K,
         return new ChronicleMapBuilder<K, V>(builder);
     }
 
-    // todo - work in progress this will be changed me not today, so don't refactor this !
-    public static <T> T newInstance(Class<T> interfaceClass, boolean isKey) {
 
 
-        if (interfaceClass.isEnum())
-            return isKey ? DataValueClasses.newDirectReference(interfaceClass) : DataValueClasses
-                    .newDirectInstance(interfaceClass);
-
-        else if (!offHeapReference(interfaceClass) && !interfaceClass.isInterface() &&
-                !builtInType(interfaceClass)) {
-
-            // if (())
-            //     interfaceClass = DataValueClasses.directClassFor(interfaceClass);
-            return DataValueClasses.newInstance(interfaceClass);
-
-        }
-        return DataValueClasses.newDirectInstance(interfaceClass);
-
-    }
-
     static boolean builtInType(Class clazz) {
         return clazz.getClassLoader() == Class.class.getClassLoader();
     }
@@ -97,7 +79,7 @@ public final class ChronicleMapBuilder<K, V> implements ChronicleMapBuilderI<K,
         this.delegate = delegate;
     }
 
-    private static boolean offHeapReference(Class valueClass) {
+      static boolean offHeapReference(Class valueClass) {
         return Byteable.class.isAssignableFrom(valueClass);
     }
 

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

@@ -177,6 +177,16 @@ class StatelessChronicleMap<K, V> implements ChronicleMap<K, V>, Closeable, Clon
         throw new UnsupportedOperationException();
     }
 
+    @Override
+    public V newValueInstance() {
+        return VanillaChronicleMap.newInstance(vClass, false);
+    }
+
+    @Override
+    public K newKeyInstance() {
+        return VanillaChronicleMap.newInstance(kClass, true);
+    }
+
     private ExecutorService lazyExecutorService() {
         if (executorService == null) {
             synchronized (this) {

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

@@ -37,6 +37,7 @@ import net.openhft.lang.collection.SingleThreadedDirectBitSet;
 import net.openhft.lang.io.*;
 import net.openhft.lang.io.serialization.JDKObjectSerializer;
 import net.openhft.lang.io.serialization.impl.VanillaBytesMarshallerFactory;
+import net.openhft.lang.model.DataValueClasses;
 import net.openhft.lang.threadlocal.Provider;
 import net.openhft.lang.threadlocal.StatefulCopyable;
 import net.openhft.lang.threadlocal.ThreadLocalCopies;
@@ -58,6 +59,8 @@ import static java.lang.Math.max;
 import static java.lang.Thread.currentThread;
 import static java.nio.ByteBuffer.allocateDirect;
 import static net.openhft.chronicle.map.Asserts.assertNotNull;
+import static net.openhft.chronicle.map.ChronicleMapBuilder.builtInType;
+import static net.openhft.chronicle.map.ChronicleMapBuilder.offHeapReference;
 import static net.openhft.lang.MemoryUnit.*;
 
 class VanillaChronicleMap<K, KI, MKI extends MetaBytesInterop<K, ? super KI>,
@@ -559,7 +562,7 @@ class VanillaChronicleMap<K, KI, MKI extends MetaBytesInterop<K, ? super KI>,
     }
 
     @Override
-    public  V putMapped(K key, @NotNull UnaryOperator<V> unaryOperator) {
+    public V putMapped(K key, @NotNull UnaryOperator<V> unaryOperator) {
 
 
         final V using = (vClass.equals(CharSequence.class)) ? (V) new StringBuilder() : null;
@@ -616,6 +619,36 @@ class VanillaChronicleMap<K, KI, MKI extends MetaBytesInterop<K, ? super KI>,
         }
     }
 
+    @Override
+    public V newValueInstance() {
+        return newInstance(vClass, false);
+    }
+
+    @Override
+    public K newKeyInstance() {
+        return newInstance(kClass, true);
+    }
+
+
+    static <T> T newInstance(Class<T> interfaceClass, boolean isKey) {
+
+
+        if (interfaceClass.isEnum())
+            return isKey ? DataValueClasses.newDirectReference(interfaceClass) : DataValueClasses
+                    .newDirectInstance(interfaceClass);
+
+        else if (!offHeapReference(interfaceClass) && !interfaceClass.isInterface() &&
+                !builtInType(interfaceClass)) {
+
+            // if (())
+            //     interfaceClass = DataValueClasses.directClassFor(interfaceClass);
+            return DataValueClasses.newInstance(interfaceClass);
+
+        }
+        return DataValueClasses.newDirectInstance(interfaceClass);
+
+    }
+
     private XStreamConverter xStreamConverter;
 
     /**