HCOLL-81 made publicly a single ChronicleMapBuilder, that delegates onto internal implementations

src/test/java/eg/BigData.java

@@ -19,7 +19,8 @@
 package eg;
 
 import net.openhft.affinity.AffinitySupport;
-import net.openhft.chronicle.map.ChronicleMapOnHeapUpdatableBuilder;
+import net.openhft.chronicle.map.ChronicleMapBuilder;
+import net.openhft.chronicle.map.ChronicleMapBuilder;
 import net.openhft.lang.io.Bytes;
 
 import java.io.*;
@@ -40,8 +41,8 @@ public class BigData {
     //run 1st test with no map, and Highwatermark set to 0
     //then switch to Highwatermark set to MAXSIZE for subsequent test repeats
     static AtomicInteger Highwatermark = new AtomicInteger((int) MAXSIZE);
-    static final ChronicleMapOnHeapUpdatableBuilder<Long, BigDataStuff> builder =
-            ChronicleMapOnHeapUpdatableBuilder.of(Long.class, BigDataStuff.class);
+    static final ChronicleMapBuilder<Long, BigDataStuff> builder =
+            ChronicleMapBuilder.of(Long.class, BigDataStuff.class);
 
     //    static AtomicInteger Highwatermark = new AtomicInteger(0);
     static {

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

@@ -67,17 +67,16 @@ public class Builder {
                 identifier, serverPort, endpoints).create();
     }
 
-    public static <K, V> ChronicleMapOnHeapUpdatableBuilder<K, V> newTcpSocketShmBuilder(
+    public static <K, V> ChronicleMapBuilder<K, V> newTcpSocketShmBuilder(
             Class<K> kClass, Class<V> vClass,
             final byte identifier,
             final int serverPort,
             final InetSocketAddress... endpoints) throws IOException {
         TcpTransportAndNetworkConfig tcpConfig = TcpTransportAndNetworkConfig.of(serverPort, Arrays.asList(endpoints))
                 .heartBeatInterval(1L, TimeUnit.SECONDS);
-        return ChronicleMapOnHeapUpdatableBuilder.of(kClass, vClass)
-                .replication(identifier,  tcpConfig);
+        return ChronicleMapBuilder.of(kClass, vClass)
+                .replication(identifier, tcpConfig);
     }
 
 
-
 }

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

@@ -35,7 +35,7 @@ public class CHMMetaDataTest {
         File file = new File(TMP, "testAccessTimes");
         MapEventListener<String, String, ChronicleMap<String, String>> listener =
                 new StringStringMapEventListener(new AtomicLong(1));
-        ChronicleMap<String, String> map = ChronicleMapOnHeapUpdatableBuilder.of(String.class, String.class)
+        ChronicleMap<String, String> map = ChronicleMapBuilder.of(String.class, String.class)
                 .metaDataBytes(8)
                 .eventListener(listener).create();
 

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

@@ -39,7 +39,7 @@ public class CHMTest5 {
                         .entries(1000);
 
         //// don't include this, just to check it is as expected.
-        assertEquals(8, builder.minSegments());
+        assertEquals(8, ((AbstractChronicleMapBuilder) builder.delegate).minSegments());
         //// end of test
 
         String chmPath = System.getProperty("java.io.tmpdir") + System.getProperty("file.separator") + "CHMTest5";

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

@@ -30,7 +30,7 @@ public class CHMTestIterator1 {
         AtomicLong alValue = new AtomicLong();
         AtomicLong alKey = new AtomicLong();
         int runs = 3000000;
-        ChronicleMapOnHeapUpdatableBuilder<String, Long> builder = ChronicleMapOnHeapUpdatableBuilder.of(String.class, Long.class)
+        ChronicleMapBuilder<String, Long> builder = ChronicleMapBuilder.of(String.class, Long.class)
                 .entries(runs);
 
         ChronicleMap<String, Long> chm = builder.create();

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

@@ -61,7 +61,7 @@ public class ChannelReplicationTest {
                     .tcpTransportAndNetwork(tcpConfig)
                     .createWithId((byte) 1);
 
-            map1a = ChronicleMapOnHeapUpdatableBuilder.of(Integer.class, CharSequence.class)
+            map1a = ChronicleMapBuilder.of(Integer.class, CharSequence.class)
                     .entries(1000)
                     .instance().replicatedViaChannel(hubA.createChannel((short) 1)).create();
         }
@@ -73,7 +73,7 @@ public class ChannelReplicationTest {
             hubB = ReplicationHub.builder().tcpTransportAndNetwork(tcpConfig)
                     .createWithId((byte) 2);
 
-            map1b = ChronicleMapOnHeapUpdatableBuilder.of(Integer.class, CharSequence.class)
+            map1b = ChronicleMapBuilder.of(Integer.class, CharSequence.class)
                     .entries(1000)
                     .instance().replicatedViaChannel(hubB.createChannel((short) 1)).create();
         }
@@ -95,12 +95,12 @@ public class ChannelReplicationTest {
     @Test
     public void test() throws IOException, InterruptedException {
 
-        map2b = ChronicleMapOnHeapUpdatableBuilder.of(Integer.class, CharSequence.class)
+        map2b = ChronicleMapBuilder.of(Integer.class, CharSequence.class)
                 .entries(1000)
                 .instance().replicatedViaChannel(hubB.createChannel((short) 2)).create();
 
 
-        map2a = ChronicleMapOnHeapUpdatableBuilder.of(Integer.class, CharSequence.class)
+        map2a = ChronicleMapBuilder.of(Integer.class, CharSequence.class)
                 .entries(1000)
                 .instance().replicatedViaChannel(hubA.createChannel((short) 2)).create();
 

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

@@ -136,7 +136,7 @@ public class ChronicleMapTest {
     public void testRemoveWithKey() throws Exception {
 
         final ChronicleMap<CharSequence, CharSequence> map =
-                ChronicleMapOnHeapUpdatableBuilder.of(CharSequence.class, CharSequence.class)
+                ChronicleMapBuilder.of(CharSequence.class, CharSequence.class)
                         .minSegments(2).create();
 
         assertFalse(map.containsKey("key3"));
@@ -181,7 +181,7 @@ public class ChronicleMapTest {
     public void testSize() throws Exception {
 
         final ChronicleMap<CharSequence, CharSequence> map =
-                ChronicleMapOnHeapUpdatableBuilder.of(CharSequence.class, CharSequence.class)
+                ChronicleMapBuilder.of(CharSequence.class, CharSequence.class)
                         .minSegments(1024)
                         .removeReturnsNull(true).create();
 
@@ -203,7 +203,7 @@ public class ChronicleMapTest {
     public void testRemoveInteger() throws IOException {
 
         int count = 300;
-        final ChronicleMap<Object, Object> map = ChronicleMapOnHeapUpdatableBuilder.of(Object.class, Object.class)
+        final ChronicleMap<Object, Object> map = ChronicleMapBuilder.of(Object.class, Object.class)
                 .entrySize(count)
                 .minSegments(2).create();
 
@@ -228,7 +228,7 @@ public class ChronicleMapTest {
     public void testRemoveWithKeyAndRemoveReturnsNull() throws Exception {
 
         final ChronicleMap<CharSequence, CharSequence> map =
-                ChronicleMapOnHeapUpdatableBuilder.of(CharSequence.class, CharSequence.class)
+                ChronicleMapBuilder.of(CharSequence.class, CharSequence.class)
                         .minSegments(2)
                         .removeReturnsNull(true).create();
 
@@ -274,7 +274,7 @@ public class ChronicleMapTest {
     public void testReplaceWithKey() throws Exception {
 
         final ChronicleMap<CharSequence, CharSequence> map =
-                ChronicleMapOnHeapUpdatableBuilder.of(CharSequence.class, CharSequence.class)
+                ChronicleMapBuilder.of(CharSequence.class, CharSequence.class)
                         .minSegments(2).create();
 
 
@@ -339,7 +339,7 @@ public class ChronicleMapTest {
     public void testReplaceWithKeyAnd2Params() throws Exception {
 
         final ChronicleMap<CharSequence, CharSequence> map =
-                ChronicleMapOnHeapUpdatableBuilder.of(CharSequence.class, CharSequence.class)
+                ChronicleMapBuilder.of(CharSequence.class, CharSequence.class)
                         .minSegments(2).create();
 
         map.put("key1", "one");
@@ -381,7 +381,7 @@ public class ChronicleMapTest {
     public void testRemoveWithKeyAndValue() throws Exception {
 
         final ChronicleMap<CharSequence, CharSequence> map =
-                ChronicleMapOnHeapUpdatableBuilder.of(CharSequence.class, CharSequence.class)
+                ChronicleMapBuilder.of(CharSequence.class, CharSequence.class)
                         .minSegments(2).create();
 
 
@@ -855,7 +855,7 @@ public class ChronicleMapTest {
         String TMP = System.getProperty("java.io.tmpdir");
         int entries = 100 * 1000;
         ChronicleMap<CharSequence, CharSequence> map =
-                ChronicleMapOnHeapUpdatableBuilder.of(CharSequence.class, CharSequence.class)
+                ChronicleMapBuilder.of(CharSequence.class, CharSequence.class)
                         .entries(entries)
                         .minSegments(16)
                         .entrySize(32)
@@ -1284,7 +1284,7 @@ public class ChronicleMapTest {
 
     private ChronicleMap<Integer, CharSequence> getViewTestMap(int noOfElements) throws IOException {
         ChronicleMap<Integer, CharSequence> map =
-                ChronicleMapOnHeapUpdatableBuilder.of(Integer.class, CharSequence.class)
+                ChronicleMapBuilder.of(Integer.class, CharSequence.class)
                         .entries(noOfElements * 2 + 100)
                         .valueSize((noOfElements + "").length())
                         .putReturnsNull(true)
@@ -1304,7 +1304,7 @@ public class ChronicleMapTest {
 
     @Test
     public void testOversizeEntriesPutRemoveReplace() throws IOException {
-        ChronicleMapOnHeapUpdatableBuilder builder = ChronicleMapOnHeapUpdatableBuilder.of(CharSequence.class, CharSequence.class)
+        ChronicleMapBuilder builder = ChronicleMapBuilder.of(CharSequence.class, CharSequence.class)
                 .entries(10)
                 .minSegments(1)
                 .entrySize(10);
@@ -1356,13 +1356,13 @@ public class ChronicleMapTest {
 
     @Test
     public void equalsTest() throws IOException {
-        final ChronicleMap<Integer, String> map1 = ChronicleMapOnHeapUpdatableBuilder
+        final ChronicleMap<Integer, String> map1 = OnHeapUpdatableChronicleMapBuilder
                 .of(Integer.class, String.class).create();
 
         map1.put(1, "one");
         map1.put(2, "two");
 
-        final ChronicleMap<Integer, String> map2 = ChronicleMapOnHeapUpdatableBuilder
+        final ChronicleMap<Integer, String> map2 = OnHeapUpdatableChronicleMapBuilder
                 .of(Integer.class, String.class).create();
 
         map2.put(1, "one");
@@ -1469,7 +1469,7 @@ public class ChronicleMapTest {
     @Test(expected = IllegalArgumentException.class)
     public void testAcquireUsingLockedWithString() throws IOException {
 
-        ChronicleMapOnHeapUpdatableBuilder<CharSequence, String> builder = ChronicleMapOnHeapUpdatableBuilder
+        ChronicleMapBuilder<CharSequence, String> builder = ChronicleMapBuilder
                 .of(CharSequence.class, String.class)
                 .entries(1000)
                 .defaultValue("")
@@ -1494,7 +1494,7 @@ public class ChronicleMapTest {
     @Test
     public void testOnheapAcquireUsingLockedStringBuilder() throws IOException {
 
-        try (final ChronicleMap<CharSequence, CharSequence> map = ChronicleMapOnHeapUpdatableBuilder
+        try (final ChronicleMap<CharSequence, CharSequence> map = ChronicleMapBuilder
                 .of(CharSequence.class, CharSequence.class)
                 .entries(1000)
                 .entrySize(40)
@@ -1514,7 +1514,7 @@ public class ChronicleMapTest {
 
     @Test
     public void testOnheapAcquireUsingLocked() throws IOException {
-        ChronicleMapOnHeapUpdatableBuilder<CharSequence, LongValue> builder = ChronicleMapOnHeapUpdatableBuilder
+        ChronicleMapBuilder<CharSequence, LongValue> builder = ChronicleMapBuilder
                 .of(CharSequence.class, LongValue.class)
                 .entries(1000)
                 .entrySize(40);

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

@@ -42,7 +42,7 @@ public class ConcurrentMap8Test extends JSR166TestCase {
    /* private static ConcurrentMap<Long, Long> newLongMap() {
         //First create (or access if already created) the shared map
 
-        final ChronicleMapOnHeapUpdatableBuilder<Long, Long> builder = ChronicleMapOnHeapUpdatableBuilder.of(Long.class, Long.class);
+        final ChronicleMapOnHeapUpdatableBuilder<Long, Long> builder = ChronicleMapBuilder.of(Long.class, Long.class);
 
 
         //// don't include this, just to check it is as expected.
@@ -64,7 +64,7 @@ public class ConcurrentMap8Test extends JSR166TestCase {
     private static ConcurrentMap newIntegerStringMap() {
 
 
-        final ChronicleMapOnHeapUpdatableBuilder<Integer, String> builder = ChronicleMapOnHeapUpdatableBuilder.of(Integer.class,
+        final ChronicleMapOnHeapUpdatableBuilder<Integer, String> builder = ChronicleMapBuilder.of(Integer.class,
                 String.class);
 
 

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

@@ -32,7 +32,7 @@ public class ConstantSizeBySampleTest {
 
     @Test
     public void testConstantKeys() throws IOException {
-        ChronicleMap<byte[], Long> map = ChronicleMapOnHeapUpdatableBuilder.of(byte[].class, Long.class)
+        ChronicleMap<byte[], Long> map = ChronicleMapBuilder.of(byte[].class, Long.class)
                 .constantKeySizeBySample(new byte[8])
                 .immutableKeys()
                 .entries(100)
@@ -52,7 +52,7 @@ public class ConstantSizeBySampleTest {
 
     @Test
     public void testUnexpectedlyLongConstantByteArrayValues() throws IOException {
-        ChronicleMap<Long, byte[]> map = ChronicleMapOnHeapUpdatableBuilder.of(Long.class, byte[].class)
+        ChronicleMap<Long, byte[]> map = ChronicleMapBuilder.of(Long.class, byte[].class)
                 .constantValueSizeBySample(new byte[512 * 1024])
                 .entries(100)
                 .actualSegments(1)
@@ -89,7 +89,7 @@ public class ConstantSizeBySampleTest {
     @Test
     public void testUnexpectedlyLongConstantExternalizableValues() throws IOException {
         ChronicleMap<Long, ExternalizableData> map =
-                ChronicleMapOnHeapUpdatableBuilder.of(Long.class, ExternalizableData.class)
+                ChronicleMapBuilder.of(Long.class, ExternalizableData.class)
                         .constantValueSizeBySample(new ExternalizableData())
                         .entries(100)
                         .actualSegments(1)
@@ -116,7 +116,7 @@ public class ConstantSizeBySampleTest {
     @Ignore
     public void testUnexpectedlyLongConstantSerializableValues() throws IOException {
         ChronicleMap<Long, SerializableData> map =
-                ChronicleMapOnHeapUpdatableBuilder.of(Long.class, SerializableData.class)
+                ChronicleMapBuilder.of(Long.class, SerializableData.class)
                         .constantValueSizeBySample(new SerializableData())
                         .entries(100)
                         .actualSegments(1)

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

@@ -37,7 +37,7 @@ public class DefaultValueTest {
 
             ArrayList<Integer> defaultValue = new ArrayList<Integer>();
             defaultValue.add(42);
-            try (ChronicleMap<String, List<Integer>> map = ChronicleMapOnHeapUpdatableBuilder
+            try (ChronicleMap<String, List<Integer>> map = OnHeapUpdatableChronicleMapBuilder
                     .of(String.class, (Class<List<Integer>>) ((Class) List.class))
                     .defaultValue(defaultValue).createPersistedTo(file)) {
                 ArrayList<Integer> using = new ArrayList<Integer>();
@@ -49,7 +49,7 @@ public class DefaultValueTest {
             }
 
             ArrayList<Integer> using = new ArrayList<Integer>();
-            try (ChronicleMap<String, List<Integer>> map = ChronicleMapOnHeapUpdatableBuilder
+            try (ChronicleMap<String, List<Integer>> map = OnHeapUpdatableChronicleMapBuilder
                     .of(String.class, (Class<List<Integer>>) ((Class) List.class))
                     .createPersistedTo(file)) {
                 assertEquals(defaultValue, map.acquireUsing("c", using));

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

@@ -51,7 +51,8 @@ public class EntryCountMapTest {
     private static ChronicleMap<CharSequence, LongValue> getSharedMap(
             long entries, int segments, int entrySize, Alignment alignment)
             throws IOException {
-        ChronicleMapBuilder<CharSequence, LongValue> mapBuilder = ChronicleMapBuilder.of(CharSequence.class, LongValue.class)
+        ChronicleMapBuilder<CharSequence, LongValue> mapBuilder = ChronicleMapBuilder.of(CharSequence
+                .class, LongValue.class)
                 .entries(entries)
                 .actualSegments(segments)
                 .entrySize(entrySize)

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

@@ -99,14 +99,14 @@ public class EventListenerTestWithTCPSocketReplication {
 
             // we connect the maps via a TCP socket connection on port 8077
 
-            ChronicleMapOnHeapUpdatableBuilder<Integer, CharSequence> map1Builder = serverBuilder();
+            ChronicleMapBuilder<Integer, CharSequence> map1Builder = serverBuilder();
 
             map1 = map1Builder.create();
         }
         // ---------- SERVER2 2 on the same server as ----------
 
         {
-            ChronicleMapOnHeapUpdatableBuilder<Integer, CharSequence> map2Builder = clientBuilder();
+            ChronicleMapBuilder<Integer, CharSequence> map2Builder = clientBuilder();
 
             map2 = map2Builder.create();
         }
@@ -135,7 +135,7 @@ public class EventListenerTestWithTCPSocketReplication {
 
             // we connect the maps via a TCP socket connection on port 8077
 
-            ChronicleMapOnHeapUpdatableBuilder<Integer, CharSequence> map1Builder = serverBuilder();
+            ChronicleMapBuilder<Integer, CharSequence> map1Builder = serverBuilder();
 
             map1 = map1Builder.create();
 
@@ -206,7 +206,7 @@ public class EventListenerTestWithTCPSocketReplication {
 
             // we connect the maps via a TCP socket connection on port 8077
 
-            ChronicleMapOnHeapUpdatableBuilder<Integer, CharSequence> map1Builder = serverBuilder();
+            ChronicleMapBuilder<Integer, CharSequence> map1Builder = serverBuilder();
 
             map1 = map1Builder.create();
 
@@ -237,9 +237,9 @@ public class EventListenerTestWithTCPSocketReplication {
         Assert.assertEquals(null, map2.get(5));
     }
 
-    private ChronicleMapOnHeapUpdatableBuilder<Integer, CharSequence> clientBuilder() {
+    private ChronicleMapBuilder<Integer, CharSequence> clientBuilder() {
         TcpTransportAndNetworkConfig tcpConfig = TcpTransportAndNetworkConfig.of(8077);
-        return ChronicleMapOnHeapUpdatableBuilder.of(Integer.class, CharSequence.class)
+        return ChronicleMapBuilder.of(Integer.class, CharSequence.class)
                 .entries(20000L)
                 .replication((byte) 1, tcpConfig)
                 .eventListener(eventListener);
@@ -256,9 +256,9 @@ public class EventListenerTestWithTCPSocketReplication {
         }
     }
 
-    private ChronicleMapOnHeapUpdatableBuilder<Integer, CharSequence> serverBuilder() {
+    private ChronicleMapBuilder<Integer, CharSequence> serverBuilder() {
         TcpTransportAndNetworkConfig tcpConfig = TcpTransportAndNetworkConfig.of(8076, new InetSocketAddress("localhost", 8077));
-        return ChronicleMapOnHeapUpdatableBuilder.of(Integer.class, CharSequence.class)
+        return ChronicleMapBuilder.of(Integer.class, CharSequence.class)
                 .entries(20000L)
                 .replication((byte) 2, tcpConfig);
     }

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

@@ -99,8 +99,8 @@ public class GuavaTest extends TestCase {
     }
 
     static class CHMTestGenerator extends TestGenerator {
-        ChronicleMapOnHeapUpdatableBuilder<CharSequence, CharSequence> builder =
-                ChronicleMapOnHeapUpdatableBuilder.of(CharSequence.class, CharSequence.class)
+        ChronicleMapBuilder<CharSequence, CharSequence> builder =
+                ChronicleMapBuilder.of(CharSequence.class, CharSequence.class)
                         .entries(100)
                         .minSegments(2);
 

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

@@ -37,7 +37,7 @@ public class IntValueMapTest {
     @Test
     public void test() throws IOException {
 
-        final ChronicleMap<IntValue, CharSequence> map = ChronicleMapOnHeapUpdatableBuilder
+        final ChronicleMap<IntValue, CharSequence> map = OnHeapUpdatableChronicleMapBuilder
                 .of(IntValue.class, CharSequence.class)
                 .entries(20000)
                 .keyMarshaller(ByteableIntValueMarshaller.INSTANCE).create();

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

@@ -32,7 +32,7 @@ public class Issue42Test {
         if (!Jvm.isWindows())
             return;
 
-        final ChronicleMap<CharSequence, CharSequence> map = ChronicleMapOnHeapUpdatableBuilder
+        final ChronicleMap<CharSequence, CharSequence> map = OnHeapUpdatableChronicleMapBuilder
                 .of(CharSequence.class, CharSequence.class)
                 .entrySize(18)
                 .entries(1500000)

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

@@ -33,7 +33,7 @@ public class KeySizesTest {
     @Test
     public void testDifferentKeySizes() throws IOException {
 
-        Map<String, String> map = ChronicleMapOnHeapUpdatableBuilder.of(String.class, String.class).create();
+        Map<String, String> map = ChronicleMapBuilder.of(String.class, String.class).create();
 
         String k = "";
         for (int i = 0; i < 100; i++) {

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

@@ -35,7 +35,7 @@ import java.util.Arrays;
 public class OSResizesMain {
     public static void main(String[] args) throws IOException, InterruptedException {
         File file = File.createTempFile("over-sized", "deleteme");
-        ChronicleMap<String, String> map = ChronicleMapOnHeapUpdatableBuilder.of(String.class, String.class)
+        ChronicleMap<String, String> map = ChronicleMapBuilder.of(String.class, String.class)
                 .entrySize(100 * 1024 * 1024)
                 .entries(1000 * 1000)
                 .createPersistedTo(file);

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

@@ -70,11 +70,11 @@ public class PostChannelCreationTest {
                     .createWithId((byte) 1);
 
             // this is how you add maps after the custer is created
-            map1a = ChronicleMapOnHeapUpdatableBuilder.of(Integer.class, CharSequence.class)
+            map1a = ChronicleMapBuilder.of(Integer.class, CharSequence.class)
                     .entries(1000)
                     .instance().replicatedViaChannel(hubA.createChannel((short) 1)).create();
 
-            map2a = ChronicleMapOnHeapUpdatableBuilder.of(Integer.class, CharSequence.class)
+            map2a = ChronicleMapBuilder.of(Integer.class, CharSequence.class)
                     .entries(1000)
                     .instance().replicatedViaChannel(hubA.createChannel((short) 2)).create();
         }
@@ -89,11 +89,11 @@ public class PostChannelCreationTest {
                     .createWithId((byte) 2);
 
             // this is how you add maps after the custer is created
-            map1b = ChronicleMapOnHeapUpdatableBuilder.of(Integer.class, CharSequence.class)
+            map1b = ChronicleMapBuilder.of(Integer.class, CharSequence.class)
                     .entries(1000)
                     .instance().replicatedViaChannel(hubB.createChannel((short) 1)).create();
 
-            map2b = ChronicleMapOnHeapUpdatableBuilder.of(Integer.class, CharSequence.class)
+            map2b = ChronicleMapBuilder.of(Integer.class, CharSequence.class)
                     .entries(1000)
                     .instance().replicatedViaChannel(hubB.createChannel((short) 2)).create();
         }

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

@@ -36,8 +36,8 @@ public class ProcessInstanceLimiterMain implements Runnable {
     public ProcessInstanceLimiterMain(String sharedMapName, Callback callback) throws IOException {
         this.sharedMapName = sharedMapName;
         this.callback = callback;
-        ChronicleMapOnHeapUpdatableBuilder<String, Data> builder =
-                ChronicleMapOnHeapUpdatableBuilder.of(String.class, Data.class);
+        ChronicleMapBuilder<String, Data> builder =
+                ChronicleMapBuilder.of(String.class, Data.class);
         builder.entries(10000);
         builder.minSegments(2);
         File file = new File(System.getProperty("java.io.tmpdir") + "/" + sharedMapName);

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

@@ -33,7 +33,7 @@ public class RecursiveRefereneChMapTest {
     public void testRecursive() throws IOException {
         File file = new File(TMP + "/test." + System.nanoTime() + ".tmp");
         file.deleteOnExit();
-        Map<String, StupidCycle> map = ChronicleMapOnHeapUpdatableBuilder.of(String.class, StupidCycle.class)
+        Map<String, StupidCycle> map = ChronicleMapBuilder.of(String.class, StupidCycle.class)
                 .entries(64)
                 .objectSerializer(JDKObjectSerializer.INSTANCE).create();
         map.put("Test", new StupidCycle());

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

@@ -38,14 +38,14 @@ public class ReplicatedChronicleMapTest extends JSR166TestCase {
 
 
     ChronicleMap<Integer, CharSequence> newShmIntString() throws IOException {
-        return ChronicleMapOnHeapUpdatableBuilder.of(Integer.class, CharSequence.class)
+        return ChronicleMapBuilder.of(Integer.class, CharSequence.class)
                 .create();
 
     }
 
 
     ChronicleMap<CharSequence, CharSequence> newShmStringString() throws IOException {
-        return ChronicleMapOnHeapUpdatableBuilder.of(CharSequence.class, CharSequence.class)
+        return ChronicleMapBuilder.of(CharSequence.class, CharSequence.class)
                 .create();
 
     }

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

@@ -72,7 +72,13 @@ public class SerializerTest {
         final ByteBufferBytes out = new ByteBufferBytes(ByteBuffer.allocateDirect(1024));
         ByteBufferBytes in = out.slice();
 
-        ChronicleMapOnHeapUpdatableBuilder builder = ChronicleMapOnHeapUpdatableBuilder.of(Integer.class, valueClass);
+
+        ChronicleMapBuilder cBuilder = ChronicleMapBuilder.of(Integer
+                .class, valueClass);
+
+        OnHeapUpdatableChronicleMapBuilder builder = (OnHeapUpdatableChronicleMapBuilder) cBuilder.delegate;
+
+
         builder.preMapConstruction(false);
 
         Serializer v = new Serializer(builder.valueBuilder);
@@ -95,7 +101,10 @@ public class SerializerTest {
         final ByteBufferBytes out = new ByteBufferBytes(ByteBuffer.allocateDirect(1024));
         ByteBufferBytes in = out.slice();
 
-        ChronicleMapOnHeapUpdatableBuilder builder = ChronicleMapOnHeapUpdatableBuilder.of(clazz, Integer.class);
+        ChronicleMapBuilder cBuilder = ChronicleMapBuilder.of(clazz, Integer.class);
+
+        OnHeapUpdatableChronicleMapBuilder builder = (OnHeapUpdatableChronicleMapBuilder) cBuilder.delegate;
+
         builder.preMapConstruction(false);
         {
             Serializer v = new Serializer(builder.keyBuilder);

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

@@ -70,7 +70,7 @@ public class SingleMapChannelTest {
                     .tcpTransportAndNetwork(tcpConfig)
                     .createWithId(identifier);
             // this is how you add maps after the custer is created
-            map1a = ChronicleMapOnHeapUpdatableBuilder.of(Integer.class, CharSequence.class)
+            map1a = ChronicleMapBuilder.of(Integer.class, CharSequence.class)
                     .entries(1000)
                     .instance().replicatedViaChannel(hubA.createChannel((short) 1)).create();
         }
@@ -84,7 +84,7 @@ public class SingleMapChannelTest {
             hubB = ReplicationHub.builder().tcpTransportAndNetwork(tcpConfig).createWithId((byte) 2);
 
             // this is how you add maps after the custer is created
-            map1b = ChronicleMapOnHeapUpdatableBuilder.of(Integer.class, CharSequence.class)
+            map1b = ChronicleMapBuilder.of(Integer.class, CharSequence.class)
                     .entries(1000)
                     .instance().replicatedViaChannel(hubB.createChannel((short) 1))
                     .create();

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

@@ -53,14 +53,14 @@ public class StatelessClientTest {
     public void testMapForKeyWithEntry() throws IOException, InterruptedException {
 
 
-        try (ChronicleMap<Integer, StringBuilder> serverMap = ChronicleMapOnHeapUpdatableBuilder.of(Integer.class,
+        try (ChronicleMap<Integer, StringBuilder> serverMap = ChronicleMapBuilder.of(Integer.class,
                 StringBuilder.class)
                 .defaultValue(new StringBuilder())
                 .replication((byte) 2, TcpTransportAndNetworkConfig.of(8056)).create()) {
 
             serverMap.put(10, new StringBuilder("Hello World"));
 
-            try (ChronicleMap<Integer, StringBuilder> statelessMap = ChronicleMapOnHeapUpdatableBuilder.of(Integer
+            try (ChronicleMap<Integer, StringBuilder> statelessMap = ChronicleMapBuilder.of(Integer
                     .class, StringBuilder.class)
                     .statelessClient(new InetSocketAddress("localhost", 8056)).create()) {
 
@@ -78,14 +78,14 @@ public class StatelessClientTest {
     public void testMapForKeyWhenNoEntry() throws IOException, InterruptedException {
 
 
-        try (ChronicleMap<Integer, StringBuilder> serverMap = ChronicleMapOnHeapUpdatableBuilder.of(Integer.class,
+        try (ChronicleMap<Integer, StringBuilder> serverMap = ChronicleMapBuilder.of(Integer.class,
                 StringBuilder.class)
                 .defaultValue(new StringBuilder())
                 .replication((byte) 2, TcpTransportAndNetworkConfig.of(8056)).create()) {
 
             serverMap.put(10, new StringBuilder("Hello World"));
 
-            try (ChronicleMap<Integer, StringBuilder> statelessMap = ChronicleMapOnHeapUpdatableBuilder.of(Integer
+            try (ChronicleMap<Integer, StringBuilder> statelessMap = ChronicleMapBuilder.of(Integer
                     .class, StringBuilder.class)
                     .statelessClient(new InetSocketAddress("localhost", 8056)).create()) {
 
@@ -101,10 +101,10 @@ public class StatelessClientTest {
     public void testBufferOverFlowPutAllAndEntrySet() throws IOException, InterruptedException {
 
 
-        try (ChronicleMap<Integer, CharSequence> serverMap = ChronicleMapOnHeapUpdatableBuilder.of(Integer.class, CharSequence.class)
+        try (ChronicleMap<Integer, CharSequence> serverMap = ChronicleMapBuilder.of(Integer.class, CharSequence.class)
                 .replication((byte) 2, TcpTransportAndNetworkConfig.of(8056)).create()) {
 
-            try (ChronicleMap<Integer, CharSequence> statelessMap = ChronicleMapOnHeapUpdatableBuilder.of(Integer
+            try (ChronicleMap<Integer, CharSequence> statelessMap = ChronicleMapBuilder.of(Integer
                     .class, CharSequence.class)
                     .statelessClient(new InetSocketAddress("localhost", 8056)).create()) {
 
@@ -134,10 +134,10 @@ public class StatelessClientTest {
     @Test
     public void testBufferOverFlowPutAllAndValues() throws IOException, InterruptedException {
 
-        try (ChronicleMap<Integer, CharSequence> serverMap = ChronicleMapOnHeapUpdatableBuilder.of(Integer.class, CharSequence.class)
+        try (ChronicleMap<Integer, CharSequence> serverMap = ChronicleMapBuilder.of(Integer.class, CharSequence.class)
                 .replication((byte) 2, TcpTransportAndNetworkConfig.of(8056)).create()) {
 
-            try (ChronicleMap<Integer, CharSequence> statelessMap = ChronicleMapOnHeapUpdatableBuilder.of(Integer
+            try (ChronicleMap<Integer, CharSequence> statelessMap = ChronicleMapBuilder.of(Integer
                     .class, CharSequence.class)
                     .statelessClient(new InetSocketAddress("localhost", 8056)).create()) {
 
@@ -166,10 +166,10 @@ public class StatelessClientTest {
     public void testBufferOverFlowPutAllAndKeySet() throws IOException, InterruptedException {
 
 
-        try (ChronicleMap<Integer, CharSequence> serverMap = ChronicleMapOnHeapUpdatableBuilder.of(Integer.class, CharSequence.class)
+        try (ChronicleMap<Integer, CharSequence> serverMap = ChronicleMapBuilder.of(Integer.class, CharSequence.class)
                 .replication((byte) 2, TcpTransportAndNetworkConfig.of(8056)).create()) {
 
-            try (ChronicleMap<Integer, CharSequence> statelessMap = ChronicleMapOnHeapUpdatableBuilder.of(Integer
+            try (ChronicleMap<Integer, CharSequence> statelessMap = ChronicleMapBuilder.of(Integer
                     .class, CharSequence.class)
                     .statelessClient(new InetSocketAddress("localhost", 8056)).create()) {
 
@@ -198,11 +198,11 @@ public class StatelessClientTest {
     public void test() throws IOException, InterruptedException {
 
 
-        try (ChronicleMap<Integer, CharSequence> serverMap = ChronicleMapOnHeapUpdatableBuilder.of(Integer.class, CharSequence.class)
+        try (ChronicleMap<Integer, CharSequence> serverMap = ChronicleMapBuilder.of(Integer.class, CharSequence.class)
                 .replication((byte) 2, TcpTransportAndNetworkConfig.of(8056)).create()) {
 
             serverMap.put(10, "EXAMPLE-10");
-            try (ChronicleMap<Integer, CharSequence> statelessMap = ChronicleMapOnHeapUpdatableBuilder.of(Integer
+            try (ChronicleMap<Integer, CharSequence> statelessMap = ChronicleMapBuilder.of(Integer
                     .class, CharSequence.class)
                     .statelessClient(new InetSocketAddress("localhost", 8056)).create()) {
 
@@ -217,10 +217,10 @@ public class StatelessClientTest {
     @Test
     public void testClientCreatedBeforeServer() throws IOException, InterruptedException {
 
-        try (ChronicleMap<Integer, CharSequence> serverMap = ChronicleMapOnHeapUpdatableBuilder.of(Integer.class, CharSequence.class)
+        try (ChronicleMap<Integer, CharSequence> serverMap = ChronicleMapBuilder.of(Integer.class, CharSequence.class)
                 .replication((byte) 2, TcpTransportAndNetworkConfig.of(8056)).create()) {
 
-            try (ChronicleMap<Integer, CharSequence> statelessMap = ChronicleMapOnHeapUpdatableBuilder.of(Integer
+            try (ChronicleMap<Integer, CharSequence> statelessMap = ChronicleMapBuilder.of(Integer
                     .class, CharSequence.class)
                     .statelessClient(new InetSocketAddress("localhost", 8056)).create()) {
 
@@ -241,10 +241,10 @@ public class StatelessClientTest {
 
     @Test
     public void testBufferOverFlowPutAll() throws IOException, InterruptedException {
-        try (ChronicleMap<Integer, CharSequence> serverMap = ChronicleMapOnHeapUpdatableBuilder.of(Integer.class, CharSequence.class)
+        try (ChronicleMap<Integer, CharSequence> serverMap = ChronicleMapBuilder.of(Integer.class, CharSequence.class)
                 .replication((byte) 2, TcpTransportAndNetworkConfig.of(8056)).create()) {
 
-            try (ChronicleMap<Integer, CharSequence> statelessMap = ChronicleMapOnHeapUpdatableBuilder.of(Integer
+            try (ChronicleMap<Integer, CharSequence> statelessMap = ChronicleMapBuilder.of(Integer
                     .class, CharSequence.class)
                     .statelessClient(new InetSocketAddress("localhost", 8056)).create()) {
 
@@ -272,10 +272,10 @@ public class StatelessClientTest {
     public void testBufferOverFlowPutAllWherePutReturnsNull() throws IOException,
             InterruptedException {
 
-        try (ChronicleMap<Integer, CharSequence> serverMap = ChronicleMapOnHeapUpdatableBuilder.of(Integer.class, CharSequence.class)
+        try (ChronicleMap<Integer, CharSequence> serverMap = ChronicleMapBuilder.of(Integer.class, CharSequence.class)
                 .replication((byte) 2, TcpTransportAndNetworkConfig.of(8056)).create()) {
 
-            try (ChronicleMap<Integer, CharSequence> statelessMap = ChronicleMapOnHeapUpdatableBuilder.of(Integer
+            try (ChronicleMap<Integer, CharSequence> statelessMap = ChronicleMapBuilder.of(Integer
                     .class, CharSequence.class)
                     .statelessClient(new InetSocketAddress("localhost", 8056)).create()) {
 
@@ -304,10 +304,10 @@ public class StatelessClientTest {
     public void testPutWherePutReturnsNull() throws IOException,
             InterruptedException {
 
-        try (ChronicleMap<Integer, CharSequence> serverMap = ChronicleMapOnHeapUpdatableBuilder.of(Integer.class, CharSequence.class)
+        try (ChronicleMap<Integer, CharSequence> serverMap = ChronicleMapBuilder.of(Integer.class, CharSequence.class)
                 .replication((byte) 2, TcpTransportAndNetworkConfig.of(8056)).create()) {
 
-            try (ChronicleMap<Integer, CharSequence> statelessMap = ChronicleMapOnHeapUpdatableBuilder.of(Integer
+            try (ChronicleMap<Integer, CharSequence> statelessMap = ChronicleMapBuilder.of(Integer
                     .class, CharSequence.class)
                     .statelessClient(new InetSocketAddress("localhost", 8056)).create()) {
 
@@ -326,10 +326,10 @@ public class StatelessClientTest {
     public void testRemoveWhereRemoveReturnsNull() throws IOException,
             InterruptedException {
 
-        try (ChronicleMap<Integer, CharSequence> serverMap = ChronicleMapOnHeapUpdatableBuilder.of(Integer.class, CharSequence.class)
+        try (ChronicleMap<Integer, CharSequence> serverMap = ChronicleMapBuilder.of(Integer.class, CharSequence.class)
                 .replication((byte) 2, TcpTransportAndNetworkConfig.of(8056)).create()) {
 
-            try (ChronicleMap<Integer, CharSequence> statelessMap = ChronicleMapOnHeapUpdatableBuilder.of(Integer
+            try (ChronicleMap<Integer, CharSequence> statelessMap = ChronicleMapBuilder.of(Integer
                     .class, CharSequence.class)
                     .statelessClient(new InetSocketAddress("localhost", 8056)).create()) {
 
@@ -360,9 +360,9 @@ public class StatelessClientTest {
 
         // server
         {
-            serverMap1 = ChronicleMapOnHeapUpdatableBuilder.of(Integer.class, CharSequence.class)
+            serverMap1 = ChronicleMapBuilder.of(Integer.class, CharSequence.class)
                     .replication((byte) 2, TcpTransportAndNetworkConfig.of(8056)).create();
-            serverMap2 = ChronicleMapOnHeapUpdatableBuilder.of(Integer.class, CharSequence.class)
+            serverMap2 = ChronicleMapBuilder.of(Integer.class, CharSequence.class)
                     .replication((byte) 2, TcpTransportAndNetworkConfig.of(8077)).create();
 
         }
@@ -370,10 +370,10 @@ public class StatelessClientTest {
 
         // stateless client
         {
-            statelessMap1 = ChronicleMapOnHeapUpdatableBuilder.of(Integer
+            statelessMap1 = ChronicleMapBuilder.of(Integer
                     .class, CharSequence.class)
                     .statelessClient(new InetSocketAddress("localhost", 8056)).create();
-            statelessMap2 = ChronicleMapOnHeapUpdatableBuilder.of(Integer
+            statelessMap2 = ChronicleMapBuilder.of(Integer
                     .class, CharSequence.class)
                     .statelessClient(new InetSocketAddress("localhost", 8077)).create();
         }

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

@@ -50,7 +50,7 @@ public class TCPSocketReplication3wayPutReturnsNullTest {
             final InetSocketAddress... endpoints) throws IOException {
         TcpTransportAndNetworkConfig tcpConfig = TcpTransportAndNetworkConfig.of(serverPort, Arrays.asList(endpoints));
 
-        return (T) ChronicleMapOnHeapUpdatableBuilder.of(Integer.class, CharSequence.class)
+        return (T) ChronicleMapBuilder.of(Integer.class, CharSequence.class)
                 .putReturnsNull(true)
                 .replication(identifier, tcpConfig).create();
     }

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

@@ -47,7 +47,7 @@ public class TCPSocketReplicationBootStrapTest {
 
         map1 = newTcpSocketShmIntString((byte) 1, 8069);
 
-        ChronicleMapOnHeapUpdatableBuilder<Integer, CharSequence> map2aBuilder =
+        ChronicleMapBuilder<Integer, CharSequence> map2aBuilder =
                 newTcpSocketShmBuilder(Integer.class, CharSequence.class,
                         (byte) 2, 8066, new InetSocketAddress("localhost", 8069));
         final ChronicleMap<Integer, CharSequence> map2a =
@@ -108,7 +108,7 @@ public class TCPSocketReplicationBootStrapTest {
 
         {
             // restart map 2 but does not connect it to map1
-            final ChronicleMap<Integer, CharSequence> map2b = ChronicleMapOnHeapUpdatableBuilder.of(Integer.class,
+            final ChronicleMap<Integer, CharSequence> map2b = ChronicleMapBuilder.of(Integer.class,
                     CharSequence.class).replication((byte) 2).createPersistedTo(persistenceFile);
             // add data into it
             map2b.put(11, "ADDED WHEN DISCONNECTED TO MAP1");

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

@@ -45,7 +45,7 @@ import static org.junit.Assert.assertTrue;
 
 public class TCPSocketReplicationIntValueTest {
 
-    private ChronicleMapOnHeapUpdatableBuilder<IntValue, CharSequence> map1Builder;
+    private ChronicleMapBuilder<IntValue, CharSequence> map1Builder;
     private ChronicleMap<IntValue, CharSequence> map1;
     private ChronicleMap<IntValue, CharSequence> map2;
     private IntValue value;

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

@@ -76,7 +76,7 @@ public class TCPSocketReplicationPostConnectionTest {
     @Test
     public void testBootStrapIntoNewMapWithNewFile() throws IOException, InterruptedException {
 
-        ChronicleMapOnHeapUpdatableBuilder<Integer, CharSequence> map2aBuilder =
+        ChronicleMapBuilder<Integer, CharSequence> map2aBuilder =
                 newTcpSocketShmBuilder(Integer.class, CharSequence.class,
                         (byte) 2, 8077, new InetSocketAddress("localhost", 8076));
         try (final ChronicleMap<Integer, CharSequence> map2a =

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

@@ -47,7 +47,7 @@ public class TCPSocketReplicationTest {
 
     @Before
     public void setup() throws IOException {
-        ChronicleMapOnHeapUpdatableBuilder<Integer, CharSequence> map1Builder =
+        ChronicleMapBuilder<Integer, CharSequence> map1Builder =
                 newTcpSocketShmBuilder(Integer.class, CharSequence.class,
                         (byte) 1, 8076, new InetSocketAddress("localhost", 8077));
         map1 = map1Builder.createPersistedTo(getPersistenceFile());

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

@@ -35,7 +35,7 @@ public class TestBooleanValues {
     @Test
     public void testTestBooleanValues() throws IOException, InterruptedException {
         ChronicleMap<Integer, Boolean> map =
-                ChronicleMapOnHeapUpdatableBuilder.of(Integer.class, Boolean.class).create();
+                ChronicleMapBuilder.of(Integer.class, Boolean.class).create();
         map.put(7, true);
         Assert.assertEquals(true, map.get(7));
     }

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

@@ -49,7 +49,7 @@ public class TimeBasedReplicationTest extends JSR166TestCase {
     public void testIgnoreALatePut() throws IOException {
 
         final TimeProvider timeProvider = Mockito.mock(TimeProvider.class);
-        ChronicleMap map = ChronicleMapOnHeapUpdatableBuilder.of(CharSequence.class, CharSequence.class)
+        ChronicleMap map = ChronicleMapBuilder.of(CharSequence.class, CharSequence.class)
                 .entries(10)
                 .timeProvider(timeProvider)
                 .createReplicated((byte) 1);
@@ -78,7 +78,7 @@ public class TimeBasedReplicationTest extends JSR166TestCase {
     public void testIgnoreALatePutIfAbsent() throws IOException {
 
         final TimeProvider timeProvider = Mockito.mock(TimeProvider.class);
-        ChronicleMap map = ChronicleMapOnHeapUpdatableBuilder.of(CharSequence.class, CharSequence.class)
+        ChronicleMap map = ChronicleMapBuilder.of(CharSequence.class, CharSequence.class)
                 .entries(10)
                 .timeProvider(timeProvider)
                 .createReplicated((byte) 1);
@@ -108,7 +108,7 @@ public class TimeBasedReplicationTest extends JSR166TestCase {
     public void testIgnoreALateReplace() throws IOException {
 
         final TimeProvider timeProvider = Mockito.mock(TimeProvider.class);
-        ChronicleMap map = ChronicleMapOnHeapUpdatableBuilder.of(CharSequence.class, CharSequence.class)
+        ChronicleMap map = ChronicleMapBuilder.of(CharSequence.class, CharSequence.class)
                 .entries(10)
                 .timeProvider(timeProvider)
                 .createReplicated((byte) 1);
@@ -141,7 +141,7 @@ public class TimeBasedReplicationTest extends JSR166TestCase {
     public void testIgnoreALateReplaceWithValue() throws IOException {
 
         final TimeProvider timeProvider = Mockito.mock(TimeProvider.class);
-        ChronicleMap map = ChronicleMapOnHeapUpdatableBuilder.of(CharSequence.class, CharSequence.class)
+        ChronicleMap map = ChronicleMapBuilder.of(CharSequence.class, CharSequence.class)
                 .entries(10)
                 .timeProvider(timeProvider)
                 .createReplicated((byte) 1);
@@ -171,7 +171,7 @@ public class TimeBasedReplicationTest extends JSR166TestCase {
     public void testIgnoreALateRemoveWithValue() throws IOException {
 
         final TimeProvider timeProvider = Mockito.mock(TimeProvider.class);
-        ChronicleMap map = ChronicleMapOnHeapUpdatableBuilder.of(CharSequence.class, CharSequence.class)
+        ChronicleMap map = ChronicleMapBuilder.of(CharSequence.class, CharSequence.class)
                 .entries(10)
                 .timeProvider(timeProvider)
                 .createReplicated((byte) 1);
@@ -200,7 +200,7 @@ public class TimeBasedReplicationTest extends JSR166TestCase {
     public void testIgnoreALateRemove() throws IOException {
 
         final TimeProvider timeProvider = Mockito.mock(TimeProvider.class);
-        ChronicleMap map = ChronicleMapOnHeapUpdatableBuilder.of(CharSequence.class, CharSequence.class)
+        ChronicleMap map = ChronicleMapBuilder.of(CharSequence.class, CharSequence.class)
                 .entries(10)
                 .timeProvider(timeProvider)
                 .createReplicated((byte) 1);
@@ -229,7 +229,7 @@ public class TimeBasedReplicationTest extends JSR166TestCase {
     public void testIgnoreWithRemoteRemove() throws IOException {
 
         final TimeProvider timeProvider = Mockito.mock(TimeProvider.class);
-        ReplicatedChronicleMap map = (ReplicatedChronicleMap) ChronicleMapOnHeapUpdatableBuilder.of(CharSequence.class, CharSequence.class)
+        ReplicatedChronicleMap map = (ReplicatedChronicleMap) ChronicleMapBuilder.of(CharSequence.class, CharSequence.class)
                 .entries(10)
                 .timeProvider(timeProvider)
                 .createReplicated((byte) 1);
@@ -259,7 +259,7 @@ public class TimeBasedReplicationTest extends JSR166TestCase {
 
 
         final TimeProvider timeProvider = Mockito.mock(TimeProvider.class);
-        ReplicatedChronicleMap map = (ReplicatedChronicleMap) ChronicleMapOnHeapUpdatableBuilder.of(CharSequence.class, CharSequence.class)
+        ReplicatedChronicleMap map = (ReplicatedChronicleMap) ChronicleMapBuilder.of(CharSequence.class, CharSequence.class)
                 .entries(10)
                 .timeProvider(timeProvider)
                 .createReplicated((byte) 1);
@@ -289,7 +289,7 @@ public class TimeBasedReplicationTest extends JSR166TestCase {
     public void testRemoveFollowedByLatePut() throws IOException {
 
         final TimeProvider timeProvider = Mockito.mock(TimeProvider.class);
-        ReplicatedChronicleMap map = (ReplicatedChronicleMap) ChronicleMapOnHeapUpdatableBuilder.of(CharSequence.class, CharSequence.class)
+        ReplicatedChronicleMap map = (ReplicatedChronicleMap) ChronicleMapBuilder.of(CharSequence.class, CharSequence.class)
                 .entries(10)
                 .timeProvider(timeProvider)
                 .createReplicated((byte) 1);
@@ -317,7 +317,7 @@ public class TimeBasedReplicationTest extends JSR166TestCase {
     public void testPutRemovePut() throws IOException {
 
         final TimeProvider timeProvider = Mockito.mock(TimeProvider.class);
-        ChronicleMap map = ChronicleMapOnHeapUpdatableBuilder.of(CharSequence.class, CharSequence.class)
+        ChronicleMap map = ChronicleMapBuilder.of(CharSequence.class, CharSequence.class)
                 .entries(10)
                 .timeProvider(timeProvider)
                 .createReplicated((byte) 1);

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

@@ -48,11 +48,11 @@ public class TwoMapOnDifferentServersTest {
                         .heartBeatInterval(1, SECONDS);
 
 
-        map1 = ChronicleMapOnHeapUpdatableBuilder.of(Integer.class, CharSequence.class)
+        map1 = ChronicleMapBuilder.of(Integer.class, CharSequence.class)
                 .entries(20000)
                 .replication((byte) 1, tcpConfig).create();
 
-        map2 = ChronicleMapOnHeapUpdatableBuilder.of(Integer.class, CharSequence.class)
+        map2 = ChronicleMapBuilder.of(Integer.class, CharSequence.class)
                 .entries(20000)
                 .replication((byte) 2, TcpTransportAndNetworkConfig.of(8077)
                         .heartBeatInterval(1, SECONDS)).create();

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

@@ -44,7 +44,7 @@ public class UDPSocketReplicationTest {
         UdpTransportConfig udpConfig = UdpTransportConfig
                 .of(Inet4Address.getByName("255.255.255.255"), udpPort);
 
-        return ChronicleMapOnHeapUpdatableBuilder.of(Integer.class, CharSequence.class)
+        return ChronicleMapBuilder.of(Integer.class, CharSequence.class)
                 .entries(1000)
                 .replication(SingleChronicleHashReplication.builder().udpTransport(udpConfig)
                                 .createWithId((byte) identifier))

src/test/java/net/openhft/chronicle/map/example/ChannelExample.java

@@ -3,7 +3,8 @@ package net.openhft.chronicle.map.example;
 import net.openhft.chronicle.hash.replication.ReplicationHub;
 import net.openhft.chronicle.hash.replication.TcpTransportAndNetworkConfig;
 import net.openhft.chronicle.map.ChronicleMap;
-import net.openhft.chronicle.map.ChronicleMapOnHeapUpdatableBuilder;
+import net.openhft.chronicle.map.ChronicleMapBuilder;
+import net.openhft.chronicle.map.ChronicleMapBuilder;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -63,8 +64,8 @@ public class ChannelExample {
 
     // server 1 with  identifier = 1
     {
-        ChronicleMapOnHeapUpdatableBuilder<CharSequence, CharSequence> smallStringToStringMapBuilder =
-                ChronicleMapOnHeapUpdatableBuilder.of(CharSequence.class, CharSequence.class)
+        ChronicleMapBuilder<CharSequence, CharSequence> smallStringToStringMapBuilder =
+                ChronicleMapBuilder.of(CharSequence.class, CharSequence.class)
                         .entries(1000);
 
         byte identifier = (byte) 1;
@@ -98,8 +99,8 @@ public class ChannelExample {
 
     // server 2 with  identifier = 2
     {
-        ChronicleMapOnHeapUpdatableBuilder<CharSequence, CharSequence> smallStringToStringMapBuilder =
-                ChronicleMapOnHeapUpdatableBuilder.of(CharSequence.class, CharSequence.class)
+        ChronicleMapBuilder<CharSequence, CharSequence> smallStringToStringMapBuilder =
+                ChronicleMapBuilder.of(CharSequence.class, CharSequence.class)
                         .entries(1000);
 
         byte identifier = (byte) 2;

src/test/java/net/openhft/chronicle/map/example/DistributedSequenceMain.java

@@ -19,7 +19,7 @@
 package net.openhft.chronicle.map.example;
 
 import net.openhft.chronicle.map.ChronicleMap;
-import net.openhft.chronicle.map.ChronicleMapOnHeapUpdatableBuilder;
+import net.openhft.chronicle.map.ChronicleMapBuilder;
 import net.openhft.lang.model.DataValueClasses;
 import net.openhft.lang.values.LongValue;
 
@@ -30,7 +30,7 @@ public class DistributedSequenceMain {
     public static void main(String... ignored) throws IOException {
         Class<LongValue> longValueClass = DataValueClasses.directClassFor(LongValue.class);
         ChronicleMap<String, LongValue> map =
-                ChronicleMapOnHeapUpdatableBuilder.of(String.class, longValueClass)
+                ChronicleMapBuilder.of(String.class, longValueClass)
                         .entries(128)
                         .actualSegments(1).create();
         LongValue value = DataValueClasses.newDirectReference(longValueClass);

src/test/java/net/openhft/chronicle/map/example/ServersMapMain.java

@@ -20,7 +20,7 @@ package net.openhft.chronicle.map.example;
 
 import net.openhft.chronicle.hash.replication.TcpTransportAndNetworkConfig;
 import net.openhft.chronicle.map.ChronicleMap;
-import net.openhft.chronicle.map.ChronicleMapOnHeapUpdatableBuilder;
+import net.openhft.chronicle.map.ChronicleMapBuilder;
 
 import java.io.File;
 import java.io.IOException;
@@ -39,7 +39,7 @@ public class ServersMapMain {
     public static void startServer() throws IOException {
         File file = File.createTempFile("testServersMapMain", ".deleteme");
         file.deleteOnExit();
-        final ChronicleMap<byte[], byte[]> serverMap = ChronicleMapOnHeapUpdatableBuilder.of(byte[].class, byte[].class)
+        final ChronicleMap<byte[], byte[]> serverMap = ChronicleMapBuilder.of(byte[].class, byte[].class)
                 .putReturnsNull(true)
                 .entrySize(50)
                 .replication((byte) 2, TcpTransportAndNetworkConfig.of(port))
@@ -52,7 +52,7 @@ public class ServersMapMain {
     public static void startRemoteClient(String hostname) throws IOException {
         final ChronicleMap<byte[], byte[]> map;
         if (stateless) {
-            map = ChronicleMapOnHeapUpdatableBuilder.of(
+            map = ChronicleMapBuilder.of(
                     byte[].class, byte[].class)
                     .putReturnsNull(true)
                     .statelessClient(new InetSocketAddress(hostname, port)).create();
@@ -61,7 +61,7 @@ public class ServersMapMain {
             file.deleteOnExit();
             TcpTransportAndNetworkConfig tcpConfig = TcpTransportAndNetworkConfig.of(port, new InetSocketAddress(hostname, port));
 
-            map = ChronicleMapOnHeapUpdatableBuilder.of(
+            map = ChronicleMapBuilder.of(
                     byte[].class, byte[].class)
                     .putReturnsNull(true)
                     .replication((byte) 1, tcpConfig)

src/test/java/net/openhft/chronicle/map/example/StringsMapMain.java

@@ -20,7 +20,7 @@ package net.openhft.chronicle.map.example;
 
 import net.openhft.chronicle.hash.replication.TcpTransportAndNetworkConfig;
 import net.openhft.chronicle.map.ChronicleMap;
-import net.openhft.chronicle.map.ChronicleMapOnHeapUpdatableBuilder;
+import net.openhft.chronicle.map.ChronicleMapBuilder;
 
 import java.io.File;
 import java.io.IOException;
@@ -38,7 +38,7 @@ public class StringsMapMain {
     public static void startServer() throws IOException {
         File file = File.createTempFile("testServersMapMain", ".deleteme");
         file.deleteOnExit();
-        final ChronicleMap<CharSequence, CharSequence> serverMap = ChronicleMapOnHeapUpdatableBuilder
+        final ChronicleMap<CharSequence, CharSequence> serverMap = ChronicleMapBuilder
                 .of(CharSequence.class, CharSequence.class)
                 .putReturnsNull(true)
                 .entrySize(50)
@@ -52,8 +52,7 @@ public class StringsMapMain {
     public static void startRemoteClient(String hostname) throws IOException {
         final ChronicleMap<CharSequence, CharSequence> map;
         if (stateless) {
-            map = ChronicleMapOnHeapUpdatableBuilder
-                    .of(CharSequence.class, CharSequence.class)
+            map = ChronicleMapBuilder.of(CharSequence.class, CharSequence.class)
                     .putReturnsNull(true)
                     .statelessClient(new InetSocketAddress(hostname, port)).create();
         } else {
@@ -61,7 +60,7 @@ public class StringsMapMain {
             file.deleteOnExit();
             TcpTransportAndNetworkConfig tcpConfig = TcpTransportAndNetworkConfig.of(port, new InetSocketAddress(hostname, port));
 
-            map = ChronicleMapOnHeapUpdatableBuilder
+            map = ChronicleMapBuilder
                     .of(CharSequence.class, CharSequence.class)
                     .putReturnsNull(true)
                     .replication((byte) 1, tcpConfig)

src/test/java/net/openhft/chronicle/map/fromdocs/pingpong_latency/PingPongCASLeft.java

@@ -20,7 +20,7 @@ package net.openhft.chronicle.map.fromdocs.pingpong_latency;
 
 import net.openhft.affinity.AffinitySupport;
 import net.openhft.chronicle.map.ChronicleMap;
-import net.openhft.chronicle.map.ChronicleMapOnHeapUpdatableBuilder;
+import net.openhft.chronicle.map.ChronicleMapBuilder;
 import net.openhft.chronicle.map.fromdocs.BondVOInterface;
 
 import java.io.IOException;
@@ -89,7 +89,7 @@ public class PingPongCASLeft {
     static ChronicleMap<String, BondVOInterface> acquireCHM() throws IOException {
         // ensure thread ids are globally unique.
         AffinitySupport.setThreadId();
-        return ChronicleMapOnHeapUpdatableBuilder.of(String.class, BondVOInterface.class)
+        return ChronicleMapBuilder.of(String.class, BondVOInterface.class)
                 .entries(16)
                 .entrySize(64).create();
     }

src/test/java/net/openhft/chronicle/map/ipc/StateMachineTutorial.java

@@ -19,7 +19,7 @@
 package net.openhft.chronicle.map.ipc;
 
 import net.openhft.chronicle.map.ChronicleMap;
-import net.openhft.chronicle.map.ChronicleMapOnHeapUpdatableBuilder;
+import net.openhft.chronicle.map.ChronicleMapBuilder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -40,7 +40,7 @@ public class StateMachineTutorial {
 
         try {
             File dataFile = new File(System.getProperty("java.io.tmpdir"), "hft-state-machine");
-            map = ChronicleMapOnHeapUpdatableBuilder.of(Integer.class, StateMachineData.class)
+            map = ChronicleMapBuilder.of(Integer.class, StateMachineData.class)
                     .entries(8).create();
 
             if (args.length > 0) {

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

@@ -19,7 +19,7 @@
 package net.openhft.chronicle.map.jrs166.map;
 
 import net.openhft.chronicle.map.ChronicleMap;
-import net.openhft.chronicle.map.ChronicleMapOnHeapUpdatableBuilder;
+import net.openhft.chronicle.map.ChronicleMapBuilder;
 import net.openhft.chronicle.map.jrs166.JSR166TestCase;
 import org.junit.Test;
 
@@ -49,33 +49,33 @@ public class ChronicleMapTest extends JSR166TestCase {
     }
 
     static ChronicleMap<Integer, CharSequence> newShmIntString(int size) throws IOException {
-        return ChronicleMapOnHeapUpdatableBuilder.of(Integer.class, CharSequence.class)
+        return ChronicleMapBuilder.of(Integer.class, CharSequence.class)
                 .entries(size).create();
 
     }
 
     static ChronicleMap<ArrayList, CharSequence> newShmListBoolean(int size) throws IOException {
-        return ChronicleMapOnHeapUpdatableBuilder.of(ArrayList.class, CharSequence.class)
+        return ChronicleMapBuilder.of(ArrayList.class, CharSequence.class)
                 .entries(size).create();
     }
 
 
     static ChronicleMap<ArrayList, CharSequence> newShmListBoolean() throws IOException {
-        return ChronicleMapOnHeapUpdatableBuilder.of(ArrayList.class, CharSequence.class).create();
+        return ChronicleMapBuilder.of(ArrayList.class, CharSequence.class).create();
     }
 
     static ChronicleMap<CharSequence, CharSequence> newShmStringString(int size) throws IOException {
-        return ChronicleMapOnHeapUpdatableBuilder.of(CharSequence.class, CharSequence.class)
+        return ChronicleMapBuilder.of(CharSequence.class, CharSequence.class)
                 .entries(size).create();
     }
 
 
     static ChronicleMap<Integer, CharSequence> newShmIntString() throws IOException {
-        return ChronicleMapOnHeapUpdatableBuilder.of(Integer.class, CharSequence.class).create();
+        return ChronicleMapBuilder.of(Integer.class, CharSequence.class).create();
     }
 
     static ChronicleMap<BI, Boolean> newShmBiBoolean() throws IOException {
-        return ChronicleMapOnHeapUpdatableBuilder.of(BI.class, Boolean.class).create();
+        return ChronicleMapBuilder.of(BI.class, Boolean.class).create();
     }
 
     /**

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

@@ -19,7 +19,7 @@
 package net.openhft.chronicle.map.jrs166.map;
 
 import net.openhft.chronicle.map.ChronicleMap;
-import net.openhft.chronicle.map.ChronicleMapOnHeapUpdatableBuilder;
+import net.openhft.chronicle.map.ChronicleMapBuilder;
 
 import java.io.*;
 import java.util.*;
@@ -123,7 +123,7 @@ public class MapCheck {
 
     static Map newMap() {
         try {
-            return ChronicleMapOnHeapUpdatableBuilder.of(Object.class, Object.class).create();
+            return ChronicleMapBuilder.of(Object.class, Object.class).create();
 
         } catch (Exception e) {
             throw new RuntimeException("Can't instantiate CHM : " + e);

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

@@ -20,7 +20,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.ChronicleMapOnHeapUpdatableBuilder;
+import net.openhft.chronicle.map.ChronicleMapBuilder;
 import net.openhft.chronicle.map.ReadContext;
 import net.openhft.chronicle.map.WriteContext;
 import net.openhft.chronicle.map.jrs166.JSR166TestCase;
@@ -193,10 +193,10 @@ public class StatelessChronicleMapTest extends JSR166TestCase {
     static ChronicleMap<Integer, String> newShmIntString(int port) throws IOException {
 
         final ChronicleMap<Integer, String> serverMap =
-                ChronicleMapOnHeapUpdatableBuilder.of(Integer.class, String.class)
+                ChronicleMapBuilder.of(Integer.class, String.class)
                         .replication((byte) 1, TcpTransportAndNetworkConfig.of(port)).create();
 
-        final ChronicleMap<Integer, String> statelessMap = ChronicleMapOnHeapUpdatableBuilder.of(Integer
+        final ChronicleMap<Integer, String> statelessMap = ChronicleMapBuilder.of(Integer
                 .class, String.class)
                 .statelessClient(new InetSocketAddress("localhost", port)).create();
 
@@ -207,11 +207,11 @@ public class StatelessChronicleMapTest extends JSR166TestCase {
     static ChronicleMap<CharSequence, CharSequence> newStrStrMap(int port) throws
             IOException {
 
-        final ChronicleMap<CharSequence, CharSequence> serverMap = ChronicleMapOnHeapUpdatableBuilder.of(CharSequence.class, CharSequence.class)
+        final ChronicleMap<CharSequence, CharSequence> serverMap = ChronicleMapBuilder.of(CharSequence.class, CharSequence.class)
                 .replication((byte) 2, TcpTransportAndNetworkConfig.of(port)).create();
 
 
-        final ChronicleMap<CharSequence, CharSequence> statelessMap = ChronicleMapOnHeapUpdatableBuilder.of(CharSequence
+        final ChronicleMap<CharSequence, CharSequence> statelessMap = ChronicleMapBuilder.of(CharSequence
                 .class, CharSequence.class)
                 .statelessClient(new InetSocketAddress("localhost", port)).create();
 
@@ -221,12 +221,12 @@ public class StatelessChronicleMapTest extends JSR166TestCase {
     static ChronicleMap<byte[], byte[]> newByteArrayMap(int port) throws
             IOException {
 
-        final ChronicleMap<byte[], byte[]> serverMap = ChronicleMapOnHeapUpdatableBuilder.of(byte[].class, byte[].class)
+        final ChronicleMap<byte[], byte[]> serverMap = ChronicleMapBuilder.of(byte[].class, byte[].class)
                 .putReturnsNull(true)
                 .replication((byte) 2, TcpTransportAndNetworkConfig.of(port)).create();
 
 
-        final ChronicleMap<byte[], byte[]> statelessMap = ChronicleMapOnHeapUpdatableBuilder.of(
+        final ChronicleMap<byte[], byte[]> statelessMap = ChronicleMapBuilder.of(
                 byte[].class, byte[].class)
                 .putReturnsNull(true)
                 .statelessClient(new InetSocketAddress("localhost", port)).create();

src/test/java/net/openhft/chronicle/map/utility/ProcessInstanceLimiter.java

@@ -20,7 +20,7 @@ package net.openhft.chronicle.map.utility;
 
 import net.openhft.affinity.AffinitySupport;
 import net.openhft.chronicle.map.ChronicleMap;
-import net.openhft.chronicle.map.ChronicleMapOnHeapUpdatableBuilder;
+import net.openhft.chronicle.map.ChronicleMapBuilder;
 import net.openhft.lang.model.DataValueClasses;
 import net.openhft.lang.model.constraints.MaxSize;
 
@@ -134,8 +134,8 @@ public class ProcessInstanceLimiter implements Runnable {
     public ProcessInstanceLimiter(String sharedMapPath, Callback callback) throws IOException {
         this.sharedMapPath = sharedMapPath;
         this.callback = callback;
-        ChronicleMapOnHeapUpdatableBuilder<String, Data> builder =
-                ChronicleMapOnHeapUpdatableBuilder.of(String.class, Data.class);
+        ChronicleMapBuilder<String, Data> builder =
+                ChronicleMapBuilder.of(String.class, Data.class);
         builder.entries(1000);
         builder.entrySize(1024);
         this.theSharedMap = builder.createPersistedTo(new File(sharedMapPath));