diff --git a/src/main/java/net/openhft/chronicle/map/ReplicatedChronicleMap.java b/src/main/java/net/openhft/chronicle/map/ReplicatedChronicleMap.java
index 7fa9449b8..884f7be7a 100644
--- a/src/main/java/net/openhft/chronicle/map/ReplicatedChronicleMap.java
+++ b/src/main/java/net/openhft/chronicle/map/ReplicatedChronicleMap.java
@@ -1535,21 +1535,23 @@ abstract class Replicator {
/**
* Applies the replicator to the map instance and returns a Closeable token to manage resources,
- * associated with the replication.
- *
- * This method isn't intended to be called from the client code.
+ * associated with the replication.
This method isn't intended to be called from the
+ * client code.
*
- * @param builder the builder from which the map was constructed. The replicator may obtain some
- * map configurations, not accessible via the map instance.
- * @param map a replicated map instance. Provides basic tools for replication implementation.
+ * @param builder the builder from which the map was constructed. The replicator may
+ * obtain some map configurations, not accessible via the map
+ * instance.
+ * @param map a replicated map instance. Provides basic tools for replication
+ * implementation.
* @param entryExternalizable the callback for ser/deser implementation in the replicator
* @param chronicleMap
- * @return a {@code Closeable} token to control replication resources.
- * It should be closed on closing the replicated map.
+ * @return a {@code Closeable} token to control replication resources. It should be closed on
+ * closing the replicated map.
* @throws java.io.IOException if an io error occurred during the replicator setup
- * @throws IllegalStateException if this replicator doesn't support application to more than
- * one map (or the specified number of maps), and this replicator has already been
- * applied to a map (or the specified number of maps)
+ * @throws IllegalStateException if this replicator doesn't support application to more than one
+ * map (or the specified number of maps), and this replicator has
+ * already been applied to a map (or the specified number of
+ * maps)
*/
protected abstract Closeable applyTo(ChronicleMapBuilder builder,
Replica map, Replica.EntryExternalizable entryExternalizable, final ChronicleMap chronicleMap)
diff --git a/src/main/java/net/openhft/chronicle/map/StatelessChronicleMap.java b/src/main/java/net/openhft/chronicle/map/StatelessChronicleMap.java
index 54ce1f1fa..46c3b0d77 100644
--- a/src/main/java/net/openhft/chronicle/map/StatelessChronicleMap.java
+++ b/src/main/java/net/openhft/chronicle/map/StatelessChronicleMap.java
@@ -29,7 +29,7 @@ class StatelessChronicleMap implements ChronicleMap, Closeable {
private final CloseablesManager closeables = new CloseablesManager();
private final StatelessBuilder builder;
- public static enum EventId {
+ static enum EventId {
HEARTBEAT,
STATEFUL_UPDATE,
LONG_SIZE, SIZE,
@@ -48,16 +48,10 @@ class StatelessChronicleMap implements ChronicleMap, Closeable {
REMOVE_WITH_VALUE
}
- // private final ThreadLocal sourceBuffer = new ThreadLocal();
-
-
private final AtomicLong transactionID = new AtomicLong();
- // private long timeoutMs = TimeUnit.SECONDS.toMillis(20);
-
-
- public StatelessChronicleMap(final KeyValueSerializer keyValueSerializer,
- final StatelessBuilder builder) throws IOException {
+ StatelessChronicleMap(final KeyValueSerializer keyValueSerializer,
+ final StatelessBuilder builder) throws IOException {
this.keyValueSerializer = keyValueSerializer;
this.builder = builder;
@@ -514,7 +508,7 @@ interface Buffer {
class RuntimeIOException extends RuntimeException {
- public RuntimeIOException(IOException e) {
+ RuntimeIOException(IOException e) {
super(e);
}
@@ -522,7 +516,7 @@ class RuntimeIOException extends RuntimeException {
class TimeoutException extends RuntimeException {
- public TimeoutException() {
+ TimeoutException() {
}
diff --git a/src/main/java/net/openhft/chronicle/map/TcpReplicator.java b/src/main/java/net/openhft/chronicle/map/TcpReplicator.java
index e01c5a0d6..d01fb70a7 100644
--- a/src/main/java/net/openhft/chronicle/map/TcpReplicator.java
+++ b/src/main/java/net/openhft/chronicle/map/TcpReplicator.java
@@ -19,6 +19,7 @@ package net.openhft.chronicle.map;
import net.openhft.lang.io.ByteBufferBytes;
import net.openhft.lang.io.Bytes;
import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -70,14 +71,14 @@ class TcpReplicator extends AbstractChannelReplicator implements Closeable {
* set smaller the buffer will over flow, it can be larger then
* the entry, but setting it too large reduces the workable
* space in the buffer.
- * @param statelessServerConnector
+ * @param statelessServerConnector set to NULL if not required
* @throws IOException
*/
TcpReplicator(@NotNull final Replica replica,
@NotNull final Replica.EntryExternalizable externalizable,
@NotNull final TcpReplicationConfig replicationConfig,
final int maxEntrySizeBytes,
- StatelessServerConnector statelessServerConnector) throws IOException {
+ @Nullable StatelessServerConnector statelessServerConnector) throws IOException {
super("TcpSocketReplicator-" + replica.identifier(), replicationConfig.throttlingConfig(),
maxEntrySizeBytes);
@@ -1192,19 +1193,21 @@ interface Work {
*/
class StatelessServerConnector {
-
private final KeyValueSerializer keyValueSerializer;
private final ChronicleMap map;
private double maxEntrySizeBytes;
- StatelessServerConnector(KeyValueSerializer keyValueSerializer, ChronicleMap map, int maxEntrySizeBytes) {
+ StatelessServerConnector(@NotNull KeyValueSerializer keyValueSerializer,
+ @NotNull ChronicleMap map,
+ int maxEntrySizeBytes) {
this.keyValueSerializer = keyValueSerializer;
this.map = map;
this.maxEntrySizeBytes = maxEntrySizeBytes;
}
- Work processStatelessEvent(byte eventId, @net.openhft.lang.model.constraints.NotNull Bytes in, @net.openhft.lang.model.constraints.NotNull Bytes out) {
+ Work processStatelessEvent(byte eventId,
+ @NotNull Bytes in,
+ @NotNull Bytes out) {
final StatelessChronicleMap.EventId event = StatelessChronicleMap.EventId.values()[eventId];
@@ -1290,28 +1293,28 @@ class StatelessServerConnector {
}
- public Work longSize(Bytes in, Bytes out) {
+ private Work longSize(Bytes in, Bytes out) {
long sizeLocation = reflectTransactionId(in, out);
out.writeLong(map.longSize());
writeSizeAndFlags(sizeLocation, false, out);
return null;
}
- public Work size(Bytes in, Bytes out) {
+ private Work size(Bytes in, Bytes out) {
long sizeLocation = reflectTransactionId(in, out);
out.writeInt(map.size());
writeSizeAndFlags(sizeLocation, false, out);
return null;
}
- public Work isEmpty(Bytes in, Bytes out) {
+ private Work isEmpty(Bytes in, Bytes out) {
long sizeLocation = reflectTransactionId(in, out);
out.writeBoolean(map.isEmpty());
writeSizeAndFlags(sizeLocation, false, out);
return null;
}
- public Work containsKey(Bytes in, Bytes out) {
+ private Work containsKey(Bytes in, Bytes out) {
K k = readKey(in);
long sizeLocation = reflectTransactionId(in, out);
out.writeBoolean(map.containsKey(k));
@@ -1319,7 +1322,7 @@ class StatelessServerConnector {
return null;
}
- public Work containsValue(Bytes in, Bytes out) {
+ private Work containsValue(Bytes in, Bytes out) {
V v = readValue(in);
long sizeLocation = reflectTransactionId(in, out);
out.writeBoolean(map.containsValue(v));
@@ -1327,7 +1330,7 @@ class StatelessServerConnector {
return null;
}
- public Work get(Bytes in, Bytes out) {
+ private Work get(Bytes in, Bytes out) {
K k = readKey(in);
long sizeLocation = reflectTransactionId(in, out);
try {
@@ -1342,8 +1345,7 @@ class StatelessServerConnector {
}
-
- public Work put(Bytes in, Bytes out) {
+ private Work put(Bytes in, Bytes out) {
K k = readKey(in);
V v = readValue(in);
long sizeLocation = reflectTransactionId(in, out);
@@ -1352,7 +1354,7 @@ class StatelessServerConnector {
return null;
}
- public Work remove(Bytes in, Bytes out) {
+ private Work remove(Bytes in, Bytes out) {
final V value = map.remove(readKey(in));
long sizeLocation = reflectTransactionId(in, out);
writeValue(value, out);
@@ -1360,7 +1362,7 @@ class StatelessServerConnector {
return null;
}
- public Work putAll(Bytes in, Bytes out) {
+ private Work putAll(Bytes in, Bytes out) {
map.putAll(readEntries(in));
long sizeLocation = reflectTransactionId(in, out);
writeSizeAndFlags(sizeLocation, false, out);
@@ -1368,14 +1370,14 @@ class StatelessServerConnector {
}
- public Work clear(Bytes in, Bytes out) {
+ private Work clear(Bytes in, Bytes out) {
map.clear();
long sizeLocation = reflectTransactionId(in, out);
writeSizeAndFlags(sizeLocation, false, out);
return null;
}
- public Work keySet(Bytes in, final Bytes out) {
+ private Work keySet(Bytes in, final Bytes out) {
final long sizeLocation = reflectTransactionId(in, out);
final Set ks = map.keySet();
@@ -1405,7 +1407,7 @@ class StatelessServerConnector {
};
}
- public Work values(Bytes in, Bytes out) {
+ private Work values(Bytes in, Bytes out) {
long sizeLocation = reflectTransactionId(in, out);
final Collection values = map.values();
out.writeStopBit(values.size());
@@ -1416,7 +1418,7 @@ class StatelessServerConnector {
return null;
}
- public Work entrySet(Bytes in, Bytes out) {
+ private Work entrySet(Bytes in, Bytes out) {
long sizeLocation = reflectTransactionId(in, out);
final Set> entries = map.entrySet();
@@ -1428,7 +1430,7 @@ class StatelessServerConnector {
return null;
}
- public Work putIfAbsent(Bytes in, Bytes out) {
+ private Work putIfAbsent(Bytes in, Bytes out) {
K key = readKey(in);
V v = readValue(in);
long sizeLocation = reflectTransactionId(in, out);
@@ -1438,7 +1440,7 @@ class StatelessServerConnector {
}
- public Work replace(Bytes in, Bytes out) {
+ private Work replace(Bytes in, Bytes out) {
K k = readKey(in);
V v = readValue(in);
@@ -1547,7 +1549,6 @@ class KeyValueSerializer {
valueSerializer.writeMarshallable(value, out);
}
-
}