diff --git a/src/main/java/net/openhft/chronicle/exceptions/IORuntimeException.java b/src/main/java/net/openhft/chronicle/common/exceptions/IORuntimeException.java similarity index 79% rename from src/main/java/net/openhft/chronicle/exceptions/IORuntimeException.java rename to src/main/java/net/openhft/chronicle/common/exceptions/IORuntimeException.java index 0084700bc..a654ca675 100644 --- a/src/main/java/net/openhft/chronicle/exceptions/IORuntimeException.java +++ b/src/main/java/net/openhft/chronicle/common/exceptions/IORuntimeException.java @@ -1,4 +1,4 @@ -package net.openhft.chronicle.exceptions; +package net.openhft.chronicle.common.exceptions; import java.io.IOException; diff --git a/src/main/java/net/openhft/chronicle/exceptions/TimeoutRuntimeException.java b/src/main/java/net/openhft/chronicle/common/exceptions/TimeoutRuntimeException.java similarity index 67% rename from src/main/java/net/openhft/chronicle/exceptions/TimeoutRuntimeException.java rename to src/main/java/net/openhft/chronicle/common/exceptions/TimeoutRuntimeException.java index 25ea70985..9374150ef 100644 --- a/src/main/java/net/openhft/chronicle/exceptions/TimeoutRuntimeException.java +++ b/src/main/java/net/openhft/chronicle/common/exceptions/TimeoutRuntimeException.java @@ -1,4 +1,4 @@ -package net.openhft.chronicle.exceptions; +package net.openhft.chronicle.common.exceptions; /** * @author Rob Austin. diff --git a/src/main/java/net/openhft/chronicle/serialization/AgileBytesMarshaller.java b/src/main/java/net/openhft/chronicle/common/serialization/AgileBytesMarshaller.java similarity index 93% rename from src/main/java/net/openhft/chronicle/serialization/AgileBytesMarshaller.java rename to src/main/java/net/openhft/chronicle/common/serialization/AgileBytesMarshaller.java index 205a19115..08ca9ddbf 100644 --- a/src/main/java/net/openhft/chronicle/serialization/AgileBytesMarshaller.java +++ b/src/main/java/net/openhft/chronicle/common/serialization/AgileBytesMarshaller.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package net.openhft.chronicle.serialization; +package net.openhft.chronicle.common.serialization; public interface AgileBytesMarshaller extends BytesReader, BytesInterop, SizeMarshaller { } diff --git a/src/main/java/net/openhft/chronicle/serialization/BytesInterop.java b/src/main/java/net/openhft/chronicle/common/serialization/BytesInterop.java similarity index 95% rename from src/main/java/net/openhft/chronicle/serialization/BytesInterop.java rename to src/main/java/net/openhft/chronicle/common/serialization/BytesInterop.java index ac3ebf74f..b9602fd50 100644 --- a/src/main/java/net/openhft/chronicle/serialization/BytesInterop.java +++ b/src/main/java/net/openhft/chronicle/common/serialization/BytesInterop.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package net.openhft.chronicle.serialization; +package net.openhft.chronicle.common.serialization; import net.openhft.lang.io.Bytes; import net.openhft.lang.model.Byteable; diff --git a/src/main/java/net/openhft/chronicle/serialization/BytesReader.java b/src/main/java/net/openhft/chronicle/common/serialization/BytesReader.java similarity index 94% rename from src/main/java/net/openhft/chronicle/serialization/BytesReader.java rename to src/main/java/net/openhft/chronicle/common/serialization/BytesReader.java index ec559a713..1ea181716 100644 --- a/src/main/java/net/openhft/chronicle/serialization/BytesReader.java +++ b/src/main/java/net/openhft/chronicle/common/serialization/BytesReader.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package net.openhft.chronicle.serialization; +package net.openhft.chronicle.common.serialization; import net.openhft.lang.io.Bytes; diff --git a/src/main/java/net/openhft/chronicle/serialization/BytesReaders.java b/src/main/java/net/openhft/chronicle/common/serialization/BytesReaders.java similarity index 96% rename from src/main/java/net/openhft/chronicle/serialization/BytesReaders.java rename to src/main/java/net/openhft/chronicle/common/serialization/BytesReaders.java index b95b7a5e5..83f9514a3 100644 --- a/src/main/java/net/openhft/chronicle/serialization/BytesReaders.java +++ b/src/main/java/net/openhft/chronicle/common/serialization/BytesReaders.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package net.openhft.chronicle.serialization; +package net.openhft.chronicle.common.serialization; import net.openhft.lang.io.Bytes; import net.openhft.lang.io.serialization.BytesMarshaller; diff --git a/src/main/java/net/openhft/chronicle/serialization/BytesWriter.java b/src/main/java/net/openhft/chronicle/common/serialization/BytesWriter.java similarity index 94% rename from src/main/java/net/openhft/chronicle/serialization/BytesWriter.java rename to src/main/java/net/openhft/chronicle/common/serialization/BytesWriter.java index b120ac778..bccbefd99 100644 --- a/src/main/java/net/openhft/chronicle/serialization/BytesWriter.java +++ b/src/main/java/net/openhft/chronicle/common/serialization/BytesWriter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package net.openhft.chronicle.serialization; +package net.openhft.chronicle.common.serialization; import net.openhft.lang.io.Bytes; diff --git a/src/main/java/net/openhft/chronicle/serialization/CopyingMetaBytesInterop.java b/src/main/java/net/openhft/chronicle/common/serialization/CopyingMetaBytesInterop.java similarity index 97% rename from src/main/java/net/openhft/chronicle/serialization/CopyingMetaBytesInterop.java rename to src/main/java/net/openhft/chronicle/common/serialization/CopyingMetaBytesInterop.java index 362756e1a..d61ff4422 100644 --- a/src/main/java/net/openhft/chronicle/serialization/CopyingMetaBytesInterop.java +++ b/src/main/java/net/openhft/chronicle/common/serialization/CopyingMetaBytesInterop.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package net.openhft.chronicle.serialization; +package net.openhft.chronicle.common.serialization; -import net.openhft.chronicle.threadlocal.Provider; -import net.openhft.chronicle.threadlocal.StatefulCopyable; -import net.openhft.chronicle.threadlocal.ThreadLocalCopies; +import net.openhft.chronicle.common.threadlocal.Provider; +import net.openhft.chronicle.common.threadlocal.StatefulCopyable; +import net.openhft.chronicle.common.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/serialization/DelegatingMetaBytesInterop.java b/src/main/java/net/openhft/chronicle/common/serialization/DelegatingMetaBytesInterop.java similarity index 96% rename from src/main/java/net/openhft/chronicle/serialization/DelegatingMetaBytesInterop.java rename to src/main/java/net/openhft/chronicle/common/serialization/DelegatingMetaBytesInterop.java index 90c57f7f6..3f8f476f4 100644 --- a/src/main/java/net/openhft/chronicle/serialization/DelegatingMetaBytesInterop.java +++ b/src/main/java/net/openhft/chronicle/common/serialization/DelegatingMetaBytesInterop.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package net.openhft.chronicle.serialization; +package net.openhft.chronicle.common.serialization; import net.openhft.lang.io.Bytes; diff --git a/src/main/java/net/openhft/chronicle/serialization/DelegatingMetaBytesInteropProvider.java b/src/main/java/net/openhft/chronicle/common/serialization/DelegatingMetaBytesInteropProvider.java similarity index 93% rename from src/main/java/net/openhft/chronicle/serialization/DelegatingMetaBytesInteropProvider.java rename to src/main/java/net/openhft/chronicle/common/serialization/DelegatingMetaBytesInteropProvider.java index e17afa503..f0b0e8863 100644 --- a/src/main/java/net/openhft/chronicle/serialization/DelegatingMetaBytesInteropProvider.java +++ b/src/main/java/net/openhft/chronicle/common/serialization/DelegatingMetaBytesInteropProvider.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package net.openhft.chronicle.serialization; +package net.openhft.chronicle.common.serialization; -import net.openhft.chronicle.threadlocal.ThreadLocalCopies; +import net.openhft.chronicle.common.threadlocal.ThreadLocalCopies; import java.io.ObjectStreamException; diff --git a/src/main/java/net/openhft/chronicle/serialization/Hasher.java b/src/main/java/net/openhft/chronicle/common/serialization/Hasher.java similarity index 98% rename from src/main/java/net/openhft/chronicle/serialization/Hasher.java rename to src/main/java/net/openhft/chronicle/common/serialization/Hasher.java index c113707a7..f0a15da56 100644 --- a/src/main/java/net/openhft/chronicle/serialization/Hasher.java +++ b/src/main/java/net/openhft/chronicle/common/serialization/Hasher.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package net.openhft.chronicle.serialization; +package net.openhft.chronicle.common.serialization; import net.openhft.lang.io.Bytes; import net.openhft.lang.io.NativeBytes; diff --git a/src/main/java/net/openhft/chronicle/serialization/MetaBytesInterop.java b/src/main/java/net/openhft/chronicle/common/serialization/MetaBytesInterop.java similarity index 94% rename from src/main/java/net/openhft/chronicle/serialization/MetaBytesInterop.java rename to src/main/java/net/openhft/chronicle/common/serialization/MetaBytesInterop.java index 72d94702e..9d2e3446e 100644 --- a/src/main/java/net/openhft/chronicle/serialization/MetaBytesInterop.java +++ b/src/main/java/net/openhft/chronicle/common/serialization/MetaBytesInterop.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package net.openhft.chronicle.serialization; +package net.openhft.chronicle.common.serialization; import net.openhft.lang.io.Bytes; diff --git a/src/main/java/net/openhft/chronicle/serialization/MetaBytesWriter.java b/src/main/java/net/openhft/chronicle/common/serialization/MetaBytesWriter.java similarity index 94% rename from src/main/java/net/openhft/chronicle/serialization/MetaBytesWriter.java rename to src/main/java/net/openhft/chronicle/common/serialization/MetaBytesWriter.java index 2c1a029d2..e99f844d6 100644 --- a/src/main/java/net/openhft/chronicle/serialization/MetaBytesWriter.java +++ b/src/main/java/net/openhft/chronicle/common/serialization/MetaBytesWriter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package net.openhft.chronicle.serialization; +package net.openhft.chronicle.common.serialization; import net.openhft.lang.io.Bytes; diff --git a/src/main/java/net/openhft/chronicle/serialization/MetaProvider.java b/src/main/java/net/openhft/chronicle/common/serialization/MetaProvider.java similarity index 88% rename from src/main/java/net/openhft/chronicle/serialization/MetaProvider.java rename to src/main/java/net/openhft/chronicle/common/serialization/MetaProvider.java index 9c5a3661c..54553f6f6 100644 --- a/src/main/java/net/openhft/chronicle/serialization/MetaProvider.java +++ b/src/main/java/net/openhft/chronicle/common/serialization/MetaProvider.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package net.openhft.chronicle.serialization; +package net.openhft.chronicle.common.serialization; -import net.openhft.chronicle.threadlocal.ThreadLocalCopies; +import net.openhft.chronicle.common.threadlocal.ThreadLocalCopies; import java.io.Serializable; diff --git a/src/main/java/net/openhft/chronicle/serialization/SizeMarshaller.java b/src/main/java/net/openhft/chronicle/common/serialization/SizeMarshaller.java similarity index 94% rename from src/main/java/net/openhft/chronicle/serialization/SizeMarshaller.java rename to src/main/java/net/openhft/chronicle/common/serialization/SizeMarshaller.java index e4f0c3755..cb1449db8 100644 --- a/src/main/java/net/openhft/chronicle/serialization/SizeMarshaller.java +++ b/src/main/java/net/openhft/chronicle/common/serialization/SizeMarshaller.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package net.openhft.chronicle.serialization; +package net.openhft.chronicle.common.serialization; import net.openhft.lang.io.Bytes; diff --git a/src/main/java/net/openhft/chronicle/serialization/SizeMarshallers.java b/src/main/java/net/openhft/chronicle/common/serialization/SizeMarshallers.java similarity index 97% rename from src/main/java/net/openhft/chronicle/serialization/SizeMarshallers.java rename to src/main/java/net/openhft/chronicle/common/serialization/SizeMarshallers.java index 99254d13e..2a4274a3d 100644 --- a/src/main/java/net/openhft/chronicle/serialization/SizeMarshallers.java +++ b/src/main/java/net/openhft/chronicle/common/serialization/SizeMarshallers.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package net.openhft.chronicle.serialization; +package net.openhft.chronicle.common.serialization; import net.openhft.lang.io.Bytes; diff --git a/src/main/java/net/openhft/chronicle/serialization/impl/ByteArrayMarshaller.java b/src/main/java/net/openhft/chronicle/common/serialization/impl/ByteArrayMarshaller.java similarity index 87% rename from src/main/java/net/openhft/chronicle/serialization/impl/ByteArrayMarshaller.java rename to src/main/java/net/openhft/chronicle/common/serialization/impl/ByteArrayMarshaller.java index 705723651..98c839205 100644 --- a/src/main/java/net/openhft/chronicle/serialization/impl/ByteArrayMarshaller.java +++ b/src/main/java/net/openhft/chronicle/common/serialization/impl/ByteArrayMarshaller.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package net.openhft.chronicle.serialization.impl; +package net.openhft.chronicle.common.serialization.impl; -import net.openhft.chronicle.serialization.BytesInterop; -import net.openhft.chronicle.serialization.BytesReader; -import net.openhft.chronicle.serialization.Hasher; +import net.openhft.chronicle.common.serialization.BytesInterop; +import net.openhft.chronicle.common.serialization.BytesReader; +import net.openhft.chronicle.common.serialization.Hasher; import net.openhft.lang.io.Bytes; public enum ByteArrayMarshaller implements BytesInterop, BytesReader { diff --git a/src/main/java/net/openhft/chronicle/serialization/impl/ByteableMarshaller.java b/src/main/java/net/openhft/chronicle/common/serialization/impl/ByteableMarshaller.java similarity index 96% rename from src/main/java/net/openhft/chronicle/serialization/impl/ByteableMarshaller.java rename to src/main/java/net/openhft/chronicle/common/serialization/impl/ByteableMarshaller.java index 977bbe4cd..fd9fdb7dd 100644 --- a/src/main/java/net/openhft/chronicle/serialization/impl/ByteableMarshaller.java +++ b/src/main/java/net/openhft/chronicle/common/serialization/impl/ByteableMarshaller.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package net.openhft.chronicle.serialization.impl; +package net.openhft.chronicle.common.serialization.impl; -import net.openhft.chronicle.serialization.AgileBytesMarshaller; -import net.openhft.chronicle.serialization.Hasher; +import net.openhft.chronicle.common.serialization.AgileBytesMarshaller; +import net.openhft.chronicle.common.serialization.Hasher; import net.openhft.lang.io.Bytes; import net.openhft.lang.io.NativeBytes; import net.openhft.lang.io.serialization.*; diff --git a/src/main/java/net/openhft/chronicle/serialization/impl/CharArrayMarshaller.java b/src/main/java/net/openhft/chronicle/common/serialization/impl/CharArrayMarshaller.java similarity index 87% rename from src/main/java/net/openhft/chronicle/serialization/impl/CharArrayMarshaller.java rename to src/main/java/net/openhft/chronicle/common/serialization/impl/CharArrayMarshaller.java index d995b106e..b7cdbca60 100644 --- a/src/main/java/net/openhft/chronicle/serialization/impl/CharArrayMarshaller.java +++ b/src/main/java/net/openhft/chronicle/common/serialization/impl/CharArrayMarshaller.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package net.openhft.chronicle.serialization.impl; +package net.openhft.chronicle.common.serialization.impl; -import net.openhft.chronicle.serialization.BytesInterop; -import net.openhft.chronicle.serialization.BytesReader; -import net.openhft.chronicle.serialization.Hasher; +import net.openhft.chronicle.common.serialization.BytesInterop; +import net.openhft.chronicle.common.serialization.BytesReader; +import net.openhft.chronicle.common.serialization.Hasher; import net.openhft.lang.io.Bytes; public enum CharArrayMarshaller implements BytesInterop, BytesReader { diff --git a/src/main/java/net/openhft/chronicle/serialization/impl/CharSequenceReader.java b/src/main/java/net/openhft/chronicle/common/serialization/impl/CharSequenceReader.java similarity index 95% rename from src/main/java/net/openhft/chronicle/serialization/impl/CharSequenceReader.java rename to src/main/java/net/openhft/chronicle/common/serialization/impl/CharSequenceReader.java index b2e40f818..44d405ac7 100644 --- a/src/main/java/net/openhft/chronicle/serialization/impl/CharSequenceReader.java +++ b/src/main/java/net/openhft/chronicle/common/serialization/impl/CharSequenceReader.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package net.openhft.chronicle.serialization.impl; +package net.openhft.chronicle.common.serialization.impl; -import net.openhft.chronicle.serialization.BytesReader; +import net.openhft.chronicle.common.serialization.BytesReader; import net.openhft.lang.io.AbstractBytes; import net.openhft.lang.io.Bytes; import net.openhft.lang.pool.CharSequenceInterner; -import net.openhft.chronicle.threadlocal.StatefulCopyable; +import net.openhft.chronicle.common.threadlocal.StatefulCopyable; import org.jetbrains.annotations.NotNull; import java.io.IOException; diff --git a/src/main/java/net/openhft/chronicle/serialization/impl/CharSequenceWriter.java b/src/main/java/net/openhft/chronicle/common/serialization/impl/CharSequenceWriter.java similarity index 92% rename from src/main/java/net/openhft/chronicle/serialization/impl/CharSequenceWriter.java rename to src/main/java/net/openhft/chronicle/common/serialization/impl/CharSequenceWriter.java index 387de3ff2..aff02a086 100644 --- a/src/main/java/net/openhft/chronicle/serialization/impl/CharSequenceWriter.java +++ b/src/main/java/net/openhft/chronicle/common/serialization/impl/CharSequenceWriter.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package net.openhft.chronicle.serialization.impl; +package net.openhft.chronicle.common.serialization.impl; -import net.openhft.chronicle.serialization.BytesWriter; +import net.openhft.chronicle.common.serialization.BytesWriter; import net.openhft.lang.io.AbstractBytes; import net.openhft.lang.io.Bytes; diff --git a/src/main/java/net/openhft/chronicle/serialization/impl/DoubleMarshaller.java b/src/main/java/net/openhft/chronicle/common/serialization/impl/DoubleMarshaller.java similarity index 90% rename from src/main/java/net/openhft/chronicle/serialization/impl/DoubleMarshaller.java rename to src/main/java/net/openhft/chronicle/common/serialization/impl/DoubleMarshaller.java index 6d69ab18a..7bcf301ec 100644 --- a/src/main/java/net/openhft/chronicle/serialization/impl/DoubleMarshaller.java +++ b/src/main/java/net/openhft/chronicle/common/serialization/impl/DoubleMarshaller.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package net.openhft.chronicle.serialization.impl; +package net.openhft.chronicle.common.serialization.impl; -import net.openhft.chronicle.serialization.AgileBytesMarshaller; -import net.openhft.chronicle.serialization.Hasher; +import net.openhft.chronicle.common.serialization.AgileBytesMarshaller; +import net.openhft.chronicle.common.serialization.Hasher; import net.openhft.lang.io.Bytes; import static java.lang.Double.doubleToLongBits; diff --git a/src/main/java/net/openhft/chronicle/serialization/impl/IntegerMarshaller.java b/src/main/java/net/openhft/chronicle/common/serialization/impl/IntegerMarshaller.java similarity index 89% rename from src/main/java/net/openhft/chronicle/serialization/impl/IntegerMarshaller.java rename to src/main/java/net/openhft/chronicle/common/serialization/impl/IntegerMarshaller.java index fee023837..2eb344f53 100644 --- a/src/main/java/net/openhft/chronicle/serialization/impl/IntegerMarshaller.java +++ b/src/main/java/net/openhft/chronicle/common/serialization/impl/IntegerMarshaller.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package net.openhft.chronicle.serialization.impl; +package net.openhft.chronicle.common.serialization.impl; -import net.openhft.chronicle.serialization.AgileBytesMarshaller; -import net.openhft.chronicle.serialization.Hasher; +import net.openhft.chronicle.common.serialization.AgileBytesMarshaller; +import net.openhft.chronicle.common.serialization.Hasher; import net.openhft.lang.io.Bytes; public enum IntegerMarshaller implements AgileBytesMarshaller { diff --git a/src/main/java/net/openhft/chronicle/serialization/impl/LongMarshaller.java b/src/main/java/net/openhft/chronicle/common/serialization/impl/LongMarshaller.java similarity index 89% rename from src/main/java/net/openhft/chronicle/serialization/impl/LongMarshaller.java rename to src/main/java/net/openhft/chronicle/common/serialization/impl/LongMarshaller.java index b21550595..fe39508d9 100644 --- a/src/main/java/net/openhft/chronicle/serialization/impl/LongMarshaller.java +++ b/src/main/java/net/openhft/chronicle/common/serialization/impl/LongMarshaller.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package net.openhft.chronicle.serialization.impl; +package net.openhft.chronicle.common.serialization.impl; -import net.openhft.chronicle.serialization.AgileBytesMarshaller; -import net.openhft.chronicle.serialization.Hasher; +import net.openhft.chronicle.common.serialization.AgileBytesMarshaller; +import net.openhft.chronicle.common.serialization.Hasher; import net.openhft.lang.io.Bytes; public enum LongMarshaller implements AgileBytesMarshaller { diff --git a/src/main/java/net/openhft/chronicle/serialization/impl/VoidMarshaller.java b/src/main/java/net/openhft/chronicle/common/serialization/impl/VoidMarshaller.java similarity index 92% rename from src/main/java/net/openhft/chronicle/serialization/impl/VoidMarshaller.java rename to src/main/java/net/openhft/chronicle/common/serialization/impl/VoidMarshaller.java index f1a1b7d8a..4e36d1e66 100644 --- a/src/main/java/net/openhft/chronicle/serialization/impl/VoidMarshaller.java +++ b/src/main/java/net/openhft/chronicle/common/serialization/impl/VoidMarshaller.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package net.openhft.chronicle.serialization.impl; +package net.openhft.chronicle.common.serialization.impl; -import net.openhft.chronicle.serialization.AgileBytesMarshaller; +import net.openhft.chronicle.common.serialization.AgileBytesMarshaller; import net.openhft.lang.io.Bytes; public enum VoidMarshaller implements AgileBytesMarshaller { diff --git a/src/main/java/net/openhft/chronicle/threadlocal/Provider.java b/src/main/java/net/openhft/chronicle/common/threadlocal/Provider.java similarity index 98% rename from src/main/java/net/openhft/chronicle/threadlocal/Provider.java rename to src/main/java/net/openhft/chronicle/common/threadlocal/Provider.java index 349c85f2e..acbdd8be9 100644 --- a/src/main/java/net/openhft/chronicle/threadlocal/Provider.java +++ b/src/main/java/net/openhft/chronicle/common/threadlocal/Provider.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package net.openhft.chronicle.threadlocal; +package net.openhft.chronicle.common.threadlocal; public abstract class Provider { diff --git a/src/main/java/net/openhft/chronicle/threadlocal/StatefulCopyable.java b/src/main/java/net/openhft/chronicle/common/threadlocal/StatefulCopyable.java similarity index 93% rename from src/main/java/net/openhft/chronicle/threadlocal/StatefulCopyable.java rename to src/main/java/net/openhft/chronicle/common/threadlocal/StatefulCopyable.java index e666aa489..460451697 100644 --- a/src/main/java/net/openhft/chronicle/threadlocal/StatefulCopyable.java +++ b/src/main/java/net/openhft/chronicle/common/threadlocal/StatefulCopyable.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package net.openhft.chronicle.threadlocal; +package net.openhft.chronicle.common.threadlocal; public interface StatefulCopyable> { Object stateIdentity(); diff --git a/src/main/java/net/openhft/chronicle/threadlocal/ThreadLocalCopies.java b/src/main/java/net/openhft/chronicle/common/threadlocal/ThreadLocalCopies.java similarity index 97% rename from src/main/java/net/openhft/chronicle/threadlocal/ThreadLocalCopies.java rename to src/main/java/net/openhft/chronicle/common/threadlocal/ThreadLocalCopies.java index e94deb291..8c137cb25 100644 --- a/src/main/java/net/openhft/chronicle/threadlocal/ThreadLocalCopies.java +++ b/src/main/java/net/openhft/chronicle/common/threadlocal/ThreadLocalCopies.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package net.openhft.chronicle.threadlocal; +package net.openhft.chronicle.common.threadlocal; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/src/main/java/net/openhft/chronicle/map/ChronicleMap.java b/src/main/java/net/openhft/chronicle/map/ChronicleMap.java index 58e826d9d..fac994855 100644 --- a/src/main/java/net/openhft/chronicle/map/ChronicleMap.java +++ b/src/main/java/net/openhft/chronicle/map/ChronicleMap.java @@ -17,7 +17,7 @@ package net.openhft.chronicle.map; import net.openhft.chronicle.common.ChronicleHash; -import net.openhft.chronicle.serialization.BytesReader; +import net.openhft.chronicle.common.serialization.BytesReader; import net.openhft.lang.io.Bytes; import net.openhft.lang.io.serialization.BytesMarshaller; import net.openhft.lang.io.serialization.ObjectFactory; diff --git a/src/main/java/net/openhft/chronicle/map/ChronicleMapBuilder.java b/src/main/java/net/openhft/chronicle/map/ChronicleMapBuilder.java index f1ada6c3e..770aa0421 100644 --- a/src/main/java/net/openhft/chronicle/map/ChronicleMapBuilder.java +++ b/src/main/java/net/openhft/chronicle/map/ChronicleMapBuilder.java @@ -17,13 +17,13 @@ package net.openhft.chronicle.map; import net.openhft.chronicle.common.*; -import net.openhft.chronicle.serialization.AgileBytesMarshaller; -import net.openhft.chronicle.serialization.MetaBytesInterop; -import net.openhft.chronicle.serialization.MetaBytesWriter; -import net.openhft.chronicle.serialization.MetaProvider; +import net.openhft.chronicle.common.serialization.AgileBytesMarshaller; +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.set.ChronicleSetBuilder; -import net.openhft.chronicle.threadlocal.Provider; -import net.openhft.chronicle.threadlocal.ThreadLocalCopies; +import net.openhft.chronicle.common.threadlocal.Provider; +import net.openhft.chronicle.common.threadlocal.ThreadLocalCopies; import net.openhft.lang.Maths; import net.openhft.lang.io.ByteBufferBytes; import net.openhft.lang.io.Bytes; diff --git a/src/main/java/net/openhft/chronicle/map/ConstantValueProvider.java b/src/main/java/net/openhft/chronicle/map/ConstantValueProvider.java index 048b5bb64..977b81985 100644 --- a/src/main/java/net/openhft/chronicle/map/ConstantValueProvider.java +++ b/src/main/java/net/openhft/chronicle/map/ConstantValueProvider.java @@ -16,8 +16,8 @@ package net.openhft.chronicle.map; -import net.openhft.chronicle.serialization.BytesReader; -import net.openhft.chronicle.serialization.MetaBytesWriter; +import net.openhft.chronicle.common.serialization.BytesReader; +import net.openhft.chronicle.common.serialization.MetaBytesWriter; import net.openhft.lang.io.ByteBufferBytes; import java.nio.ByteBuffer; diff --git a/src/main/java/net/openhft/chronicle/map/ReplicatedChronicleMap.java b/src/main/java/net/openhft/chronicle/map/ReplicatedChronicleMap.java index 26940e93a..e5bd41fd5 100644 --- a/src/main/java/net/openhft/chronicle/map/ReplicatedChronicleMap.java +++ b/src/main/java/net/openhft/chronicle/map/ReplicatedChronicleMap.java @@ -18,10 +18,10 @@ package net.openhft.chronicle.map; import net.openhft.chronicle.common.TimeProvider; -import net.openhft.chronicle.serialization.BytesReader; -import net.openhft.chronicle.serialization.MetaBytesInterop; -import net.openhft.chronicle.serialization.MetaBytesWriter; -import net.openhft.chronicle.threadlocal.ThreadLocalCopies; +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.lang.Maths; import net.openhft.lang.collection.ATSDirectBitSet; import net.openhft.lang.io.Bytes; @@ -38,7 +38,7 @@ import java.util.Set; import java.util.concurrent.CopyOnWriteArraySet; import java.util.concurrent.atomic.AtomicReferenceArray; -import static net.openhft.chronicle.serialization.Hasher.hash; +import static net.openhft.chronicle.common.serialization.Hasher.hash; import static net.openhft.lang.collection.DirectBitSet.NOT_FOUND; /** diff --git a/src/main/java/net/openhft/chronicle/map/SerializationBuilder.java b/src/main/java/net/openhft/chronicle/map/SerializationBuilder.java index 22bca8eaa..7a63bf17e 100644 --- a/src/main/java/net/openhft/chronicle/map/SerializationBuilder.java +++ b/src/main/java/net/openhft/chronicle/map/SerializationBuilder.java @@ -16,10 +16,10 @@ package net.openhft.chronicle.map; -import net.openhft.chronicle.threadlocal.Provider; -import net.openhft.chronicle.threadlocal.ThreadLocalCopies; -import net.openhft.chronicle.serialization.*; -import net.openhft.chronicle.serialization.impl.*; +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.lang.io.Bytes; import net.openhft.lang.io.serialization.BytesMarshallable; import net.openhft.lang.io.serialization.BytesMarshaller; @@ -36,7 +36,7 @@ import java.io.Serializable; import java.lang.reflect.Modifier; import static net.openhft.chronicle.map.Objects.hash; -import static net.openhft.chronicle.serialization.SizeMarshallers.stopBit; +import static net.openhft.chronicle.common.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 d459d2ceb..99359e8f7 100644 --- a/src/main/java/net/openhft/chronicle/map/Serializer.java +++ b/src/main/java/net/openhft/chronicle/map/Serializer.java @@ -1,8 +1,8 @@ package net.openhft.chronicle.map; -import net.openhft.chronicle.threadlocal.Provider; -import net.openhft.chronicle.threadlocal.ThreadLocalCopies; -import net.openhft.chronicle.serialization.*; +import net.openhft.chronicle.common.threadlocal.Provider; +import net.openhft.chronicle.common.threadlocal.ThreadLocalCopies; +import net.openhft.chronicle.common.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 8462bd6ea..a651c6d2c 100644 --- a/src/main/java/net/openhft/chronicle/map/StatelessChronicleMap.java +++ b/src/main/java/net/openhft/chronicle/map/StatelessChronicleMap.java @@ -1,8 +1,8 @@ package net.openhft.chronicle.map; import net.openhft.chronicle.common.StatelessBuilder; -import net.openhft.chronicle.exceptions.IORuntimeException; -import net.openhft.chronicle.exceptions.TimeoutRuntimeException; +import net.openhft.chronicle.common.exceptions.IORuntimeException; +import net.openhft.chronicle.common.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 3ea582f93..ba9e584e7 100644 --- a/src/main/java/net/openhft/chronicle/map/VanillaChronicleMap.java +++ b/src/main/java/net/openhft/chronicle/map/VanillaChronicleMap.java @@ -17,9 +17,9 @@ package net.openhft.chronicle.map; import net.openhft.chronicle.common.ChronicleHashErrorListener; -import net.openhft.chronicle.threadlocal.Provider; -import net.openhft.chronicle.threadlocal.ThreadLocalCopies; -import net.openhft.chronicle.serialization.*; +import net.openhft.chronicle.common.threadlocal.Provider; +import net.openhft.chronicle.common.threadlocal.ThreadLocalCopies; +import net.openhft.chronicle.common.serialization.*; import net.openhft.lang.Maths; import net.openhft.lang.collection.DirectBitSet; import net.openhft.lang.collection.SingleThreadedDirectBitSet; diff --git a/src/main/java/net/openhft/chronicle/set/DummyValueMarshaller.java b/src/main/java/net/openhft/chronicle/set/DummyValueMarshaller.java index 9566014b5..a07d8f71c 100644 --- a/src/main/java/net/openhft/chronicle/set/DummyValueMarshaller.java +++ b/src/main/java/net/openhft/chronicle/set/DummyValueMarshaller.java @@ -16,7 +16,7 @@ package net.openhft.chronicle.set; -import net.openhft.chronicle.serialization.AgileBytesMarshaller; +import net.openhft.chronicle.common.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/fromdocs/StringEncodingExamples.java b/src/test/java/net/openhft/chronicle/map/fromdocs/StringEncodingExamples.java index 66555f680..83cbc8eec 100644 --- a/src/test/java/net/openhft/chronicle/map/fromdocs/StringEncodingExamples.java +++ b/src/test/java/net/openhft/chronicle/map/fromdocs/StringEncodingExamples.java @@ -16,7 +16,7 @@ package net.openhft.chronicle.map.fromdocs; -import net.openhft.chronicle.threadlocal.StatefulCopyable; +import net.openhft.chronicle.common.threadlocal.StatefulCopyable; import net.openhft.chronicle.set.ChronicleSet; import net.openhft.chronicle.set.ChronicleSetBuilder; import net.openhft.lang.io.Bytes;