From 09008f16fe092a97db277749846db31d8a444b6a Mon Sep 17 00:00:00 2001 From: leventov Date: Fri, 7 Nov 2014 14:40:11 +0300 Subject: [PATCH] Moved more classes from net.openhft.chronicle.hash.serialization to .internal --- .../{ => internal}/CopyingMetaBytesInterop.java | 4 +++- .../{ => internal}/DelegatingMetaBytesInterop.java | 3 ++- .../{ => internal}/DelegatingMetaBytesInteropProvider.java | 3 ++- .../hash/serialization/{ => internal}/MetaBytesInterop.java | 2 +- .../hash/serialization/{ => internal}/MetaBytesWriter.java | 2 +- .../hash/serialization/{ => internal}/MetaProvider.java | 2 +- .../openhft/chronicle/map/AbstractChronicleMapBuilder.java | 6 +++--- .../net/openhft/chronicle/map/ConstantValueProvider.java | 2 +- .../openhft/chronicle/map/PrepareValueBytesAsWriter.java | 2 +- .../net/openhft/chronicle/map/ReplicatedChronicleMap.java | 4 ++-- src/main/java/net/openhft/chronicle/map/Serializer.java | 3 +++ .../java/net/openhft/chronicle/map/VanillaChronicleMap.java | 3 +++ 12 files changed, 23 insertions(+), 13 deletions(-) rename src/main/java/net/openhft/chronicle/hash/serialization/{ => internal}/CopyingMetaBytesInterop.java (98%) rename src/main/java/net/openhft/chronicle/hash/serialization/{ => internal}/DelegatingMetaBytesInterop.java (93%) rename src/main/java/net/openhft/chronicle/hash/serialization/{ => internal}/DelegatingMetaBytesInteropProvider.java (93%) rename src/main/java/net/openhft/chronicle/hash/serialization/{ => internal}/MetaBytesInterop.java (93%) rename src/main/java/net/openhft/chronicle/hash/serialization/{ => internal}/MetaBytesWriter.java (93%) rename src/main/java/net/openhft/chronicle/hash/serialization/{ => internal}/MetaProvider.java (94%) diff --git a/src/main/java/net/openhft/chronicle/hash/serialization/CopyingMetaBytesInterop.java b/src/main/java/net/openhft/chronicle/hash/serialization/internal/CopyingMetaBytesInterop.java similarity index 98% rename from src/main/java/net/openhft/chronicle/hash/serialization/CopyingMetaBytesInterop.java rename to src/main/java/net/openhft/chronicle/hash/serialization/internal/CopyingMetaBytesInterop.java index 7f01eccbb..fb2b27379 100644 --- a/src/main/java/net/openhft/chronicle/hash/serialization/CopyingMetaBytesInterop.java +++ b/src/main/java/net/openhft/chronicle/hash/serialization/internal/CopyingMetaBytesInterop.java @@ -16,8 +16,10 @@ * limitations under the License. */ -package net.openhft.chronicle.hash.serialization; +package net.openhft.chronicle.hash.serialization.internal; +import net.openhft.chronicle.hash.serialization.BytesWriter; +import net.openhft.chronicle.hash.serialization.Hasher; import net.openhft.lang.threadlocal.Provider; import net.openhft.lang.threadlocal.StatefulCopyable; import net.openhft.lang.threadlocal.ThreadLocalCopies; diff --git a/src/main/java/net/openhft/chronicle/hash/serialization/DelegatingMetaBytesInterop.java b/src/main/java/net/openhft/chronicle/hash/serialization/internal/DelegatingMetaBytesInterop.java similarity index 93% rename from src/main/java/net/openhft/chronicle/hash/serialization/DelegatingMetaBytesInterop.java rename to src/main/java/net/openhft/chronicle/hash/serialization/internal/DelegatingMetaBytesInterop.java index cd73e9779..7342f2c02 100644 --- a/src/main/java/net/openhft/chronicle/hash/serialization/DelegatingMetaBytesInterop.java +++ b/src/main/java/net/openhft/chronicle/hash/serialization/internal/DelegatingMetaBytesInterop.java @@ -16,8 +16,9 @@ * limitations under the License. */ -package net.openhft.chronicle.hash.serialization; +package net.openhft.chronicle.hash.serialization.internal; +import net.openhft.chronicle.hash.serialization.BytesInterop; import net.openhft.lang.io.Bytes; import java.io.ObjectStreamException; diff --git a/src/main/java/net/openhft/chronicle/hash/serialization/DelegatingMetaBytesInteropProvider.java b/src/main/java/net/openhft/chronicle/hash/serialization/internal/DelegatingMetaBytesInteropProvider.java similarity index 93% rename from src/main/java/net/openhft/chronicle/hash/serialization/DelegatingMetaBytesInteropProvider.java rename to src/main/java/net/openhft/chronicle/hash/serialization/internal/DelegatingMetaBytesInteropProvider.java index 54811fd4e..b55a80da4 100644 --- a/src/main/java/net/openhft/chronicle/hash/serialization/DelegatingMetaBytesInteropProvider.java +++ b/src/main/java/net/openhft/chronicle/hash/serialization/internal/DelegatingMetaBytesInteropProvider.java @@ -16,8 +16,9 @@ * limitations under the License. */ -package net.openhft.chronicle.hash.serialization; +package net.openhft.chronicle.hash.serialization.internal; +import net.openhft.chronicle.hash.serialization.BytesInterop; import net.openhft.lang.threadlocal.ThreadLocalCopies; import java.io.ObjectStreamException; diff --git a/src/main/java/net/openhft/chronicle/hash/serialization/MetaBytesInterop.java b/src/main/java/net/openhft/chronicle/hash/serialization/internal/MetaBytesInterop.java similarity index 93% rename from src/main/java/net/openhft/chronicle/hash/serialization/MetaBytesInterop.java rename to src/main/java/net/openhft/chronicle/hash/serialization/internal/MetaBytesInterop.java index 78dc5b08f..7e947a614 100644 --- a/src/main/java/net/openhft/chronicle/hash/serialization/MetaBytesInterop.java +++ b/src/main/java/net/openhft/chronicle/hash/serialization/internal/MetaBytesInterop.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package net.openhft.chronicle.hash.serialization; +package net.openhft.chronicle.hash.serialization.internal; import net.openhft.lang.io.Bytes; diff --git a/src/main/java/net/openhft/chronicle/hash/serialization/MetaBytesWriter.java b/src/main/java/net/openhft/chronicle/hash/serialization/internal/MetaBytesWriter.java similarity index 93% rename from src/main/java/net/openhft/chronicle/hash/serialization/MetaBytesWriter.java rename to src/main/java/net/openhft/chronicle/hash/serialization/internal/MetaBytesWriter.java index a58079c37..8fb068450 100644 --- a/src/main/java/net/openhft/chronicle/hash/serialization/MetaBytesWriter.java +++ b/src/main/java/net/openhft/chronicle/hash/serialization/internal/MetaBytesWriter.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package net.openhft.chronicle.hash.serialization; +package net.openhft.chronicle.hash.serialization.internal; import net.openhft.lang.io.Bytes; diff --git a/src/main/java/net/openhft/chronicle/hash/serialization/MetaProvider.java b/src/main/java/net/openhft/chronicle/hash/serialization/internal/MetaProvider.java similarity index 94% rename from src/main/java/net/openhft/chronicle/hash/serialization/MetaProvider.java rename to src/main/java/net/openhft/chronicle/hash/serialization/internal/MetaProvider.java index cf7eb75b4..5a12019f9 100644 --- a/src/main/java/net/openhft/chronicle/hash/serialization/MetaProvider.java +++ b/src/main/java/net/openhft/chronicle/hash/serialization/internal/MetaProvider.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package net.openhft.chronicle.hash.serialization; +package net.openhft.chronicle.hash.serialization.internal; import net.openhft.lang.threadlocal.ThreadLocalCopies; diff --git a/src/main/java/net/openhft/chronicle/map/AbstractChronicleMapBuilder.java b/src/main/java/net/openhft/chronicle/map/AbstractChronicleMapBuilder.java index 1fd906ff7..44c578a79 100644 --- a/src/main/java/net/openhft/chronicle/map/AbstractChronicleMapBuilder.java +++ b/src/main/java/net/openhft/chronicle/map/AbstractChronicleMapBuilder.java @@ -20,9 +20,9 @@ package net.openhft.chronicle.map; import net.openhft.chronicle.hash.*; import net.openhft.chronicle.hash.replication.*; -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.serialization.internal.MetaBytesInterop; +import net.openhft.chronicle.hash.serialization.internal.MetaBytesWriter; +import net.openhft.chronicle.hash.serialization.internal.MetaProvider; 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/ConstantValueProvider.java b/src/main/java/net/openhft/chronicle/map/ConstantValueProvider.java index 31edd8591..f55bcaacb 100644 --- a/src/main/java/net/openhft/chronicle/map/ConstantValueProvider.java +++ b/src/main/java/net/openhft/chronicle/map/ConstantValueProvider.java @@ -19,7 +19,7 @@ package net.openhft.chronicle.map; import net.openhft.chronicle.hash.serialization.BytesReader; -import net.openhft.chronicle.hash.serialization.MetaBytesWriter; +import net.openhft.chronicle.hash.serialization.internal.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 c4f57ff18..237d2fd51 100644 --- a/src/main/java/net/openhft/chronicle/map/PrepareValueBytesAsWriter.java +++ b/src/main/java/net/openhft/chronicle/map/PrepareValueBytesAsWriter.java @@ -17,7 +17,7 @@ package net.openhft.chronicle.map; import net.openhft.chronicle.hash.serialization.BytesWriter; -import net.openhft.chronicle.hash.serialization.MetaBytesWriter; +import net.openhft.chronicle.hash.serialization.internal.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 9348e0c09..46c7586cc 100644 --- a/src/main/java/net/openhft/chronicle/map/ReplicatedChronicleMap.java +++ b/src/main/java/net/openhft/chronicle/map/ReplicatedChronicleMap.java @@ -21,8 +21,8 @@ package net.openhft.chronicle.map; import net.openhft.chronicle.hash.replication.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.serialization.internal.MetaBytesInterop; +import net.openhft.chronicle.hash.serialization.internal.MetaBytesWriter; import net.openhft.lang.Maths; import net.openhft.lang.collection.ATSDirectBitSet; import net.openhft.lang.io.Bytes; diff --git a/src/main/java/net/openhft/chronicle/map/Serializer.java b/src/main/java/net/openhft/chronicle/map/Serializer.java index ec555a704..24d2ccf0f 100644 --- a/src/main/java/net/openhft/chronicle/map/Serializer.java +++ b/src/main/java/net/openhft/chronicle/map/Serializer.java @@ -19,6 +19,9 @@ package net.openhft.chronicle.map; import net.openhft.chronicle.hash.serialization.*; +import net.openhft.chronicle.hash.serialization.internal.MetaBytesInterop; +import net.openhft.chronicle.hash.serialization.internal.MetaBytesWriter; +import net.openhft.chronicle.hash.serialization.internal.MetaProvider; 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 d9ffc64e1..98a46941c 100644 --- a/src/main/java/net/openhft/chronicle/map/VanillaChronicleMap.java +++ b/src/main/java/net/openhft/chronicle/map/VanillaChronicleMap.java @@ -20,6 +20,9 @@ package net.openhft.chronicle.map; import net.openhft.chronicle.hash.ChronicleHashErrorListener; import net.openhft.chronicle.hash.serialization.*; +import net.openhft.chronicle.hash.serialization.internal.MetaBytesInterop; +import net.openhft.chronicle.hash.serialization.internal.MetaBytesWriter; +import net.openhft.chronicle.hash.serialization.internal.MetaProvider; import net.openhft.lang.collection.DirectBitSet; import net.openhft.lang.collection.SingleThreadedDirectBitSet; import net.openhft.lang.io.*;