From c680344be328f24c2cae31b14ffdd6f0b992839b Mon Sep 17 00:00:00 2001
From: Rob Austin <rob.austin@boundedbuffer>
Date: Mon, 20 Oct 2014 17:36:05 +0100
Subject: [PATCH] HCOLL-167 renamed to StatelessChronicleMap

---
 .../chronicle/map/AbstractChannelReplicator.java   |  2 +-
 .../openhft/chronicle/map/ChronicleMapBuilder.java |  4 ++--
 ...ssMapClient.java => StatelessChronicleMap.java} | 14 ++++++--------
 .../net/openhft/chronicle/map/TcpReplicator.java   |  4 ++--
 4 files changed, 11 insertions(+), 13 deletions(-)
 rename src/main/java/net/openhft/chronicle/map/{StatelessMapClient.java => StatelessChronicleMap.java} (96%)

diff --git a/src/main/java/net/openhft/chronicle/map/AbstractChannelReplicator.java b/src/main/java/net/openhft/chronicle/map/AbstractChannelReplicator.java
index 86167e108..20a4d9ae2 100644
--- a/src/main/java/net/openhft/chronicle/map/AbstractChannelReplicator.java
+++ b/src/main/java/net/openhft/chronicle/map/AbstractChannelReplicator.java
@@ -285,7 +285,7 @@ abstract class AbstractChannelReplicator implements Closeable {
             long pos0 = in.position();
 
             // used to denote that this is not a stateless map event
-            in.writeByte(StatelessMapClient.EventId.STATEFUL_UPDATE.ordinal());
+            in.writeByte(StatelessChronicleMap.EventId.STATEFUL_UPDATE.ordinal());
 
             long sizeLocation = in.position();
 
diff --git a/src/main/java/net/openhft/chronicle/map/ChronicleMapBuilder.java b/src/main/java/net/openhft/chronicle/map/ChronicleMapBuilder.java
index 3b47a2675..6d0d036f0 100644
--- a/src/main/java/net/openhft/chronicle/map/ChronicleMapBuilder.java
+++ b/src/main/java/net/openhft/chronicle/map/ChronicleMapBuilder.java
@@ -668,7 +668,7 @@ public class ChronicleMapBuilder<K, V> implements Cloneable,
     }
 
     @Override
-    public ChronicleMapBuilder<K, V> stateless(StatelessBuilder statelessBuilder) {
+    public ChronicleMapBuilder<K, V> stateless(@NotNull StatelessBuilder statelessBuilder) {
         this.statelessBuilder = statelessBuilder;
         return this;
     }
@@ -837,7 +837,7 @@ public class ChronicleMapBuilder<K, V> implements Cloneable,
         final KeyValueSerializer<K, V> keyValueSerializer
                 = new KeyValueSerializer<K, V>(keyBuilder, valueBuilder);
 
-        return new StatelessMapClient<K, V>(keyValueSerializer, statelessBuilder);
+        return new StatelessChronicleMap<K, V>(keyValueSerializer, statelessBuilder);
     }
 
     private VanillaChronicleMap<K, ?, ?, V, ?, ?> newMap() throws IOException {
diff --git a/src/main/java/net/openhft/chronicle/map/StatelessMapClient.java b/src/main/java/net/openhft/chronicle/map/StatelessChronicleMap.java
similarity index 96%
rename from src/main/java/net/openhft/chronicle/map/StatelessMapClient.java
rename to src/main/java/net/openhft/chronicle/map/StatelessChronicleMap.java
index 03aefd365..54ce1f1fa 100644
--- a/src/main/java/net/openhft/chronicle/map/StatelessMapClient.java
+++ b/src/main/java/net/openhft/chronicle/map/StatelessChronicleMap.java
@@ -15,16 +15,14 @@ import java.nio.channels.SocketChannel;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicLong;
 
-import static net.openhft.chronicle.map.StatelessMapClient.EventId.*;
+import static net.openhft.chronicle.map.StatelessChronicleMap.EventId.*;
 
 /**
- * **** THIS IS VERY MUCH IN DRAFT ***
- *
  * @author Rob Austin.
  */
-class StatelessMapClient<K, V> implements ChronicleMap<K, V>, Closeable {
+class StatelessChronicleMap<K, V> implements ChronicleMap<K, V>, Closeable {
 
-    private static final Logger LOG = LoggerFactory.getLogger(StatelessMapClient.class);
+    private static final Logger LOG = LoggerFactory.getLogger(StatelessChronicleMap.class);
 
     private final SocketChannel clientChannel;
     public static final ByteBuffer STATELESS_CLIENT_IDENTIFER = ByteBuffer.wrap(new byte[]{-127});
@@ -58,8 +56,8 @@ class StatelessMapClient<K, V> implements ChronicleMap<K, V>, Closeable {
     // private long timeoutMs = TimeUnit.SECONDS.toMillis(20);
 
 
-    public StatelessMapClient(final KeyValueSerializer<K, V> keyValueSerializer,
-                              final StatelessBuilder builder) throws IOException {
+    public StatelessChronicleMap(final KeyValueSerializer<K, V> keyValueSerializer,
+                                 final StatelessBuilder builder) throws IOException {
 
         this.keyValueSerializer = keyValueSerializer;
         this.builder = builder;
@@ -365,7 +363,7 @@ class StatelessMapClient<K, V> implements ChronicleMap<K, V>, Closeable {
         public final V setValue(V newValue) {
             V oldValue = value;
 
-            StatelessMapClient.this.put((K) getKey(), (V) newValue);
+            StatelessChronicleMap.this.put((K) getKey(), (V) newValue);
 
             return oldValue;
         }
diff --git a/src/main/java/net/openhft/chronicle/map/TcpReplicator.java b/src/main/java/net/openhft/chronicle/map/TcpReplicator.java
index 809955418..e01c5a0d6 100644
--- a/src/main/java/net/openhft/chronicle/map/TcpReplicator.java
+++ b/src/main/java/net/openhft/chronicle/map/TcpReplicator.java
@@ -32,7 +32,7 @@ import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import static java.nio.channels.SelectionKey.*;
-import static net.openhft.chronicle.map.StatelessMapClient.EventId.HEARTBEAT;
+import static net.openhft.chronicle.map.StatelessChronicleMap.EventId.HEARTBEAT;
 
 /**
  * Used with a {@see net.openhft.map.ReplicatedSharedHashMap} to send data between the maps using a
@@ -1206,7 +1206,7 @@ class StatelessServerConnector<K, V> {
 
     Work processStatelessEvent(byte eventId, @net.openhft.lang.model.constraints.NotNull Bytes in, @net.openhft.lang.model.constraints.NotNull Bytes out) {
 
-        final StatelessMapClient.EventId event = StatelessMapClient.EventId.values()[eventId];
+        final StatelessChronicleMap.EventId event = StatelessChronicleMap.EventId.values()[eventId];
 
         switch (event) {