Ensure serializable types are registered for resources prior to recei…

…ving and deserializing resource operations.
atomix · Mar 2, 2016 · 0c7e749 · 0c7e749
1 parent a0a4225
commit 0c7e749
Show file tree

Hide file tree

Showing 42 changed files with 275 additions and 165 deletions.
diff --git a/collections/src/main/java/io/atomix/collections/DistributedMap.java b/collections/src/main/java/io/atomix/collections/DistributedMap.java
@@ -15,7 +15,6 @@
  */
 package io.atomix.collections;
 
-import io.atomix.catalyst.serializer.SerializerRegistry;
 import io.atomix.collections.state.MapCommands;
 import io.atomix.copycat.client.CopycatClient;
 import io.atomix.resource.AbstractResource;
@@ -70,11 +69,6 @@ public DistributedMap(CopycatClient client, Properties options) {
     super(client, options);
   }
 
-  @Override
-  protected void registerTypes(SerializerRegistry registry) {
-    new MapCommands.TypeResolver().resolve(registry);
-  }
-
   /**
    * Returns {@code true} if the map is empty.
    * <p>

diff --git a/collections/src/main/java/io/atomix/collections/DistributedMapFactory.java b/collections/src/main/java/io/atomix/collections/DistributedMapFactory.java
@@ -15,6 +15,8 @@
  */
 package io.atomix.collections;
 
+import io.atomix.catalyst.serializer.SerializableTypeResolver;
+import io.atomix.collections.state.MapCommands;
 import io.atomix.collections.state.MapState;
 import io.atomix.copycat.client.CopycatClient;
 import io.atomix.resource.ResourceFactory;
@@ -29,6 +31,11 @@
  */
 public class DistributedMapFactory implements ResourceFactory<DistributedMap<?, ?>> {
 
+  @Override
+  public SerializableTypeResolver createSerializableTypeResolver() {
+    return new MapCommands.TypeResolver();
+  }
+
   @Override
   public ResourceStateMachine createStateMachine(Properties config) {
     return new MapState(config);

diff --git a/collections/src/main/java/io/atomix/collections/DistributedMultiMap.java b/collections/src/main/java/io/atomix/collections/DistributedMultiMap.java
@@ -15,7 +15,6 @@
  */
 package io.atomix.collections;
 
-import io.atomix.catalyst.serializer.SerializerRegistry;
 import io.atomix.collections.state.MultiMapCommands;
 import io.atomix.copycat.client.CopycatClient;
 import io.atomix.resource.AbstractResource;
@@ -123,11 +122,6 @@ public DistributedMultiMap(CopycatClient client, Properties options) {
     super(client, options);
   }
 
-  @Override
-  protected void registerTypes(SerializerRegistry registry) {
-    new MultiMapCommands.TypeResolver().resolve(registry);
-  }
-
   @Override
   public Resource.Config config() {
     return new Config(super.config());

diff --git a/collections/src/main/java/io/atomix/collections/DistributedMultiMapFactory.java b/collections/src/main/java/io/atomix/collections/DistributedMultiMapFactory.java
@@ -15,6 +15,8 @@
  */
 package io.atomix.collections;
 
+import io.atomix.catalyst.serializer.SerializableTypeResolver;
+import io.atomix.collections.state.MultiMapCommands;
 import io.atomix.collections.state.MultiMapState;
 import io.atomix.copycat.client.CopycatClient;
 import io.atomix.resource.ResourceFactory;
@@ -29,6 +31,11 @@
  */
 public class DistributedMultiMapFactory implements ResourceFactory<DistributedMultiMap<?, ?>> {
 
+  @Override
+  public SerializableTypeResolver createSerializableTypeResolver() {
+    return new MultiMapCommands.TypeResolver();
+  }
+
   @Override
   public ResourceStateMachine createStateMachine(Properties config) {
     return new MultiMapState(config);

diff --git a/collections/src/main/java/io/atomix/collections/DistributedQueue.java b/collections/src/main/java/io/atomix/collections/DistributedQueue.java
@@ -15,7 +15,6 @@
  */
 package io.atomix.collections;
 
-import io.atomix.catalyst.serializer.SerializerRegistry;
 import io.atomix.collections.state.QueueCommands;
 import io.atomix.copycat.client.CopycatClient;
 import io.atomix.resource.AbstractResource;
@@ -62,11 +61,6 @@ public DistributedQueue(CopycatClient client, Properties options) {
     super(client, options);
   }
 
-  @Override
-  protected void registerTypes(SerializerRegistry registry) {
-    new QueueCommands.TypeResolver().resolve(registry);
-  }
-
   /**
    * Adds a value to the set.
    *

diff --git a/collections/src/main/java/io/atomix/collections/DistributedQueueFactory.java b/collections/src/main/java/io/atomix/collections/DistributedQueueFactory.java
@@ -15,6 +15,8 @@
  */
 package io.atomix.collections;
 
+import io.atomix.catalyst.serializer.SerializableTypeResolver;
+import io.atomix.collections.state.QueueCommands;
 import io.atomix.collections.state.QueueState;
 import io.atomix.copycat.client.CopycatClient;
 import io.atomix.resource.ResourceFactory;
@@ -29,6 +31,11 @@
  */
 public class DistributedQueueFactory implements ResourceFactory<DistributedQueue<?>> {
 
+  @Override
+  public SerializableTypeResolver createSerializableTypeResolver() {
+    return new QueueCommands.TypeResolver();
+  }
+
   @Override
   public ResourceStateMachine createStateMachine(Properties config) {
     return new QueueState(config);

diff --git a/collections/src/main/java/io/atomix/collections/DistributedSet.java b/collections/src/main/java/io/atomix/collections/DistributedSet.java
@@ -15,7 +15,6 @@
  */
 package io.atomix.collections;
 
-import io.atomix.catalyst.serializer.SerializerRegistry;
 import io.atomix.collections.state.SetCommands;
 import io.atomix.copycat.client.CopycatClient;
 import io.atomix.resource.AbstractResource;
@@ -58,11 +57,6 @@ public DistributedSet(CopycatClient client, Properties options) {
     super(client, options);
   }
 
-  @Override
-  protected void registerTypes(SerializerRegistry registry) {
-    new SetCommands.TypeResolver().resolve(registry);
-  }
-
   /**
    * Adds a value to the set.
    *

diff --git a/collections/src/main/java/io/atomix/collections/DistributedSetFactory.java b/collections/src/main/java/io/atomix/collections/DistributedSetFactory.java
@@ -15,6 +15,8 @@
  */
 package io.atomix.collections;
 
+import io.atomix.catalyst.serializer.SerializableTypeResolver;
+import io.atomix.collections.state.SetCommands;
 import io.atomix.collections.state.SetState;
 import io.atomix.copycat.client.CopycatClient;
 import io.atomix.resource.ResourceFactory;
@@ -29,6 +31,11 @@
  */
 public class DistributedSetFactory implements ResourceFactory<DistributedSet<?>> {
 
+  @Override
+  public SerializableTypeResolver createSerializableTypeResolver() {
+    return new SetCommands.TypeResolver();
+  }
+
   @Override
   public ResourceStateMachine createStateMachine(Properties config) {
     return new SetState(config);

diff --git a/collections/src/main/java/io/atomix/collections/state/MapState.java b/collections/src/main/java/io/atomix/collections/state/MapState.java
@@ -15,7 +15,6 @@
  */
 package io.atomix.collections.state;
 
-import io.atomix.catalyst.serializer.SerializerRegistry;
 import io.atomix.catalyst.util.Assert;
 import io.atomix.catalyst.util.concurrent.Scheduled;
 import io.atomix.copycat.server.Commit;
@@ -36,11 +35,6 @@ public MapState(Properties config) {
     super(config);
   }
 
-  @Override
-  protected void registerTypes(SerializerRegistry registry) {
-    new MapCommands.TypeResolver().resolve(registry);
-  }
-
   /**
    * Handles a contains key commit.
    */

diff --git a/collections/src/main/java/io/atomix/collections/state/MultiMapState.java b/collections/src/main/java/io/atomix/collections/state/MultiMapState.java
@@ -15,7 +15,6 @@
  */
 package io.atomix.collections.state;
 
-import io.atomix.catalyst.serializer.SerializerRegistry;
 import io.atomix.catalyst.util.concurrent.Scheduled;
 import io.atomix.collections.DistributedMultiMap;
 import io.atomix.copycat.server.Commit;
@@ -39,11 +38,6 @@ public MultiMapState(Properties properties) {
     this.order = DistributedMultiMap.Order.valueOf(config.getProperty("order", DistributedMultiMap.Order.INSERT.name().toLowerCase()).toUpperCase());
   }
 
-  @Override
-  protected void registerTypes(SerializerRegistry registry) {
-    new MultiMapCommands.TypeResolver().resolve(registry);
-  }
-
   /**
    * Creates a new value map.
    */

diff --git a/collections/src/main/java/io/atomix/collections/state/QueueState.java b/collections/src/main/java/io/atomix/collections/state/QueueState.java
@@ -15,7 +15,6 @@
  */
 package io.atomix.collections.state;
 
-import io.atomix.catalyst.serializer.SerializerRegistry;
 import io.atomix.copycat.server.Commit;
 import io.atomix.resource.ResourceStateMachine;
 
@@ -36,11 +35,6 @@ public QueueState(Properties properties) {
     super(properties);
   }
 
-  @Override
-  protected void registerTypes(SerializerRegistry registry) {
-    new QueueCommands.TypeResolver().resolve(registry);
-  }
-
   /**
    * Handles a contains commit.
    */

diff --git a/collections/src/main/java/io/atomix/collections/state/SetState.java b/collections/src/main/java/io/atomix/collections/state/SetState.java
@@ -15,7 +15,6 @@
  */
 package io.atomix.collections.state;
 
-import io.atomix.catalyst.serializer.SerializerRegistry;
 import io.atomix.catalyst.util.concurrent.Scheduled;
 import io.atomix.copycat.server.Commit;
 import io.atomix.resource.ResourceStateMachine;
@@ -38,11 +37,6 @@ public SetState(Properties properties) {
     super(properties);
   }
 
-  @Override
-  protected void registerTypes(SerializerRegistry registry) {
-    new SetCommands.TypeResolver().resolve(registry);
-  }
-
   /**
    * Handles a contains commit.
    */

diff --git a/coordination/src/main/java/io/atomix/coordination/DistributedGroup.java b/coordination/src/main/java/io/atomix/coordination/DistributedGroup.java
@@ -15,7 +15,6 @@
  */
 package io.atomix.coordination;
 
-import io.atomix.catalyst.serializer.SerializerRegistry;
 import io.atomix.catalyst.transport.Address;
 import io.atomix.catalyst.transport.Server;
 import io.atomix.catalyst.util.ConfigurationException;
@@ -319,11 +318,6 @@ public DistributedGroup(CopycatClient client, Properties options) {
     this.connections = new GroupConnectionManager(client.transport().client(), client.context());
   }
 
-  @Override
-  protected void registerTypes(SerializerRegistry registry) {
-    new GroupCommands.TypeResolver().resolve(registry);
-  }
-
   @Override
   public Options options() {
     return new Options(super.options());

diff --git a/coordination/src/main/java/io/atomix/coordination/DistributedGroupFactory.java b/coordination/src/main/java/io/atomix/coordination/DistributedGroupFactory.java
@@ -15,6 +15,8 @@
  */
 package io.atomix.coordination;
 
+import io.atomix.catalyst.serializer.SerializableTypeResolver;
+import io.atomix.coordination.state.GroupCommands;
 import io.atomix.coordination.state.GroupState;
 import io.atomix.copycat.client.CopycatClient;
 import io.atomix.resource.ResourceFactory;
@@ -29,6 +31,11 @@
  */
 public class DistributedGroupFactory implements ResourceFactory<DistributedGroup> {
 
+  @Override
+  public SerializableTypeResolver createSerializableTypeResolver() {
+    return new GroupCommands.TypeResolver();
+  }
+
   @Override
   public ResourceStateMachine createStateMachine(Properties config) {
     return new GroupState(config);

diff --git a/coordination/src/main/java/io/atomix/coordination/DistributedLock.java b/coordination/src/main/java/io/atomix/coordination/DistributedLock.java
@@ -15,7 +15,6 @@
  */
 package io.atomix.coordination;
 
-import io.atomix.catalyst.serializer.SerializerRegistry;
 import io.atomix.coordination.state.LockCommands;
 import io.atomix.copycat.client.CopycatClient;
 import io.atomix.resource.AbstractResource;
@@ -144,11 +143,6 @@ public DistributedLock(CopycatClient client, Properties options) {
     super(client, options);
   }
 
-  @Override
-  protected void registerTypes(SerializerRegistry registry) {
-    new LockCommands.TypeResolver().resolve(registry);
-  }
-
   @Override
   public CompletableFuture<DistributedLock> open() {
     return super.open().thenApply(result -> {

diff --git a/coordination/src/main/java/io/atomix/coordination/DistributedLockFactory.java b/coordination/src/main/java/io/atomix/coordination/DistributedLockFactory.java
@@ -15,6 +15,8 @@
  */
 package io.atomix.coordination;
 
+import io.atomix.catalyst.serializer.SerializableTypeResolver;
+import io.atomix.coordination.state.LockCommands;
 import io.atomix.coordination.state.LockState;
 import io.atomix.copycat.client.CopycatClient;
 import io.atomix.resource.ResourceFactory;
@@ -29,6 +31,11 @@
  */
 public class DistributedLockFactory implements ResourceFactory<DistributedLock> {
 
+  @Override
+  public SerializableTypeResolver createSerializableTypeResolver() {
+    return new LockCommands.TypeResolver();
+  }
+
   @Override
   public ResourceStateMachine createStateMachine(Properties config) {
     return new LockState(config);

diff --git a/coordination/src/main/java/io/atomix/coordination/state/GroupState.java b/coordination/src/main/java/io/atomix/coordination/state/GroupState.java
@@ -15,7 +15,6 @@
  */
 package io.atomix.coordination.state;
 
-import io.atomix.catalyst.serializer.SerializerRegistry;
 import io.atomix.catalyst.transport.Address;
 import io.atomix.coordination.GroupMemberInfo;
 import io.atomix.coordination.GroupTask;
@@ -45,11 +44,6 @@ public GroupState(Properties config) {
     super(config);
   }
 
-  @Override
-  protected void registerTypes(SerializerRegistry registry) {
-    new GroupCommands.TypeResolver().resolve(registry);
-  }
-
   @Override
   public void close(ServerSession session) {
     Map<Long, Member> left = new HashMap<>();

diff --git a/coordination/src/main/java/io/atomix/coordination/state/LockState.java b/coordination/src/main/java/io/atomix/coordination/state/LockState.java
@@ -15,7 +15,6 @@
  */
 package io.atomix.coordination.state;
 
-import io.atomix.catalyst.serializer.SerializerRegistry;
 import io.atomix.catalyst.util.concurrent.Scheduled;
 import io.atomix.copycat.server.Commit;
 import io.atomix.copycat.server.session.ServerSession;
@@ -39,11 +38,6 @@ public LockState(Properties config) {
     super(config);
   }
 
-  @Override
-  protected void registerTypes(SerializerRegistry registry) {
-    new LockCommands.TypeResolver().resolve(registry);
-  }
-
   @Override
   public void close(ServerSession session) {
     if (lock != null && lock.session().id() == session.id()) {