WIP refactoring jmx

Author: artem-v

cluster/src/main/java/io/scalecube/cluster/ClusterImpl.java

@@ -484,21 +484,11 @@ public boolean isShutdown() {
   @SuppressWarnings("unused")
   public interface MonitorMBean {
 
-    Collection<String> getId();
+    int getClusterSize();
 
-    String getIdAsString();
+    String getMember();
 
-    Collection<String> getAlias();
-
-    String getAliasAsString();
-
-    Collection<String> getAddress();
-
-    String getAddressAsString();
-
-    Collection<String> getMetadata();
-
-    String getMetadataAsString();
+    String getMetadata();
   }
 
   public static class JmxMonitorMBean extends AbstractMonitorMBean implements MonitorMBean {
@@ -510,42 +500,17 @@ private JmxMonitorMBean(ClusterImpl cluster) {
     }
 
     @Override
-    public Collection<String> getId() {
-      return Collections.singleton(getIdAsString());
-    }
-
-    @Override
-    public String getIdAsString() {
-      return cluster.member().id();
-    }
-
-    @Override
-    public Collection<String> getAlias() {
-      return Collections.singleton(getAliasAsString());
-    }
-
-    @Override
-    public String getAliasAsString() {
-      return cluster.member().alias();
-    }
-
-    @Override
-    public Collection<String> getAddress() {
-      return Collections.singleton(getAddressAsString());
-    }
-
-    @Override
-    public String getAddressAsString() {
-      return String.valueOf(cluster.member().address());
+    public int getClusterSize() {
+      return cluster.otherMembers().size() + 1;
     }
 
     @Override
-    public Collection<String> getMetadata() {
-      return Collections.singletonList(getMetadataAsString());
+    public String getMember() {
+      return cluster.member().toString();
     }
 
     @Override
-    public String getMetadataAsString() {
+    public String getMetadata() {
       return String.valueOf(cluster.metadataStore.metadata().map(Object::toString).orElse(null));
     }
 

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

@@ -726,17 +726,11 @@ public interface MonitorMBean {
 
     int getIncarnation();
 
-    List<String> getAliveMembers();
+    String getAliveMembers();
 
-    String getAliveMembersAsString();
+    String getSuspectedMembers();
 
-    List<String> getSuspectedMembers();
-
-    String getSuspectedMembersAsString();
-
-    List<String> getDeadMembers();
-
-    String getDeadMembersAsString();
+    String getRemovedMembers();
   }
 
   public static class JmxMonitorMBean extends AbstractMonitorMBean implements MonitorMBean {
@@ -770,35 +764,22 @@ public int getIncarnation() {
     }
 
     @Override
-    public List<String> getAliveMembers() {
-      return findRecordsByCondition(MembershipRecord::isAlive);
+    public String getAliveMembers() {
+      return findRecordsByCondition(MembershipRecord::isAlive).stream()
+          .collect(Collectors.joining(",", "[", "]"));
     }
 
     @Override
-    public String getAliveMembersAsString() {
-      return getAliveMembers().stream().collect(Collectors.joining(",", "[", "]"));
+    public String getSuspectedMembers() {
+      return findRecordsByCondition(MembershipRecord::isSuspect).stream()
+          .collect(Collectors.joining(",", "[", "]"));
     }
 
     @Override
-    public List<String> getSuspectedMembers() {
-      return findRecordsByCondition(MembershipRecord::isSuspect);
-    }
-
-    @Override
-    public String getSuspectedMembersAsString() {
-      return getSuspectedMembers().stream().collect(Collectors.joining(",", "[", "]"));
-    }
-
-    @Override
-    public List<String> getDeadMembers() {
+    public String getRemovedMembers() {
       return removedMembersHistory.stream()
           .map(MembershipEvent::toString)
-          .collect(Collectors.toList());
-    }
-
-    @Override
-    public String getDeadMembersAsString() {
-      return getDeadMembers().stream().collect(Collectors.joining(",", "[", "]"));
+          .collect(Collectors.joining(",", "[", "]"));
     }
 
     private List<String> findRecordsByCondition(Predicate<MembershipRecord> condition) {