Use ChronicleMapBuilder to build all ChronicleMap

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

@@ -1126,12 +1126,12 @@ public class CHMUseCasesTest {
             }));
 
             try {
-                map.putMapped(1.0, new UnaryOperator<Double>() {
-                    @Override
-                    public Double update(Double s) {
-                        return s + 1;
-                    }
-                });
+map.putMapped(1.0, new UnaryOperator<Double>() {
+    @Override
+    public Double update(Double s) {
+        return s + 1;
+    }
+});
 
             } catch (Exception todoMoreSpecificException) {
             }

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

@@ -117,8 +117,8 @@ public class StatelessClientTest {
             serverMap.put(10, new StringBuilder("Hello World"));
 
             try (ChronicleMap<Integer, StringBuilder> statelessMap =
-                    ChronicleMapStatelessClientBuilder
-                    .<Integer, StringBuilder>of(new InetSocketAddress("localhost", port))
+                         ChronicleMapBuilder
+                                 .of(Integer.class, StringBuilder.class, new InetSocketAddress("localhost", port))
                     .putReturnsNull(true)
                     .create()) {
                 String actual = statelessMap.getMapped(10, ToString.INSTANCE);

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

@@ -21,7 +21,6 @@ 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;
@@ -42,11 +41,11 @@ public class ServersMapMain {
         file.deleteOnExit();
         final ChronicleMap<byte[], byte[]> serverMap =
                 ChronicleMapBuilder.of(byte[].class, byte[].class)
-                .putReturnsNull(true)
-                .constantKeySizeBySample(new byte[8])
-                .constantValueSizeBySample(new byte[32])
-                .replication((byte) 2, TcpTransportAndNetworkConfig.of(port))
-                .createPersistedTo(file);
+                        .putReturnsNull(true)
+                        .constantKeySizeBySample(new byte[8])
+                        .constantValueSizeBySample(new byte[32])
+                        .replication((byte) 2, TcpTransportAndNetworkConfig.of(port))
+                        .createPersistedTo(file);
         System.out.println("Server started");
         System.in.read();
         serverMap.close();
@@ -55,8 +54,8 @@ public class ServersMapMain {
     public static void startRemoteClient(String hostname) throws IOException {
         final ChronicleMap<byte[], byte[]> map;
         if (stateless) {
-            map = ChronicleMapStatelessClientBuilder
-                    .<byte[], byte[]>of(new InetSocketAddress(hostname, port))
+            map = ChronicleMapBuilder
+                    .of(byte[].class, byte[].class, new InetSocketAddress(hostname, port))
                     .putReturnsNull(true)
                     .create();
         } else {
@@ -65,8 +64,8 @@ public class ServersMapMain {
             TcpTransportAndNetworkConfig tcpConfig =
                     TcpTransportAndNetworkConfig.of(port, new InetSocketAddress(hostname, port));
 
-            map = ChronicleMapBuilder.of(
-                    byte[].class, byte[].class)
+            map = ChronicleMapBuilder
+                    .of(byte[].class, byte[].class)
                     .putReturnsNull(true)
                     .replication((byte) 1, tcpConfig)
                     .createPersistedTo(file);

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

@@ -21,7 +21,6 @@ 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;
@@ -56,8 +55,8 @@ public class StringsMapMain {
     public static void startRemoteClient(String hostname) throws IOException {
         final ChronicleMap<CharSequence, CharSequence> map;
         if (stateless) {
-            map = ChronicleMapStatelessClientBuilder
-                    .<CharSequence, CharSequence>of(new InetSocketAddress(hostname, port))
+            map = ChronicleMapBuilder
+                    .of(CharSequence.class, CharSequence.class, new InetSocketAddress(hostname, port))
                     .putReturnsNull(true)
                     .create();
         } else {

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

@@ -267,8 +267,8 @@ public class StatelessChronicleMapTest extends JSR166TestCase {
                 .replication((byte) 2, TcpTransportAndNetworkConfig.of(port))
                 .create();
 
-        final ChronicleMap<byte[], byte[]> statelessMap = ChronicleMapStatelessClientBuilder
-                .<byte[], byte[]>of(new InetSocketAddress("localhost", port))
+        final ChronicleMap<byte[], byte[]> statelessMap = ChronicleMapBuilder
+                .of(byte[].class, byte[].class, new InetSocketAddress("localhost", port))
                 .putReturnsNull(true)
                 .create();