HCOLL-167 simplified the map builder by making "file" very much an option parameter, is it not REQUIRED for all types of maps. Also updated the many of the TCP replication test to remove the user of file() as its simply not required for this in many cases.

src/test/java/eg/BigData.java

@@ -51,7 +51,7 @@ public class BigData {
         String chmPath = dir + "/testmap-" + Long.toString(System.nanoTime(), 36);
         new File(chmPath).deleteOnExit();
         try {
-            theMap = builder.create(new File(chmPath));
+            theMap =  builder.file(new File(chmPath)).create();
         } catch (IOException e) {
             // TODO Auto-generated catch block
             e.printStackTrace();

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

@@ -27,8 +27,7 @@ import static org.junit.Assert.fail;
 public class AcquireGetUsingMain {
     public static void main(String[] args) throws Exception {
         File file = new File(System.getProperty("java.io.tmpdir") + "/test1");
-        ChronicleMap<String, Data> theSharedMap = ChronicleMapBuilder.of(String.class, Data.class)
-                .create(file);
+        ChronicleMap<String, Data> theSharedMap = ChronicleMapBuilder.of(String.class, Data.class).file(file).create();
         Data data = DataValueClasses.newDirectReference(Data.class);
         String processType = "testkey";
         if (theSharedMap.getUsing(processType, data) == null) {

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

@@ -59,7 +59,7 @@ public class Builder {
             final int serverPort,
             final InetSocketAddress... endpoints) throws IOException {
         return (T) newTcpSocketShmBuilder(Integer.class, Void.class,
-                identifier, serverPort, endpoints).create(getPersistenceFile());
+                identifier, serverPort, endpoints).create();
     }
 
     public static <K, V> ChronicleMapBuilder<K, V> newTcpSocketShmBuilder(
@@ -70,7 +70,6 @@ public class Builder {
         TcpReplicationConfig tcpConfig = TcpReplicationConfig.of(serverPort, endpoints)
                 .heartBeatInterval(1L, TimeUnit.SECONDS);
         return ChronicleMapBuilder.of(kClass, vClass)
-                .entries(20000L)
                 .replicators(identifier,  tcpConfig);
     }
 

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

@@ -74,10 +74,8 @@ public class CHMLatencyTestMain {
 //        File file = new File("testCHMLatency.deleteme");
         file.delete();
         ChronicleMap<LongValue, LongValue> countersMap = ChronicleMapBuilder.of(LongValue.class, LongValue.class)
-
                 .entries(KEYS)
-                .entrySize(24)
-                .create(file);
+                .entrySize(24).create();
 
         // add keys
         LongValue key = DataValueClasses.newInstance(LongValue.class);

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

@@ -35,8 +35,7 @@ public class CHMMetaDataTest {
                 new StringStringMapEventListener(new AtomicLong(1));
         ChronicleMap<String, String> map = ChronicleMapBuilder.of(String.class, String.class)
                 .metaDataBytes(8)
-                .eventListener(listener)
-                .create(file);
+                .eventListener(listener).create();
 
         try {
             map.put("a", "aye");

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

@@ -41,8 +41,8 @@ public class CHMTest5 {
         //// end of test
 
         String chmPath = System.getProperty("java.io.tmpdir") + System.getProperty("file.separator") + "CHMTest5";
-        ChronicleMap<String, CHMTest5Data> theSharedMap = builder
-                .create(new File(chmPath));
+
+        ChronicleMap<String, CHMTest5Data> theSharedMap = builder.file(new File(chmPath)).create();
 
         //Now get the shared data object, auto-creating if it's not there
         CHMTest5Data data = DataValueClasses.newDirectReference(CHMTest5Data.class);

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

@@ -16,7 +16,6 @@
 
 package net.openhft.chronicle.map;
 
-import java.io.File;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicLong;
 
@@ -31,8 +30,8 @@ public class CHMTestIterator1 {
         int runs = 3000000;
         ChronicleMapBuilder<String, Long> builder = ChronicleMapBuilder.of(String.class, Long.class)
                 .entries(runs);
-        String chmPath = System.getProperty("java.io.tmpdir") + System.getProperty("file.separator") + "CHMTestIterator1";
-        ChronicleMap<String, Long> chm = builder.create(new File(chmPath));
+
+        ChronicleMap<String, Long> chm = builder.create();
         /*chm.put("k1", alValue.incrementAndGet());
         chm.put("k2", alValue.incrementAndGet());
         chm.put("k3", alValue.incrementAndGet());

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

@@ -27,7 +27,6 @@ import java.io.IOException;
 import java.net.InetSocketAddress;
 
 import static java.util.concurrent.TimeUnit.SECONDS;
-import static net.openhft.chronicle.map.Builder.getPersistenceFile;
 import static org.junit.Assert.assertTrue;
 
 /**
@@ -61,8 +60,7 @@ public class ChannelReplicationTest {
 
             map1a = ChronicleMapBuilder.of(Integer.class, CharSequence.class)
                     .entries(1000)
-                    .channel(channelProviderA.createChannel((short) 1))
-                    .create(getPersistenceFile());
+                    .channel(channelProviderA.createChannel((short) 1)).create();
         }
 
         {
@@ -74,8 +72,7 @@ public class ChannelReplicationTest {
 
             map1b = ChronicleMapBuilder.of(Integer.class, CharSequence.class)
                     .entries(1000)
-                    .channel(channelProviderB.createChannel((short) 1))
-                    .create(getPersistenceFile());
+                    .channel(channelProviderB.createChannel((short) 1)).create();
         }
     }
 
@@ -97,14 +94,12 @@ public class ChannelReplicationTest {
 
         map2b = ChronicleMapBuilder.of(Integer.class, CharSequence.class)
                 .entries(1000)
-                .channel(channelProviderB.createChannel((short) 2))
-                .create(getPersistenceFile());
+                .channel(channelProviderB.createChannel((short) 2)).create();
 
 
         map2a = ChronicleMapBuilder.of(Integer.class, CharSequence.class)
                 .entries(1000)
-                .channel(channelProviderA.createChannel((short) 2))
-                .create(getPersistenceFile());
+                .channel(channelProviderA.createChannel((short) 2)).create();
 
         map2a.put(1, "EXAMPLE-2");
         map1a.put(1, "EXAMPLE-1");

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

@@ -114,8 +114,7 @@ public class ChronicleMapTest {
                 .entrySize(entrySize)
                 .entryAndValueAlignment(alignment)
                 .valueMarshallerAndFactory(ByteableLongValueMarshaller.INSTANCE,
-                        DirectLongValueFactory.INSTANCE)
-                .create(getPersistenceFile());
+                        DirectLongValueFactory.INSTANCE).create();
     }
 
     private static void printStatus() {
@@ -137,8 +136,7 @@ public class ChronicleMapTest {
 
         final ChronicleMap<CharSequence, CharSequence> map =
                 ChronicleMapBuilder.of(CharSequence.class, CharSequence.class)
-                        .minSegments(2)
-                        .create(getPersistenceFile());
+                        .minSegments(2).create();
 
         assertFalse(map.containsKey("key3"));
         map.put("key1", "one");
@@ -184,8 +182,7 @@ public class ChronicleMapTest {
         final ChronicleMap<CharSequence, CharSequence> map =
                 ChronicleMapBuilder.of(CharSequence.class, CharSequence.class)
                         .minSegments(1024)
-                        .removeReturnsNull(true)
-                        .create(getPersistenceFile());
+                        .removeReturnsNull(true).create();
 
 
         for (int i = 1; i < 1024; i++) {
@@ -207,8 +204,7 @@ public class ChronicleMapTest {
         int count = 300;
         final ChronicleMap<Object, Object> map = ChronicleMapBuilder.of(Object.class, Object.class)
                 .entrySize(count)
-                .minSegments(2)
-                .create(getPersistenceFile());
+                .minSegments(2).create();
 
 
         for (int i = 1; i < count; i++) {
@@ -233,8 +229,7 @@ public class ChronicleMapTest {
         final ChronicleMap<CharSequence, CharSequence> map =
                 ChronicleMapBuilder.of(CharSequence.class, CharSequence.class)
                         .minSegments(2)
-                        .removeReturnsNull(true)
-                        .create(getPersistenceFile());
+                        .removeReturnsNull(true).create();
 
         assertFalse(map.containsKey("key3"));
         map.put("key1", "one");
@@ -279,8 +274,7 @@ public class ChronicleMapTest {
 
         final ChronicleMap<CharSequence, CharSequence> map =
                 ChronicleMapBuilder.of(CharSequence.class, CharSequence.class)
-                        .minSegments(2)
-                        .create(getPersistenceFile());
+                        .minSegments(2).create();
 
 
         map.put("key1", "one");
@@ -345,8 +339,7 @@ public class ChronicleMapTest {
 
         final ChronicleMap<CharSequence, CharSequence> map =
                 ChronicleMapBuilder.of(CharSequence.class, CharSequence.class)
-                        .minSegments(2)
-                        .create(getPersistenceFile());
+                        .minSegments(2).create();
 
         map.put("key1", "one");
         map.put("key2", "two");
@@ -388,8 +381,7 @@ public class ChronicleMapTest {
 
         final ChronicleMap<CharSequence, CharSequence> map =
                 ChronicleMapBuilder.of(CharSequence.class, CharSequence.class)
-                        .minSegments(2)
-                        .create(getPersistenceFile());
+                        .minSegments(2).create();
 
 
         map.put("key1", "one");
@@ -591,7 +583,8 @@ public class ChronicleMapTest {
                     .entrySize(20)
                     .valueMarshallerAndFactory(ByteableIntValueMarshaller.INSTANCE,
                             DirectIntValueFactory.INSTANCE);
-            final ChronicleMap<CharSequence, IntValue> map = builder.create(getPersistenceFile());
+
+            final ChronicleMap<CharSequence, IntValue> map = builder.create();
 
             int procs = Runtime.getRuntime().availableProcessors();
             int threads = procs * 2; // runs > 100 ? procs / 2 : procs;
@@ -713,8 +706,7 @@ public class ChronicleMapTest {
                         .minSegments(16)
                         .entrySize(32)
                         .putReturnsNull(true)
-                        .removeReturnsNull(true)
-                        .create(getPersistenceFile());
+                        .removeReturnsNull(true).create();
         StringBuilder key = new StringBuilder();
         StringBuilder value = new StringBuilder();
         StringBuilder value2 = new StringBuilder();
@@ -1144,8 +1136,7 @@ public class ChronicleMapTest {
                         .minSegments(16)
                         .entrySize(32)
                         .putReturnsNull(true)
-                        .removeReturnsNull(true)
-                        .create(getPersistenceFile());
+                        .removeReturnsNull(true).create();
 
         int[] expectedKeys = new int[noOfElements];
         String[] expectedValues = new String[noOfElements];
@@ -1166,19 +1157,22 @@ public class ChronicleMapTest {
                 .minSegments(1)
                 .entrySize(10);
         builder.entryAndValueAlignment(NO_ALIGNMENT);
+        builder.file(getPersistenceFile());
         testOversizeEntriesPutRemoveReplace(
                 (VanillaChronicleMap<CharSequence, ?, ?, CharSequence, ?, ?>)
-                        builder.create(getPersistenceFile())
+                        builder.create()
         );
         builder.entryAndValueAlignment(Alignment.OF_4_BYTES);
+        builder.file(getPersistenceFile());
         testOversizeEntriesPutRemoveReplace(
                 (VanillaChronicleMap<CharSequence, ?, ?, CharSequence, ?, ?>)
-                        builder.create(getPersistenceFile())
+                        builder.create()
         );
         builder.entryAndValueAlignment(OF_8_BYTES);
+        builder.file(getPersistenceFile());
         testOversizeEntriesPutRemoveReplace(
                 (VanillaChronicleMap<CharSequence, ?, ?, CharSequence, ?, ?>)
-                        builder.create(getPersistenceFile())
+                        builder.create()
         );
     }
 
@@ -1225,13 +1219,13 @@ public class ChronicleMapTest {
     @Test
     public void equalsTest() throws IOException {
         final ChronicleMap<Integer, String> map1 = ChronicleMapBuilder
-                .of(Integer.class, String.class).create(getPersistenceFile());
+                .of(Integer.class, String.class).create();
 
         map1.put(1, "one");
         map1.put(2, "two");
 
         final ChronicleMap<Integer, String> map2 = ChronicleMapBuilder
-                .of(Integer.class, String.class).create(getPersistenceFile());
+                .of(Integer.class, String.class).create();
 
         map2.put(1, "one");
         map2.put(2, "two");

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

@@ -37,8 +37,7 @@ public class DefaultValueTest {
             defaultValue.add(42);
             try (ChronicleMap<String, List<Integer>> map = ChronicleMapBuilder
                     .of(String.class, (Class<List<Integer>>) ((Class) List.class))
-                    .defaultValue(defaultValue)
-                    .create(file)) {
+                    .defaultValue(defaultValue).file(file).create()) {
 
                 assertEquals(defaultValue, map.get("a"));
                 assertEquals(1, map.size());
@@ -48,7 +47,8 @@ public class DefaultValueTest {
             }
 
             try (ChronicleMap<String, List<Integer>> map = ChronicleMapBuilder
-                    .of(String.class, (Class<List<Integer>>) ((Class) List.class)).create(file)) {
+                    .of(String.class, (Class<List<Integer>>) ((Class) List.class)).file(file).
+                 create()) {
                 assertEquals(defaultValue, map.get("c"));
             }
         } finally {

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

@@ -30,7 +30,6 @@ import java.util.List;
 import java.util.Map;
 
 import static com.google.common.collect.testing.features.MapFeature.*;
-import static net.openhft.chronicle.map.ChronicleMapTest.getPersistenceFile;
 
 
 public class GuavaTest extends TestCase {
@@ -106,7 +105,7 @@ public class GuavaTest extends TestCase {
         @Override
         Map<CharSequence, CharSequence> newMap() {
             try {
-                return builder.create(getPersistenceFile());
+                return builder.create();
             } catch (IOException e) {
                 throw new AssertionError(e);
             }

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

@@ -24,7 +24,6 @@ import org.junit.Test;
 import java.io.IOException;
 import java.nio.ByteBuffer;
 
-import static net.openhft.chronicle.map.Builder.getPersistenceFile;
 import static org.junit.Assert.assertEquals;
 
 
@@ -39,8 +38,7 @@ public class IntValueMapTest {
         final ChronicleMap<IntValue, CharSequence> map = ChronicleMapBuilder
                 .of(IntValue.class, CharSequence.class)
                 .entries(20000)
-                .keyMarshaller(ByteableIntValueMarshaller.INSTANCE)
-                .create(getPersistenceFile());
+                .keyMarshaller(ByteableIntValueMarshaller.INSTANCE).create();
 
         IntValue$$Native value = new IntValue$$Native();
         value.bytes(new ByteBufferBytes(ByteBuffer.allocateDirect(4)), 0);

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

@@ -22,7 +22,6 @@ import org.testng.Assert;
 import java.io.IOException;
 
 import static net.openhft.chronicle.map.Alignment.NO_ALIGNMENT;
-import static net.openhft.chronicle.map.Builder.getPersistenceFile;
 
 public class Issue42 {
 
@@ -44,8 +43,7 @@ public class Issue42 {
                 .entryAndValueAlignment(NO_ALIGNMENT)
                 .entrySize(18)
                 .entries(15000000)
-                .minSegments(128)
-                .create(getPersistenceFile());
+                .minSegments(128).create();
 
         for (int i = 0; i < 10000000; ++i) {
             String s = String.valueOf(i);

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

@@ -19,7 +19,6 @@ package net.openhft.chronicle.map;
 import org.junit.Test;
 
 import java.io.Closeable;
-import java.io.File;
 import java.io.IOException;
 import java.util.Map;
 
@@ -31,10 +30,8 @@ import static org.junit.Assert.assertEquals;
 public class KeySizesTest {
     @Test
     public void testDifferentKeySizes() throws IOException {
-        File tempFile = File.createTempFile("delete", "me");
-        Map<String, String> map = ChronicleMapBuilder.of(String.class, String.class)
 
-                .create(tempFile);
+        Map<String, String> map = ChronicleMapBuilder.of(String.class, String.class).create();
 
         String k = "";
         for (int i = 0; i < 100; i++) {
@@ -51,6 +48,6 @@ public class KeySizesTest {
         }
 
         ((Closeable) map).close();
-        tempFile.delete();
+
     }
 }

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

@@ -35,8 +35,7 @@ public class OSResizesMain {
         File file = File.createTempFile("over-sized", "deleteme");
         ChronicleMap<String, String> map = ChronicleMapBuilder.of(String.class, String.class)
                 .entrySize(100 * 1024 * 1024)
-                .entries(1000000)
-                .create(file);
+                .entries(1000000).create();
         for (int i = 0; i < 10000; i++) {
             char[] chars = new char[i];
             Arrays.fill(chars, '+');

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

@@ -69,13 +69,11 @@ public class PostChannelCreationTest {
             // this is how you add maps after the custer is created
             map1a = ChronicleMapBuilder.of(Integer.class, CharSequence.class)
                     .entries(1000)
-                    .channel(channelProviderA.createChannel((short) 1))
-                    .create(getPersistenceFile());
+                    .channel(channelProviderA.createChannel((short) 1)).create();
 
             map2a = ChronicleMapBuilder.of(Integer.class, CharSequence.class)
                     .entries(1000)
-                    .channel(channelProviderA.createChannel((short) 2))
-                    .create(getPersistenceFile());
+                    .channel(channelProviderA.createChannel((short) 2)).create();
         }
 
 
@@ -90,13 +88,11 @@ public class PostChannelCreationTest {
             // this is how you add maps after the custer is created
             map1b = ChronicleMapBuilder.of(Integer.class, CharSequence.class)
                     .entries(1000)
-                    .channel(channelProviderB.createChannel((short) 1))
-                    .create(getPersistenceFile());
+                    .channel(channelProviderB.createChannel((short) 1)).create();
 
             map2b = ChronicleMapBuilder.of(Integer.class, CharSequence.class)
                     .entries(1000)
-                    .channel(channelProviderB.createChannel((short) 2))
-                    .create(getPersistenceFile());
+                    .channel(channelProviderB.createChannel((short) 2)).create();
         }
 
 

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

@@ -39,7 +39,7 @@ public class ProcessInstanceLimiterMain implements Runnable {
         builder.entries(10000);
         builder.minSegments(2);
         File file = new File(System.getProperty("java.io.tmpdir") + "/" + sharedMapName);
-        this.theSharedMap = builder.create(file);
+        this.theSharedMap = builder.create();
         Thread t = new Thread(this, "ProcessInstanceLimiterMain updater");
         t.setDaemon(true);
         t.start();

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

@@ -33,8 +33,7 @@ public class RecursiveRefereneChMapTest {
         file.deleteOnExit();
         Map<String, StupidCycle> map = ChronicleMapBuilder.of(String.class, StupidCycle.class)
                 .entries(64)
-                .objectSerializer(JDKObjectSerializer.INSTANCE)
-                .create(file);
+                .objectSerializer(JDKObjectSerializer.INSTANCE).create();
         map.put("Test", new StupidCycle());
         map.put("Test2", new StupidCycle2());
         StupidCycle cycle = (StupidCycle) map.get("Test");

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

@@ -46,7 +46,7 @@ public class ReplicatedChronicleMapTest extends JSR166TestCase {
                 .entries(size).replicators((byte) 1);
         return ChronicleMapBuilder.of(Integer.class, CharSequence.class)
                 .entries(size)
-                .create(getPersistenceFile());
+                .create();
 
     }
 
@@ -55,7 +55,7 @@ public class ReplicatedChronicleMapTest extends JSR166TestCase {
                 .entries(size).replicators((byte) 1);
         return ChronicleMapBuilder.of(ArrayList.class, CharSequence.class)
                 .entries(size)
-                .create(getPersistenceFile());
+                .create();
 
     }
 
@@ -63,7 +63,7 @@ public class ReplicatedChronicleMapTest extends JSR166TestCase {
     ChronicleMap<ArrayList, CharSequence> newShmListBoolean() throws IOException {
         ChronicleMapBuilder.of(ArrayList.class, CharSequence.class).replicators((byte) 1);
         return ChronicleMapBuilder.of(ArrayList.class, CharSequence.class)
-                .create(getPersistenceFile());
+                .create();
 
     }
 
@@ -72,7 +72,7 @@ public class ReplicatedChronicleMapTest extends JSR166TestCase {
                 .entries(size).replicators((byte) 1);
         return ChronicleMapBuilder.of(CharSequence.class, CharSequence.class)
                 .entries(size)
-                .create(getPersistenceFile());
+                .create();
 
     }
 
@@ -80,13 +80,13 @@ public class ReplicatedChronicleMapTest extends JSR166TestCase {
     ChronicleMap<Integer, CharSequence> newShmIntString() throws IOException {
         ChronicleMapBuilder.of(Integer.class, CharSequence.class).replicators((byte) 1);
         return ChronicleMapBuilder.of(Integer.class, CharSequence.class)
-                .create(getPersistenceFile());
+                .create();
 
     }
 
     ChronicleMap<BI, Boolean> newShmBiBoolean() throws IOException {
         ChronicleMapBuilder.of(BI.class, Boolean.class).replicators((byte) 1);
-        return ChronicleMapBuilder.of(BI.class, Boolean.class).create(getPersistenceFile());
+        return ChronicleMapBuilder.of(BI.class, Boolean.class).create();
 
     }
 

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

@@ -67,8 +67,7 @@ public class SingleMapClusterTest {
             // this is how you add maps after the custer is created
             map1a = ChronicleMapBuilder.of(Integer.class, CharSequence.class)
                     .entries(1000)
-                    .channel(channelProviderA.createChannel((short) 1))
-                    .create(getPersistenceFile());
+                    .channel(channelProviderA.createChannel((short) 1)).create();
         }
 
 
@@ -83,8 +82,7 @@ public class SingleMapClusterTest {
             // this is how you add maps after the custer is created
             map1b = ChronicleMapBuilder.of(Integer.class, CharSequence.class)
                     .channel(channelProviderB.createChannel((short) 1))
-                    .entries(1000)
-                    .create(getPersistenceFile());
+                    .entries(1000).create();
         }
     }
 

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

@@ -8,7 +8,6 @@ import java.net.InetSocketAddress;
 
 import static java.util.concurrent.TimeUnit.SECONDS;
 import static net.openhft.chronicle.StatelessBuilder.remoteAddress;
-import static net.openhft.chronicle.map.Builder.getPersistenceFile;
 import static net.openhft.chronicle.map.TcpReplicationConfig.of;
 
 /**
@@ -28,8 +27,7 @@ public class StatelessClientTest {
 
             serverMap = ChronicleMapBuilder.of(Integer.class, CharSequence.class)
                     .entries(20000L)
-                    .replicators((byte) 2, of(8076).heartBeatInterval(1L, SECONDS))
-                    .create(getPersistenceFile());
+                    .replicators((byte) 2, of(8076).heartBeatInterval(1L, SECONDS)).create();
 
             serverMap.put(10, "EXAMPLE-10");
         }

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

@@ -26,7 +26,6 @@ import java.io.Closeable;
 import java.io.IOException;
 import java.net.InetSocketAddress;
 
-import static net.openhft.chronicle.map.Builder.getPersistenceFile;
 import static net.openhft.chronicle.map.Builder.newTcpSocketShmBuilder;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
@@ -48,7 +47,7 @@ public class TCPSocketReplication4WayMapTest {
             final int serverPort,
             final InetSocketAddress... endpoints) throws IOException {
         return (T) newTcpSocketShmBuilder(Integer.class, CharSequence.class,
-                identifier, serverPort, endpoints).create(getPersistenceFile());
+                identifier, serverPort, endpoints).create();
     }
 
 
@@ -60,8 +59,7 @@ public class TCPSocketReplication4WayMapTest {
         return newTcpSocketShmBuilder(IntValue.class, CharSequence.class,
                 identifier, serverPort, endpoints)
                 .entries(20000L)
-                .keyMarshaller(ByteableIntValueMarshaller.INSTANCE)
-                .create(getPersistenceFile());
+                .keyMarshaller(ByteableIntValueMarshaller.INSTANCE).create();
     }
 
 

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

@@ -49,7 +49,7 @@ public class TCPSocketReplicationBootStrapTests {
                 newTcpSocketShmBuilder(Integer.class, CharSequence.class,
                         (byte) 2, 8076, new InetSocketAddress("localhost", 8079));
         final ChronicleMap<Integer, CharSequence> map2a =
-                map2aBuilder.create(getPersistenceFile());
+                map2aBuilder.file(getPersistenceFile()).create();
         map2a.put(10, "EXAMPLE-10");  // this will be the last time that map1 go an update from map2
 
         long lastModificationTime;
@@ -67,14 +67,16 @@ public class TCPSocketReplicationBootStrapTests {
             // restart map 2 but don't doConnect it to map one
             final ChronicleMap<Integer, CharSequence> map2b =
                     ChronicleMapBuilder.of(Integer.class, CharSequence.class)
-                            .create(map2File);
+                            .file(map2File)
+            .create();
             // add data into it
             map2b.put(11, "ADDED WHEN DISCONNECTED TO MAP1");
             map2b.close();
         }
 
         // now restart map2a and doConnect it to map1, map1 should bootstrap the missing entry
-        map2 = map2aBuilder.create(map2File);
+        map2aBuilder.file(map2File);
+        map2 = map2aBuilder.create();
 
         // add data into it
         waitTillEqual(5000);
@@ -88,9 +90,10 @@ public class TCPSocketReplicationBootStrapTests {
         map1 = newTcpSocketShmIntString((byte) 1, 8079, new InetSocketAddress("localhost", 8076));
         ChronicleMapBuilder<Integer, CharSequence> map2aBuilder =
                 newTcpSocketShmBuilder(Integer.class, CharSequence.class, (byte) 2, 8076);
+
         final ReplicatedChronicleMap<Integer, ?, ?, CharSequence, ?, ?> map2a =
                 (ReplicatedChronicleMap<Integer, ?, ?, CharSequence, ?, ?>)
-                        map2aBuilder.create(getPersistenceFile());
+                        map2aBuilder.file(getPersistenceFile()).create();
 
         map2a.put(10, "EXAMPLE-10");  // this will be the last time that map1 go an update from map2
 
@@ -107,16 +110,18 @@ public class TCPSocketReplicationBootStrapTests {
 
         {
             // restart map 2 but don't doConnect it to map one
+            ChronicleMapBuilder.of(Integer.class, CharSequence.class).file(map2File);
             final ChronicleMap<Integer, CharSequence> map2b =
-                    ChronicleMapBuilder.of(Integer.class, CharSequence.class)
-                            .create(map2File);
+                    ChronicleMapBuilder.of(Integer.class, CharSequence.class).file(map2File).
+            create();
             // add data into it
             map2b.put(11, "ADDED WHEN DISCONNECTED TO MAP1");
             map2b.close();
         }
 
         // now restart map2a and doConnect it to map1, map1 should bootstrap the missing entry
-        map2 = map2aBuilder.create(map2File);
+        map2aBuilder.file(map2File);
+        map2 = map2aBuilder.create();
 
         // add data into it
         waitTillEqual(20000);

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

@@ -55,8 +55,8 @@ public class TCPSocketReplicationIntValueTest {
         value.bytes(new ByteBufferBytes(ByteBuffer.allocateDirect(4)), 0);
         map1Builder = newTcpSocketShmBuilder(IntValue.class, CharSequence.class,
                 (byte) 1, 8076, new InetSocketAddress("localhost", 8077));
-        map1 = map1Builder.keyMarshaller(ByteableIntValueMarshaller.INSTANCE)
-                .create(getPersistenceFile());
+        map1Builder.keyMarshaller(ByteableIntValueMarshaller.INSTANCE).file(getPersistenceFile());
+        map1 = map1Builder.keyMarshaller(ByteableIntValueMarshaller.INSTANCE).create();
         map2 = newTcpSocketShmIntValueString((byte) 2, 8077);
     }
 

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

@@ -48,7 +48,8 @@ public class TCPSocketReplicationTest {
         ChronicleMapBuilder<Integer, CharSequence> map1Builder =
                 newTcpSocketShmBuilder(Integer.class, CharSequence.class,
                         (byte) 1, 8076, new InetSocketAddress("localhost", 8077));
-        map1 = map1Builder.create(getPersistenceFile());
+        map1Builder.file(getPersistenceFile());
+        map1 = map1Builder.create();
         map2 = newTcpSocketShmIntString((byte) 2, 8077);
     }
 

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

@@ -45,12 +45,10 @@ public class TCPSocketReplicationTest3wayPutReturnsNull {
             final int serverPort,
             final InetSocketAddress... endpoints) throws IOException {
         TcpReplicationConfig tcpConfig = TcpReplicationConfig.of(serverPort, endpoints);
-        return (T) ChronicleMapBuilder.of(Integer.class, CharSequence.class)
 
-                .entries(1000)
+        return (T) ChronicleMapBuilder.of(Integer.class, CharSequence.class)
                 .putReturnsNull(true)
-                .replicators(identifier, tcpConfig)
-                .create(Builder.getPersistenceFile());
+                .replicators(identifier, tcpConfig).create();
     }
 
 

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

@@ -77,8 +77,9 @@ public class TCPSocketReplicationTestPostConnection {
         ChronicleMapBuilder<Integer, CharSequence> map2aBuilder =
                 newTcpSocketShmBuilder(Integer.class, CharSequence.class,
                         (byte) 2, 8077, new InetSocketAddress("localhost", 8076));
+        map2aBuilder.file(Builder.getPersistenceFile());
         final ChronicleMap<Integer, CharSequence> map2a =
-                map2aBuilder.create(Builder.getPersistenceFile());
+                map2aBuilder.create();
         map1 = TCPSocketReplication4WayMapTest.newTcpSocketShmIntString((byte) 1, 8076);
 
         Thread.sleep(1);
@@ -91,7 +92,8 @@ public class TCPSocketReplicationTestPostConnection {
         map1.put(6, "EXAMPLE-1");
 
         // recreate map2 with new unique file
-        map2 = map2aBuilder.create(Builder.getPersistenceFile());
+        map2aBuilder.file(Builder.getPersistenceFile());
+        map2 = map2aBuilder.create();
 
 
         // allow time for the recompilation to resolve

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

@@ -52,8 +52,7 @@ public class TimeBasedReplicationTests extends JSR166TestCase {
                 .entries(10).replicators((byte) 1);
         ChronicleMap map = ChronicleMapBuilder.of(CharSequence.class, CharSequence.class)
                 .replicators((byte) 1)
-                .timeProvider(timeProvider)
-                .create(getPersistenceFile());
+                .timeProvider(timeProvider).create();
 
         current(timeProvider);
 
@@ -83,8 +82,7 @@ public class TimeBasedReplicationTests extends JSR166TestCase {
                 .entries(10).replicators((byte) 1);
         ChronicleMap map = ChronicleMapBuilder.of(CharSequence.class, CharSequence.class)
                 .replicators((byte) 1)
-                .timeProvider(timeProvider)
-                .create(getPersistenceFile());
+                .timeProvider(timeProvider).create();
 
         current(timeProvider);
 
@@ -115,8 +113,7 @@ public class TimeBasedReplicationTests extends JSR166TestCase {
                 .entries(10).replicators((byte) 1);
         ChronicleMap map = ChronicleMapBuilder.of(CharSequence.class, CharSequence.class)
                 .replicators((byte) 1)
-                .timeProvider(timeProvider)
-                .create(getPersistenceFile());
+                .timeProvider(timeProvider).create();
 
         current(timeProvider);
 
@@ -148,10 +145,12 @@ public class TimeBasedReplicationTests extends JSR166TestCase {
         final TimeProvider timeProvider = Mockito.mock(TimeProvider.class);
         ChronicleMapBuilder.of(CharSequence.class, CharSequence.class)
                 .entries(10).replicators((byte) 1);
+        ChronicleMapBuilder.of(CharSequence.class, CharSequence.class)
+                .replicators((byte) 1)
+                .timeProvider(timeProvider).file(getPersistenceFile());
         ChronicleMap map = ChronicleMapBuilder.of(CharSequence.class, CharSequence.class)
                 .replicators((byte) 1)
-                .timeProvider(timeProvider)
-                .create(getPersistenceFile());
+                .timeProvider(timeProvider).create();
 
         current(timeProvider);
 
@@ -179,10 +178,12 @@ public class TimeBasedReplicationTests extends JSR166TestCase {
 
         final TimeProvider timeProvider = Mockito.mock(TimeProvider.class);
         ChronicleMapBuilder.of(CharSequence.class, CharSequence.class).replicators((byte) 1);
+        ChronicleMapBuilder.of(CharSequence.class, CharSequence.class)
+                .replicators((byte) 1)
+                .timeProvider(timeProvider).file(getPersistenceFile());
         ChronicleMap map = ChronicleMapBuilder.of(CharSequence.class, CharSequence.class)
                 .replicators((byte) 1)
-                .timeProvider(timeProvider)
-                .create(getPersistenceFile());
+                .timeProvider(timeProvider).create();
 
         current(timeProvider);
 
@@ -209,10 +210,12 @@ public class TimeBasedReplicationTests extends JSR166TestCase {
 
         final TimeProvider timeProvider = Mockito.mock(TimeProvider.class);
         ChronicleMapBuilder.of(CharSequence.class, CharSequence.class).replicators((byte) 1);
+        ChronicleMapBuilder.of(CharSequence.class, CharSequence.class)
+                .replicators((byte) 1)
+                .timeProvider(timeProvider).file(getPersistenceFile());
         ChronicleMap map = ChronicleMapBuilder.of(CharSequence.class, CharSequence.class)
                 .replicators((byte) 1)
-                .timeProvider(timeProvider)
-                .create(getPersistenceFile());
+                .timeProvider(timeProvider).create();
 
         current(timeProvider);
 
@@ -239,10 +242,12 @@ public class TimeBasedReplicationTests extends JSR166TestCase {
 
         final TimeProvider timeProvider = Mockito.mock(TimeProvider.class);
         ChronicleMapBuilder.of(CharSequence.class, CharSequence.class).replicators((byte) 1);
+        ChronicleMapBuilder.of(CharSequence.class, CharSequence.class)
+                .replicators((byte) 1)
+                .timeProvider(timeProvider).file(getPersistenceFile());
         ReplicatedChronicleMap map = (ReplicatedChronicleMap) ChronicleMapBuilder.of(CharSequence.class, CharSequence.class)
                 .replicators((byte) 1)
-                .timeProvider(timeProvider)
-                .create(getPersistenceFile());
+                .timeProvider(timeProvider).create();
 
         current(timeProvider);
 
@@ -270,10 +275,12 @@ public class TimeBasedReplicationTests extends JSR166TestCase {
 
         final TimeProvider timeProvider = Mockito.mock(TimeProvider.class);
         ChronicleMapBuilder.of(CharSequence.class, CharSequence.class).replicators((byte) 1);
+        ChronicleMapBuilder.of(CharSequence.class, CharSequence.class)
+                .replicators((byte) 1)
+                .timeProvider(timeProvider).file(getPersistenceFile());
         ReplicatedChronicleMap map = (ReplicatedChronicleMap) ChronicleMapBuilder.of(CharSequence.class, CharSequence.class)
                 .replicators((byte) 1)
-                .timeProvider(timeProvider)
-                .create(getPersistenceFile());
+                .timeProvider(timeProvider).create();
 
         current(timeProvider);
 
@@ -300,12 +307,16 @@ public class TimeBasedReplicationTests extends JSR166TestCase {
     public void testRemoveFollowedByLatePut() throws IOException {
 
         final TimeProvider timeProvider = Mockito.mock(TimeProvider.class);
+        ChronicleMapBuilder.of(CharSequence.class, CharSequence.class)
+                .entries(10)
+                .replicators((byte) 1)
+                .entries(10)
+                .timeProvider(timeProvider).file(getPersistenceFile());
         ReplicatedChronicleMap map = (ReplicatedChronicleMap) ChronicleMapBuilder.of(CharSequence.class, CharSequence.class)
                 .entries(10)
                 .replicators((byte) 1)
                 .entries(10)
-                .timeProvider(timeProvider)
-                .create(getPersistenceFile());
+                .timeProvider(timeProvider).create();
 
         current(timeProvider);
 
@@ -332,11 +343,14 @@ public class TimeBasedReplicationTests extends JSR166TestCase {
         final TimeProvider timeProvider = Mockito.mock(TimeProvider.class);
         ChronicleMapBuilder.of(CharSequence.class, CharSequence.class)
                 .entries(10).replicators((byte) 1);
+        ChronicleMapBuilder.of(CharSequence.class, CharSequence.class)
+                .entries(10)
+                .entries(10)
+                .timeProvider(timeProvider).file(getPersistenceFile());
         ChronicleMap map = ChronicleMapBuilder.of(CharSequence.class, CharSequence.class)
                 .entries(10)
                 .entries(10)
-                .timeProvider(timeProvider)
-                .create(getPersistenceFile());
+                .timeProvider(timeProvider).create();
 
         current(timeProvider);
 

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

@@ -51,13 +51,11 @@ public class TwoMapOnDifferentServers {
         File persistenceFile = getPersistenceFile();
         map1 = ChronicleMapBuilder.of(Integer.class, CharSequence.class)
                 .entries(20000)
-                .replicators((byte) 1, tcpConfig)
-                .create(persistenceFile);
+                .replicators((byte) 1, tcpConfig).create();
 
         map2 = ChronicleMapBuilder.of(Integer.class, CharSequence.class)
                 .entries(20000)
-                .replicators((byte) 2, of(8077).heartBeatInterval(1, SECONDS))
-                .create(persistenceFile);
+                .replicators((byte) 2, of(8077).heartBeatInterval(1, SECONDS)).create();
     }
 
     @After

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

@@ -42,8 +42,7 @@ public class UDPSocketReplicationTest {
 
         return ChronicleMapBuilder.of(Integer.class, CharSequence.class)
                 .entries(1000)
-                .replicators((byte) identifier, udpConfig)
-                .create(Builder.getPersistenceFile());
+                .replicators((byte) identifier, udpConfig).create();
     }
 
     @Before

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

@@ -12,11 +12,13 @@ public class DistributedSequenceMain {
 
     public static void main(String... ignored) throws IOException {
         Class<LongValue> longValueClass = DataValueClasses.directClassFor(LongValue.class);
+        ChronicleMapBuilder.of(String.class, longValueClass)
+                        .entries(128)
+                        .actualSegments(1).file(new File("/tmp/counters"));
         ChronicleMap<String, LongValue> map =
                 ChronicleMapBuilder.of(String.class, longValueClass)
                         .entries(128)
-                        .actualSegments(1)
-                        .create(new File("/tmp/counters"));
+                        .actualSegments(1).create();
         LongValue value = DataValueClasses.newDirectReference(longValueClass);
         map.acquireUsing("sequence", value);
 

src/test/java/net/openhft/chronicle/map/fromdocs/OpenJDKAndHashMapExamplesTest.java

@@ -19,7 +19,6 @@ package net.openhft.chronicle.map.fromdocs;
 import net.openhft.affinity.AffinitySupport;
 import net.openhft.chronicle.map.ChronicleMap;
 import net.openhft.chronicle.map.ChronicleMapBuilder;
-import net.openhft.lang.io.serialization.impl.NewInstanceObjectFactory;
 import net.openhft.lang.model.DataValueClasses;
 import org.junit.Test;
 
@@ -57,7 +56,8 @@ public class OpenJDKAndHashMapExamplesTest {
         ChronicleMap<String, BondVOInterface> chm = ChronicleMapBuilder
                 .of(String.class, directClassFor(BondVOInterface.class))
                 .keySize(10)
-                .create(file);
+                .file(file)
+                .create();
 
 
         BondVOInterface bondVO = DataValueClasses.newDirectReference(BondVOInterface.class);
@@ -74,11 +74,11 @@ public class OpenJDKAndHashMapExamplesTest {
         mpx1030.setAskPx(109.7);
         mpx1030.setBidPx(107.6);
 
-
         ChronicleMap<String, BondVOInterface> chmB = ChronicleMapBuilder
                 .of(String.class, directClassFor(BondVOInterface.class))
                 .keySize(10)
-                .create(file);
+                .file(file)
+                .create();
 
         // ZERO Copy but creates a new off heap reference each time
 

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

@@ -90,10 +90,13 @@ public class PingPongCASLeft {
         AffinitySupport.setThreadId();
 
         String TMP = System.getProperty("java.io.tmpdir");
+        ChronicleMapBuilder.of(String.class, BondVOInterface.class)
+
+                .entries(16)
+                .entrySize(64).file(new File(TMP + "/BondPortfolioCHM"));
         return ChronicleMapBuilder.of(String.class, BondVOInterface.class)
 
                 .entries(16)
-                .entrySize(64)
-                .create(new File(TMP + "/BondPortfolioCHM"));
+                .entrySize(64).create();
     }
 }

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

@@ -39,10 +39,12 @@ public class StateMachineTutorial {
         try {
             File dataFile = new File(System.getProperty("java.io.tmpdir"), "hft-state-machine");
 
+            ChronicleMapBuilder.of(Integer.class, StateMachineData.class)
+
+                        .entries(8).file(dataFile);
             map = ChronicleMapBuilder.of(Integer.class, StateMachineData.class)
 
-                    .entries(8)
-                    .create(dataFile);
+                    .entries(8).create();
 
             if (args.length > 0) {
                 if ("0".equalsIgnoreCase(args[0])) {

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

@@ -48,49 +48,55 @@ public class ChronicleMapTest extends JSR166TestCase {
 
     static ChronicleMap<Integer, CharSequence> newShmIntString(int size) throws IOException {
 
+        ChronicleMapBuilder.of(Integer.class, CharSequence.class)
+                .entries(size).file(getPersistenceFile());
         return ChronicleMapBuilder.of(Integer.class, CharSequence.class)
-                .entries(size)
-                .create(getPersistenceFile());
+                .entries(size).create();
 
     }
 
     static ChronicleMap<ArrayList, CharSequence> newShmListBoolean(int size) throws IOException {
 
+        ChronicleMapBuilder.of(ArrayList.class, CharSequence.class)
+
+                .entries(size).file(getPersistenceFile());
         return ChronicleMapBuilder.of(ArrayList.class, CharSequence.class)
 
-                .entries(size).create(getPersistenceFile());
+                .entries(size).create();
 
     }
 
 
     static ChronicleMap<ArrayList, CharSequence> newShmListBoolean() throws IOException {
 
-        return ChronicleMapBuilder.of(ArrayList.class, CharSequence.class)
-
-                .create(getPersistenceFile());
+        ChronicleMapBuilder.of(ArrayList.class, CharSequence.class).file(getPersistenceFile());
+        return ChronicleMapBuilder.of(ArrayList.class, CharSequence.class).create();
 
     }
 
     static ChronicleMap<CharSequence, CharSequence> newShmStringString(int size) throws IOException {
 
+        ChronicleMapBuilder.of(CharSequence.class, CharSequence.class)
+
+                .entries(size).file(getPersistenceFile());
         return ChronicleMapBuilder.of(CharSequence.class, CharSequence.class)
 
-                .entries(size).create(getPersistenceFile());
+                .entries(size).create();
 
     }
 
 
     static ChronicleMap<Integer, CharSequence> newShmIntString() throws IOException {
 
-        return ChronicleMapBuilder.of(Integer.class, CharSequence.class)
-
-                .create(getPersistenceFile());
+        ChronicleMapBuilder.of(Integer.class, CharSequence.class).file(getPersistenceFile());
+        return ChronicleMapBuilder.of(Integer.class, CharSequence.class).create();
 
     }
 
     static ChronicleMap<BI, Boolean> newShmBiBoolean() throws IOException {
 
-        return ChronicleMapBuilder.of(BI.class, Boolean.class).create(getPersistenceFile());
+        ChronicleMapBuilder.of(BI.class, Boolean.class).file(getPersistenceFile());
+        return ChronicleMapBuilder.of(BI.class, Boolean.class).create();
 
     }
 

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

@@ -123,8 +123,8 @@ public class MapCheck {
         try {
 
 //            return new ConcurrentHashMap();
-            return ChronicleMapBuilder.of(Object.class, Object.class)
-                    .create(getPersistenceFile());
+            ChronicleMapBuilder.of(Object.class, Object.class).file(getPersistenceFile());
+            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/utility/ProcessInstanceLimiter.java

@@ -136,7 +136,8 @@ public class ProcessInstanceLimiter implements Runnable {
                 ChronicleMapBuilder.of(String.class, Data.class);
         builder.entries(1000);
         builder.entrySize(1024);
-        this.theSharedMap = builder.create(new File(sharedMapPath));
+        builder.file(new File(sharedMapPath));
+        this.theSharedMap = builder.create();
         Thread t = new Thread(this, "ProcessInstanceLimiter updater");
         t.setDaemon(true);
         t.start();

src/test/java/net/openhft/chronicle/set/SetForTCPSocketReplicationTest3way.java

@@ -49,8 +49,10 @@ public class SetForTCPSocketReplicationTest3way {
             final int serverPort,
             final InetSocketAddress... endpoints) throws IOException {
         return (T) ChronicleSetBuilder.of(Integer.class)
-                .replicators(identifier, of(serverPort, endpoints).
-                        heartBeatInterval(1L, SECONDS)).create(getPersistenceFile());
+                .file(getPersistenceFile())
+                .replicators(identifier, of(serverPort, endpoints)
+                        .heartBeatInterval(1L, SECONDS))
+                .create();
     }