From d11e02d48fa3ea7c537be4c483bd5543463b9ce7 Mon Sep 17 00:00:00 2001 From: leventov Date: Sun, 19 Oct 2014 21:13:13 +0400 Subject: [PATCH] Moved seriaization and threadlocal packages up: n.o.chronicle.map -> n.o.chronicle --- .../java/net/openhft/chronicle/map/ChronicleMap.java | 2 +- .../openhft/chronicle/map/ChronicleMapBuilder.java | 12 ++++++------ .../openhft/chronicle/map/ConstantValueProvider.java | 4 ++-- .../chronicle/map/ReplicatedChronicleMap.java | 10 +++++----- .../openhft/chronicle/map/SerializationBuilder.java | 8 +++++--- .../java/net/openhft/chronicle/map/Serializer.java | 6 +++--- .../openhft/chronicle/map/VanillaChronicleMap.java | 6 +++--- .../serialization/AgileBytesMarshaller.java | 2 +- .../{map => }/serialization/BytesInterop.java | 2 +- .../{map => }/serialization/BytesReader.java | 2 +- .../{map => }/serialization/BytesReaders.java | 2 +- .../{map => }/serialization/BytesWriter.java | 2 +- .../serialization/CopyingMetaBytesInterop.java | 8 ++++---- .../serialization/DelegatingMetaBytesInterop.java | 2 +- .../DelegatingMetaBytesInteropProvider.java | 4 ++-- .../chronicle/{map => }/serialization/Hasher.java | 2 +- .../{map => }/serialization/MetaBytesInterop.java | 2 +- .../{map => }/serialization/MetaBytesWriter.java | 2 +- .../{map => }/serialization/MetaProvider.java | 4 ++-- .../{map => }/serialization/SizeMarshaller.java | 2 +- .../{map => }/serialization/SizeMarshallers.java | 2 +- .../serialization/impl/ByteArrayMarshaller.java | 8 ++++---- .../serialization/impl/ByteableMarshaller.java | 6 +++--- .../serialization/impl/CharSequenceReader.java | 6 +++--- .../serialization/impl/CharSequenceWriter.java | 4 ++-- .../serialization/impl/DoubleMarshaller.java | 6 +++--- .../serialization/impl/IntegerMarshaller.java | 6 +++--- .../{map => }/serialization/impl/LongMarshaller.java | 6 +++--- .../{map => }/serialization/impl/VoidMarshaller.java | 4 ++-- .../openhft/chronicle/set/DummyValueMarshaller.java | 2 +- .../chronicle/{map => }/threadlocal/Provider.java | 2 +- .../{map => }/threadlocal/StatefulCopyable.java | 2 +- .../{map => }/threadlocal/ThreadLocalCopies.java | 2 +- .../map/fromdocs/StringEncodingExamples.java | 2 +- 34 files changed, 72 insertions(+), 70 deletions(-) rename src/main/java/net/openhft/chronicle/{map => }/serialization/AgileBytesMarshaller.java (93%) rename src/main/java/net/openhft/chronicle/{map => }/serialization/BytesInterop.java (96%) rename src/main/java/net/openhft/chronicle/{map => }/serialization/BytesReader.java (94%) rename src/main/java/net/openhft/chronicle/{map => }/serialization/BytesReaders.java (96%) rename src/main/java/net/openhft/chronicle/{map => }/serialization/BytesWriter.java (94%) rename src/main/java/net/openhft/chronicle/{map => }/serialization/CopyingMetaBytesInterop.java (97%) rename src/main/java/net/openhft/chronicle/{map => }/serialization/DelegatingMetaBytesInterop.java (97%) rename src/main/java/net/openhft/chronicle/{map => }/serialization/DelegatingMetaBytesInteropProvider.java (93%) rename src/main/java/net/openhft/chronicle/{map => }/serialization/Hasher.java (98%) rename src/main/java/net/openhft/chronicle/{map => }/serialization/MetaBytesInterop.java (94%) rename src/main/java/net/openhft/chronicle/{map => }/serialization/MetaBytesWriter.java (94%) rename src/main/java/net/openhft/chronicle/{map => }/serialization/MetaProvider.java (88%) rename src/main/java/net/openhft/chronicle/{map => }/serialization/SizeMarshaller.java (94%) rename src/main/java/net/openhft/chronicle/{map => }/serialization/SizeMarshallers.java (97%) rename src/main/java/net/openhft/chronicle/{map => }/serialization/impl/ByteArrayMarshaller.java (88%) rename src/main/java/net/openhft/chronicle/{map => }/serialization/impl/ByteableMarshaller.java (96%) rename src/main/java/net/openhft/chronicle/{map => }/serialization/impl/CharSequenceReader.java (95%) rename src/main/java/net/openhft/chronicle/{map => }/serialization/impl/CharSequenceWriter.java (92%) rename src/main/java/net/openhft/chronicle/{map => }/serialization/impl/DoubleMarshaller.java (90%) rename src/main/java/net/openhft/chronicle/{map => }/serialization/impl/IntegerMarshaller.java (90%) rename src/main/java/net/openhft/chronicle/{map => }/serialization/impl/LongMarshaller.java (89%) rename src/main/java/net/openhft/chronicle/{map => }/serialization/impl/VoidMarshaller.java (92%) rename src/main/java/net/openhft/chronicle/{map => }/threadlocal/Provider.java (98%) rename src/main/java/net/openhft/chronicle/{map => }/threadlocal/StatefulCopyable.java (94%) rename src/main/java/net/openhft/chronicle/{map => }/threadlocal/ThreadLocalCopies.java (97%) diff --git a/src/main/java/net/openhft/chronicle/map/ChronicleMap.java b/src/main/java/net/openhft/chronicle/map/ChronicleMap.java index 57385aa98..3e69ead86 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.ChronicleHash; -import net.openhft.chronicle.map.serialization.BytesReader; +import net.openhft.chronicle.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 c400f0f43..b55e7db2f 100644 --- a/src/main/java/net/openhft/chronicle/map/ChronicleMapBuilder.java +++ b/src/main/java/net/openhft/chronicle/map/ChronicleMapBuilder.java @@ -20,12 +20,12 @@ import net.openhft.chronicle.ChronicleHashBuilder; import net.openhft.chronicle.ChronicleHashErrorListener; import net.openhft.chronicle.ChronicleHashErrorListeners; import net.openhft.chronicle.TimeProvider; -import net.openhft.chronicle.map.serialization.AgileBytesMarshaller; -import net.openhft.chronicle.map.serialization.MetaBytesInterop; -import net.openhft.chronicle.map.serialization.MetaBytesWriter; -import net.openhft.chronicle.map.serialization.MetaProvider; -import net.openhft.chronicle.map.threadlocal.Provider; -import net.openhft.chronicle.map.threadlocal.ThreadLocalCopies; +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.threadlocal.Provider; +import net.openhft.chronicle.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 b6b9ff825..048b5bb64 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.map.serialization.BytesReader; -import net.openhft.chronicle.map.serialization.MetaBytesWriter; +import net.openhft.chronicle.serialization.BytesReader; +import net.openhft.chronicle.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 6c768546e..113cf982e 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.TimeProvider; -import net.openhft.chronicle.map.serialization.BytesReader; -import net.openhft.chronicle.map.serialization.MetaBytesInterop; -import net.openhft.chronicle.map.serialization.MetaBytesWriter; -import net.openhft.chronicle.map.threadlocal.ThreadLocalCopies; +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.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.map.serialization.Hasher.hash; +import static net.openhft.chronicle.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 e95967aa9..48a4f88a2 100644 --- a/src/main/java/net/openhft/chronicle/map/SerializationBuilder.java +++ b/src/main/java/net/openhft/chronicle/map/SerializationBuilder.java @@ -18,8 +18,10 @@ package net.openhft.chronicle.map; import net.openhft.chronicle.map.serialization.*; import net.openhft.chronicle.map.serialization.impl.*; -import net.openhft.chronicle.map.threadlocal.Provider; -import net.openhft.chronicle.map.threadlocal.ThreadLocalCopies; +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.lang.io.Bytes; import net.openhft.lang.io.serialization.BytesMarshallable; import net.openhft.lang.io.serialization.BytesMarshaller; @@ -36,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.map.serialization.SizeMarshallers.stopBit; +import static net.openhft.chronicle.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 d30bb388a..d459d2ceb 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.map.serialization.*; -import net.openhft.chronicle.map.threadlocal.Provider; -import net.openhft.chronicle.map.threadlocal.ThreadLocalCopies; +import net.openhft.chronicle.threadlocal.Provider; +import net.openhft.chronicle.threadlocal.ThreadLocalCopies; +import net.openhft.chronicle.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/VanillaChronicleMap.java b/src/main/java/net/openhft/chronicle/map/VanillaChronicleMap.java index d34852d43..aadec9d79 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.ChronicleHashErrorListener; -import net.openhft.chronicle.map.serialization.*; -import net.openhft.chronicle.map.threadlocal.Provider; -import net.openhft.chronicle.map.threadlocal.ThreadLocalCopies; +import net.openhft.chronicle.threadlocal.Provider; +import net.openhft.chronicle.threadlocal.ThreadLocalCopies; +import net.openhft.chronicle.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/map/serialization/AgileBytesMarshaller.java b/src/main/java/net/openhft/chronicle/serialization/AgileBytesMarshaller.java similarity index 93% rename from src/main/java/net/openhft/chronicle/map/serialization/AgileBytesMarshaller.java rename to src/main/java/net/openhft/chronicle/serialization/AgileBytesMarshaller.java index d3cd897b1..205a19115 100644 --- a/src/main/java/net/openhft/chronicle/map/serialization/AgileBytesMarshaller.java +++ b/src/main/java/net/openhft/chronicle/serialization/AgileBytesMarshaller.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package net.openhft.chronicle.map.serialization; +package net.openhft.chronicle.serialization; public interface AgileBytesMarshaller extends BytesReader, BytesInterop, SizeMarshaller { } diff --git a/src/main/java/net/openhft/chronicle/map/serialization/BytesInterop.java b/src/main/java/net/openhft/chronicle/serialization/BytesInterop.java similarity index 96% rename from src/main/java/net/openhft/chronicle/map/serialization/BytesInterop.java rename to src/main/java/net/openhft/chronicle/serialization/BytesInterop.java index 71a23a127..ac3ebf74f 100644 --- a/src/main/java/net/openhft/chronicle/map/serialization/BytesInterop.java +++ b/src/main/java/net/openhft/chronicle/serialization/BytesInterop.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package net.openhft.chronicle.map.serialization; +package net.openhft.chronicle.serialization; import net.openhft.lang.io.Bytes; import net.openhft.lang.model.Byteable; diff --git a/src/main/java/net/openhft/chronicle/map/serialization/BytesReader.java b/src/main/java/net/openhft/chronicle/serialization/BytesReader.java similarity index 94% rename from src/main/java/net/openhft/chronicle/map/serialization/BytesReader.java rename to src/main/java/net/openhft/chronicle/serialization/BytesReader.java index e3dcabe48..ec559a713 100644 --- a/src/main/java/net/openhft/chronicle/map/serialization/BytesReader.java +++ b/src/main/java/net/openhft/chronicle/serialization/BytesReader.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package net.openhft.chronicle.map.serialization; +package net.openhft.chronicle.serialization; import net.openhft.lang.io.Bytes; diff --git a/src/main/java/net/openhft/chronicle/map/serialization/BytesReaders.java b/src/main/java/net/openhft/chronicle/serialization/BytesReaders.java similarity index 96% rename from src/main/java/net/openhft/chronicle/map/serialization/BytesReaders.java rename to src/main/java/net/openhft/chronicle/serialization/BytesReaders.java index c0e2e7398..b95b7a5e5 100644 --- a/src/main/java/net/openhft/chronicle/map/serialization/BytesReaders.java +++ b/src/main/java/net/openhft/chronicle/serialization/BytesReaders.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package net.openhft.chronicle.map.serialization; +package net.openhft.chronicle.serialization; import net.openhft.lang.io.Bytes; import net.openhft.lang.io.serialization.BytesMarshaller; diff --git a/src/main/java/net/openhft/chronicle/map/serialization/BytesWriter.java b/src/main/java/net/openhft/chronicle/serialization/BytesWriter.java similarity index 94% rename from src/main/java/net/openhft/chronicle/map/serialization/BytesWriter.java rename to src/main/java/net/openhft/chronicle/serialization/BytesWriter.java index ed8ecad11..b120ac778 100644 --- a/src/main/java/net/openhft/chronicle/map/serialization/BytesWriter.java +++ b/src/main/java/net/openhft/chronicle/serialization/BytesWriter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package net.openhft.chronicle.map.serialization; +package net.openhft.chronicle.serialization; import net.openhft.lang.io.Bytes; diff --git a/src/main/java/net/openhft/chronicle/map/serialization/CopyingMetaBytesInterop.java b/src/main/java/net/openhft/chronicle/serialization/CopyingMetaBytesInterop.java similarity index 97% rename from src/main/java/net/openhft/chronicle/map/serialization/CopyingMetaBytesInterop.java rename to src/main/java/net/openhft/chronicle/serialization/CopyingMetaBytesInterop.java index 79e6111e3..362756e1a 100644 --- a/src/main/java/net/openhft/chronicle/map/serialization/CopyingMetaBytesInterop.java +++ b/src/main/java/net/openhft/chronicle/serialization/CopyingMetaBytesInterop.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package net.openhft.chronicle.map.serialization; +package net.openhft.chronicle.serialization; -import net.openhft.chronicle.map.threadlocal.Provider; -import net.openhft.chronicle.map.threadlocal.StatefulCopyable; -import net.openhft.chronicle.map.threadlocal.ThreadLocalCopies; +import net.openhft.chronicle.threadlocal.Provider; +import net.openhft.chronicle.threadlocal.StatefulCopyable; +import net.openhft.chronicle.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/map/serialization/DelegatingMetaBytesInterop.java b/src/main/java/net/openhft/chronicle/serialization/DelegatingMetaBytesInterop.java similarity index 97% rename from src/main/java/net/openhft/chronicle/map/serialization/DelegatingMetaBytesInterop.java rename to src/main/java/net/openhft/chronicle/serialization/DelegatingMetaBytesInterop.java index 4413252a9..90c57f7f6 100644 --- a/src/main/java/net/openhft/chronicle/map/serialization/DelegatingMetaBytesInterop.java +++ b/src/main/java/net/openhft/chronicle/serialization/DelegatingMetaBytesInterop.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package net.openhft.chronicle.map.serialization; +package net.openhft.chronicle.serialization; import net.openhft.lang.io.Bytes; diff --git a/src/main/java/net/openhft/chronicle/map/serialization/DelegatingMetaBytesInteropProvider.java b/src/main/java/net/openhft/chronicle/serialization/DelegatingMetaBytesInteropProvider.java similarity index 93% rename from src/main/java/net/openhft/chronicle/map/serialization/DelegatingMetaBytesInteropProvider.java rename to src/main/java/net/openhft/chronicle/serialization/DelegatingMetaBytesInteropProvider.java index 2544d2d61..e17afa503 100644 --- a/src/main/java/net/openhft/chronicle/map/serialization/DelegatingMetaBytesInteropProvider.java +++ b/src/main/java/net/openhft/chronicle/serialization/DelegatingMetaBytesInteropProvider.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package net.openhft.chronicle.map.serialization; +package net.openhft.chronicle.serialization; -import net.openhft.chronicle.map.threadlocal.ThreadLocalCopies; +import net.openhft.chronicle.threadlocal.ThreadLocalCopies; import java.io.ObjectStreamException; diff --git a/src/main/java/net/openhft/chronicle/map/serialization/Hasher.java b/src/main/java/net/openhft/chronicle/serialization/Hasher.java similarity index 98% rename from src/main/java/net/openhft/chronicle/map/serialization/Hasher.java rename to src/main/java/net/openhft/chronicle/serialization/Hasher.java index f6b431686..c113707a7 100644 --- a/src/main/java/net/openhft/chronicle/map/serialization/Hasher.java +++ b/src/main/java/net/openhft/chronicle/serialization/Hasher.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package net.openhft.chronicle.map.serialization; +package net.openhft.chronicle.serialization; import net.openhft.lang.io.Bytes; import net.openhft.lang.io.NativeBytes; diff --git a/src/main/java/net/openhft/chronicle/map/serialization/MetaBytesInterop.java b/src/main/java/net/openhft/chronicle/serialization/MetaBytesInterop.java similarity index 94% rename from src/main/java/net/openhft/chronicle/map/serialization/MetaBytesInterop.java rename to src/main/java/net/openhft/chronicle/serialization/MetaBytesInterop.java index d900b9bfd..72d94702e 100644 --- a/src/main/java/net/openhft/chronicle/map/serialization/MetaBytesInterop.java +++ b/src/main/java/net/openhft/chronicle/serialization/MetaBytesInterop.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package net.openhft.chronicle.map.serialization; +package net.openhft.chronicle.serialization; import net.openhft.lang.io.Bytes; diff --git a/src/main/java/net/openhft/chronicle/map/serialization/MetaBytesWriter.java b/src/main/java/net/openhft/chronicle/serialization/MetaBytesWriter.java similarity index 94% rename from src/main/java/net/openhft/chronicle/map/serialization/MetaBytesWriter.java rename to src/main/java/net/openhft/chronicle/serialization/MetaBytesWriter.java index 493bee0d7..2c1a029d2 100644 --- a/src/main/java/net/openhft/chronicle/map/serialization/MetaBytesWriter.java +++ b/src/main/java/net/openhft/chronicle/serialization/MetaBytesWriter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package net.openhft.chronicle.map.serialization; +package net.openhft.chronicle.serialization; import net.openhft.lang.io.Bytes; diff --git a/src/main/java/net/openhft/chronicle/map/serialization/MetaProvider.java b/src/main/java/net/openhft/chronicle/serialization/MetaProvider.java similarity index 88% rename from src/main/java/net/openhft/chronicle/map/serialization/MetaProvider.java rename to src/main/java/net/openhft/chronicle/serialization/MetaProvider.java index b9620ce61..9c5a3661c 100644 --- a/src/main/java/net/openhft/chronicle/map/serialization/MetaProvider.java +++ b/src/main/java/net/openhft/chronicle/serialization/MetaProvider.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package net.openhft.chronicle.map.serialization; +package net.openhft.chronicle.serialization; -import net.openhft.chronicle.map.threadlocal.ThreadLocalCopies; +import net.openhft.chronicle.threadlocal.ThreadLocalCopies; import java.io.Serializable; diff --git a/src/main/java/net/openhft/chronicle/map/serialization/SizeMarshaller.java b/src/main/java/net/openhft/chronicle/serialization/SizeMarshaller.java similarity index 94% rename from src/main/java/net/openhft/chronicle/map/serialization/SizeMarshaller.java rename to src/main/java/net/openhft/chronicle/serialization/SizeMarshaller.java index 024af8558..e4f0c3755 100644 --- a/src/main/java/net/openhft/chronicle/map/serialization/SizeMarshaller.java +++ b/src/main/java/net/openhft/chronicle/serialization/SizeMarshaller.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package net.openhft.chronicle.map.serialization; +package net.openhft.chronicle.serialization; import net.openhft.lang.io.Bytes; diff --git a/src/main/java/net/openhft/chronicle/map/serialization/SizeMarshallers.java b/src/main/java/net/openhft/chronicle/serialization/SizeMarshallers.java similarity index 97% rename from src/main/java/net/openhft/chronicle/map/serialization/SizeMarshallers.java rename to src/main/java/net/openhft/chronicle/serialization/SizeMarshallers.java index dfb79af4d..99254d13e 100644 --- a/src/main/java/net/openhft/chronicle/map/serialization/SizeMarshallers.java +++ b/src/main/java/net/openhft/chronicle/serialization/SizeMarshallers.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package net.openhft.chronicle.map.serialization; +package net.openhft.chronicle.serialization; import net.openhft.lang.io.Bytes; diff --git a/src/main/java/net/openhft/chronicle/map/serialization/impl/ByteArrayMarshaller.java b/src/main/java/net/openhft/chronicle/serialization/impl/ByteArrayMarshaller.java similarity index 88% rename from src/main/java/net/openhft/chronicle/map/serialization/impl/ByteArrayMarshaller.java rename to src/main/java/net/openhft/chronicle/serialization/impl/ByteArrayMarshaller.java index 681c8513c..705723651 100644 --- a/src/main/java/net/openhft/chronicle/map/serialization/impl/ByteArrayMarshaller.java +++ b/src/main/java/net/openhft/chronicle/serialization/impl/ByteArrayMarshaller.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package net.openhft.chronicle.map.serialization.impl; +package net.openhft.chronicle.serialization.impl; -import net.openhft.chronicle.map.serialization.BytesInterop; -import net.openhft.chronicle.map.serialization.BytesReader; -import net.openhft.chronicle.map.serialization.Hasher; +import net.openhft.chronicle.serialization.BytesInterop; +import net.openhft.chronicle.serialization.BytesReader; +import net.openhft.chronicle.serialization.Hasher; import net.openhft.lang.io.Bytes; public enum ByteArrayMarshaller implements BytesInterop, BytesReader { diff --git a/src/main/java/net/openhft/chronicle/map/serialization/impl/ByteableMarshaller.java b/src/main/java/net/openhft/chronicle/serialization/impl/ByteableMarshaller.java similarity index 96% rename from src/main/java/net/openhft/chronicle/map/serialization/impl/ByteableMarshaller.java rename to src/main/java/net/openhft/chronicle/serialization/impl/ByteableMarshaller.java index 2355662ea..977bbe4cd 100644 --- a/src/main/java/net/openhft/chronicle/map/serialization/impl/ByteableMarshaller.java +++ b/src/main/java/net/openhft/chronicle/serialization/impl/ByteableMarshaller.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package net.openhft.chronicle.map.serialization.impl; +package net.openhft.chronicle.serialization.impl; -import net.openhft.chronicle.map.serialization.AgileBytesMarshaller; -import net.openhft.chronicle.map.serialization.Hasher; +import net.openhft.chronicle.serialization.AgileBytesMarshaller; +import net.openhft.chronicle.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/map/serialization/impl/CharSequenceReader.java b/src/main/java/net/openhft/chronicle/serialization/impl/CharSequenceReader.java similarity index 95% rename from src/main/java/net/openhft/chronicle/map/serialization/impl/CharSequenceReader.java rename to src/main/java/net/openhft/chronicle/serialization/impl/CharSequenceReader.java index aed9f7c71..b2e40f818 100644 --- a/src/main/java/net/openhft/chronicle/map/serialization/impl/CharSequenceReader.java +++ b/src/main/java/net/openhft/chronicle/serialization/impl/CharSequenceReader.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package net.openhft.chronicle.map.serialization.impl; +package net.openhft.chronicle.serialization.impl; -import net.openhft.chronicle.map.serialization.BytesReader; +import net.openhft.chronicle.serialization.BytesReader; import net.openhft.lang.io.AbstractBytes; import net.openhft.lang.io.Bytes; import net.openhft.lang.pool.CharSequenceInterner; -import net.openhft.chronicle.map.threadlocal.StatefulCopyable; +import net.openhft.chronicle.threadlocal.StatefulCopyable; import org.jetbrains.annotations.NotNull; import java.io.IOException; diff --git a/src/main/java/net/openhft/chronicle/map/serialization/impl/CharSequenceWriter.java b/src/main/java/net/openhft/chronicle/serialization/impl/CharSequenceWriter.java similarity index 92% rename from src/main/java/net/openhft/chronicle/map/serialization/impl/CharSequenceWriter.java rename to src/main/java/net/openhft/chronicle/serialization/impl/CharSequenceWriter.java index 38a5eb6a3..387de3ff2 100644 --- a/src/main/java/net/openhft/chronicle/map/serialization/impl/CharSequenceWriter.java +++ b/src/main/java/net/openhft/chronicle/serialization/impl/CharSequenceWriter.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package net.openhft.chronicle.map.serialization.impl; +package net.openhft.chronicle.serialization.impl; +import net.openhft.chronicle.serialization.BytesWriter; import net.openhft.lang.io.AbstractBytes; import net.openhft.lang.io.Bytes; -import net.openhft.chronicle.map.serialization.BytesWriter; import java.io.ObjectStreamException; diff --git a/src/main/java/net/openhft/chronicle/map/serialization/impl/DoubleMarshaller.java b/src/main/java/net/openhft/chronicle/serialization/impl/DoubleMarshaller.java similarity index 90% rename from src/main/java/net/openhft/chronicle/map/serialization/impl/DoubleMarshaller.java rename to src/main/java/net/openhft/chronicle/serialization/impl/DoubleMarshaller.java index ea3080b98..6d69ab18a 100644 --- a/src/main/java/net/openhft/chronicle/map/serialization/impl/DoubleMarshaller.java +++ b/src/main/java/net/openhft/chronicle/serialization/impl/DoubleMarshaller.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package net.openhft.chronicle.map.serialization.impl; +package net.openhft.chronicle.serialization.impl; -import net.openhft.chronicle.map.serialization.AgileBytesMarshaller; -import net.openhft.chronicle.map.serialization.Hasher; +import net.openhft.chronicle.serialization.AgileBytesMarshaller; +import net.openhft.chronicle.serialization.Hasher; import net.openhft.lang.io.Bytes; import static java.lang.Double.doubleToLongBits; diff --git a/src/main/java/net/openhft/chronicle/map/serialization/impl/IntegerMarshaller.java b/src/main/java/net/openhft/chronicle/serialization/impl/IntegerMarshaller.java similarity index 90% rename from src/main/java/net/openhft/chronicle/map/serialization/impl/IntegerMarshaller.java rename to src/main/java/net/openhft/chronicle/serialization/impl/IntegerMarshaller.java index c8507ed21..fee023837 100644 --- a/src/main/java/net/openhft/chronicle/map/serialization/impl/IntegerMarshaller.java +++ b/src/main/java/net/openhft/chronicle/serialization/impl/IntegerMarshaller.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package net.openhft.chronicle.map.serialization.impl; +package net.openhft.chronicle.serialization.impl; -import net.openhft.chronicle.map.serialization.AgileBytesMarshaller; -import net.openhft.chronicle.map.serialization.Hasher; +import net.openhft.chronicle.serialization.AgileBytesMarshaller; +import net.openhft.chronicle.serialization.Hasher; import net.openhft.lang.io.Bytes; public enum IntegerMarshaller implements AgileBytesMarshaller { diff --git a/src/main/java/net/openhft/chronicle/map/serialization/impl/LongMarshaller.java b/src/main/java/net/openhft/chronicle/serialization/impl/LongMarshaller.java similarity index 89% rename from src/main/java/net/openhft/chronicle/map/serialization/impl/LongMarshaller.java rename to src/main/java/net/openhft/chronicle/serialization/impl/LongMarshaller.java index 0ad365acf..b21550595 100644 --- a/src/main/java/net/openhft/chronicle/map/serialization/impl/LongMarshaller.java +++ b/src/main/java/net/openhft/chronicle/serialization/impl/LongMarshaller.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package net.openhft.chronicle.map.serialization.impl; +package net.openhft.chronicle.serialization.impl; -import net.openhft.chronicle.map.serialization.AgileBytesMarshaller; -import net.openhft.chronicle.map.serialization.Hasher; +import net.openhft.chronicle.serialization.AgileBytesMarshaller; +import net.openhft.chronicle.serialization.Hasher; import net.openhft.lang.io.Bytes; public enum LongMarshaller implements AgileBytesMarshaller { diff --git a/src/main/java/net/openhft/chronicle/map/serialization/impl/VoidMarshaller.java b/src/main/java/net/openhft/chronicle/serialization/impl/VoidMarshaller.java similarity index 92% rename from src/main/java/net/openhft/chronicle/map/serialization/impl/VoidMarshaller.java rename to src/main/java/net/openhft/chronicle/serialization/impl/VoidMarshaller.java index 257588f25..f1a1b7d8a 100644 --- a/src/main/java/net/openhft/chronicle/map/serialization/impl/VoidMarshaller.java +++ b/src/main/java/net/openhft/chronicle/serialization/impl/VoidMarshaller.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package net.openhft.chronicle.map.serialization.impl; +package net.openhft.chronicle.serialization.impl; -import net.openhft.chronicle.map.serialization.AgileBytesMarshaller; +import net.openhft.chronicle.serialization.AgileBytesMarshaller; import net.openhft.lang.io.Bytes; public enum VoidMarshaller implements AgileBytesMarshaller { diff --git a/src/main/java/net/openhft/chronicle/set/DummyValueMarshaller.java b/src/main/java/net/openhft/chronicle/set/DummyValueMarshaller.java index 85bb16462..9566014b5 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.map.serialization.AgileBytesMarshaller; +import net.openhft.chronicle.serialization.AgileBytesMarshaller; import net.openhft.lang.io.Bytes; import static net.openhft.chronicle.set.DummyValue.DUMMY_VALUE; diff --git a/src/main/java/net/openhft/chronicle/map/threadlocal/Provider.java b/src/main/java/net/openhft/chronicle/threadlocal/Provider.java similarity index 98% rename from src/main/java/net/openhft/chronicle/map/threadlocal/Provider.java rename to src/main/java/net/openhft/chronicle/threadlocal/Provider.java index e8a832b41..349c85f2e 100644 --- a/src/main/java/net/openhft/chronicle/map/threadlocal/Provider.java +++ b/src/main/java/net/openhft/chronicle/threadlocal/Provider.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package net.openhft.chronicle.map.threadlocal; +package net.openhft.chronicle.threadlocal; public abstract class Provider { diff --git a/src/main/java/net/openhft/chronicle/map/threadlocal/StatefulCopyable.java b/src/main/java/net/openhft/chronicle/threadlocal/StatefulCopyable.java similarity index 94% rename from src/main/java/net/openhft/chronicle/map/threadlocal/StatefulCopyable.java rename to src/main/java/net/openhft/chronicle/threadlocal/StatefulCopyable.java index d246fd2b8..e666aa489 100644 --- a/src/main/java/net/openhft/chronicle/map/threadlocal/StatefulCopyable.java +++ b/src/main/java/net/openhft/chronicle/threadlocal/StatefulCopyable.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package net.openhft.chronicle.map.threadlocal; +package net.openhft.chronicle.threadlocal; public interface StatefulCopyable> { Object stateIdentity(); diff --git a/src/main/java/net/openhft/chronicle/map/threadlocal/ThreadLocalCopies.java b/src/main/java/net/openhft/chronicle/threadlocal/ThreadLocalCopies.java similarity index 97% rename from src/main/java/net/openhft/chronicle/map/threadlocal/ThreadLocalCopies.java rename to src/main/java/net/openhft/chronicle/threadlocal/ThreadLocalCopies.java index e6dcec6d6..e94deb291 100644 --- a/src/main/java/net/openhft/chronicle/map/threadlocal/ThreadLocalCopies.java +++ b/src/main/java/net/openhft/chronicle/threadlocal/ThreadLocalCopies.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package net.openhft.chronicle.map.threadlocal; +package net.openhft.chronicle.threadlocal; import java.util.concurrent.atomic.AtomicBoolean; 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 e9394e63f..66555f680 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.map.threadlocal.StatefulCopyable; +import net.openhft.chronicle.threadlocal.StatefulCopyable; import net.openhft.chronicle.set.ChronicleSet; import net.openhft.chronicle.set.ChronicleSetBuilder; import net.openhft.lang.io.Bytes;