Deprecated MetadataEncoder/Decoder; ++ MetadataCode interface + impl

Author: artem-v

cluster-api/src/main/java/io/scalecube/cluster/Cluster.java

@@ -2,7 +2,6 @@
 
 import io.scalecube.cluster.transport.api.Message;
 import io.scalecube.net.Address;
-import java.lang.reflect.Type;
 import java.util.Collection;
 import java.util.Optional;
 import reactor.core.publisher.Mono;
@@ -74,24 +73,13 @@ public interface Cluster {
    */
   <T> Optional<T> metadata();
 
-  /**
-   * Returns cluster member metadata by given member. Deprecated since {@code 2.4.10} in favor of
-   * {@link #metadata(Member, Type)}.
-   *
-   * @param member cluster member
-   * @return cluster member metadata
-   */
-  @Deprecated
-  <T> Optional<T> metadata(Member member);
-
   /**
    * Returns cluster member metadata by given member.
    *
    * @param member cluster member
-   * @param type metadata type
    * @return cluster member metadata
    */
-  <T> Optional<T> metadata(Member member, Type type);
+  <T> Optional<T> metadata(Member member);
 
   /**
    * Returns local cluster member which corresponds to this cluster instance.

cluster-api/src/main/java/io/scalecube/cluster/metadata/MetadataCodec.java

@@ -1,7 +1,6 @@
 package io.scalecube.cluster.metadata;
 
 import io.scalecube.utils.ServiceLoaderUtil;
-import java.lang.reflect.Type;
 import java.nio.ByteBuffer;
 
 /** Contains methods for metadata serializing/deserializing logic. */
@@ -13,10 +12,9 @@ public interface MetadataCodec {
    * Deserializes metadata from buffer.
    *
    * @param buffer metadata buffer; if {@code buffer} is empty then returned result shall be null.
-   * @param type metadata object type
    * @return metadata object from metadata buffer or null
    */
-  Object deserialize(ByteBuffer buffer, Type type);
+  Object deserialize(ByteBuffer buffer);
 
   /**
    * Serializes given metadata into buffer.

cluster/src/main/java/io/scalecube/cluster/ClusterImpl.java

@@ -21,7 +21,7 @@
 import io.scalecube.net.Address;
 import io.scalecube.transport.netty.TransportImpl;
 import java.lang.management.ManagementFactory;
-import java.lang.reflect.Type;
+import java.nio.ByteBuffer;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Objects;
@@ -438,27 +438,16 @@ public <T> Optional<T> metadata(Member member) {
     if (member().equals(member)) {
       return metadata();
     }
-    return metadataStore
-        .metadata(member)
-        .map(
-            buffer -> {
-              //noinspection unchecked
-              return (T) config.metadataDecoder().decode(buffer);
-            });
+    return metadataStore.metadata(member).map(this::toMetadata);
   }
 
-  @Override
-  public <T> Optional<T> metadata(Member member, Type type) {
-    if (member().equals(member)) {
-      return metadata();
+  @SuppressWarnings("unchecked")
+  private <T> T toMetadata(ByteBuffer buffer) {
+    if (config.metadataDecoder() != null) {
+      return (T) config.metadataDecoder().decode(buffer);
+    } else {
+      return (T) config.metadataCodec().deserialize(buffer);
     }
-    return metadataStore
-        .metadata(member)
-        .map(
-            buffer -> {
-              //noinspection unchecked
-              return (T) config.metadataCodec().deserialize(buffer, type);
-            });
   }
 
   @Override

cluster/src/test/java/io/scalecube/cluster/ClusterTest.java

@@ -226,7 +226,7 @@ public void onMembershipEvent(MembershipEvent event) {
         Optional<Member> memberOptional = node.member(metadataNode.member().id());
         assertTrue(memberOptional.isPresent());
         Member member = memberOptional.get();
-        assertEquals(metadata, node.metadata(member, Map.class).orElse(null));
+        assertEquals(metadata, node.metadata(member).orElse(null));
       }
 
       // Update metadata
@@ -238,7 +238,7 @@ public void onMembershipEvent(MembershipEvent event) {
         Optional<Member> memberOptional = node.member(metadataNode.member().id());
         assertTrue(memberOptional.isPresent());
         Member member = memberOptional.get();
-        assertEquals(updatedMetadata, node.metadata(member, Map.class).orElse(null));
+        assertEquals(updatedMetadata, node.metadata(member).orElse(null));
       }
     } finally {
       // Shutdown all nodes
@@ -299,7 +299,7 @@ public void onMembershipEvent(MembershipEvent event) {
         Optional<Member> memberOptional = node.member(metadataNode.member().id());
         assertTrue(memberOptional.isPresent());
         Member member = memberOptional.get();
-        assertEquals(metadata, node.metadata(member, Map.class).orElse(null));
+        assertEquals(metadata, node.metadata(member).orElse(null));
       }
 
       // Update metadata
@@ -313,8 +313,7 @@ public void onMembershipEvent(MembershipEvent event) {
         assertTrue(memberOptional.isPresent());
         Member member = memberOptional.get();
         //noinspection unchecked,OptionalGetWithoutIsPresent
-        Map<String, String> actualMetadata =
-            (Map<String, String>) node.metadata(member, Map.class).get();
+        Map<String, String> actualMetadata = (Map<String, String>) node.metadata(member).get();
         assertEquals(2, actualMetadata.size());
         assertEquals("value1", actualMetadata.get("key1"));
         assertEquals("value3", actualMetadata.get("key2"));
@@ -378,7 +377,7 @@ public void onMembershipEvent(MembershipEvent event) {
         Optional<Member> memberOptional = node.member(metadataNode.member().id());
         assertTrue(memberOptional.isPresent());
         Member member = memberOptional.get();
-        assertEquals(metadata, node.metadata(member, Map.class).orElse(null));
+        assertEquals(metadata, node.metadata(member).orElse(null));
       }
 
       // Update metadata
@@ -393,8 +392,7 @@ public void onMembershipEvent(MembershipEvent event) {
         assertTrue(memberOptional.isPresent());
         Member member = memberOptional.get();
         //noinspection unchecked,OptionalGetWithoutIsPresent
-        Map<String, String> actualMetadata =
-            (Map<String, String>) node.metadata(member, Map.class).get();
+        Map<String, String> actualMetadata = (Map<String, String>) node.metadata(member).get();
         assertEquals(1, actualMetadata.size());
         assertEquals("value1", actualMetadata.get("key1"));
         assertNull(actualMetadata.get("key2"));
@@ -503,8 +501,8 @@ public void onMembershipEvent(MembershipEvent event) {
     assertEquals(Type.ADDED, seedAddedEvent.type());
 
     // Check metadata
-    assertEquals(node1Metadata, seedNode.metadata(node1.member(), Map.class).orElse(null));
-    assertEquals(seedMetadata, node1.metadata(seedNode.member(), Map.class).orElse(null));
+    assertEquals(node1Metadata, seedNode.metadata(node1.member()).orElse(null));
+    assertEquals(seedMetadata, node1.metadata(seedNode.member()).orElse(null));
 
     // Remove node1 from cluster
     CountDownLatch latch = new CountDownLatch(1);
@@ -513,7 +511,7 @@ public void onMembershipEvent(MembershipEvent event) {
         .filter(MembershipEvent::isRemoved)
         .subscribe(
             event -> {
-              Object metadata = MetadataCodec.INSTANCE.deserialize(event.oldMetadata(), Map.class);
+              Object metadata = MetadataCodec.INSTANCE.deserialize(event.oldMetadata());
               //noinspection unchecked
               removedMetadata.set((Map<String, String>) metadata);
               latch.countDown();

codec-parent/codec-jackson/src/main/java/io/scalecube/cluster/codec/jackson/DefaultObjectMapper.java

@@ -30,7 +30,7 @@ private static ObjectMapper initMapper() {
     mapper.enableDefaultTyping(
         LaissezFaireSubTypeValidator.instance,
         DefaultTyping.JAVA_LANG_OBJECT,
-        JsonTypeInfo.As.PROPERTY);
+        JsonTypeInfo.As.WRAPPER_OBJECT);
     return mapper;
   }
 }

codec-parent/codec-jackson/src/main/java/io/scalecube/cluster/codec/jackson/JacksonMetadataCodec.java

@@ -3,7 +3,6 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import io.scalecube.cluster.metadata.MetadataCodec;
 import java.io.IOException;
-import java.lang.reflect.Type;
 import java.nio.ByteBuffer;
 import reactor.core.Exceptions;
 
@@ -25,13 +24,14 @@ public JacksonMetadataCodec() {
   }
 
   @Override
-  public Object deserialize(ByteBuffer buffer, Type type) {
+  public Object deserialize(ByteBuffer buffer) {
     if (buffer.remaining() == 0) {
       return null;
     }
     try {
-      return this.delegate.readValue(
-          buffer.array(), this.delegate.getTypeFactory().constructType(type));
+      final MetadataWrapper metadataWrapper =
+          this.delegate.readValue(buffer.array(), MetadataWrapper.class);
+      return metadataWrapper.getMetadata();
     } catch (IOException e) {
       throw Exceptions.propagate(e);
     }
@@ -43,9 +43,29 @@ public ByteBuffer serialize(Object metadata) {
       return null;
     }
     try {
-      return ByteBuffer.wrap(this.delegate.writeValueAsBytes(metadata));
+      final MetadataWrapper metadataWrapper = new MetadataWrapper(metadata);
+      return ByteBuffer.wrap(this.delegate.writeValueAsBytes(metadataWrapper));
     } catch (IOException e) {
       throw Exceptions.propagate(e);
     }
   }
+
+  public static class MetadataWrapper {
+
+    private Object metadata;
+
+    public MetadataWrapper() {}
+
+    public MetadataWrapper(Object metadata) {
+      this.metadata = metadata;
+    }
+
+    public Object getMetadata() {
+      return metadata;
+    }
+
+    public void setMetadata(Object metadata) {
+      this.metadata = metadata;
+    }
+  }
 }

examples/src/main/java/io/scalecube/examples/ClusterCustomMetadataEncodingExample.java

@@ -3,9 +3,7 @@
 import io.scalecube.cluster.Cluster;
 import io.scalecube.cluster.ClusterImpl;
 import io.scalecube.cluster.metadata.MetadataCodec;
-import java.lang.reflect.Type;
 import java.nio.ByteBuffer;
-import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
 public class ClusterCustomMetadataEncodingExample {
@@ -40,23 +38,23 @@ public static void main(String[] args) throws Exception {
         .otherMembers()
         .forEach(
             member -> {
-              Long metadata = (Long) alice.metadata(member, Map.class).orElse(null);
+              Long metadata = (Long) alice.metadata(member).orElse(null);
               System.out.println(
                   "Alice knows [" + member.id() + "] has `" + metadata + "` as a metadata");
             });
 
     joe.otherMembers()
         .forEach(
             member -> {
-              Long metadata = (Long) alice.metadata(member, Map.class).orElse(null);
+              Long metadata = (Long) alice.metadata(member).orElse(null);
               System.out.println(
                   "Joe knows [" + member.id() + "] has `" + metadata + "` as a metadata");
             });
 
     bob.otherMembers()
         .forEach(
             member -> {
-              Long metadata = (Long) alice.metadata(member, Map.class).orElse(null);
+              Long metadata = (Long) alice.metadata(member).orElse(null);
               System.out.println(
                   "Bob knows [" + member.id() + "] has `" + metadata + "` as a metadata");
             });
@@ -67,7 +65,7 @@ public static void main(String[] args) throws Exception {
   static class LongMetadataCodec implements MetadataCodec {
 
     @Override
-    public Object deserialize(ByteBuffer buffer, Type type) {
+    public Object deserialize(ByteBuffer buffer) {
       return buffer.remaining() == 0 ? null : buffer.getLong();
     }
 

examples/src/main/java/io/scalecube/examples/ClusterMetadataExample.java

@@ -49,8 +49,7 @@ public void onMessage(Message message) {
             .filter(
                 member -> {
                   //noinspection unchecked,OptionalGetWithoutIsPresent
-                  Map<String, String> metadata =
-                      (Map<String, String>) alice.metadata(member, Map.class).get();
+                  Map<String, String> metadata = (Map<String, String>) alice.metadata(member).get();
                   return "Joe".equals(metadata.get("name"));
                 })
             .findAny();