Merge pull request #696 from scalecube/remove-groups-support

Remove groups support

Author: artem-v

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

@@ -18,7 +18,6 @@ public class ServiceEndpoint {
   private Set<String> contentTypes;
   private Map<String, String> tags;
   private Collection<ServiceRegistration> serviceRegistrations;
-  private ServiceGroup serviceGroup;
 
   /**
    * Constructor for SerDe.
@@ -34,7 +33,6 @@ private ServiceEndpoint(Builder builder) {
     this.tags = new HashMap<>(builder.tags);
     this.serviceRegistrations =
         Collections.unmodifiableCollection(new ArrayList<>(builder.serviceRegistrations));
-    this.serviceGroup = builder.serviceGroup;
   }
 
   public static Builder builder() {
@@ -57,10 +55,6 @@ public Map<String, String> tags() {
     return tags;
   }
 
-  public ServiceGroup serviceGroup() {
-    return serviceGroup;
-  }
-
   /**
    * Return collection of service registratrions.
    *
@@ -84,12 +78,11 @@ public Collection<ServiceReference> serviceReferences() {
   @Override
   public String toString() {
     return new StringJoiner(", ", ServiceEndpoint.class.getSimpleName() + "[", "]")
-        .add("id='" + id + "'")
+        .add("id=" + id)
         .add("address=" + address)
         .add("contentTypes=" + contentTypes)
-        .add("tags(" + tags.size() + ")")
+        .add("tags=" + tags)
         .add("serviceRegistrations(" + serviceRegistrations.size() + ")")
-        .add("serviceGroup=" + serviceGroup)
         .toString();
   }
 
@@ -100,7 +93,6 @@ public static class Builder {
     private Set<String> contentTypes = Collections.emptySet();
     private Map<String, String> tags = Collections.emptyMap();
     private Collection<ServiceRegistration> serviceRegistrations = new ArrayList<>();
-    private ServiceGroup serviceGroup;
 
     private Builder() {}
 
@@ -135,11 +127,6 @@ public Builder serviceRegistrations(Collection<ServiceRegistration> serviceRegis
       return this;
     }
 
-    public Builder serviceGroup(String groupId, int groupSize) {
-      this.serviceGroup = new ServiceGroup(groupId, groupSize);
-      return this;
-    }
-
     public ServiceEndpoint build() {
       return new ServiceEndpoint(this);
     }

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

@@ -2,6 +2,7 @@
 
 import java.util.Collections;
 import java.util.Map;
+import java.util.StringJoiner;
 
 /**
  * A Service Method Definition is a single method definition of a service inside service
@@ -76,14 +77,10 @@ public ServiceMethodDefinition setAuth(boolean auth) {
 
   @Override
   public String toString() {
-    return "ServiceMethodDefinition{"
-        + "action='"
-        + action
-        + '\''
-        + ", tags="
-        + tags
-        + ", auth="
-        + auth
-        + '}';
+    return new StringJoiner(", ", ServiceMethodDefinition.class.getSimpleName() + "[", "]")
+        .add("action=" + action)
+        .add("tags=" + tags)
+        .add("auth=" + auth)
+        .toString();
   }
 }

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

@@ -6,6 +6,7 @@
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
+import java.util.StringJoiner;
 
 /**
  * Service reference. This is merge of service method information together with service registration
@@ -88,30 +89,13 @@ private Map<String, String> mergeTags(
 
   @Override
   public String toString() {
-    return "ServiceReference{"
-        + "qualifier='"
-        + qualifier
-        + '\''
-        + ", endpointId='"
-        + endpointId
-        + '\''
-        + ", address='"
-        + address
-        + '\''
-        + ", namespace='"
-        + namespace
-        + '\''
-        + ", contentTypes='"
-        + contentTypes
-        + '\''
-        + ", tags="
-        + tags
-        + ", action='"
-        + action
-        + '\''
-        + ", auth='"
-        + auth
-        + '\''
-        + '}';
+    return new StringJoiner(", ", ServiceReference.class.getSimpleName() + "[", "]")
+        .add("endpointId=" + endpointId)
+        .add("address=" + address)
+        .add("qualifier=" + qualifier)
+        .add("contentTypes=" + contentTypes)
+        .add("tags=" + tags)
+        .add("auth=" + auth)
+        .toString();
   }
 }

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

@@ -2,6 +2,7 @@
 
 import java.util.Collection;
 import java.util.Map;
+import java.util.StringJoiner;
 
 public class ServiceRegistration {
 
@@ -49,14 +50,10 @@ public ServiceRegistration setTags(Map<String, String> tags) {
 
   @Override
   public String toString() {
-    return "ServiceRegistration{"
-        + "namespace='"
-        + namespace
-        + '\''
-        + ", tags="
-        + tags
-        + ", methods="
-        + methods
-        + '}';
+    return new StringJoiner(", ", ServiceRegistration.class.getSimpleName() + "[", "]")
+        .add("namespace=" + namespace)
+        .add("tags=" + tags)
+        .add("methods(" + methods.size() + ")")
+        .toString();
   }
 }

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

@@ -1,5 +1,7 @@
 package io.scalecube.services.api;
 
+import java.util.StringJoiner;
+
 public final class ErrorData {
 
   private int errorCode;
@@ -33,6 +35,9 @@ public String getErrorMessage() {
 
   @Override
   public String toString() {
-    return "ErrorData{" + "errorCode=" + errorCode + ", errorMessage='" + errorMessage + '\'' + '}';
+    return new StringJoiner(", ", ErrorData.class.getSimpleName() + "[", "]")
+        .add("errorCode=" + errorCode)
+        .add("errorMessage=" + errorMessage)
+        .toString();
   }
 }

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

@@ -5,6 +5,7 @@
 import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
+import java.util.StringJoiner;
 
 public final class ServiceMessage {
 
@@ -184,7 +185,10 @@ public int errorType() {
 
   @Override
   public String toString() {
-    return "ServiceMessage {headers: " + headers + ", data: " + data + '}';
+    return new StringJoiner(", ", ServiceMessage.class.getSimpleName() + "[", "]")
+        .add("headers(" + headers.size() + ")")
+        .add("data=" + (data != null ? data.getClass().getName() : null))
+        .toString();
   }
 
   public static class Builder {