Moved seriaization and threadlocal packages up: n.o.chronicle.map -> n.o.chronicle

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;

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;

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;

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;
 
 /**

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<E> implements Cloneable {
 

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;

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;

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<E> extends BytesReader<E>, BytesInterop<E>, SizeMarshaller {
 }

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;

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;
 

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;

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;
 

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;

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;
 

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;
 

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;

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;
 

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;
 

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;
 

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;
 

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;
 

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<byte[]>, BytesReader<byte[]> {

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.*;

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;

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;
 

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;

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<Integer> {

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<Long> {

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<Void> {

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;

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<T> {
 

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<S extends StatefulCopyable<S>> {
     Object stateIdentity();

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;