CR1 changes

Author: artem-v

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

@@ -6,7 +6,9 @@
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.StringJoiner;
 
+@SuppressWarnings("rawtypes")
 public class ServiceInfo {
 
   private final Object serviceInstance;
@@ -23,6 +25,10 @@ private ServiceInfo(Builder builder) {
     this.authenticator = builder.authenticator;
   }
 
+  public static Builder from(ServiceInfo serviceInfo) {
+    return new Builder(serviceInfo);
+  }
+
   public static Builder fromServiceInstance(Object serviceInstance) {
     return new Builder(serviceInstance);
   }
@@ -47,13 +53,34 @@ public Authenticator authenticator() {
     return authenticator;
   }
 
+  @Override
+  public String toString() {
+    return new StringJoiner(", ", ServiceInfo.class.getSimpleName() + "[", "]")
+        .add("serviceInstance=" + serviceInstance)
+        .add("tags=" + tags)
+        .add("errorMapper=" + errorMapper)
+        .add("dataDecoder=" + dataDecoder)
+        .add("authenticator=" + authenticator)
+        .toString();
+  }
+
+  @SuppressWarnings("rawtypes")
   public static class Builder {
-    private final Object serviceInstance;
-    private final Map<String, String> tags = new HashMap<>();
+
+    private Object serviceInstance;
+    private Map<String, String> tags = new HashMap<>();
     private ServiceProviderErrorMapper errorMapper;
     private ServiceMessageDataDecoder dataDecoder;
     private Authenticator authenticator;
 
+    public Builder(ServiceInfo serviceInfo) {
+      this.serviceInstance = serviceInfo.serviceInstance;
+      this.tags.putAll(new HashMap<>(serviceInfo.tags));
+      this.errorMapper = serviceInfo.errorMapper;
+      this.dataDecoder = serviceInfo.dataDecoder;
+      this.authenticator = serviceInfo.authenticator;
+    }
+
     public Builder(Object serviceInstance) {
       this.serviceInstance = serviceInstance;
     }

services-api/src/main/java/io/scalecube/services/methods/MethodInfo.java

@@ -3,6 +3,7 @@
 import io.scalecube.services.CommunicationMode;
 import io.scalecube.services.api.Qualifier;
 import java.lang.reflect.Type;
+import java.util.StringJoiner;
 
 public final class MethodInfo {
 
@@ -97,33 +98,19 @@ public boolean isAuth() {
     return auth;
   }
 
-  /**
-   * Shortened version of {@code toString} method.
-   *
-   * @return method info as string
-   */
-  public String asString() {
-    final StringBuilder sb = new StringBuilder("MethodInfo{");
-    sb.append("qualifier='").append(qualifier).append('\'');
-    sb.append(", auth=").append(auth);
-    sb.append('}');
-    return sb.toString();
-  }
-
   @Override
   public String toString() {
-    final StringBuilder sb = new StringBuilder("MethodInfo{");
-    sb.append("serviceName='").append(serviceName).append('\'');
-    sb.append(", methodName='").append(methodName).append('\'');
-    sb.append(", qualifier='").append(qualifier).append('\'');
-    sb.append(", parameterizedReturnType=").append(parameterizedReturnType);
-    sb.append(", isReturnTypeServiceMessage=").append(isReturnTypeServiceMessage);
-    sb.append(", communicationMode=").append(communicationMode);
-    sb.append(", parameterCount=").append(parameterCount);
-    sb.append(", requestType=").append(requestType);
-    sb.append(", isRequestTypeServiceMessage=").append(isRequestTypeServiceMessage);
-    sb.append(", auth=").append(auth);
-    sb.append('}');
-    return sb.toString();
+    return new StringJoiner(", ", MethodInfo.class.getSimpleName() + "[", "]")
+        .add("serviceName='" + serviceName + "'")
+        .add("methodName='" + methodName + "'")
+        .add("qualifier='" + qualifier + "'")
+        .add("parameterizedReturnType=" + parameterizedReturnType)
+        .add("isReturnTypeServiceMessage=" + isReturnTypeServiceMessage)
+        .add("communicationMode=" + communicationMode)
+        .add("parameterCount=" + parameterCount)
+        .add("requestType=" + requestType)
+        .add("isRequestTypeServiceMessage=" + isRequestTypeServiceMessage)
+        .add("auth=" + auth)
+        .toString();
   }
 }

services-api/src/main/java/io/scalecube/services/methods/ServiceMethodInvoker.java

@@ -9,11 +9,9 @@
 import io.scalecube.services.transport.api.ServiceMessageDataDecoder;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
-import java.lang.reflect.Parameter;
 import java.util.Optional;
+import java.util.StringJoiner;
 import java.util.function.Consumer;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
 import org.reactivestreams.Publisher;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
@@ -211,12 +209,13 @@ public MethodInfo methodInfo() {
 
   @Override
   public String toString() {
-    String classAndMethod = service.getClass().getCanonicalName() + "." + method.getName();
-    String args =
-        Stream.of(method.getParameters())
-            .map(Parameter::getType)
-            .map(Class::getSimpleName)
-            .collect(Collectors.joining(", ", "(", ")"));
-    return classAndMethod + args;
+    return new StringJoiner(", ", ServiceMethodInvoker.class.getSimpleName() + "[", "]")
+        .add("method=" + method)
+        .add("service=" + service)
+        .add("methodInfo=" + methodInfo)
+        .add("errorMapper=" + errorMapper)
+        .add("dataDecoder=" + dataDecoder)
+        .add("authenticator=" + authenticator)
+        .toString();
   }
 }

services-api/src/main/java/io/scalecube/services/methods/ServiceMethodRegistry.java

@@ -1,22 +1,17 @@
 package io.scalecube.services.methods;
 
-import io.scalecube.services.auth.Authenticator;
-import io.scalecube.services.exceptions.ServiceProviderErrorMapper;
-import io.scalecube.services.transport.api.ServiceMessageDataDecoder;
+import io.scalecube.services.ServiceInfo;
 import java.util.List;
 
 public interface ServiceMethodRegistry {
 
-  @SuppressWarnings("rawtypes")
-  void registerService(
-      Object serviceInstance,
-      ServiceProviderErrorMapper errorMapper,
-      ServiceMessageDataDecoder dataDecoder,
-      Authenticator authenticator);
+  void registerService(ServiceInfo serviceInfo);
 
   boolean containsInvoker(String qualifier);
 
   ServiceMethodInvoker getInvoker(String qualifier);
 
   List<ServiceMethodInvoker> listInvokers();
+
+  List<ServiceInfo> listServices();
 }

services-discovery/src/main/java/io/scalecube/services/discovery/ScalecubeServiceDiscovery.java

@@ -363,6 +363,7 @@ public void serialize(Message message, OutputStream stream) throws Exception {
     }
   }
 
+  @SuppressWarnings("unused")
   public interface MonitorMBean {
 
     String getClusterConfig();

services/src/main/java/io/scalecube/services/Microservices.java

@@ -8,6 +8,7 @@
 import io.scalecube.services.exceptions.ServiceProviderErrorMapper;
 import io.scalecube.services.gateway.Gateway;
 import io.scalecube.services.gateway.GatewayOptions;
+import io.scalecube.services.methods.MethodInfo;
 import io.scalecube.services.methods.ServiceMethodInvoker;
 import io.scalecube.services.methods.ServiceMethodRegistry;
 import io.scalecube.services.methods.ServiceMethodRegistryImpl;
@@ -226,10 +227,11 @@ private Mono<Microservices> start() {
 
   private void registerInMethodRegistry(ServiceInfo serviceInfo) {
     methodRegistry.registerService(
-        serviceInfo.serviceInstance(),
-        Optional.ofNullable(serviceInfo.errorMapper()).orElse(errorMapper),
-        Optional.ofNullable(serviceInfo.dataDecoder()).orElse(dataDecoder),
-        Optional.ofNullable(serviceInfo.authenticator()).orElse(authenticator));
+        ServiceInfo.from(serviceInfo)
+            .errorMapper(Optional.ofNullable(serviceInfo.errorMapper()).orElse(errorMapper))
+            .dataDecoder(Optional.ofNullable(serviceInfo.dataDecoder()).orElse(dataDecoder))
+            .authenticator(Optional.ofNullable(serviceInfo.authenticator()).orElse(authenticator))
+            .build());
   }
 
   private Mono<GatewayBootstrap> startGateway(ServiceCall call) {
@@ -308,8 +310,8 @@ private Mono<Void> doShutdown() {
 
   private Mono<Void> processBeforeDestroy() {
     return Mono.whenDelayError(
-        methodRegistry.listInvokers().stream()
-            .map(ServiceMethodInvoker::service)
+        methodRegistry.listServices().stream()
+            .map(ServiceInfo::serviceInstance)
             .map(s -> Mono.fromRunnable(() -> Injector.processBeforeDestroy(this, s)))
             .collect(Collectors.toList()));
   }
@@ -644,13 +646,16 @@ private Mono<Void> shutdown() {
     }
   }
 
+  @SuppressWarnings("unused")
   public interface MonitorMBean {
 
     String getServiceEndpoint();
 
     String getAllServiceEndpoints();
 
     String getServiceMethodInvokers();
+
+    String getServiceInfos();
   }
 
   private static class JmxMonitorMBean implements MonitorMBean {
@@ -689,18 +694,39 @@ public String getServiceMethodInvokers() {
           .collect(Collectors.joining(",", "[", "]"));
     }
 
+    @Override
+    public String getServiceInfos() {
+      return microservices.methodRegistry.listServices().stream()
+          .map(JmxMonitorMBean::asString)
+          .collect(Collectors.joining(",", "[", "]"));
+    }
+
     private static String asString(ServiceMethodInvoker invoker) {
       return new StringJoiner(", ", ServiceMethodInvoker.class.getSimpleName() + "[", "]")
-          .add("methodInfo=" + invoker.methodInfo().asString())
+          .add("methodInfo=" + asString(invoker.methodInfo()))
           .add(
-              "serviceMethod='"
+              "serviceMethod="
                   + invoker.service().getClass().getCanonicalName()
                   + "."
                   + invoker.methodInfo().methodName()
                   + "("
                   + invoker.methodInfo().parameterCount()
-                  + ")"
-                  + "'")
+                  + ")")
+          .toString();
+    }
+
+    private static String asString(MethodInfo methodInfo) {
+      return new StringJoiner(", ", MethodInfo.class.getSimpleName() + "[", "]")
+          .add("qualifier=" + methodInfo.qualifier())
+          .add("auth=" + methodInfo.isAuth())
+          .toString();
+    }
+
+    private static String asString(ServiceInfo serviceInfo) {
+      return new StringJoiner(", ", ServiceMethodInvoker.class.getSimpleName() + "[", "]")
+          .add("serviceInstance=" + serviceInfo.serviceInstance())
+          .add("tags=tags(" + serviceInfo.tags().size() + ")")
+          .add("authenticator=" + serviceInfo.authenticator())
           .toString();
     }
   }