Merge pull request #305 from scalecube/develop

New release

Author: artem-v

.github/release-drafter.yml

@@ -0,0 +1,4 @@
+template: |
+  ## What’s Changed
+
+  $CHANGES

.travis.yml

@@ -1,3 +1,11 @@
+env:
+  global:
+    - clusterTransport=warn
+    - clusterFdetector=warn
+    - clusterGossip=warn
+    - clusterMembership=warn
+    - clusterMetadata=warn
+    - clusterUtils=warn
 addons:
   apt:
     packages:

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

@@ -74,7 +74,7 @@ public interface Cluster {
   <T> Optional<T> metadata();
 
   /**
-   * Returns cluster member metadata by given member with default metadata type.
+   * Returns cluster member metadata by given member.
    *
    * @param member cluster member
    * @return cluster member metadata

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

@@ -3,6 +3,7 @@
 import io.scalecube.cluster.fdetector.FailureDetectorConfig;
 import io.scalecube.cluster.gossip.GossipConfig;
 import io.scalecube.cluster.membership.MembershipConfig;
+import io.scalecube.cluster.metadata.MetadataCodec;
 import io.scalecube.cluster.metadata.MetadataDecoder;
 import io.scalecube.cluster.metadata.MetadataEncoder;
 import io.scalecube.cluster.transport.api.TransportConfig;
@@ -32,12 +33,13 @@ public final class ClusterConfig implements Cloneable {
 
   private Object metadata;
   private int metadataTimeout = DEFAULT_METADATA_TIMEOUT;
+  private MetadataCodec metadataCodec = MetadataCodec.INSTANCE;
   private MetadataEncoder metadataEncoder = MetadataEncoder.INSTANCE;
   private MetadataDecoder metadataDecoder = MetadataDecoder.INSTANCE;
 
   private String memberAlias;
-  private String memberHost;
-  private Integer memberPort;
+  private String containerHost;
+  private Integer containerPort;
 
   private TransportConfig transportConfig = TransportConfig.defaultConfig();
   private FailureDetectorConfig failureDetectorConfig = FailureDetectorConfig.defaultConfig();
@@ -93,7 +95,7 @@ public <T> T metadata() {
   }
 
   /**
-   * Sets a metadata.
+   * Setter for metadata.
    *
    * @param metadata metadata
    * @return new {@code ClusterConfig} instance
@@ -109,7 +111,7 @@ public int metadataTimeout() {
   }
 
   /**
-   * Sets a metadataTimeout.
+   * Setter for metadataTimeout.
    *
    * @param metadataTimeout metadata timeout
    * @return new {@code ClusterConfig} instance
@@ -120,60 +122,129 @@ public ClusterConfig metadataTimeout(int metadataTimeout) {
     return c;
   }
 
+  public MetadataCodec metadataCodec() {
+    return metadataCodec;
+  }
+
+  /**
+   * Setter for metadataCodec.
+   *
+   * @param metadataCodec metadata codec
+   * @return new {@code ClusterConfig} instance
+   */
+  public ClusterConfig metadataCodec(MetadataCodec metadataCodec) {
+    ClusterConfig c = clone();
+    c.metadataCodec = metadataCodec;
+    return c;
+  }
+
+  /**
+   * Deprecated since {@code 2.4.10} in favor of {@link MetadataCodec}.
+   *
+   * @return metadataEncoder
+   */
+  @Deprecated
   public MetadataEncoder metadataEncoder() {
     return metadataEncoder;
   }
 
   /**
-   * Sets a metadataEncoder.
+   * Setter for metadataEncoder. Deprecated since {@code 2.4.10} in favor of {@link MetadataCodec}.
    *
    * @param metadataEncoder metadata encoder
    * @return new {@code ClusterConfig} instance
    */
+  @Deprecated
   public ClusterConfig metadataEncoder(MetadataEncoder metadataEncoder) {
     ClusterConfig c = clone();
     c.metadataEncoder = metadataEncoder;
     return c;
   }
 
+  /**
+   * Deprecated since {@code 2.4.10} in favor of {@link MetadataCodec}.
+   *
+   * @return metadataDecoder
+   */
+  @Deprecated
   public MetadataDecoder metadataDecoder() {
     return metadataDecoder;
   }
 
   /**
-   * Sets a metadataDecoder.
+   * Setter for metadataDecoder. Deprecated since {@code 2.4.10} in favor of {@link MetadataCodec}.
    *
    * @param metadataDecoder metadata decoder
    * @return new {@code ClusterConfig} instance
    */
+  @Deprecated
   public ClusterConfig metadataDecoder(MetadataDecoder metadataDecoder) {
     ClusterConfig c = clone();
     c.metadataDecoder = metadataDecoder;
     return c;
   }
 
+  /**
+   * Deprecated since {@code 2.4.10} in favor of {@link #containerHost()}.
+   *
+   * @return member host
+   */
+  @Deprecated
   public String memberHost() {
-    return memberHost;
+    return containerHost;
   }
 
   /**
-   * Sets a memberHost.
+   * Deprecated since {@code 2.4.10} in favor of {@link #containerHost(String)}.
    *
    * @param memberHost member host
    * @return new {@code ClusterConfig} instance
    */
+  @Deprecated
   public ClusterConfig memberHost(String memberHost) {
     ClusterConfig c = clone();
-    c.memberHost = memberHost;
+    c.containerHost = memberHost;
     return c;
   }
 
+  /**
+   * Returns mappedHost. {@code mappedHost} is a config property for container environments, it's
+   * being set for advertising to scalecube cluster some connectable hostname which maps to
+   * scalecube transport's hostname on which scalecube transport is listening.
+   *
+   * @return mapped host
+   */
+  public String containerHost() {
+    return containerHost;
+  }
+
+  /**
+   * Setter for mappedHost. {@code mappedHost} is a config property for container environments, it's
+   * being set for advertising to scalecube cluster some connectable hostname which maps to
+   * scalecube transport's hostname on which scalecube transport is listening.
+   *
+   * @param mappedHost mapped host
+   * @return new {@code ClusterConfig} instance
+   */
+  public ClusterConfig containerHost(String mappedHost) {
+    ClusterConfig c = clone();
+    c.containerHost = mappedHost;
+    return c;
+  }
+
+  /**
+   * Returns memberAlias. {@code memberAlias} is a config property which facilitates {@link
+   * io.scalecube.cluster.Member#toString()}.
+   *
+   * @return member alias.
+   */
   public String memberAlias() {
     return memberAlias;
   }
 
   /**
-   * Sets a memberAlias.
+   * Setter for memberAlias. {@code memberAlias} is a config property which facilitates {@link
+   * io.scalecube.cluster.Member#toString()}.
    *
    * @param memberAlias member alias
    * @return new {@code ClusterConfig} instance
@@ -184,19 +255,51 @@ public ClusterConfig memberAlias(String memberAlias) {
     return c;
   }
 
+  /**
+   * Returns mappedPort. {@code mappedPort} is a config property for container environments, it's
+   * being set for advertising to scalecube cluster a port which mapped to scalecube transport's
+   * listening port.
+   *
+   * @return mapped port
+   */
+  public Integer containerPort() {
+    return containerPort;
+  }
+
+  /**
+   * Setter for mappedPort. {@code mappedPort} is a config property for container environments, it's
+   * being set for advertising to scalecube cluster a port which mapped to scalecube transport's
+   * listening port.
+   *
+   * @param mappedPort mapped port
+   * @return new {@code ClusterConfig} instance
+   */
+  public ClusterConfig containerPort(Integer mappedPort) {
+    ClusterConfig c = clone();
+    c.containerPort = mappedPort;
+    return c;
+  }
+
+  /**
+   * Deprecated since {@code 2.4.10} in favor of {@link #containerPort()}.
+   *
+   * @return member port
+   */
+  @Deprecated
   public Integer memberPort() {
-    return memberPort;
+    return containerPort;
   }
 
   /**
-   * Sets a memberPort.
+   * Deprecated since {@code 2.4.10} in favor of {@link #containerPort(Integer)}.
    *
    * @param memberPort member port
    * @return new {@code ClusterConfig} instance
    */
+  @Deprecated
   public ClusterConfig memberPort(Integer memberPort) {
     ClusterConfig c = clone();
-    c.memberPort = memberPort;
+    c.containerPort = memberPort;
     return c;
   }
 
@@ -283,11 +386,12 @@ public String toString() {
     return new StringJoiner(", ", ClusterConfig.class.getSimpleName() + "[", "]")
         .add("metadata=" + metadataAsString())
         .add("metadataTimeout=" + metadataTimeout)
+        .add("metadataCodec=" + metadataCodec)
         .add("metadataEncoder=" + metadataEncoder)
         .add("metadataDecoder=" + metadataDecoder)
         .add("memberAlias='" + memberAlias + "'")
-        .add("memberHost='" + memberHost + "'")
-        .add("memberPort=" + memberPort)
+        .add("containerHost='" + containerHost + "'")
+        .add("containerPort=" + containerPort)
         .add("transportConfig=" + transportConfig)
         .add("failureDetectorConfig=" + failureDetectorConfig)
         .add("gossipConfig=" + gossipConfig)

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

@@ -1,21 +1,26 @@
 package io.scalecube.cluster;
 
 import io.scalecube.net.Address;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
 import java.util.Objects;
 import java.util.UUID;
 
 /**
  * Cluster member which represents node in the cluster and contains its id and address. This class
  * is essentially immutable.
  */
-public final class Member {
+public final class Member implements Externalizable {
+
+  private static final long serialVersionUID = 1L;
 
   private String id;
   private String alias;
   private Address address;
 
-  /** Instantiates empty member for deserialization purpose. */
-  Member() {}
+  public Member() {}
 
   /**
    * Constructor.
@@ -63,6 +68,33 @@ public int hashCode() {
     return Objects.hash(id, address);
   }
 
+  @Override
+  public void writeExternal(ObjectOutput out) throws IOException {
+    // id
+    out.writeUTF(id);
+    // alias
+    boolean aliasNotNull = alias != null;
+    out.writeBoolean(aliasNotNull);
+    if (aliasNotNull) {
+      out.writeUTF(alias);
+    }
+    // address
+    out.writeUTF(address.toString());
+  }
+
+  @Override
+  public void readExternal(ObjectInput in) throws IOException {
+    // id
+    id = in.readUTF();
+    // alias
+    boolean aliasNotNull = in.readBoolean();
+    if (aliasNotNull) {
+      alias = in.readUTF();
+    }
+    // address
+    address = Address.from(in.readUTF());
+  }
+
   @Override
   public String toString() {
     if (alias == null) {

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

@@ -0,0 +1,33 @@
+package io.scalecube.cluster.metadata;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.nio.ByteBuffer;
+import reactor.core.Exceptions;
+
+public class JdkMetadataCodec implements MetadataCodec {
+
+  @Override
+  public Object deserialize(ByteBuffer buffer) {
+    byte[] bytes = buffer.array();
+    try (ObjectInputStream is = new ObjectInputStream(new ByteArrayInputStream(bytes))) {
+      return is.readObject();
+    } catch (Exception e) {
+      throw Exceptions.propagate(e);
+    }
+  }
+
+  @Override
+  public ByteBuffer serialize(Object metadata) {
+    ByteArrayOutputStream baos = new ByteArrayOutputStream();
+    try (ObjectOutputStream os = new ObjectOutputStream(baos)) {
+      os.writeObject(metadata);
+      os.flush();
+      return ByteBuffer.wrap(baos.toByteArray());
+    } catch (Exception e) {
+      throw Exceptions.propagate(e);
+    }
+  }
+}