Merge pull request #701 from scalecube/update/scalecube-cluster

Update/scalecube cluster on RC5

Author: artem-v

pom.xml

@@ -23,7 +23,7 @@
 
   <properties>
     <jackson.version>2.10.0.pr1</jackson.version>
-    <scalecube-cluster.version>2.4.10-RC1</scalecube-cluster.version>
+    <scalecube-cluster.version>2.4.10-RC5</scalecube-cluster.version>
     <scalecube-commons.version>1.0.1</scalecube-commons.version>
     <scalecube-benchmarks.version>1.2.2</scalecube-benchmarks.version>
     <scalecube-config.version>0.3.11</scalecube-config.version>
@@ -69,6 +69,11 @@
         <artifactId>scalecube-cluster</artifactId>
         <version>${scalecube-cluster.version}</version>
       </dependency>
+      <dependency>
+        <groupId>io.scalecube</groupId>
+        <artifactId>scalecube-codec-jackson</artifactId>
+        <version>${scalecube-cluster.version}</version>
+      </dependency>
 
       <!-- Scalecube Config -->
       <dependency>

services-api/src/main/java/io/scalecube/services/ServiceEndpoint.java

@@ -1,17 +1,26 @@
 package io.scalecube.services;
 
 import io.scalecube.net.Address;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Objects;
 import java.util.Set;
 import java.util.StringJoiner;
 import java.util.stream.Collectors;
 
-public class ServiceEndpoint {
+public class ServiceEndpoint implements Externalizable {
+
+  private static final long serialVersionUID = 1L;
 
   private String id;
   private Address address;
@@ -27,12 +36,12 @@ public class ServiceEndpoint {
   public ServiceEndpoint() {}
 
   private ServiceEndpoint(Builder builder) {
-    this.id = builder.id;
+    this.id = Objects.requireNonNull(builder.id, "ServiceEndpoint.id is required");
     this.address = builder.address;
     this.contentTypes = Collections.unmodifiableSet(new HashSet<>(builder.contentTypes));
-    this.tags = new HashMap<>(builder.tags);
+    this.tags = Collections.unmodifiableMap(new HashMap<>(builder.tags));
     this.serviceRegistrations =
-        Collections.unmodifiableCollection(new ArrayList<>(builder.serviceRegistrations));
+        Collections.unmodifiableList(new ArrayList<>(builder.serviceRegistrations));
   }
 
   public static Builder builder() {
@@ -55,19 +64,14 @@ public Map<String, String> tags() {
     return tags;
   }
 
-  /**
-   * Return collection of service registratrions.
-   *
-   * @return collection of {@link ServiceRegistration}
-   */
   public Collection<ServiceRegistration> serviceRegistrations() {
     return serviceRegistrations;
   }
 
   /**
-   * Creates collection of service references from this service endpoint.
+   * Creates collection of service references from {@code serviceRegistrations}.
    *
-   * @return collection of {@link ServiceReference}
+   * @return {@link ServiceReference} collection
    */
   public Collection<ServiceReference> serviceReferences() {
     return serviceRegistrations.stream()
@@ -86,6 +90,76 @@ public String toString() {
         .toString();
   }
 
+  @Override
+  public void writeExternal(ObjectOutput out) throws IOException {
+    // id
+    out.writeUTF(id);
+
+    // address
+    boolean addressExists = address != null;
+    out.writeBoolean(addressExists);
+    if (addressExists) {
+      out.writeUTF(address.toString());
+    }
+
+    // contentTypes
+    out.writeInt(contentTypes.size());
+    for (String contentType : contentTypes) {
+      out.writeUTF(contentType);
+    }
+
+    // tags
+    out.writeInt(tags.size());
+    for (Entry<String, String> entry : tags.entrySet()) {
+      out.writeUTF(entry.getKey());
+      out.writeUTF(entry.getValue());
+    }
+
+    // serviceRegistrations
+    out.writeInt(serviceRegistrations.size());
+    for (ServiceRegistration registration : serviceRegistrations) {
+      out.writeObject(registration);
+    }
+  }
+
+  @Override
+  public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
+    // id
+    id = in.readUTF();
+
+    // address
+    boolean addressExists = in.readBoolean();
+    if (addressExists) {
+      address = Address.from(in.readUTF());
+    }
+
+    // contentTypes
+    int contentTypesSize = in.readInt();
+    Set<String> contentTypes = new HashSet<>(contentTypesSize);
+    for (int i = 0; i < contentTypesSize; i++) {
+      contentTypes.add(in.readUTF());
+    }
+    this.contentTypes = Collections.unmodifiableSet(contentTypes);
+
+    // tags
+    int tagsSize = in.readInt();
+    Map<String, String> tags = new HashMap<>(tagsSize);
+    for (int i = 0; i < tagsSize; i++) {
+      String key = in.readUTF();
+      String value = in.readUTF();
+      tags.put(key, value);
+    }
+    this.tags = Collections.unmodifiableMap(tags);
+
+    // serviceRegistrations
+    int serviceRegistrationsSize = in.readInt();
+    List<ServiceRegistration> serviceRegistrations = new ArrayList<>(serviceRegistrationsSize);
+    for (int i = 0; i < serviceRegistrationsSize; i++) {
+      serviceRegistrations.add((ServiceRegistration) in.readObject());
+    }
+    this.serviceRegistrations = Collections.unmodifiableList(serviceRegistrations);
+  }
+
   public static class Builder {
 
     private String id;

services-api/src/main/java/io/scalecube/services/ServiceMethodDefinition.java

@@ -1,14 +1,23 @@
 package io.scalecube.services;
 
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Objects;
 import java.util.StringJoiner;
 
 /**
  * A Service Method Definition is a single method definition of a service inside service
  * registration.
  */
-public class ServiceMethodDefinition {
+public class ServiceMethodDefinition implements Externalizable {
+
+  private static final long serialVersionUID = 1L;
 
   private String action;
   private Map<String, String> tags;
@@ -38,43 +47,23 @@ public ServiceMethodDefinition(String action) {
    * @param auth is method protected by authentication
    */
   public ServiceMethodDefinition(String action, Map<String, String> tags, boolean auth) {
-    this.action = action;
-    this.tags = tags;
+    this.action = Objects.requireNonNull(action, "ServiceMethodDefinition.action is required");
+    this.tags = Collections.unmodifiableMap(new HashMap<>(tags));
     this.auth = auth;
   }
 
-  /**
-   * a generic definition for method name.
-   *
-   * @return the method name
-   */
-  public String getAction() {
+  public String action() {
     return action;
   }
 
-  public ServiceMethodDefinition setAction(String action) {
-    this.action = action;
-    return this;
-  }
-
-  public Map<String, String> getTags() {
+  public Map<String, String> tags() {
     return tags;
   }
 
-  public ServiceMethodDefinition setTags(Map<String, String> tags) {
-    this.tags = tags;
-    return this;
-  }
-
   public boolean isAuth() {
     return auth;
   }
 
-  public ServiceMethodDefinition setAuth(boolean auth) {
-    this.auth = auth;
-    return this;
-  }
-
   @Override
   public String toString() {
     return new StringJoiner(", ", ServiceMethodDefinition.class.getSimpleName() + "[", "]")
@@ -83,4 +72,39 @@ public String toString() {
         .add("auth=" + auth)
         .toString();
   }
+
+  @Override
+  public void writeExternal(ObjectOutput out) throws IOException {
+    // action
+    out.writeUTF(action);
+
+    // tags
+    out.writeInt(tags.size());
+    for (Entry<String, String> entry : tags.entrySet()) {
+      out.writeUTF(entry.getKey());
+      out.writeUTF(entry.getValue());
+    }
+
+    // auth
+    out.writeBoolean(auth);
+  }
+
+  @Override
+  public void readExternal(ObjectInput in) throws IOException {
+    // namespace
+    action = in.readUTF();
+
+    // tags
+    int tagsSize = in.readInt();
+    Map<String, String> tags = new HashMap<>(tagsSize);
+    for (int i = 0; i < tagsSize; i++) {
+      String key = in.readUTF();
+      String value = in.readUTF();
+      tags.put(key, value);
+    }
+    this.tags = Collections.unmodifiableMap(tags);
+
+    // auth
+    this.auth = in.readBoolean();
+  }
 }

services-api/src/main/java/io/scalecube/services/ServiceReference.java

@@ -38,7 +38,7 @@ public ServiceReference(
     this.namespace = serviceRegistration.namespace();
     this.contentTypes = Collections.unmodifiableSet(serviceEndpoint.contentTypes());
     this.tags = mergeTags(serviceMethodDefinition, serviceRegistration, serviceEndpoint);
-    this.action = serviceMethodDefinition.getAction();
+    this.action = serviceMethodDefinition.action();
     this.qualifier = Qualifier.asString(namespace, action);
     this.address = serviceEndpoint.address();
     this.auth = serviceMethodDefinition.isAuth();
@@ -83,7 +83,7 @@ private Map<String, String> mergeTags(
     Map<String, String> tags = new HashMap<>();
     tags.putAll(serviceEndpoint.tags());
     tags.putAll(serviceRegistration.tags());
-    tags.putAll(serviceMethodDefinition.getTags());
+    tags.putAll(serviceMethodDefinition.tags());
     return tags;
   }
 

services-api/src/main/java/io/scalecube/services/ServiceRegistration.java

@@ -1,10 +1,22 @@
 package io.scalecube.services;
 
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Objects;
 import java.util.StringJoiner;
 
-public class ServiceRegistration {
+public class ServiceRegistration implements Externalizable {
+
+  private static final long serialVersionUID = 1L;
 
   private String namespace;
   private Map<String, String> tags;
@@ -26,9 +38,9 @@ public ServiceRegistration() {}
    */
   public ServiceRegistration(
       String namespace, Map<String, String> tags, Collection<ServiceMethodDefinition> methods) {
-    this.namespace = namespace;
-    this.tags = tags;
-    this.methods = methods;
+    this.namespace = Objects.requireNonNull(namespace, "ServiceRegistration.namespace is required");
+    this.tags = Collections.unmodifiableMap(new HashMap<>(tags));
+    this.methods = Collections.unmodifiableList(new ArrayList<>(methods));
   }
 
   public String namespace() {
@@ -43,11 +55,6 @@ public Collection<ServiceMethodDefinition> methods() {
     return methods;
   }
 
-  public ServiceRegistration setTags(Map<String, String> tags) {
-    this.tags = tags;
-    return this;
-  }
-
   @Override
   public String toString() {
     return new StringJoiner(", ", ServiceRegistration.class.getSimpleName() + "[", "]")
@@ -56,4 +63,47 @@ public String toString() {
         .add("methods(" + methods.size() + ")")
         .toString();
   }
+
+  @Override
+  public void writeExternal(ObjectOutput out) throws IOException {
+    // namespace
+    out.writeUTF(namespace);
+
+    // tags
+    out.writeInt(tags.size());
+    for (Entry<String, String> entry : tags.entrySet()) {
+      out.writeUTF(entry.getKey());
+      out.writeUTF(entry.getValue());
+    }
+
+    // methods
+    out.writeInt(methods.size());
+    for (ServiceMethodDefinition method : methods) {
+      out.writeObject(method);
+    }
+  }
+
+  @Override
+  public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
+    // namespace
+    namespace = in.readUTF();
+
+    // tags
+    int tagsSize = in.readInt();
+    Map<String, String> tags = new HashMap<>(tagsSize);
+    for (int i = 0; i < tagsSize; i++) {
+      String key = in.readUTF();
+      String value = in.readUTF();
+      tags.put(key, value);
+    }
+    this.tags = Collections.unmodifiableMap(tags);
+
+    // methods
+    int methodsSize = in.readInt();
+    List<ServiceMethodDefinition> methods = new ArrayList<>(methodsSize);
+    for (int i = 0; i < methodsSize; i++) {
+      methods.add((ServiceMethodDefinition) in.readObject());
+    }
+    this.methods = Collections.unmodifiableList(methods);
+  }
 }