From 4992cb6c31fd6fd0d47bbcf8927676b03d450381 Mon Sep 17 00:00:00 2001 From: Rob Austin Date: Wed, 29 Oct 2014 13:19:00 +0000 Subject: [PATCH] HCOLL-167 moved classes to hash as they are used for set as well. --- .../net/openhft/chronicle/hash/ChronicleHashBuilder.java | 2 +- .../net/openhft/chronicle/hash/TcpReplicationConfig.java | 3 +-- .../openhft/chronicle/{map => hash}/ThrottlingConfig.java | 6 +++--- .../net/openhft/chronicle/hash/UdpReplicationConfig.java | 2 -- .../openhft/chronicle/map/AbstractChannelReplicator.java | 3 ++- src/main/java/net/openhft/chronicle/map/TcpReplicator.java | 1 + 6 files changed, 8 insertions(+), 9 deletions(-) rename src/main/java/net/openhft/chronicle/{map => hash}/ThrottlingConfig.java (98%) diff --git a/src/main/java/net/openhft/chronicle/hash/ChronicleHashBuilder.java b/src/main/java/net/openhft/chronicle/hash/ChronicleHashBuilder.java index b58186a34..61b4481f2 100644 --- a/src/main/java/net/openhft/chronicle/hash/ChronicleHashBuilder.java +++ b/src/main/java/net/openhft/chronicle/hash/ChronicleHashBuilder.java @@ -399,7 +399,7 @@ public interface ChronicleHashBuilder endpoints; private int packetSize = DEFAULT_PACKET_SIZE; diff --git a/src/main/java/net/openhft/chronicle/map/ThrottlingConfig.java b/src/main/java/net/openhft/chronicle/hash/ThrottlingConfig.java similarity index 98% rename from src/main/java/net/openhft/chronicle/map/ThrottlingConfig.java rename to src/main/java/net/openhft/chronicle/hash/ThrottlingConfig.java index 77060c0a7..30b177a26 100644 --- a/src/main/java/net/openhft/chronicle/map/ThrottlingConfig.java +++ b/src/main/java/net/openhft/chronicle/hash/ThrottlingConfig.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package net.openhft.chronicle.map; +package net.openhft.chronicle.hash; import java.util.concurrent.TimeUnit; @@ -143,11 +143,11 @@ public class ThrottlingConfig { } - long bucketInterval() { + public long bucketInterval() { return bucketInterval; } - TimeUnit bucketIntervalUnit() { + public TimeUnit bucketIntervalUnit() { return bucketIntervalUnit; } diff --git a/src/main/java/net/openhft/chronicle/hash/UdpReplicationConfig.java b/src/main/java/net/openhft/chronicle/hash/UdpReplicationConfig.java index cb1892b5c..85076edcb 100644 --- a/src/main/java/net/openhft/chronicle/hash/UdpReplicationConfig.java +++ b/src/main/java/net/openhft/chronicle/hash/UdpReplicationConfig.java @@ -17,8 +17,6 @@ */ package net.openhft.chronicle.hash; - -import net.openhft.chronicle.map.ThrottlingConfig; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/net/openhft/chronicle/map/AbstractChannelReplicator.java b/src/main/java/net/openhft/chronicle/map/AbstractChannelReplicator.java index c0796778d..350b80f79 100644 --- a/src/main/java/net/openhft/chronicle/map/AbstractChannelReplicator.java +++ b/src/main/java/net/openhft/chronicle/map/AbstractChannelReplicator.java @@ -18,6 +18,7 @@ package net.openhft.chronicle.map; +import net.openhft.chronicle.hash.ThrottlingConfig; import net.openhft.lang.io.ByteBufferBytes; import net.openhft.lang.io.Bytes; import net.openhft.lang.thread.NamedThreadFactory; @@ -47,7 +48,7 @@ public abstract class AbstractChannelReplicator implements Closeable { public static final int BITS_IN_A_BYTE = 8; public static final int SIZE_OF_SIZE = 4; - public static final int SIZE_OF_TRANSACTIONID =8; + public static final int SIZE_OF_TRANSACTIONID = 8; private static final Logger LOG = LoggerFactory.getLogger(AbstractChannelReplicator.class); final Selector selector; diff --git a/src/main/java/net/openhft/chronicle/map/TcpReplicator.java b/src/main/java/net/openhft/chronicle/map/TcpReplicator.java index 2a5b79d39..80ad3962e 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.chronicle.hash.TcpReplicationConfig; +import net.openhft.chronicle.hash.ThrottlingConfig; import net.openhft.lang.io.ByteBufferBytes; import net.openhft.lang.io.Bytes; import org.jetbrains.annotations.NotNull;