HCOLL-285 Refactor Stateless client builders, MapInstanceConfig =>

Builder, removed addJsonConverter method from ChronicleMapBuilder

src/test/java/eg/BGChronicleTest.java

@@ -3,6 +3,7 @@ package eg;
 import net.openhft.chronicle.hash.replication.TcpTransportAndNetworkConfig;
 import net.openhft.chronicle.map.ChronicleMap;
 import net.openhft.chronicle.map.ChronicleMapBuilder;
+import net.openhft.chronicle.map.ChronicleMapStatelessClientBuilder;
 
 import java.io.Closeable;
 import java.io.File;
@@ -99,13 +100,12 @@ public class BGChronicleTest {
             futureList.add(es.submit(new Callable<Void>() {
                 @Override
                 public Void call() throws IOException {
-                    try (ChronicleMap<byte[], byte[]> map = ChronicleMapBuilder
-                            .of(byte[].class, byte[].class)
-                            .constantKeySizeBySample(new byte[KEY_SIZE])
-                            .constantValueSizeBySample(new byte[VALUE_SIZE])
+                    InetSocketAddress serverAddress =
+                            REPLICAS > 1 && clientId % 2 == 0 ? remoteAddress2 : remoteAddress;
+                    try (ChronicleMap<byte[], byte[]> map = ChronicleMapStatelessClientBuilder
+                            .<byte[], byte[]>of(serverAddress)
                             .putReturnsNull(true)
                             .removeReturnsNull(true)
-                            .statelessClient(REPLICAS > 1 && clientId % 2 == 0 ? remoteAddress2 : remoteAddress)
                             .create()) {
 
                         System.out.println((clientId + 1) + "/" + CLIENTS + " client started");
@@ -138,13 +138,10 @@ public class BGChronicleTest {
             futureList2.add(es.submit(new Callable<long[]>() {
                 @Override
                 public long[] call() throws IOException, InterruptedException {
-                    try (ChronicleMap<byte[], byte[]> map = ChronicleMapBuilder
-                            .of(byte[].class, byte[].class)
-                            .constantKeySizeBySample(new byte[KEY_SIZE])
-                            .constantValueSizeBySample(new byte[VALUE_SIZE])
+                    try (ChronicleMap<byte[], byte[]> map = ChronicleMapStatelessClientBuilder
+                            .<byte[], byte[]>of(remoteAddress)
                             .putReturnsNull(true)
                             .removeReturnsNull(true)
-                            .statelessClient(remoteAddress)
                             .create()) {
                         map.size();
 

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

@@ -26,6 +26,7 @@ import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 
 import static java.util.Arrays.asList;
+import static net.openhft.chronicle.map.StatelessClientTest.localClient;
 import static net.openhft.chronicle.map.fromdocs.OpenJDKAndHashMapExamplesTest.parseYYYYMMDD;
 import static org.junit.Assert.*;
 
@@ -294,9 +295,7 @@ public class CHMUseCasesTest {
 
                 }
                 {
-                    map1 = builder
-                            .statelessClient(new InetSocketAddress("localhost", 8086))
-                            .create();
+                    map1 = localClient(8086);
 
                     closeables.add(map1);
                     return map1;

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

@@ -15,6 +15,7 @@ import java.net.InetSocketAddress;
 import java.util.HashMap;
 import java.util.Map;
 
+import static net.openhft.chronicle.map.StatelessClientTest.localClient;
 import static org.junit.Assert.assertEquals;
 
 /**
@@ -210,14 +211,12 @@ public class ChronicleMapImportExportTest {
         file.deleteOnExit();
         File file2 = new File(TMP + "/chronicle-map-" + System.nanoTime() + "-2.json");
         file.deleteOnExit();
-        try (ChronicleMap<CharSequence, CharSequence> expected = ChronicleMapBuilder.of(CharSequence.class, CharSequence
-                .class)
-                .create()) {
-            try (ChronicleMap<CharSequence, CharSequence> serverMap = ChronicleMapBuilder.of(CharSequence.class, CharSequence.class)
+        try (ChronicleMap<CharSequence, CharSequence> expected =
+                     ChronicleMapBuilder.of(CharSequence.class, CharSequence.class).create()) {
+            try (ChronicleMap<CharSequence, CharSequence> serverMap = ChronicleMapBuilder
+                    .of(CharSequence.class, CharSequence.class)
                     .replication((byte) 2, TcpTransportAndNetworkConfig.of(8056)).create()) {
-                try (ChronicleMap<CharSequence, CharSequence> actual = ChronicleMapBuilder.of(CharSequence
-                        .class, CharSequence.class)
-                        .statelessClient(new InetSocketAddress("localhost", 8056)).create()) {
+                try (ChronicleMap<CharSequence, CharSequence> actual = localClient(8056)) {
 
                     expected.put("hello", "world");
                     expected.getAll(file);

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

@@ -40,6 +40,7 @@ import java.util.concurrent.*;
 import java.util.concurrent.atomic.AtomicInteger;
 
 import static net.openhft.chronicle.map.Alignment.*;
+import static net.openhft.chronicle.map.StatelessClientTest.localClient;
 import static org.junit.Assert.*;
 
 @SuppressWarnings({"unchecked", "ResultOfMethodCallIgnored"})
@@ -1710,11 +1711,7 @@ public class ChronicleMapTest {
                     .constantKeySizeBySample(new byte[14])
                     .createPersistedTo(mapFile)) {
 
-                try (ChronicleMap<byte[], byte[][]> map2 = ChronicleMapBuilder
-                        .of(byte[].class, byte[][].class)
-                        .constantKeySizeBySample(new byte[14])
-                        .statelessClient(new InetSocketAddress("localhost", 8877))
-                        .create()) {
+                try (ChronicleMap<byte[], byte[][]> map2 = localClient(8877)) {
 
 
                     byte[] key = new byte[14];

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

@@ -46,8 +46,8 @@ public class MapByNameTest {
     @Test
     public void testSerializingBuilder() throws TimeoutException, InterruptedException, IOException {
 
-        final MapInstanceConfig<CharSequence, CharSequence> config =
-                (MapInstanceConfig<CharSequence, CharSequence>)
+        final MapInstanceBuilder<CharSequence, CharSequence> config =
+                (MapInstanceBuilder<CharSequence, CharSequence>)
                         ChronicleMapBuilder.of(CharSequence.class, CharSequence.class)
                                 .averageKeySize("hello".length()).averageValueSize("world".length())
                                 .entries(2)
@@ -73,8 +73,8 @@ public class MapByNameTest {
 
         NodeDiscovery nodeDiscovery = new NodeDiscovery();
 
-        MapInstanceConfig<CharSequence, CharSequence> config =
-                (MapInstanceConfig<CharSequence, CharSequence>)
+        MapInstanceBuilder<CharSequence, CharSequence> config =
+                (MapInstanceBuilder<CharSequence, CharSequence>)
                         ChronicleMapBuilder.of(CharSequence.class, CharSequence.class)
                                 .minSegments(2)
                                 .removeReturnsNull(true)
@@ -93,8 +93,8 @@ public class MapByNameTest {
         final ReplicationHubFindByName<CharSequence> mapByName = nodeDiscovery.mapByName();
         Thread.sleep(2000);
 
-        MapInstanceConfig<CharSequence, CharSequence> config =
-                (MapInstanceConfig<CharSequence, CharSequence>)
+        MapInstanceBuilder<CharSequence, CharSequence> config =
+                (MapInstanceBuilder<CharSequence, CharSequence>)
                         ChronicleMapBuilder.of(CharSequence.class, CharSequence.class)
                                 .minSegments(2)
                                 .entries(2)

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

@@ -24,6 +24,7 @@ import net.openhft.lang.io.ByteBufferBytes;
 import net.openhft.lang.io.Bytes;
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -35,6 +36,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.concurrent.atomic.AtomicInteger;
 
+import static net.openhft.chronicle.map.ChronicleMapStatelessClientBuilder.createClientOf;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
@@ -114,10 +116,11 @@ public class StatelessClientTest {
                 .create()) {
             serverMap.put(10, new StringBuilder("Hello World"));
 
-            try (ChronicleMap<Integer, StringBuilder> statelessMap = ChronicleMapBuilder.of(Integer
-                    .class, StringBuilder.class)
+            try (ChronicleMap<Integer, StringBuilder> statelessMap =
+                    ChronicleMapStatelessClientBuilder
+                    .<Integer, StringBuilder>of(new InetSocketAddress("localhost", port))
                     .putReturnsNull(true)
-                    .statelessClient(new InetSocketAddress("localhost", port)).create()) {
+                    .create()) {
                 String actual = statelessMap.getMapped(10, ToString.INSTANCE);
 
                 assertEquals("{10=Hello World}", statelessMap.toString());
@@ -126,6 +129,10 @@ public class StatelessClientTest {
         }
     }
 
+    public static <K, V> ChronicleMap<K, V> localClient(int port) throws IOException {
+        return createClientOf(new InetSocketAddress("localhost", port));
+    }
+
     @Test(timeout = 10000)
     public void testMapForKeyWhenNoEntry() throws IOException, InterruptedException {
         int port = s_port++;
@@ -136,9 +143,7 @@ public class StatelessClientTest {
                 .replication((byte) 2, TcpTransportAndNetworkConfig.of(port)).create()) {
             serverMap.put(10, new StringBuilder("Hello World"));
 
-            try (ChronicleMap<Integer, StringBuilder> statelessMap = ChronicleMapBuilder.of(Integer
-                    .class, StringBuilder.class)
-                    .statelessClient(new InetSocketAddress("localhost", port)).create()) {
+            try (ChronicleMap<Integer, StringBuilder> statelessMap = localClient(port)) {
                 String actual = statelessMap.getMapped(11, ToString.INSTANCE);
 
                 assertEquals(null, actual);
@@ -146,7 +151,9 @@ public class StatelessClientTest {
         }
     }
 
-    // @Test(timeout = 10000)
+    // TODO ignore why?
+    @Ignore
+    @Test(timeout = 10000)
     public void testBufferOverFlowPutAllAndEntrySet() throws IOException, InterruptedException {
         int port = s_port++;
         try (ChronicleMap<Integer, CharSequence> serverMap = ChronicleMapBuilder
@@ -154,10 +161,7 @@ public class StatelessClientTest {
                 .entries(SIZE)
                 .replication((byte) 2, TcpTransportAndNetworkConfig.of(port))
                 .create()) {
-            try (ChronicleMap<Integer, CharSequence> statelessMap = ChronicleMapBuilder
-                    .of(Integer.class, CharSequence.class)
-                    .statelessClient(new InetSocketAddress("localhost", port))
-                    .create()) {
+            try (ChronicleMap<Integer, CharSequence> statelessMap = localClient(port)) {
                 Map<Integer, CharSequence> payload = new HashMap<Integer, CharSequence>();
 
                 for (int i = 0; i < SIZE; i++) {
@@ -186,10 +190,7 @@ public class StatelessClientTest {
                 .entries(SIZE)
                 .replication((byte) 2, TcpTransportAndNetworkConfig.of(port))
                 .create()) {
-            try (ChronicleMap<Integer, CharSequence> statelessMap = ChronicleMapBuilder
-                    .of(Integer.class, CharSequence.class)
-                    .statelessClient(new InetSocketAddress("localhost", port))
-                    .create()) {
+            try (ChronicleMap<Integer, CharSequence> statelessMap = localClient(port)) {
                 Map<Integer, CharSequence> payload = new HashMap<Integer, CharSequence>();
 
                 for (int i = 0; i < SIZE; i++) {
@@ -217,10 +218,7 @@ public class StatelessClientTest {
                 .create()) {
 
             Thread.sleep(100);
-            try (ChronicleMap<Integer, CharSequence> statelessMap = ChronicleMapBuilder
-                    .of(Integer.class, CharSequence.class)
-                    .statelessClient(new InetSocketAddress("localhost", port))
-                    .create()) {
+            try (ChronicleMap<Integer, CharSequence> statelessMap = localClient(port)) {
                 Map<Integer, CharSequence> payload = new HashMap<Integer, CharSequence>();
 
                 for (int i = 0; i < SIZE; i++) {
@@ -246,9 +244,7 @@ public class StatelessClientTest {
                 .replication((byte) 2, TcpTransportAndNetworkConfig.of(port))
                 .create()) {
             serverMap.put(10, "EXAMPLE-10");
-            try (ChronicleMap<Integer, CharSequence> statelessMap = ChronicleMapBuilder.of(Integer
-                    .class, CharSequence.class)
-                    .statelessClient(new InetSocketAddress("localhost", port)).create()) {
+            try (ChronicleMap<Integer, CharSequence> statelessMap = localClient(port)) {
                 assertEquals("EXAMPLE-10", statelessMap.get(10));
 
                 int size = statelessMap.size();
@@ -261,11 +257,10 @@ public class StatelessClientTest {
     public void testClientCreatedBeforeServer() throws IOException, InterruptedException {
         int port = s_port++;
 
-        try (ChronicleMap<Integer, CharSequence> serverMap = ChronicleMapBuilder.of(Integer.class, CharSequence.class)
+        try (ChronicleMap<Integer, CharSequence> serverMap =
+                     ChronicleMapBuilder.of(Integer.class, CharSequence.class)
                 .replication((byte) 2, TcpTransportAndNetworkConfig.of(port)).create()) {
-            try (ChronicleMap<Integer, CharSequence> statelessMap = ChronicleMapBuilder.of(Integer
-                    .class, CharSequence.class)
-                    .statelessClient(new InetSocketAddress("localhost", port)).create()) {
+            try (ChronicleMap<Integer, CharSequence> statelessMap = localClient(port)) {
                 serverMap.put(10, "EXAMPLE-10");
 
                 assertEquals("EXAMPLE-10", statelessMap.get(10));
@@ -282,10 +277,7 @@ public class StatelessClientTest {
                 .entries(SIZE)
                 .replication((byte) 2, TcpTransportAndNetworkConfig.of(8056))
                 .create()) {
-            try (ChronicleMap<String, Map> statelessMap = ChronicleMapBuilder
-                    .of(String.class, Map.class)
-                    .statelessClient(new InetSocketAddress("localhost", 8056))
-                    .create()) {
+            try (ChronicleMap<String, Map> statelessMap = localClient(8056)) {
                 serverMap.put("hello", Collections.singletonMap("hello", "world"));
 
                 assertEquals(Collections.singletonMap("hello", "world"), statelessMap.get("hello"));
@@ -303,10 +295,7 @@ public class StatelessClientTest {
                 .entries(SIZE)
                 .replication((byte) 2, TcpTransportAndNetworkConfig.of(8056))
                 .create()) {
-            try (ChronicleMap<String, String> statelessMap = ChronicleMapBuilder
-                    .of(String.class, String.class)
-                    .statelessClient(new InetSocketAddress("localhost", 8056))
-                    .create()) {
+            try (ChronicleMap<String, String> statelessMap = localClient(8056)) {
 
                 serverMap.put("hello", "world");
 
@@ -329,10 +318,7 @@ public class StatelessClientTest {
                 .entries(SIZE)
                 .replication((byte) 2, TcpTransportAndNetworkConfig.of(8056))
                 .create()) {
-            try (ChronicleMap<String, String> statelessMap = ChronicleMapBuilder
-                    .of(String.class, String.class)
-                    .statelessClient(new InetSocketAddress("localhost", 8056))
-                    .create()) {
+            try (ChronicleMap<String, String> statelessMap = localClient(8056)) {
 
                 assertTrue(statelessMap.isEmpty());
                 assertEquals(0, statelessMap.size());
@@ -358,10 +344,7 @@ public class StatelessClientTest {
                 .entries(1000)
                 .replication((byte) 2, TcpTransportAndNetworkConfig.of(8056))
                 .create()) {
-            try (ChronicleMap<String, Map> statelessMap = ChronicleMapBuilder
-                    .of(String.class, Map.class)
-                    .statelessClient(new InetSocketAddress("localhost", 8056))
-                    .create()) {
+            try (ChronicleMap<String, Map> statelessMap = localClient(8056)) {
                 statelessMap.putIfAbsent("hello", data);
 
                 assertEquals(data, serverMap.get("hello"));
@@ -377,10 +360,7 @@ public class StatelessClientTest {
                 .entries(SIZE)
                 .replication((byte) 2, TcpTransportAndNetworkConfig.of(8056))
                 .create()) {
-            try (ChronicleMap<Integer, CharSequence> statelessMap = ChronicleMapBuilder
-                    .of(Integer.class, CharSequence.class)
-                    .statelessClient(new InetSocketAddress("localhost", 8056))
-                    .create()) {
+            try (ChronicleMap<Integer, CharSequence> statelessMap = localClient(8056)) {
                 Map<Integer, CharSequence> payload = new HashMap<Integer, CharSequence>();
 
                 for (int i = 0; i < SIZE; i++) {
@@ -398,17 +378,15 @@ public class StatelessClientTest {
     }
 
     @Test(timeout = 10000)
-    public void testBufferOverFlowPutAllWherePutReturnsNull() throws IOException, InterruptedException {
+    public void testBufferOverFlowPutAllWherePutReturnsNull()
+            throws IOException, InterruptedException {
 
         try (ChronicleMap<Integer, CharSequence> serverMap = ChronicleMapBuilder
                 .of(Integer.class, CharSequence.class)
                 .entries(SIZE)
                 .replication((byte) 2, TcpTransportAndNetworkConfig.of(8056))
                 .create()) {
-            try (ChronicleMap<Integer, CharSequence> statelessMap = ChronicleMapBuilder
-                    .of(Integer.class, CharSequence.class)
-                    .statelessClient(new InetSocketAddress("localhost", 8056))
-                    .create()) {
+            try (ChronicleMap<Integer, CharSequence> statelessMap = localClient(8056)) {
                 Map<Integer, CharSequence> payload = new HashMap<Integer, CharSequence>();
 
                 for (int i = 0; i < SIZE; i++) {
@@ -429,11 +407,10 @@ public class StatelessClientTest {
     public void testPutWherePutReturnsNull() throws IOException,
             InterruptedException {
 
-        try (ChronicleMap<Integer, CharSequence> serverMap = ChronicleMapBuilder.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 = ChronicleMapBuilder.of(Integer
-                    .class, CharSequence.class)
-                    .statelessClient(new InetSocketAddress("localhost", 8056)).create()) {
+            try (ChronicleMap<Integer, CharSequence> statelessMap = localClient(8056)) {
                 statelessMap.put(1, "some value");
 
                 assertEquals("some value", statelessMap.get(1));
@@ -446,11 +423,10 @@ public class StatelessClientTest {
     public void testRemoveWhereRemoveReturnsNull() throws IOException,
             InterruptedException {
 
-        try (ChronicleMap<Integer, CharSequence> serverMap = ChronicleMapBuilder.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 = ChronicleMapBuilder.of(Integer
-                    .class, CharSequence.class)
-                    .statelessClient(new InetSocketAddress("localhost", 8056)).create()) {
+            try (ChronicleMap<Integer, CharSequence> statelessMap = localClient(8056)) {
                 statelessMap.put(1, "some value");
 
                 assertEquals("some value", statelessMap.get(1));
@@ -482,11 +458,7 @@ public class StatelessClientTest {
                              .replication((byte) 2, TcpTransportAndNetworkConfig.of(8056)
                                      .tcpBufferSize(128))
                              .create()) {
-            try (ChronicleMap<Integer, CharSequence> statelessMap = ChronicleMapBuilder.of(Integer
-                    .class, CharSequence.class)
-                    .entries(1)
-                    .constantValueSizeBySample(sampleValue)
-                    .statelessClient(new InetSocketAddress("localhost", 8056)).create()) {
+            try (ChronicleMap<Integer, CharSequence> statelessMap = localClient(8056)) {
 
                 statelessMap.put(1, new String(value));
 
@@ -505,11 +477,10 @@ public class StatelessClientTest {
     public void testGetAndEntryWeDontHave() throws IOException,
             InterruptedException, ExecutionException {
 
-        try (ChronicleMap<Integer, CharSequence> serverMap = ChronicleMapBuilder.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 = ChronicleMapBuilder.of(Integer
-                    .class, CharSequence.class)
-                    .statelessClient(new InetSocketAddress("localhost", 8056)).create()) {
+            try (ChronicleMap<Integer, CharSequence> statelessMap = localClient(8056)) {
                 assertEquals(null, statelessMap.get(3));
 
             }
@@ -534,12 +505,8 @@ public class StatelessClientTest {
 
         // stateless client
         {
-            statelessMap1 = ChronicleMapBuilder.of(Integer
-                    .class, CharSequence.class)
-                    .statelessClient(new InetSocketAddress("localhost", 8056)).create();
-            statelessMap2 = ChronicleMapBuilder.of(Integer
-                    .class, CharSequence.class)
-                    .statelessClient(new InetSocketAddress("localhost", 8077)).create();
+            statelessMap1 = localClient(8056);
+            statelessMap2 = localClient(8077);
         }
 
         Map<Integer, CharSequence> payload = new HashMap<Integer, CharSequence>();
@@ -570,14 +537,13 @@ public class StatelessClientTest {
 
         long startTime = System.currentTimeMillis();
         // server
-        try (ChronicleMap<Integer, Integer> server = ChronicleMapBuilder.of(Integer.class, Integer.class)
+        try (ChronicleMap<Integer, Integer> server = ChronicleMapBuilder
+                .of(Integer.class, Integer.class)
                 .putReturnsNull(true)
                 .replication((byte) 1, TcpTransportAndNetworkConfig.of(8047)).create()) {
 
             // stateless client
-            try (ChronicleMap<Integer, Integer> client = ChronicleMapBuilder.of(Integer.class,
-                    Integer.class)
-                    .statelessClient(new InetSocketAddress("localhost", 8047)).create()) {
+            try (ChronicleMap<Integer, Integer> client = localClient(8047)) {
 
                 for (int i = 0; i < count; i++) {
 
@@ -618,7 +584,8 @@ public class StatelessClientTest {
                                 if (result.equals(j)) {
                                     got.incrementAndGet();
                                 } else {
-                                    System.out.println("expected j=" + j + " but got back=" + result);
+                                    System.out.println("expected j=" + j + " but got back=" +
+                                            result);
                                 }
 
                                 latch.countDown();
@@ -636,7 +603,7 @@ public class StatelessClientTest {
                 latch.await(25, TimeUnit.SECONDS);
                 System.out.println("" + count + " messages took " +
                         TimeUnit.MILLISECONDS.toSeconds(System
-                                .currentTimeMillis() - startTime) + " seconds, using " + nThreads + "" +
+                                .currentTimeMillis() - startTime) + " seconds, using " + nThreads +
                         " threads");
 
                 assertEquals(count, got.get());
@@ -666,20 +633,20 @@ public class StatelessClientTest {
 
 
         // server
-        try (ChronicleMap<Integer, Integer> server = ChronicleMapBuilder.of(Integer.class, Integer.class)
+        try (ChronicleMap<Integer, Integer> server = ChronicleMapBuilder
+                .of(Integer.class, Integer.class)
                 .putReturnsNull(true)
                 .replication((byte) 1, TcpTransportAndNetworkConfig.of(8047)).create()) {
 
-            try (ChronicleMap<Integer, Integer> server2 = ChronicleMapBuilder.of(Integer.class, Integer.class)
+            try (ChronicleMap<Integer, Integer> server2 = ChronicleMapBuilder
+                    .of(Integer.class, Integer.class)
                     .putReturnsNull(true)
                     .replication((byte) 2, TcpTransportAndNetworkConfig.of(8046, new
                             InetSocketAddress("localhost", 8047))).create()) {
 
 
                 // stateless client
-                try (ChronicleMap<Integer, Integer> client = ChronicleMapBuilder.of(Integer.class,
-                        Integer.class)
-                        .statelessClient(new InetSocketAddress("localhost", 8046)).create()) {
+                try (ChronicleMap<Integer, Integer> client = localClient(8046)) {
 
                     for (int i = 0; i < count; i++) {
 
@@ -720,7 +687,8 @@ public class StatelessClientTest {
                                     if (result.equals(j)) {
                                         got.incrementAndGet();
                                     } else {
-                                        System.out.println("expected j=" + j + " but got back=" + result);
+                                        System.out.println("expected j=" + j + " but got back=" +
+                                                result);
                                     }
 
                                     latch.countDown();
@@ -738,8 +706,8 @@ public class StatelessClientTest {
                     latch.await(25, TimeUnit.SECONDS);
                     System.out.println("" + count + " messages took " +
                             TimeUnit.MILLISECONDS.toSeconds(System
-                                    .currentTimeMillis() - startTime) + " seconds, using " + nThreads + "" +
-                            " threads");
+                                    .currentTimeMillis() - startTime) + " seconds, using " +
+                            nThreads + " threads");
 
                     assertEquals(count, got.get());
 
@@ -766,12 +734,7 @@ public class StatelessClientTest {
                 .replication((byte) 2, TcpTransportAndNetworkConfig.of(8056))
                 .create()) {
 
-            try (ChronicleMap<byte[], byte[]> statelessMap = ChronicleMapBuilder
-                    .of(byte[].class, byte[].class)
-                    .averageKeySize(4)
-                    .averageValueSize(4)
-                    .statelessClient(new InetSocketAddress("localhost", 8056))
-                    .create()) {
+            try (ChronicleMap<byte[], byte[]> statelessMap = localClient(8056)) {
 
                 for (int i = 0; i < SIZE; i++) {
                     keyBuffer.clear();
@@ -795,10 +758,7 @@ public class StatelessClientTest {
                 .constantKeySizeBySample(new byte[14])
                 .create()) {
 
-            try (ChronicleMap<byte[], CharSequence> map2 = ChronicleMapBuilder
-                    .of(byte[].class, CharSequence.class)
-                    .statelessClient(new InetSocketAddress("localhost", 8875))
-                    .create()) {
+            try (ChronicleMap<byte[], CharSequence> map2 = localClient(8875)) {
 
                 byte[] key = new byte[14];
                 System.arraycopy("A".getBytes(), 0, key, 0, "A".length());
@@ -819,11 +779,10 @@ public class StatelessClientTest {
                 .replication((byte) 2, TcpTransportAndNetworkConfig.of(port))
                 .create()) {
 
-            try (ChronicleMap<Integer, StringBuilder> statelessMap = ChronicleMapBuilder.of(Integer
-                    .class, StringBuilder.class)
-                    .statelessClient(new InetSocketAddress("localhost", port)).create()) {
+            try (ChronicleMap<Integer, StringBuilder> statelessMap = localClient(port)) {
 
-                assertTrue(!((StatelessChronicleMap) statelessMap).serverApplicationVersion().isEmpty());
+                assertTrue(!((StatelessChronicleMap) statelessMap).serverApplicationVersion()
+                        .isEmpty());
 
             }
         }

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

@@ -18,7 +18,7 @@
 
 package net.openhft.chronicle.map.example;
 
-import net.openhft.chronicle.hash.ChronicleHashInstanceConfig;
+import net.openhft.chronicle.hash.ChronicleHashInstanceBuilder;
 import net.openhft.chronicle.hash.replication.ReplicationHub;
 import net.openhft.chronicle.hash.replication.TcpTransportAndNetworkConfig;
 import net.openhft.chronicle.map.ChronicleMap;
@@ -197,7 +197,7 @@ public class ChannelReplicationTest {
             // this demotes favoriteColour
             short channel1 = (short) 1;
 
-            ChronicleHashInstanceConfig<ChronicleMap<CharSequence, CharSequence>> instance = builder.instance().replicatedViaChannel(hubOnServer.createChannel(channel1));
+            ChronicleHashInstanceBuilder<ChronicleMap<CharSequence, CharSequence>> instance = builder.instance().replicatedViaChannel(hubOnServer.createChannel(channel1));
 
             favoriteColourServer2 = instance.create();
         }

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

@@ -21,6 +21,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.ChronicleMapBuilder;
+import net.openhft.chronicle.map.ChronicleMapStatelessClientBuilder;
 
 import java.io.File;
 import java.io.IOException;
@@ -54,10 +55,10 @@ public class ServersMapMain {
     public static void startRemoteClient(String hostname) throws IOException {
         final ChronicleMap<byte[], byte[]> map;
         if (stateless) {
-            map = ChronicleMapBuilder.of(
-                    byte[].class, byte[].class)
+            map = ChronicleMapStatelessClientBuilder
+                    .<byte[], byte[]>of(new InetSocketAddress(hostname, port))
                     .putReturnsNull(true)
-                    .statelessClient(new InetSocketAddress(hostname, port)).create();
+                    .create();
         } else {
             File file = File.createTempFile("testServersMapMain", ".deleteme");
             file.deleteOnExit();

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

@@ -21,6 +21,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.ChronicleMapBuilder;
+import net.openhft.chronicle.map.ChronicleMapStatelessClientBuilder;
 
 import java.io.File;
 import java.io.IOException;
@@ -55,9 +56,10 @@ public class StringsMapMain {
     public static void startRemoteClient(String hostname) throws IOException {
         final ChronicleMap<CharSequence, CharSequence> map;
         if (stateless) {
-            map = ChronicleMapBuilder.of(CharSequence.class, CharSequence.class)
+            map = ChronicleMapStatelessClientBuilder
+                    .<CharSequence, CharSequence>of(new InetSocketAddress(hostname, port))
                     .putReturnsNull(true)
-                    .statelessClient(new InetSocketAddress(hostname, port)).create();
+                    .create();
         } else {
             File file = File.createTempFile("testServersMapMain", ".deleteme");
             file.deleteOnExit();

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

@@ -34,6 +34,7 @@ import java.net.InetSocketAddress;
 import java.nio.ByteBuffer;
 import java.util.*;
 
+import static net.openhft.chronicle.map.StatelessClientTest.localClient;
 import static org.junit.Assert.*;
 
 /*
@@ -239,9 +240,7 @@ public class StatelessChronicleMapTest extends JSR166TestCase {
                         .replication((byte) 1, TcpTransportAndNetworkConfig.of(port))
                         .create();
 
-        final ChronicleMap<Integer, String> statelessMap = ChronicleMapBuilder.of(Integer
-                .class, String.class)
-                .statelessClient(new InetSocketAddress("localhost", port)).create();
+        final ChronicleMap<Integer, String> statelessMap = localClient(port);
 
         return new SingleCloseMap(statelessMap, statelessMap, serverMap);
     }
@@ -254,10 +253,7 @@ public class StatelessChronicleMapTest extends JSR166TestCase {
                 .entries(SIZE)
                 .replication((byte) 2, TcpTransportAndNetworkConfig.of(port)).create();
 
-        final ChronicleMap<CharSequence, CharSequence> statelessMap = ChronicleMapBuilder
-                .of(CharSequence.class, CharSequence.class)
-                .statelessClient(new InetSocketAddress("localhost", port))
-                .create();
+        final ChronicleMap<CharSequence, CharSequence> statelessMap = localClient(port);
 
         return new SingleCloseMap<>(statelessMap, statelessMap, serverMap);
     }
@@ -271,10 +267,10 @@ public class StatelessChronicleMapTest extends JSR166TestCase {
                 .replication((byte) 2, TcpTransportAndNetworkConfig.of(port))
                 .create();
 
-        final ChronicleMap<byte[], byte[]> statelessMap = ChronicleMapBuilder
-                .of(byte[].class, byte[].class)
+        final ChronicleMap<byte[], byte[]> statelessMap = ChronicleMapStatelessClientBuilder
+                .<byte[], byte[]>of(new InetSocketAddress("localhost", port))
                 .putReturnsNull(true)
-                .statelessClient(new InetSocketAddress("localhost", port)).create();
+                .create();
 
         return new SingleCloseMap<>(statelessMap, statelessMap, serverMap);
     }