Added more methods to Serialization. Updated package names

src/dorkbox/util/serialization/IgnoreSerialization.java

@@ -1,29 +0,0 @@
-/*
- * Copyright 2010 dorkbox, llc
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package dorkbox.util.serialization;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Used to identify fields that kryo should ignore when configured with the FieldAnnotationAwareSerializer
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.FIELD})
-public
-@interface IgnoreSerialization {}

src/dorkbox/util/serialization/SerializationManager.java

@@ -1,19 +1,19 @@
 /*
- * Copyright 2010 dorkbox, llc
+ * Copyright 2018 dorkbox, llc.
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
  */
-package dorkbox.util;
+package dorkbox.util.serialization;
 
 import java.io.IOException;
 

src/dorkbox/util/serialization/UnmodifiableCollectionsSerializer.java

@@ -37,8 +37,6 @@ import com.esotericsoftware.kryo.Serializer;
 import com.esotericsoftware.kryo.io.Input;
 import com.esotericsoftware.kryo.io.Output;
 
-import dorkbox.util.SerializationManager;
-
 /**
  * A kryo {@link Serializer} for unmodifiable {@link Collection}s and {@link Map}s
  * created via {@link Collections}.

src/dorkbox/util/storage/DefaultStorageSerializationManager.java

@@ -25,7 +25,7 @@ import com.esotericsoftware.kryo.io.Input;
 import com.esotericsoftware.kryo.io.Output;
 import com.esotericsoftware.minlog.Log;
 
-import dorkbox.util.SerializationManager;
+import dorkbox.util.serialization.SerializationManager;
 import io.netty.buffer.ByteBuf;
 
 class DefaultStorageSerializationManager implements SerializationManager {
@@ -41,6 +41,13 @@ class DefaultStorageSerializationManager implements SerializationManager {
         return this;
     }
 
+    @Override
+    public
+    SerializationManager register(final Class<?> clazz, final int id) {
+        kryo.register(clazz, id);
+        return this;
+    }
+
     @Override
     public
     SerializationManager register(final Class<?> clazz, final Serializer<?> serializer) {

src/dorkbox/util/storage/DiskStorage.java

@@ -26,7 +26,7 @@ import java.util.concurrent.atomic.AtomicReferenceFieldUpdater;
 import org.slf4j.Logger;
 
 import dorkbox.util.DelayTimer;
-import dorkbox.util.SerializationManager;
+import dorkbox.util.serialization.SerializationManager;
 
 
 /**

src/dorkbox/util/storage/Metadata.java

@@ -25,7 +25,7 @@ import java.nio.channels.FileLock;
 import com.esotericsoftware.kryo.io.Input;
 import com.esotericsoftware.kryo.io.Output;
 
-import dorkbox.util.SerializationManager;
+import dorkbox.util.serialization.SerializationManager;
 
 public
 class Metadata {

src/dorkbox/util/storage/StorageBase.java

@@ -38,7 +38,7 @@ import com.esotericsoftware.kryo.io.Input;
 import com.esotericsoftware.kryo.io.Output;
 
 import dorkbox.util.OS;
-import dorkbox.util.SerializationManager;
+import dorkbox.util.serialization.SerializationManager;
 
 
 // a note on file locking between c and java

src/dorkbox/util/storage/StorageSystem.java

@@ -26,7 +26,7 @@ import org.slf4j.helpers.NOPLogger;
 
 import dorkbox.util.FileUtil;
 import dorkbox.util.OS;
-import dorkbox.util.SerializationManager;
+import dorkbox.util.serialization.SerializationManager;
 
 public
 class StorageSystem {