Changes to support better separation between applying global and type serialization

subzero-all-it-hz38/pom.xml

@@ -37,4 +37,17 @@
         </dependency>
     </dependencies>
 
+    <repositories>
+        <repository>
+            <id>sonatype-snapshots</id>
+            <name>Sonatype Snapshot Repository</name>
+            <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+            <releases>
+                <enabled>false</enabled>
+            </releases>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </repository>
+    </repositories>
 </project>

subzero-core/src/main/java/info/jerrinot/subzero/AbstractGlobalUserSerializer.java

@@ -0,0 +1,10 @@
+package info.jerrinot.subzero;
+
+import info.jerrinot.subzero.internal.strategy.GlobalKryoStrategy;
+
+public abstract class AbstractGlobalUserSerializer<T> extends AbstractSerializer<T> {
+
+    public AbstractGlobalUserSerializer(UserSerializer userSerializer) {
+        super(new GlobalKryoStrategy(userSerializer));
+    }
+}

subzero-core/src/main/java/info/jerrinot/subzero/AbstractSerializer.java

@@ -0,0 +1,60 @@
+package info.jerrinot.subzero;
+
+import com.hazelcast.core.HazelcastInstance;
+import com.hazelcast.core.HazelcastInstanceAware;
+import com.hazelcast.nio.ObjectDataInput;
+import com.hazelcast.nio.ObjectDataOutput;
+import com.hazelcast.nio.serialization.StreamSerializer;
+import info.jerrinot.subzero.internal.strategy.KryoStrategy;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+
+public abstract class AbstractSerializer<T> implements StreamSerializer<T>, HazelcastInstanceAware {
+    private int autoGeneratedTypeId;
+    private HazelcastInstance hazelcastInstance;
+    private KryoStrategy<T> strategy;
+
+    AbstractSerializer(KryoStrategy<T> strategy) {
+        this.strategy = strategy;
+    }
+
+    @Override
+    public final void write(ObjectDataOutput out, T object) throws IOException {
+        strategy.write((OutputStream) out, object);
+    }
+
+    @Override
+    public final T read(ObjectDataInput in) throws IOException {
+        return strategy.read((InputStream) in);
+    }
+
+    /**
+     * Override this method to returns your own type ID.
+     * <p>
+     * Default implementation relies on serializers registration order - all
+     * your cluster members have to register SubZero in the same order otherwise
+     * things will get out-of-sync you you will get tons of serializations errors.
+     * <p>
+     * All serializers registered in Hazelcast have to return a unique type ID.
+     *
+     * @return serializer type ID.
+     */
+    @Override
+    public int getTypeId() {
+        return autoGeneratedTypeId;
+    }
+
+    @Override
+    public final void destroy() {
+        strategy.destroy(hazelcastInstance);
+    }
+
+    @Override
+    public final void setHazelcastInstance(HazelcastInstance hazelcastInstance) {
+        strategy.setHazelcastInstance(hazelcastInstance);
+        this.hazelcastInstance = hazelcastInstance;
+        this.autoGeneratedTypeId = strategy.newId();
+    }
+}

subzero-core/src/main/java/info/jerrinot/subzero/AbstractTypeSpecificUserSerializer.java

@@ -0,0 +1,19 @@
+package info.jerrinot.subzero;
+
+import info.jerrinot.subzero.internal.PropertyUserSerializer;
+import info.jerrinot.subzero.internal.strategy.TypedKryoStrategy;
+
+public abstract class AbstractTypeSpecificUserSerializer<T> extends AbstractSerializer<T> {
+
+    public AbstractTypeSpecificUserSerializer(Class<T> clazz, com.esotericsoftware.kryo.Serializer serializer) {
+        super(new TypedKryoStrategy<T>(clazz, UserSerializerConfig.register(clazz, serializer)));
+    }
+
+    /**
+     * @param clazz class this serializer uses.
+     *
+     */
+    public AbstractTypeSpecificUserSerializer(Class<T> clazz) {
+        super(new TypedKryoStrategy<T>(clazz, new PropertyUserSerializer()));
+    }
+}

subzero-core/src/main/java/info/jerrinot/subzero/Serializer.java

@@ -1,75 +1,21 @@
 package info.jerrinot.subzero;
 
-import com.hazelcast.core.HazelcastInstance;
-import com.hazelcast.core.HazelcastInstanceAware;
-import com.hazelcast.nio.ObjectDataInput;
-import com.hazelcast.nio.ObjectDataOutput;
-import com.hazelcast.nio.serialization.StreamSerializer;
 import info.jerrinot.subzero.internal.PropertyUserSerializer;
 import info.jerrinot.subzero.internal.strategy.GlobalKryoStrategy;
-import info.jerrinot.subzero.internal.strategy.KryoStrategy;
 import info.jerrinot.subzero.internal.strategy.TypedKryoStrategy;
 
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-public class Serializer<T> implements StreamSerializer<T>, HazelcastInstanceAware {
-    private int autoGeneratedTypeId;
-    private HazelcastInstance hazelcastInstance;
-    private KryoStrategy<T> strategy;
+public final class Serializer<T> extends AbstractSerializer<T> {
 
     Serializer() {
-        this.strategy = new GlobalKryoStrategy<T>(userSerializers());
+        super(new GlobalKryoStrategy<T>(new PropertyUserSerializer()));
     }
 
     /**
      * @param clazz class this serializer uses.
      *
      */
     public Serializer(Class<T> clazz) {
-        this.strategy = new TypedKryoStrategy<T>(clazz, userSerializers());
-    }
-
-    @Override
-    public final void write(ObjectDataOutput out, T object) throws IOException {
-        strategy.write((OutputStream) out, object);
-    }
-
-    @Override
-    public final T read(ObjectDataInput in) throws IOException {
-        return strategy.read((InputStream) in);
+        super(new TypedKryoStrategy<T>(clazz, new PropertyUserSerializer()));
     }
 
-    public UserSerializer userSerializers() {
-        return new PropertyUserSerializer();
-    }
-
-    /**
-     * Override this method to returns your own type ID.
-     *
-     * Default implementation relies on serializers registration order - all
-     * your cluster members have to register SubZero in the same order otherwise
-     * things will get out-of-sync you you will get tons of serializations errors.
-     *
-     * All serializers registered in Hazelcast have to return a unique type ID.
-     *
-     * @return serializer type ID.
-     */
-    @Override
-    public int getTypeId() {
-        return autoGeneratedTypeId;
-    }
-
-    @Override
-    public final void destroy() {
-        strategy.destroy(hazelcastInstance);
-    }
-
-    @Override
-    public final void setHazelcastInstance(HazelcastInstance hazelcastInstance) {
-        strategy.setHazelcastInstance(hazelcastInstance);
-        this.hazelcastInstance = hazelcastInstance;
-        this.autoGeneratedTypeId = strategy.newId();
-    }
 }

subzero-core/src/main/java/info/jerrinot/subzero/SubZero.java

@@ -23,22 +23,38 @@ private SubZero() {
      * Use SubZero as a global serializer.
      *
      * This method configures Hazelcast to delegate a class serialization to SubZero when the class
-     * has no explicit strategy configured.
+     * has no explicit strategy configured. Uses {@link Serializer} serializer implementation
+     * internally.
      *
      * @param config Hazelcast configuration to inject SubZero into
      * @return Hazelcast configuration.
      */
     public static Config useAsGlobalSerializer(Config config) {
+        return useAsGlobalSerializerInternal(config, Serializer.class);
+    }
+
+    /**
+     * Use SubZero as a global serializer.
+     *
+     * This method configures Hazelcast to delegate a class serialization to SubZero when the class
+     * has no explicit strategy configured.
+     *
+     * @param config Hazelcast configuration to inject SubZero into
+     * @param serializerClazz Class of global serializer implementation to use
+     * @return Hazelcast configuration.
+     */
+    public static <T> Config useAsGlobalSerializer(Config config, Class<? extends AbstractGlobalUserSerializer> serializerClazz) {
         SerializationConfig serializationConfig = config.getSerializationConfig();
-        injectSubZero(serializationConfig);
+        injectSubZero(serializationConfig, serializerClazz);
         return config;
     }
 
     /**
      * Use SubZero as a global serializer.
      *
      * This method configures Hazelcast to delegate a class serialization to SubZero when the class
-     * has no explicit strategy configured.
+     * has no explicit strategy configured. Uses {@link Serializer} serializer implementation
+     * internally.
      *
      * This method it intended to be used to configure {@link ClientConfig} instances, but
      * I do not want to create a hard-dependency on Hazelcast Client module.
@@ -47,6 +63,27 @@ public static Config useAsGlobalSerializer(Config config) {
      * @return Hazelcast configuration.
      */
     public static <T> T useAsGlobalSerializer(T config) {
+        return useAsGlobalSerializerInternal(config, Serializer.class);
+    }
+
+    /**
+     * Use SubZero as a global serializer.
+     *
+     * This method configures Hazelcast to delegate a class serialization to SubZero when the class
+     * has no explicit strategy configured.
+     *
+     * This method it intended to be used to configure {@link ClientConfig} instances, but
+     * I do not want to create a hard-dependency on Hazelcast Client module.
+     *
+     * @param config Hazelcast configuration to inject SubZero into
+     * @param serializerClazz Class of global serializer implementation to use
+     * @return Hazelcast configuration.
+     */
+    public static <T> T useAsGlobalSerializer(T config, Class<? extends AbstractGlobalUserSerializer> serializerClazz) {
+        return useAsGlobalSerializer(config, serializerClazz);
+    }
+
+    private static <T> T useAsGlobalSerializerInternal(T config, Class<? extends AbstractSerializer> serializerClazz) {
         String className = config.getClass().getName();
         SerializationConfig serializationConfig;
         if (className.equals("com.hazelcast.client.config.ClientConfig")) {
@@ -58,17 +95,17 @@ public static <T> T useAsGlobalSerializer(T config) {
         } else {
             throw new IllegalArgumentException("Unknown configuration object " + config);
         }
-        injectSubZero(serializationConfig);
+        injectSubZero(serializationConfig, serializerClazz);
         return config;
     }
 
-    private static void injectSubZero(SerializationConfig serializationConfig) {
+    private static void injectSubZero(SerializationConfig serializationConfig, Class<? extends AbstractSerializer> serializerClazz) {
         GlobalSerializerConfig globalSerializerConfig = serializationConfig.getGlobalSerializerConfig();
         if (globalSerializerConfig == null) {
             globalSerializerConfig = new GlobalSerializerConfig();
             serializationConfig.setGlobalSerializerConfig(globalSerializerConfig);
         }
-        globalSerializerConfig.setClassName(Serializer.class.getName()).setOverrideJavaSerialization(true);
+        globalSerializerConfig.setClassName(serializerClazz.getName()).setOverrideJavaSerialization(true);
     }
 
     /**

subzero-core/src/main/java/info/jerrinot/subzero/example/HashMapSerializerExample.java

@@ -1,6 +1,6 @@
 package info.jerrinot.subzero.example;
 
-import info.jerrinot.subzero.Serializer;
+import info.jerrinot.subzero.AbstractTypeSpecificUserSerializer;
 
 import java.util.HashMap;
 
@@ -19,7 +19,7 @@
  * }
  * </pre>
  */
-public class HashMapSerializerExample extends Serializer<HashMap> {
+public class HashMapSerializerExample extends AbstractTypeSpecificUserSerializer<HashMap> {
 
     public HashMapSerializerExample() {
         super(HashMap.class);

subzero-core/src/test/java/info/jerrinot/subzero/SerializerTest.java

@@ -15,7 +15,7 @@ public class SerializerTest {
 
     @Test
     public void givenSingleSerializerExist_whenHazelcastInstanceIsInjected_thenTypeIdIsGreaterThenZero() {
-        Serializer serializer = new Serializer();
+        AbstractSerializer serializer = new Serializer();
         serializer.setHazelcastInstance(newMockHazelcastInstance());
 
         HazelcastInstance hz = newMockHazelcastInstance();
@@ -27,9 +27,9 @@ public void givenSingleSerializerExist_whenHazelcastInstanceIsInjected_thenTypeI
 
     @Test
     public void givenTwoSerializerExist_whenTheSameHazelcastInstanceIsInjected_thenTheyHaveDifferentTypeId() {
-        Serializer serializer1 = new Serializer();
+        AbstractSerializer serializer1 = new Serializer();
         serializer1.setHazelcastInstance(newMockHazelcastInstance());
-        Serializer serializer2 = new Serializer();
+        AbstractSerializer serializer2 = new Serializer();
         serializer2.setHazelcastInstance(newMockHazelcastInstance());
 
         HazelcastInstance hz = newMockHazelcastInstance();
@@ -43,9 +43,9 @@ public void givenTwoSerializerExist_whenTheSameHazelcastInstanceIsInjected_thenT
 
     @Test
     public void givenTwoSerializerExist_whenDifferentHazelcastInstanceAreInjected_thenTheyHaveTheSameTypeId() {
-        Serializer serializer1 = new Serializer();
+        AbstractSerializer serializer1 = new Serializer();
         serializer1.setHazelcastInstance(newMockHazelcastInstance());
-        Serializer serializer2 = new Serializer();
+        AbstractSerializer serializer2 = new Serializer();
         serializer2.setHazelcastInstance(newMockHazelcastInstance());
 
         HazelcastInstance hz1 = newMockHazelcastInstance();
@@ -58,6 +58,17 @@ public void givenTwoSerializerExist_whenDifferentHazelcastInstanceAreInjected_th
         assertEquals(typeId1, typeId2);
     }
 
+    @Test
+    public void givenSpecificNeutralSerializerExist_whenObjectIsSerializedAndDeserialized_thenItHasTheSameInternalState() throws IOException {
+        String input = "foo";
+        AbstractSerializer<String> serializer = new Serializer();
+        serializer.setHazelcastInstance(newMockHazelcastInstance());
+
+        String output = TestUtils.serializeAndDeserializeObject(serializer, input);
+
+        assertEquals(input, output);
+    }
+
     @Test(expected = AssertionError.class)
     public void givenTwoTypeSpecificSerializersWithTheSameTypeExists_whenTheSameHazelcastInstanceIsInjected_thenTheyThrowError() {
         Serializer serializer1 = new Serializer(String.class);
@@ -89,17 +100,6 @@ public void givenTwoTypeSpecificSerializersWithTheSameTypeExists_whenDifferentHa
         assertEquals(typeId1, typeId2);
     }
 
-    @Test
-    public void givenSpecificNeutralSerializerExist_whenObjectIsSerializedAndDeserialized_thenItHasTheSameInternalState() throws IOException {
-        String input = "foo";
-        Serializer<String> serializer = new Serializer();
-        serializer.setHazelcastInstance(newMockHazelcastInstance());
-
-        String output = TestUtils.serializeAndDeserializeObject(serializer, input);
-
-        assertEquals(input, output);
-    }
-
     @Test
     public void givenTypeSpecificSerializerExist_whenObjectIsSerializedAndDeserialized_thenItHasTheSameInternalState() throws IOException {
         String input = "foo";

subzero-core/src/test/java/info/jerrinot/subzero/SubZeroTest.java

@@ -8,9 +8,7 @@
 import java.util.Collection;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.tuple;
 import static org.junit.Assert.assertEquals;
-import static org.mockito.Matchers.anyObject;
 
 public class SubZeroTest {