mirror of
https://github.com/OpenHFT/Chronicle-Map.git
synced 2021-09-13 01:26:12 +00:00
HCOLL-167 moved serilization and exceptions to common
This commit is contained in:
+1
-1
@@ -1,4 +1,4 @@
|
||||
package net.openhft.chronicle.exceptions;
|
||||
package net.openhft.chronicle.common.exceptions;
|
||||
|
||||
import java.io.IOException;
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package net.openhft.chronicle.exceptions;
|
||||
package net.openhft.chronicle.common.exceptions;
|
||||
|
||||
/**
|
||||
* @author Rob Austin.
|
||||
+1
-1
@@ -14,7 +14,7 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package net.openhft.chronicle.serialization;
|
||||
package net.openhft.chronicle.common.serialization;
|
||||
|
||||
public interface AgileBytesMarshaller<E> extends BytesReader<E>, BytesInterop<E>, SizeMarshaller {
|
||||
}
|
||||
+1
-1
@@ -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;
|
||||
+1
-1
@@ -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;
|
||||
|
||||
+1
-1
@@ -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;
|
||||
+1
-1
@@ -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;
|
||||
|
||||
+4
-4
@@ -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;
|
||||
+1
-1
@@ -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;
|
||||
|
||||
+2
-2
@@ -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;
|
||||
|
||||
+1
-1
@@ -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;
|
||||
+1
-1
@@ -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;
|
||||
|
||||
+1
-1
@@ -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;
|
||||
|
||||
+2
-2
@@ -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;
|
||||
|
||||
+1
-1
@@ -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;
|
||||
|
||||
+1
-1
@@ -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;
|
||||
|
||||
+4
-4
@@ -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<byte[]>, BytesReader<byte[]> {
|
||||
+3
-3
@@ -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.*;
|
||||
+4
-4
@@ -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<char[]>, BytesReader<char[]> {
|
||||
+3
-3
@@ -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;
|
||||
+2
-2
@@ -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;
|
||||
|
||||
+3
-3
@@ -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;
|
||||
+3
-3
@@ -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<Integer> {
|
||||
+3
-3
@@ -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<Long> {
|
||||
+2
-2
@@ -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<Void> {
|
||||
+1
-1
@@ -14,7 +14,7 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package net.openhft.chronicle.threadlocal;
|
||||
package net.openhft.chronicle.common.threadlocal;
|
||||
|
||||
public abstract class Provider<T> {
|
||||
|
||||
+1
-1
@@ -14,7 +14,7 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package net.openhft.chronicle.threadlocal;
|
||||
package net.openhft.chronicle.common.threadlocal;
|
||||
|
||||
public interface StatefulCopyable<S extends StatefulCopyable<S>> {
|
||||
Object stateIdentity();
|
||||
+1
-1
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
/**
|
||||
|
||||
@@ -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<E> implements Cloneable {
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user