Finished with default cluster codec

Author: artem-v

cluster/src/main/java/io/scalecube/cluster/membership/MembershipProtocolImpl.java

@@ -493,7 +493,10 @@ private void schedulePeriodicSync() {
   private Message prepareSyncDataMsg(String qualifier, String cid) {
     List<MembershipRecord> membershipRecords = new ArrayList<>(membershipTable.values());
     SyncData syncData = new SyncData(membershipRecords, membershipConfig.syncGroup());
-    return Message.withData(syncData).qualifier(qualifier).correlationId(cid).build();
+    return Message.withData(syncData)
+        .qualifier(qualifier)
+        .correlationId(Optional.ofNullable(cid).orElse("null"))
+        .build();
   }
 
   private Mono<Void> syncMembership(SyncData syncData, boolean onStart) {

cluster/src/main/java/io/scalecube/cluster/membership/SyncData.java

@@ -63,7 +63,7 @@ public void readExternal(ObjectInput in) throws IOException, ClassNotFoundExcept
       membership.add((MembershipRecord) in.readObject());
     }
     // syncGroup
-    syncGroup = (String) in.readObject();
+    syncGroup = in.readUTF();
   }
 
   @Override

cluster/src/main/java/io/scalecube/cluster/metadata/GetMetadataRequest.java

@@ -1,17 +1,22 @@
 package io.scalecube.cluster.metadata;
 
 import io.scalecube.cluster.Member;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
 import java.util.Objects;
 import java.util.StringJoiner;
 
 /** DTO class. Stands for remote request on getting metadata in remote MetadataStore. */
-final class GetMetadataRequest {
+final class GetMetadataRequest implements Externalizable {
+
+  private static final long serialVersionUID = 1L;
 
   /** Target member. */
   private Member member;
 
-  /** Instantiates empty GetMetadataRequest for deserialization purpose. */
-  GetMetadataRequest() {}
+  public GetMetadataRequest() {}
 
   GetMetadataRequest(Member member) {
     this.member = Objects.requireNonNull(member);
@@ -21,6 +26,18 @@ public Member getMember() {
     return member;
   }
 
+  @Override
+  public void writeExternal(ObjectOutput out) throws IOException {
+    // member
+    out.writeObject(member);
+  }
+
+  @Override
+  public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
+    // member
+    member = (Member) in.readObject();
+  }
+
   @Override
   public String toString() {
     return new StringJoiner(", ", GetMetadataRequest.class.getSimpleName() + "[", "]")

cluster/src/main/java/io/scalecube/cluster/metadata/GetMetadataResponse.java

@@ -1,23 +1,28 @@
 package io.scalecube.cluster.metadata;
 
 import io.scalecube.cluster.Member;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
 import java.nio.ByteBuffer;
 import java.util.StringJoiner;
 
 /**
  * DTO class. Stands for response for preceding remote request on getting metadata in remote
  * MetadataStore.
  */
-final class GetMetadataResponse {
+final class GetMetadataResponse implements Externalizable {
+
+  private static final long serialVersionUID = 1L;
 
   /** Target member with metadata. */
   private Member member;
 
   /** Cluster member metadata. */
   private ByteBuffer metadata;
 
-  /** Instantiates empty GetMetadataResponse for deserialization purpose. */
-  GetMetadataResponse() {}
+  public GetMetadataResponse() {}
 
   GetMetadataResponse(Member member, ByteBuffer metadata) {
     this.member = member;
@@ -32,6 +37,27 @@ ByteBuffer getMetadata() {
     return metadata;
   }
 
+  @Override
+  public void writeExternal(ObjectOutput out) throws IOException {
+    // member
+    out.writeObject(member);
+    // metadata
+    byte[] bytes = metadata.array();
+    out.writeInt(bytes.length);
+    out.write(bytes);
+  }
+
+  @Override
+  public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
+    // member
+    member = (Member) in.readObject();
+    // metadata
+    int size = in.readInt();
+    byte[] bytes = new byte[size];
+    in.read(bytes);
+    metadata = ByteBuffer.wrap(bytes);
+  }
+
   @Override
   public String toString() {
     return new StringJoiner(", ", GetMetadataResponse.class.getSimpleName() + "[", "]")

cluster/src/test/java/io/scalecube/cluster/gossip/GossipRequestTest.java

@@ -11,6 +11,7 @@
 import io.scalecube.net.Address;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
+import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -76,11 +77,13 @@ private List<Gossip> getGossips() {
     return gossips;
   }
 
-  private static class TestData {
+  private static class TestData implements Serializable {
+
+    private static final long serialVersionUID = 1L;
 
     private Map<String, String> properties;
 
-    TestData() {}
+    public TestData() {}
 
     public Map<String, String> getProperties() {
       return properties;

transport-parent/transport-api/src/main/java/io/scalecube/cluster/transport/api/Message.java

@@ -134,7 +134,7 @@ public static Builder with(Message message) {
    * @return new builder
    */
   public static Builder builder() {
-    return Builder.getInstance();
+    return new Builder();
   }
 
   /**
@@ -235,10 +235,6 @@ public static class Builder {
 
     private Builder() {}
 
-    static Builder getInstance() {
-      return new Builder();
-    }
-
     private Object data() {
       return this.data;
     }
@@ -253,11 +249,13 @@ private Map<String, String> headers() {
     }
 
     public Builder headers(Map<String, String> headers) {
-      this.headers.putAll(headers);
+      headers.forEach(this::header);
       return this;
     }
 
     public Builder header(String key, String value) {
+      Objects.requireNonNull(key);
+      Objects.requireNonNull(value);
       headers.put(key, value);
       return this;
     }