diff --git a/src/main/java/net/openhft/chronicle/common/ChronicleHash.java b/src/main/java/net/openhft/chronicle/hash/ChronicleHash.java similarity index 98% rename from src/main/java/net/openhft/chronicle/common/ChronicleHash.java rename to src/main/java/net/openhft/chronicle/hash/ChronicleHash.java index c582f9e30..93b34eaa8 100644 --- a/src/main/java/net/openhft/chronicle/common/ChronicleHash.java +++ b/src/main/java/net/openhft/chronicle/hash/ChronicleHash.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package net.openhft.chronicle.common; +package net.openhft.chronicle.hash; import net.openhft.chronicle.map.ChronicleMap; import net.openhft.chronicle.set.ChronicleSet; diff --git a/src/main/java/net/openhft/chronicle/common/ChronicleHashBuilder.java b/src/main/java/net/openhft/chronicle/hash/ChronicleHashBuilder.java similarity index 99% rename from src/main/java/net/openhft/chronicle/common/ChronicleHashBuilder.java rename to src/main/java/net/openhft/chronicle/hash/ChronicleHashBuilder.java index 6c5661272..b58186a34 100644 --- a/src/main/java/net/openhft/chronicle/common/ChronicleHashBuilder.java +++ b/src/main/java/net/openhft/chronicle/hash/ChronicleHashBuilder.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package net.openhft.chronicle.common; +package net.openhft.chronicle.hash; import net.openhft.chronicle.map.*; import net.openhft.chronicle.set.ChronicleSet; diff --git a/src/main/java/net/openhft/chronicle/common/ChronicleHashErrorListener.java b/src/main/java/net/openhft/chronicle/hash/ChronicleHashErrorListener.java similarity index 95% rename from src/main/java/net/openhft/chronicle/common/ChronicleHashErrorListener.java rename to src/main/java/net/openhft/chronicle/hash/ChronicleHashErrorListener.java index 2e6a08185..903e553c3 100644 --- a/src/main/java/net/openhft/chronicle/common/ChronicleHashErrorListener.java +++ b/src/main/java/net/openhft/chronicle/hash/ChronicleHashErrorListener.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package net.openhft.chronicle.common; +package net.openhft.chronicle.hash; import java.io.Serializable; diff --git a/src/main/java/net/openhft/chronicle/common/ChronicleHashErrorListeners.java b/src/main/java/net/openhft/chronicle/hash/ChronicleHashErrorListeners.java similarity index 98% rename from src/main/java/net/openhft/chronicle/common/ChronicleHashErrorListeners.java rename to src/main/java/net/openhft/chronicle/hash/ChronicleHashErrorListeners.java index 8d7976088..dd0f75ae7 100644 --- a/src/main/java/net/openhft/chronicle/common/ChronicleHashErrorListeners.java +++ b/src/main/java/net/openhft/chronicle/hash/ChronicleHashErrorListeners.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package net.openhft.chronicle.common; +package net.openhft.chronicle.hash; import org.slf4j.Logger; diff --git a/src/main/java/net/openhft/chronicle/common/StatelessBuilder.java b/src/main/java/net/openhft/chronicle/hash/StatelessBuilder.java similarity index 97% rename from src/main/java/net/openhft/chronicle/common/StatelessBuilder.java rename to src/main/java/net/openhft/chronicle/hash/StatelessBuilder.java index d359e2411..5434eb768 100644 --- a/src/main/java/net/openhft/chronicle/common/StatelessBuilder.java +++ b/src/main/java/net/openhft/chronicle/hash/StatelessBuilder.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package net.openhft.chronicle.common; +package net.openhft.chronicle.hash; import java.net.InetSocketAddress; import java.util.concurrent.TimeUnit; diff --git a/src/main/java/net/openhft/chronicle/common/TimeProvider.java b/src/main/java/net/openhft/chronicle/hash/TimeProvider.java similarity index 98% rename from src/main/java/net/openhft/chronicle/common/TimeProvider.java rename to src/main/java/net/openhft/chronicle/hash/TimeProvider.java index 6c80de2cb..bdf1f565c 100644 --- a/src/main/java/net/openhft/chronicle/common/TimeProvider.java +++ b/src/main/java/net/openhft/chronicle/hash/TimeProvider.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package net.openhft.chronicle.common; +package net.openhft.chronicle.hash; import net.openhft.chronicle.map.ChronicleMap; import net.openhft.chronicle.set.ChronicleSet; diff --git a/src/main/java/net/openhft/chronicle/common/exceptions/IORuntimeException.java b/src/main/java/net/openhft/chronicle/hash/exceptions/IORuntimeException.java similarity index 94% rename from src/main/java/net/openhft/chronicle/common/exceptions/IORuntimeException.java rename to src/main/java/net/openhft/chronicle/hash/exceptions/IORuntimeException.java index 5a6f58bd1..48fafd020 100644 --- a/src/main/java/net/openhft/chronicle/common/exceptions/IORuntimeException.java +++ b/src/main/java/net/openhft/chronicle/hash/exceptions/IORuntimeException.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package net.openhft.chronicle.common.exceptions; +package net.openhft.chronicle.hash.exceptions; import java.io.IOException; diff --git a/src/main/java/net/openhft/chronicle/common/exceptions/TimeoutRuntimeException.java b/src/main/java/net/openhft/chronicle/hash/exceptions/TimeoutRuntimeException.java similarity index 94% rename from src/main/java/net/openhft/chronicle/common/exceptions/TimeoutRuntimeException.java rename to src/main/java/net/openhft/chronicle/hash/exceptions/TimeoutRuntimeException.java index 3493a9074..477e5b56e 100644 --- a/src/main/java/net/openhft/chronicle/common/exceptions/TimeoutRuntimeException.java +++ b/src/main/java/net/openhft/chronicle/hash/exceptions/TimeoutRuntimeException.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package net.openhft.chronicle.common.exceptions; +package net.openhft.chronicle.hash.exceptions; /** * @author Rob Austin. diff --git a/src/main/java/net/openhft/chronicle/common/package-info.java b/src/main/java/net/openhft/chronicle/hash/package-info.java similarity index 97% rename from src/main/java/net/openhft/chronicle/common/package-info.java rename to src/main/java/net/openhft/chronicle/hash/package-info.java index 68497fea7..3f80bcd74 100644 --- a/src/main/java/net/openhft/chronicle/common/package-info.java +++ b/src/main/java/net/openhft/chronicle/hash/package-info.java @@ -23,4 +23,4 @@ * the same level because {@code net.openhft.chronicle} package is occupied by Chronicle Queue project. */ -package net.openhft.chronicle.common; \ No newline at end of file +package net.openhft.chronicle.hash; \ No newline at end of file diff --git a/src/main/java/net/openhft/chronicle/common/serialization/AgileBytesMarshaller.java b/src/main/java/net/openhft/chronicle/hash/serialization/AgileBytesMarshaller.java similarity index 93% rename from src/main/java/net/openhft/chronicle/common/serialization/AgileBytesMarshaller.java rename to src/main/java/net/openhft/chronicle/hash/serialization/AgileBytesMarshaller.java index 1a9250042..6ab1f7b15 100644 --- a/src/main/java/net/openhft/chronicle/common/serialization/AgileBytesMarshaller.java +++ b/src/main/java/net/openhft/chronicle/hash/serialization/AgileBytesMarshaller.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package net.openhft.chronicle.common.serialization; +package net.openhft.chronicle.hash.serialization; public interface AgileBytesMarshaller extends BytesReader, BytesInterop, SizeMarshaller { } diff --git a/src/main/java/net/openhft/chronicle/common/serialization/BytesInterop.java b/src/main/java/net/openhft/chronicle/hash/serialization/BytesInterop.java similarity index 96% rename from src/main/java/net/openhft/chronicle/common/serialization/BytesInterop.java rename to src/main/java/net/openhft/chronicle/hash/serialization/BytesInterop.java index f9431ff2f..33231635c 100644 --- a/src/main/java/net/openhft/chronicle/common/serialization/BytesInterop.java +++ b/src/main/java/net/openhft/chronicle/hash/serialization/BytesInterop.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package net.openhft.chronicle.common.serialization; +package net.openhft.chronicle.hash.serialization; import net.openhft.lang.io.Bytes; import net.openhft.lang.model.Byteable; diff --git a/src/main/java/net/openhft/chronicle/common/serialization/BytesReader.java b/src/main/java/net/openhft/chronicle/hash/serialization/BytesReader.java similarity index 94% rename from src/main/java/net/openhft/chronicle/common/serialization/BytesReader.java rename to src/main/java/net/openhft/chronicle/hash/serialization/BytesReader.java index ddbd3fd15..d2d62e49e 100644 --- a/src/main/java/net/openhft/chronicle/common/serialization/BytesReader.java +++ b/src/main/java/net/openhft/chronicle/hash/serialization/BytesReader.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package net.openhft.chronicle.common.serialization; +package net.openhft.chronicle.hash.serialization; import net.openhft.lang.io.Bytes; diff --git a/src/main/java/net/openhft/chronicle/common/serialization/BytesReaders.java b/src/main/java/net/openhft/chronicle/hash/serialization/BytesReaders.java similarity index 96% rename from src/main/java/net/openhft/chronicle/common/serialization/BytesReaders.java rename to src/main/java/net/openhft/chronicle/hash/serialization/BytesReaders.java index fb87264cf..6d6f89202 100644 --- a/src/main/java/net/openhft/chronicle/common/serialization/BytesReaders.java +++ b/src/main/java/net/openhft/chronicle/hash/serialization/BytesReaders.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package net.openhft.chronicle.common.serialization; +package net.openhft.chronicle.hash.serialization; import net.openhft.lang.io.Bytes; import net.openhft.lang.io.serialization.BytesMarshaller; diff --git a/src/main/java/net/openhft/chronicle/common/serialization/BytesWriter.java b/src/main/java/net/openhft/chronicle/hash/serialization/BytesWriter.java similarity index 94% rename from src/main/java/net/openhft/chronicle/common/serialization/BytesWriter.java rename to src/main/java/net/openhft/chronicle/hash/serialization/BytesWriter.java index dce454a0d..f14c31fa2 100644 --- a/src/main/java/net/openhft/chronicle/common/serialization/BytesWriter.java +++ b/src/main/java/net/openhft/chronicle/hash/serialization/BytesWriter.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package net.openhft.chronicle.common.serialization; +package net.openhft.chronicle.hash.serialization; import net.openhft.lang.io.Bytes; diff --git a/src/main/java/net/openhft/chronicle/common/serialization/CopyingMetaBytesInterop.java b/src/main/java/net/openhft/chronicle/hash/serialization/CopyingMetaBytesInterop.java similarity index 97% rename from src/main/java/net/openhft/chronicle/common/serialization/CopyingMetaBytesInterop.java rename to src/main/java/net/openhft/chronicle/hash/serialization/CopyingMetaBytesInterop.java index 21edd4e8e..70fd5c423 100644 --- a/src/main/java/net/openhft/chronicle/common/serialization/CopyingMetaBytesInterop.java +++ b/src/main/java/net/openhft/chronicle/hash/serialization/CopyingMetaBytesInterop.java @@ -16,11 +16,11 @@ * limitations under the License. */ -package net.openhft.chronicle.common.serialization; +package net.openhft.chronicle.hash.serialization; -import net.openhft.chronicle.common.threadlocal.Provider; -import net.openhft.chronicle.common.threadlocal.StatefulCopyable; -import net.openhft.chronicle.common.threadlocal.ThreadLocalCopies; +import net.openhft.chronicle.hash.threadlocal.Provider; +import net.openhft.chronicle.hash.threadlocal.StatefulCopyable; +import net.openhft.chronicle.hash.threadlocal.ThreadLocalCopies; import net.openhft.lang.io.Bytes; import net.openhft.lang.io.DirectBytes; import net.openhft.lang.io.DirectStore; diff --git a/src/main/java/net/openhft/chronicle/common/serialization/DelegatingMetaBytesInterop.java b/src/main/java/net/openhft/chronicle/hash/serialization/DelegatingMetaBytesInterop.java similarity index 97% rename from src/main/java/net/openhft/chronicle/common/serialization/DelegatingMetaBytesInterop.java rename to src/main/java/net/openhft/chronicle/hash/serialization/DelegatingMetaBytesInterop.java index 8eccff07b..cd73e9779 100644 --- a/src/main/java/net/openhft/chronicle/common/serialization/DelegatingMetaBytesInterop.java +++ b/src/main/java/net/openhft/chronicle/hash/serialization/DelegatingMetaBytesInterop.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package net.openhft.chronicle.common.serialization; +package net.openhft.chronicle.hash.serialization; import net.openhft.lang.io.Bytes; diff --git a/src/main/java/net/openhft/chronicle/common/serialization/DelegatingMetaBytesInteropProvider.java b/src/main/java/net/openhft/chronicle/hash/serialization/DelegatingMetaBytesInteropProvider.java similarity index 93% rename from src/main/java/net/openhft/chronicle/common/serialization/DelegatingMetaBytesInteropProvider.java rename to src/main/java/net/openhft/chronicle/hash/serialization/DelegatingMetaBytesInteropProvider.java index 948da2a2b..378293569 100644 --- a/src/main/java/net/openhft/chronicle/common/serialization/DelegatingMetaBytesInteropProvider.java +++ b/src/main/java/net/openhft/chronicle/hash/serialization/DelegatingMetaBytesInteropProvider.java @@ -16,9 +16,9 @@ * limitations under the License. */ -package net.openhft.chronicle.common.serialization; +package net.openhft.chronicle.hash.serialization; -import net.openhft.chronicle.common.threadlocal.ThreadLocalCopies; +import net.openhft.chronicle.hash.threadlocal.ThreadLocalCopies; import java.io.ObjectStreamException; diff --git a/src/main/java/net/openhft/chronicle/common/serialization/Hasher.java b/src/main/java/net/openhft/chronicle/hash/serialization/Hasher.java similarity index 98% rename from src/main/java/net/openhft/chronicle/common/serialization/Hasher.java rename to src/main/java/net/openhft/chronicle/hash/serialization/Hasher.java index 365a6eb6a..185ef64a5 100644 --- a/src/main/java/net/openhft/chronicle/common/serialization/Hasher.java +++ b/src/main/java/net/openhft/chronicle/hash/serialization/Hasher.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package net.openhft.chronicle.common.serialization; +package net.openhft.chronicle.hash.serialization; import net.openhft.lang.io.Bytes; import net.openhft.lang.io.NativeBytes; diff --git a/src/main/java/net/openhft/chronicle/common/serialization/MetaBytesInterop.java b/src/main/java/net/openhft/chronicle/hash/serialization/MetaBytesInterop.java similarity index 94% rename from src/main/java/net/openhft/chronicle/common/serialization/MetaBytesInterop.java rename to src/main/java/net/openhft/chronicle/hash/serialization/MetaBytesInterop.java index b4e75c4c7..78dc5b08f 100644 --- a/src/main/java/net/openhft/chronicle/common/serialization/MetaBytesInterop.java +++ b/src/main/java/net/openhft/chronicle/hash/serialization/MetaBytesInterop.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package net.openhft.chronicle.common.serialization; +package net.openhft.chronicle.hash.serialization; import net.openhft.lang.io.Bytes; diff --git a/src/main/java/net/openhft/chronicle/common/serialization/MetaBytesWriter.java b/src/main/java/net/openhft/chronicle/hash/serialization/MetaBytesWriter.java similarity index 94% rename from src/main/java/net/openhft/chronicle/common/serialization/MetaBytesWriter.java rename to src/main/java/net/openhft/chronicle/hash/serialization/MetaBytesWriter.java index bc7b0ccff..a58079c37 100644 --- a/src/main/java/net/openhft/chronicle/common/serialization/MetaBytesWriter.java +++ b/src/main/java/net/openhft/chronicle/hash/serialization/MetaBytesWriter.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package net.openhft.chronicle.common.serialization; +package net.openhft.chronicle.hash.serialization; import net.openhft.lang.io.Bytes; diff --git a/src/main/java/net/openhft/chronicle/common/serialization/MetaProvider.java b/src/main/java/net/openhft/chronicle/hash/serialization/MetaProvider.java similarity index 88% rename from src/main/java/net/openhft/chronicle/common/serialization/MetaProvider.java rename to src/main/java/net/openhft/chronicle/hash/serialization/MetaProvider.java index 0b48dd847..e7b80b3ec 100644 --- a/src/main/java/net/openhft/chronicle/common/serialization/MetaProvider.java +++ b/src/main/java/net/openhft/chronicle/hash/serialization/MetaProvider.java @@ -16,9 +16,9 @@ * limitations under the License. */ -package net.openhft.chronicle.common.serialization; +package net.openhft.chronicle.hash.serialization; -import net.openhft.chronicle.common.threadlocal.ThreadLocalCopies; +import net.openhft.chronicle.hash.threadlocal.ThreadLocalCopies; import java.io.Serializable; diff --git a/src/main/java/net/openhft/chronicle/common/serialization/SizeMarshaller.java b/src/main/java/net/openhft/chronicle/hash/serialization/SizeMarshaller.java similarity index 94% rename from src/main/java/net/openhft/chronicle/common/serialization/SizeMarshaller.java rename to src/main/java/net/openhft/chronicle/hash/serialization/SizeMarshaller.java index bbce57e4c..d564e45e3 100644 --- a/src/main/java/net/openhft/chronicle/common/serialization/SizeMarshaller.java +++ b/src/main/java/net/openhft/chronicle/hash/serialization/SizeMarshaller.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package net.openhft.chronicle.common.serialization; +package net.openhft.chronicle.hash.serialization; import net.openhft.lang.io.Bytes; diff --git a/src/main/java/net/openhft/chronicle/common/serialization/SizeMarshallers.java b/src/main/java/net/openhft/chronicle/hash/serialization/SizeMarshallers.java similarity index 97% rename from src/main/java/net/openhft/chronicle/common/serialization/SizeMarshallers.java rename to src/main/java/net/openhft/chronicle/hash/serialization/SizeMarshallers.java index ba7de3954..7c006738f 100644 --- a/src/main/java/net/openhft/chronicle/common/serialization/SizeMarshallers.java +++ b/src/main/java/net/openhft/chronicle/hash/serialization/SizeMarshallers.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package net.openhft.chronicle.common.serialization; +package net.openhft.chronicle.hash.serialization; import net.openhft.lang.io.Bytes; diff --git a/src/main/java/net/openhft/chronicle/common/serialization/impl/ByteArrayMarshaller.java b/src/main/java/net/openhft/chronicle/hash/serialization/impl/ByteArrayMarshaller.java similarity index 87% rename from src/main/java/net/openhft/chronicle/common/serialization/impl/ByteArrayMarshaller.java rename to src/main/java/net/openhft/chronicle/hash/serialization/impl/ByteArrayMarshaller.java index 0762bfc09..8ea01472e 100644 --- a/src/main/java/net/openhft/chronicle/common/serialization/impl/ByteArrayMarshaller.java +++ b/src/main/java/net/openhft/chronicle/hash/serialization/impl/ByteArrayMarshaller.java @@ -16,11 +16,11 @@ * limitations under the License. */ -package net.openhft.chronicle.common.serialization.impl; +package net.openhft.chronicle.hash.serialization.impl; -import net.openhft.chronicle.common.serialization.BytesInterop; -import net.openhft.chronicle.common.serialization.BytesReader; -import net.openhft.chronicle.common.serialization.Hasher; +import net.openhft.chronicle.hash.serialization.BytesInterop; +import net.openhft.chronicle.hash.serialization.BytesReader; +import net.openhft.chronicle.hash.serialization.Hasher; import net.openhft.lang.io.Bytes; public enum ByteArrayMarshaller implements BytesInterop, BytesReader { diff --git a/src/main/java/net/openhft/chronicle/common/serialization/impl/ByteableMarshaller.java b/src/main/java/net/openhft/chronicle/hash/serialization/impl/ByteableMarshaller.java similarity index 96% rename from src/main/java/net/openhft/chronicle/common/serialization/impl/ByteableMarshaller.java rename to src/main/java/net/openhft/chronicle/hash/serialization/impl/ByteableMarshaller.java index 53080c63c..abe5abf95 100644 --- a/src/main/java/net/openhft/chronicle/common/serialization/impl/ByteableMarshaller.java +++ b/src/main/java/net/openhft/chronicle/hash/serialization/impl/ByteableMarshaller.java @@ -16,10 +16,10 @@ * limitations under the License. */ -package net.openhft.chronicle.common.serialization.impl; +package net.openhft.chronicle.hash.serialization.impl; -import net.openhft.chronicle.common.serialization.AgileBytesMarshaller; -import net.openhft.chronicle.common.serialization.Hasher; +import net.openhft.chronicle.hash.serialization.AgileBytesMarshaller; +import net.openhft.chronicle.hash.serialization.Hasher; import net.openhft.lang.io.Bytes; import net.openhft.lang.io.MultiStoreBytes; import net.openhft.lang.io.NativeBytes; diff --git a/src/main/java/net/openhft/chronicle/common/serialization/impl/CharArrayMarshaller.java b/src/main/java/net/openhft/chronicle/hash/serialization/impl/CharArrayMarshaller.java similarity index 87% rename from src/main/java/net/openhft/chronicle/common/serialization/impl/CharArrayMarshaller.java rename to src/main/java/net/openhft/chronicle/hash/serialization/impl/CharArrayMarshaller.java index 6a0e0a034..1cc1da171 100644 --- a/src/main/java/net/openhft/chronicle/common/serialization/impl/CharArrayMarshaller.java +++ b/src/main/java/net/openhft/chronicle/hash/serialization/impl/CharArrayMarshaller.java @@ -16,11 +16,11 @@ * limitations under the License. */ -package net.openhft.chronicle.common.serialization.impl; +package net.openhft.chronicle.hash.serialization.impl; -import net.openhft.chronicle.common.serialization.BytesInterop; -import net.openhft.chronicle.common.serialization.BytesReader; -import net.openhft.chronicle.common.serialization.Hasher; +import net.openhft.chronicle.hash.serialization.BytesInterop; +import net.openhft.chronicle.hash.serialization.BytesReader; +import net.openhft.chronicle.hash.serialization.Hasher; import net.openhft.lang.io.Bytes; public enum CharArrayMarshaller implements BytesInterop, BytesReader { diff --git a/src/main/java/net/openhft/chronicle/common/serialization/impl/CharSequenceReader.java b/src/main/java/net/openhft/chronicle/hash/serialization/impl/CharSequenceReader.java similarity index 95% rename from src/main/java/net/openhft/chronicle/common/serialization/impl/CharSequenceReader.java rename to src/main/java/net/openhft/chronicle/hash/serialization/impl/CharSequenceReader.java index c47902ccb..ae00734cf 100644 --- a/src/main/java/net/openhft/chronicle/common/serialization/impl/CharSequenceReader.java +++ b/src/main/java/net/openhft/chronicle/hash/serialization/impl/CharSequenceReader.java @@ -16,13 +16,13 @@ * limitations under the License. */ -package net.openhft.chronicle.common.serialization.impl; +package net.openhft.chronicle.hash.serialization.impl; -import net.openhft.chronicle.common.serialization.BytesReader; +import net.openhft.chronicle.hash.serialization.BytesReader; import net.openhft.lang.io.AbstractBytes; import net.openhft.lang.io.Bytes; import net.openhft.lang.pool.CharSequenceInterner; -import net.openhft.chronicle.common.threadlocal.StatefulCopyable; +import net.openhft.chronicle.hash.threadlocal.StatefulCopyable; import org.jetbrains.annotations.NotNull; import java.io.IOException; diff --git a/src/main/java/net/openhft/chronicle/common/serialization/impl/CharSequenceWriter.java b/src/main/java/net/openhft/chronicle/hash/serialization/impl/CharSequenceWriter.java similarity index 92% rename from src/main/java/net/openhft/chronicle/common/serialization/impl/CharSequenceWriter.java rename to src/main/java/net/openhft/chronicle/hash/serialization/impl/CharSequenceWriter.java index 17900819f..3454c2424 100644 --- a/src/main/java/net/openhft/chronicle/common/serialization/impl/CharSequenceWriter.java +++ b/src/main/java/net/openhft/chronicle/hash/serialization/impl/CharSequenceWriter.java @@ -16,9 +16,9 @@ * limitations under the License. */ -package net.openhft.chronicle.common.serialization.impl; +package net.openhft.chronicle.hash.serialization.impl; -import net.openhft.chronicle.common.serialization.BytesWriter; +import net.openhft.chronicle.hash.serialization.BytesWriter; import net.openhft.lang.io.AbstractBytes; import net.openhft.lang.io.Bytes; diff --git a/src/main/java/net/openhft/chronicle/common/serialization/impl/DoubleMarshaller.java b/src/main/java/net/openhft/chronicle/hash/serialization/impl/DoubleMarshaller.java similarity index 90% rename from src/main/java/net/openhft/chronicle/common/serialization/impl/DoubleMarshaller.java rename to src/main/java/net/openhft/chronicle/hash/serialization/impl/DoubleMarshaller.java index 21b0ea376..1f663ca21 100644 --- a/src/main/java/net/openhft/chronicle/common/serialization/impl/DoubleMarshaller.java +++ b/src/main/java/net/openhft/chronicle/hash/serialization/impl/DoubleMarshaller.java @@ -16,10 +16,10 @@ * limitations under the License. */ -package net.openhft.chronicle.common.serialization.impl; +package net.openhft.chronicle.hash.serialization.impl; -import net.openhft.chronicle.common.serialization.AgileBytesMarshaller; -import net.openhft.chronicle.common.serialization.Hasher; +import net.openhft.chronicle.hash.serialization.AgileBytesMarshaller; +import net.openhft.chronicle.hash.serialization.Hasher; import net.openhft.lang.io.Bytes; import static java.lang.Double.doubleToLongBits; diff --git a/src/main/java/net/openhft/chronicle/common/serialization/impl/IntegerMarshaller.java b/src/main/java/net/openhft/chronicle/hash/serialization/impl/IntegerMarshaller.java similarity index 89% rename from src/main/java/net/openhft/chronicle/common/serialization/impl/IntegerMarshaller.java rename to src/main/java/net/openhft/chronicle/hash/serialization/impl/IntegerMarshaller.java index 7c316eb4a..407ec7968 100644 --- a/src/main/java/net/openhft/chronicle/common/serialization/impl/IntegerMarshaller.java +++ b/src/main/java/net/openhft/chronicle/hash/serialization/impl/IntegerMarshaller.java @@ -16,10 +16,10 @@ * limitations under the License. */ -package net.openhft.chronicle.common.serialization.impl; +package net.openhft.chronicle.hash.serialization.impl; -import net.openhft.chronicle.common.serialization.AgileBytesMarshaller; -import net.openhft.chronicle.common.serialization.Hasher; +import net.openhft.chronicle.hash.serialization.AgileBytesMarshaller; +import net.openhft.chronicle.hash.serialization.Hasher; import net.openhft.lang.io.Bytes; public enum IntegerMarshaller implements AgileBytesMarshaller { diff --git a/src/main/java/net/openhft/chronicle/common/serialization/impl/LongMarshaller.java b/src/main/java/net/openhft/chronicle/hash/serialization/impl/LongMarshaller.java similarity index 89% rename from src/main/java/net/openhft/chronicle/common/serialization/impl/LongMarshaller.java rename to src/main/java/net/openhft/chronicle/hash/serialization/impl/LongMarshaller.java index 902862c31..822d063a7 100644 --- a/src/main/java/net/openhft/chronicle/common/serialization/impl/LongMarshaller.java +++ b/src/main/java/net/openhft/chronicle/hash/serialization/impl/LongMarshaller.java @@ -16,10 +16,10 @@ * limitations under the License. */ -package net.openhft.chronicle.common.serialization.impl; +package net.openhft.chronicle.hash.serialization.impl; -import net.openhft.chronicle.common.serialization.AgileBytesMarshaller; -import net.openhft.chronicle.common.serialization.Hasher; +import net.openhft.chronicle.hash.serialization.AgileBytesMarshaller; +import net.openhft.chronicle.hash.serialization.Hasher; import net.openhft.lang.io.Bytes; public enum LongMarshaller implements AgileBytesMarshaller { diff --git a/src/main/java/net/openhft/chronicle/common/serialization/impl/VoidMarshaller.java b/src/main/java/net/openhft/chronicle/hash/serialization/impl/VoidMarshaller.java similarity index 92% rename from src/main/java/net/openhft/chronicle/common/serialization/impl/VoidMarshaller.java rename to src/main/java/net/openhft/chronicle/hash/serialization/impl/VoidMarshaller.java index 2dbeb61a6..81f2a5ec5 100644 --- a/src/main/java/net/openhft/chronicle/common/serialization/impl/VoidMarshaller.java +++ b/src/main/java/net/openhft/chronicle/hash/serialization/impl/VoidMarshaller.java @@ -16,9 +16,9 @@ * limitations under the License. */ -package net.openhft.chronicle.common.serialization.impl; +package net.openhft.chronicle.hash.serialization.impl; -import net.openhft.chronicle.common.serialization.AgileBytesMarshaller; +import net.openhft.chronicle.hash.serialization.AgileBytesMarshaller; import net.openhft.lang.io.Bytes; public enum VoidMarshaller implements AgileBytesMarshaller { diff --git a/src/main/java/net/openhft/chronicle/common/threadlocal/Provider.java b/src/main/java/net/openhft/chronicle/hash/threadlocal/Provider.java similarity index 98% rename from src/main/java/net/openhft/chronicle/common/threadlocal/Provider.java rename to src/main/java/net/openhft/chronicle/hash/threadlocal/Provider.java index 9d7bd3f3d..5f28e2f29 100644 --- a/src/main/java/net/openhft/chronicle/common/threadlocal/Provider.java +++ b/src/main/java/net/openhft/chronicle/hash/threadlocal/Provider.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package net.openhft.chronicle.common.threadlocal; +package net.openhft.chronicle.hash.threadlocal; public abstract class Provider { diff --git a/src/main/java/net/openhft/chronicle/common/threadlocal/StatefulCopyable.java b/src/main/java/net/openhft/chronicle/hash/threadlocal/StatefulCopyable.java similarity index 93% rename from src/main/java/net/openhft/chronicle/common/threadlocal/StatefulCopyable.java rename to src/main/java/net/openhft/chronicle/hash/threadlocal/StatefulCopyable.java index 8b80b7c1c..f8ac52185 100644 --- a/src/main/java/net/openhft/chronicle/common/threadlocal/StatefulCopyable.java +++ b/src/main/java/net/openhft/chronicle/hash/threadlocal/StatefulCopyable.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package net.openhft.chronicle.common.threadlocal; +package net.openhft.chronicle.hash.threadlocal; public interface StatefulCopyable> { Object stateIdentity(); diff --git a/src/main/java/net/openhft/chronicle/common/threadlocal/ThreadLocalCopies.java b/src/main/java/net/openhft/chronicle/hash/threadlocal/ThreadLocalCopies.java similarity index 97% rename from src/main/java/net/openhft/chronicle/common/threadlocal/ThreadLocalCopies.java rename to src/main/java/net/openhft/chronicle/hash/threadlocal/ThreadLocalCopies.java index b8713182c..a00cded2c 100644 --- a/src/main/java/net/openhft/chronicle/common/threadlocal/ThreadLocalCopies.java +++ b/src/main/java/net/openhft/chronicle/hash/threadlocal/ThreadLocalCopies.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package net.openhft.chronicle.common.threadlocal; +package net.openhft.chronicle.hash.threadlocal; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/src/main/java/net/openhft/chronicle/map/AbstractChronicleMapBuilder.java b/src/main/java/net/openhft/chronicle/map/AbstractChronicleMapBuilder.java index 3427e9cf5..318302c33 100644 --- a/src/main/java/net/openhft/chronicle/map/AbstractChronicleMapBuilder.java +++ b/src/main/java/net/openhft/chronicle/map/AbstractChronicleMapBuilder.java @@ -18,12 +18,12 @@ package net.openhft.chronicle.map; -import net.openhft.chronicle.common.*; -import net.openhft.chronicle.common.serialization.MetaBytesInterop; -import net.openhft.chronicle.common.serialization.MetaBytesWriter; -import net.openhft.chronicle.common.serialization.MetaProvider; -import net.openhft.chronicle.common.threadlocal.Provider; -import net.openhft.chronicle.common.threadlocal.ThreadLocalCopies; +import net.openhft.chronicle.hash.*; +import net.openhft.chronicle.hash.serialization.MetaBytesInterop; +import net.openhft.chronicle.hash.serialization.MetaBytesWriter; +import net.openhft.chronicle.hash.serialization.MetaProvider; +import net.openhft.chronicle.hash.threadlocal.Provider; +import net.openhft.chronicle.hash.threadlocal.ThreadLocalCopies; import net.openhft.chronicle.set.ChronicleSetBuilder; import net.openhft.lang.Maths; import net.openhft.lang.io.ByteBufferBytes; diff --git a/src/main/java/net/openhft/chronicle/map/ChronicleMap.java b/src/main/java/net/openhft/chronicle/map/ChronicleMap.java index 23599052d..50524b87e 100644 --- a/src/main/java/net/openhft/chronicle/map/ChronicleMap.java +++ b/src/main/java/net/openhft/chronicle/map/ChronicleMap.java @@ -18,8 +18,8 @@ package net.openhft.chronicle.map; -import net.openhft.chronicle.common.ChronicleHash; -import net.openhft.chronicle.common.serialization.BytesReader; +import net.openhft.chronicle.hash.ChronicleHash; +import net.openhft.chronicle.hash.serialization.BytesReader; import net.openhft.lang.io.Bytes; import net.openhft.lang.io.serialization.BytesMarshaller; import net.openhft.lang.model.Byteable; diff --git a/src/main/java/net/openhft/chronicle/map/ChronicleMapBuilder.java b/src/main/java/net/openhft/chronicle/map/ChronicleMapBuilder.java index 755c59d8c..be8172522 100644 --- a/src/main/java/net/openhft/chronicle/map/ChronicleMapBuilder.java +++ b/src/main/java/net/openhft/chronicle/map/ChronicleMapBuilder.java @@ -16,8 +16,8 @@ package net.openhft.chronicle.map; -import net.openhft.chronicle.common.ChronicleHashBuilder; -import net.openhft.chronicle.common.serialization.AgileBytesMarshaller; +import net.openhft.chronicle.hash.ChronicleHashBuilder; +import net.openhft.chronicle.hash.serialization.AgileBytesMarshaller; import net.openhft.lang.io.Bytes; import net.openhft.lang.io.serialization.BytesMarshallable; import net.openhft.lang.io.serialization.BytesMarshaller; diff --git a/src/main/java/net/openhft/chronicle/map/ConstantValueProvider.java b/src/main/java/net/openhft/chronicle/map/ConstantValueProvider.java index d6f64e569..31edd8591 100644 --- a/src/main/java/net/openhft/chronicle/map/ConstantValueProvider.java +++ b/src/main/java/net/openhft/chronicle/map/ConstantValueProvider.java @@ -18,8 +18,8 @@ package net.openhft.chronicle.map; -import net.openhft.chronicle.common.serialization.BytesReader; -import net.openhft.chronicle.common.serialization.MetaBytesWriter; +import net.openhft.chronicle.hash.serialization.BytesReader; +import net.openhft.chronicle.hash.serialization.MetaBytesWriter; import net.openhft.lang.io.ByteBufferBytes; import java.nio.ByteBuffer; diff --git a/src/main/java/net/openhft/chronicle/map/PrepareValueBytesAsWriter.java b/src/main/java/net/openhft/chronicle/map/PrepareValueBytesAsWriter.java index 7ed927c9d..13b7712ed 100644 --- a/src/main/java/net/openhft/chronicle/map/PrepareValueBytesAsWriter.java +++ b/src/main/java/net/openhft/chronicle/map/PrepareValueBytesAsWriter.java @@ -16,8 +16,8 @@ package net.openhft.chronicle.map; -import net.openhft.chronicle.common.serialization.BytesWriter; -import net.openhft.chronicle.common.serialization.MetaBytesWriter; +import net.openhft.chronicle.hash.serialization.BytesWriter; +import net.openhft.chronicle.hash.serialization.MetaBytesWriter; import net.openhft.lang.io.Bytes; import java.io.Serializable; diff --git a/src/main/java/net/openhft/chronicle/map/ReplicatedChronicleMap.java b/src/main/java/net/openhft/chronicle/map/ReplicatedChronicleMap.java index 8de92f67c..7a46b9505 100644 --- a/src/main/java/net/openhft/chronicle/map/ReplicatedChronicleMap.java +++ b/src/main/java/net/openhft/chronicle/map/ReplicatedChronicleMap.java @@ -19,13 +19,12 @@ package net.openhft.chronicle.map; -import net.openhft.chronicle.common.TimeProvider; -import net.openhft.chronicle.common.serialization.BytesReader; -import net.openhft.chronicle.common.serialization.MetaBytesInterop; -import net.openhft.chronicle.common.serialization.MetaBytesWriter; -import net.openhft.chronicle.common.threadlocal.ThreadLocalCopies; +import net.openhft.chronicle.hash.TimeProvider; +import net.openhft.chronicle.hash.serialization.BytesReader; +import net.openhft.chronicle.hash.serialization.MetaBytesInterop; +import net.openhft.chronicle.hash.serialization.MetaBytesWriter; +import net.openhft.chronicle.hash.threadlocal.ThreadLocalCopies; import net.openhft.lang.Maths; -import net.openhft.lang.MemoryUnit; import net.openhft.lang.collection.ATSDirectBitSet; import net.openhft.lang.io.Bytes; import net.openhft.lang.io.MultiStoreBytes; @@ -41,7 +40,7 @@ import java.util.Set; import java.util.concurrent.CopyOnWriteArraySet; import java.util.concurrent.atomic.AtomicReferenceArray; -import static net.openhft.chronicle.common.serialization.Hasher.hash; +import static net.openhft.chronicle.hash.serialization.Hasher.hash; import static net.openhft.lang.MemoryUnit.BITS; import static net.openhft.lang.MemoryUnit.BYTES; import static net.openhft.lang.MemoryUnit.CACHE_LINES; diff --git a/src/main/java/net/openhft/chronicle/map/SerializationBuilder.java b/src/main/java/net/openhft/chronicle/map/SerializationBuilder.java index 47f52f9c3..8d1ebc511 100644 --- a/src/main/java/net/openhft/chronicle/map/SerializationBuilder.java +++ b/src/main/java/net/openhft/chronicle/map/SerializationBuilder.java @@ -18,10 +18,10 @@ package net.openhft.chronicle.map; -import net.openhft.chronicle.common.threadlocal.Provider; -import net.openhft.chronicle.common.threadlocal.ThreadLocalCopies; -import net.openhft.chronicle.common.serialization.*; -import net.openhft.chronicle.common.serialization.impl.*; +import net.openhft.chronicle.hash.threadlocal.Provider; +import net.openhft.chronicle.hash.threadlocal.ThreadLocalCopies; +import net.openhft.chronicle.hash.serialization.*; +import net.openhft.chronicle.hash.serialization.impl.*; import net.openhft.lang.io.Bytes; import net.openhft.lang.io.serialization.BytesMarshallable; import net.openhft.lang.io.serialization.BytesMarshaller; @@ -38,7 +38,7 @@ import java.io.Serializable; import java.lang.reflect.Modifier; import static net.openhft.chronicle.map.Objects.hash; -import static net.openhft.chronicle.common.serialization.SizeMarshallers.stopBit; +import static net.openhft.chronicle.hash.serialization.SizeMarshallers.stopBit; final class SerializationBuilder implements Cloneable { diff --git a/src/main/java/net/openhft/chronicle/map/Serializer.java b/src/main/java/net/openhft/chronicle/map/Serializer.java index fe62c2bdf..28ac7573c 100644 --- a/src/main/java/net/openhft/chronicle/map/Serializer.java +++ b/src/main/java/net/openhft/chronicle/map/Serializer.java @@ -18,9 +18,9 @@ package net.openhft.chronicle.map; -import net.openhft.chronicle.common.threadlocal.Provider; -import net.openhft.chronicle.common.threadlocal.ThreadLocalCopies; -import net.openhft.chronicle.common.serialization.*; +import net.openhft.chronicle.hash.threadlocal.Provider; +import net.openhft.chronicle.hash.threadlocal.ThreadLocalCopies; +import net.openhft.chronicle.hash.serialization.*; import net.openhft.lang.io.Bytes; import net.openhft.lang.model.Byteable; import net.openhft.lang.model.constraints.NotNull; diff --git a/src/main/java/net/openhft/chronicle/map/StatelessChronicleMap.java b/src/main/java/net/openhft/chronicle/map/StatelessChronicleMap.java index fc0a3aac7..790a80c5e 100644 --- a/src/main/java/net/openhft/chronicle/map/StatelessChronicleMap.java +++ b/src/main/java/net/openhft/chronicle/map/StatelessChronicleMap.java @@ -19,9 +19,9 @@ package net.openhft.chronicle.map; import com.sun.jdi.connect.spi.ClosedConnectionException; -import net.openhft.chronicle.common.StatelessBuilder; -import net.openhft.chronicle.common.exceptions.IORuntimeException; -import net.openhft.chronicle.common.exceptions.TimeoutRuntimeException; +import net.openhft.chronicle.hash.StatelessBuilder; +import net.openhft.chronicle.hash.exceptions.IORuntimeException; +import net.openhft.chronicle.hash.exceptions.TimeoutRuntimeException; import net.openhft.lang.io.ByteBufferBytes; import net.openhft.lang.io.Bytes; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/net/openhft/chronicle/map/VanillaChronicleMap.java b/src/main/java/net/openhft/chronicle/map/VanillaChronicleMap.java index 07e130ae0..65719eec5 100644 --- a/src/main/java/net/openhft/chronicle/map/VanillaChronicleMap.java +++ b/src/main/java/net/openhft/chronicle/map/VanillaChronicleMap.java @@ -18,10 +18,10 @@ package net.openhft.chronicle.map; -import net.openhft.chronicle.common.ChronicleHashErrorListener; -import net.openhft.chronicle.common.serialization.*; -import net.openhft.chronicle.common.threadlocal.Provider; -import net.openhft.chronicle.common.threadlocal.ThreadLocalCopies; +import net.openhft.chronicle.hash.ChronicleHashErrorListener; +import net.openhft.chronicle.hash.serialization.*; +import net.openhft.chronicle.hash.threadlocal.Provider; +import net.openhft.chronicle.hash.threadlocal.ThreadLocalCopies; import net.openhft.lang.collection.DirectBitSet; import net.openhft.lang.collection.SingleThreadedDirectBitSet; import net.openhft.lang.io.*; diff --git a/src/main/java/net/openhft/chronicle/set/ChronicleSet.java b/src/main/java/net/openhft/chronicle/set/ChronicleSet.java index 14c87cbeb..0ae544147 100644 --- a/src/main/java/net/openhft/chronicle/set/ChronicleSet.java +++ b/src/main/java/net/openhft/chronicle/set/ChronicleSet.java @@ -18,7 +18,7 @@ package net.openhft.chronicle.set; -import net.openhft.chronicle.common.ChronicleHash; +import net.openhft.chronicle.hash.ChronicleHash; import java.util.Set; diff --git a/src/main/java/net/openhft/chronicle/set/ChronicleSetBuilder.java b/src/main/java/net/openhft/chronicle/set/ChronicleSetBuilder.java index 6bf45441d..c8e6dd74b 100644 --- a/src/main/java/net/openhft/chronicle/set/ChronicleSetBuilder.java +++ b/src/main/java/net/openhft/chronicle/set/ChronicleSetBuilder.java @@ -18,16 +18,15 @@ package net.openhft.chronicle.set; -import net.openhft.chronicle.common.ChronicleHashBuilder; -import net.openhft.chronicle.common.ChronicleHashErrorListener; -import net.openhft.chronicle.common.StatelessBuilder; -import net.openhft.chronicle.common.TimeProvider; +import net.openhft.chronicle.hash.ChronicleHashBuilder; +import net.openhft.chronicle.hash.ChronicleHashErrorListener; +import net.openhft.chronicle.hash.StatelessBuilder; +import net.openhft.chronicle.hash.TimeProvider; import net.openhft.chronicle.map.*; import net.openhft.lang.io.serialization.BytesMarshaller; import net.openhft.lang.io.serialization.BytesMarshallerFactory; import net.openhft.lang.io.serialization.ObjectFactory; import net.openhft.lang.io.serialization.ObjectSerializer; -import net.openhft.lang.io.serialization.impl.NullObjectFactory; import org.jetbrains.annotations.NotNull; import java.io.File; diff --git a/src/main/java/net/openhft/chronicle/set/DummyValueMarshaller.java b/src/main/java/net/openhft/chronicle/set/DummyValueMarshaller.java index fcafdccf0..3ec1e79bb 100644 --- a/src/main/java/net/openhft/chronicle/set/DummyValueMarshaller.java +++ b/src/main/java/net/openhft/chronicle/set/DummyValueMarshaller.java @@ -18,7 +18,7 @@ package net.openhft.chronicle.set; -import net.openhft.chronicle.common.serialization.AgileBytesMarshaller; +import net.openhft.chronicle.hash.serialization.AgileBytesMarshaller; import net.openhft.lang.io.Bytes; import static net.openhft.chronicle.set.DummyValue.DUMMY_VALUE; diff --git a/src/test/java/net/openhft/chronicle/map/ByteableIntValueMarshaller.java b/src/test/java/net/openhft/chronicle/map/ByteableIntValueMarshaller.java index 0e916b87c..21ce337a7 100644 --- a/src/test/java/net/openhft/chronicle/map/ByteableIntValueMarshaller.java +++ b/src/test/java/net/openhft/chronicle/map/ByteableIntValueMarshaller.java @@ -18,7 +18,7 @@ package net.openhft.chronicle.map; -import net.openhft.chronicle.common.serialization.impl.ByteableMarshaller; +import net.openhft.chronicle.hash.serialization.impl.ByteableMarshaller; import net.openhft.lang.io.Bytes; import net.openhft.lang.io.NativeBytes; import net.openhft.lang.io.serialization.BytesMarshaller; diff --git a/src/test/java/net/openhft/chronicle/map/ByteableLongValueMarshaller.java b/src/test/java/net/openhft/chronicle/map/ByteableLongValueMarshaller.java index 45e0986f3..a0ebc4574 100644 --- a/src/test/java/net/openhft/chronicle/map/ByteableLongValueMarshaller.java +++ b/src/test/java/net/openhft/chronicle/map/ByteableLongValueMarshaller.java @@ -18,7 +18,7 @@ package net.openhft.chronicle.map; -import net.openhft.chronicle.common.serialization.impl.ByteableMarshaller; +import net.openhft.chronicle.hash.serialization.impl.ByteableMarshaller; import net.openhft.lang.io.Bytes; import net.openhft.lang.io.NativeBytes; import net.openhft.lang.io.serialization.BytesMarshaller; diff --git a/src/test/java/net/openhft/chronicle/map/StatelessClientTest.java b/src/test/java/net/openhft/chronicle/map/StatelessClientTest.java index 74563d7e3..27f762323 100644 --- a/src/test/java/net/openhft/chronicle/map/StatelessClientTest.java +++ b/src/test/java/net/openhft/chronicle/map/StatelessClientTest.java @@ -28,7 +28,7 @@ import java.util.HashMap; import java.util.Map; import java.util.Set; -import static net.openhft.chronicle.common.StatelessBuilder.remoteAddress; +import static net.openhft.chronicle.hash.StatelessBuilder.remoteAddress; /** diff --git a/src/test/java/net/openhft/chronicle/map/TimeBasedReplicationTests.java b/src/test/java/net/openhft/chronicle/map/TimeBasedReplicationTests.java index f273856a6..f35862472 100644 --- a/src/test/java/net/openhft/chronicle/map/TimeBasedReplicationTests.java +++ b/src/test/java/net/openhft/chronicle/map/TimeBasedReplicationTests.java @@ -18,7 +18,7 @@ package net.openhft.chronicle.map; -import net.openhft.chronicle.common.TimeProvider; +import net.openhft.chronicle.hash.TimeProvider; import net.openhft.chronicle.map.jrs166.JSR166TestCase; import org.junit.Test; import org.mockito.Mockito; diff --git a/src/test/java/net/openhft/chronicle/map/fromdocs/StringEncodingExamples.java b/src/test/java/net/openhft/chronicle/map/fromdocs/StringEncodingExamples.java index 57e214c9f..a28b52942 100644 --- a/src/test/java/net/openhft/chronicle/map/fromdocs/StringEncodingExamples.java +++ b/src/test/java/net/openhft/chronicle/map/fromdocs/StringEncodingExamples.java @@ -18,7 +18,7 @@ package net.openhft.chronicle.map.fromdocs; -import net.openhft.chronicle.common.threadlocal.StatefulCopyable; +import net.openhft.chronicle.hash.threadlocal.StatefulCopyable; import net.openhft.chronicle.set.ChronicleSet; import net.openhft.chronicle.set.ChronicleSetBuilder; import net.openhft.lang.io.Bytes; diff --git a/src/test/java/net/openhft/chronicle/map/jrs166/map/StatelessChronicleMapTest.java b/src/test/java/net/openhft/chronicle/map/jrs166/map/StatelessChronicleMapTest.java index 520c2d31e..9e03f3898 100644 --- a/src/test/java/net/openhft/chronicle/map/jrs166/map/StatelessChronicleMapTest.java +++ b/src/test/java/net/openhft/chronicle/map/jrs166/map/StatelessChronicleMapTest.java @@ -31,7 +31,7 @@ import java.io.IOException; import java.net.InetSocketAddress; import java.util.*; -import static net.openhft.chronicle.common.StatelessBuilder.remoteAddress; +import static net.openhft.chronicle.hash.StatelessBuilder.remoteAddress; import static org.junit.Assert.*; /*