Replace Group.isLocal() with Group.isSingleton(), which has clearer s…

…emantics.
wildfly · Dec 7, 2017 · bc4e0fd · bc4e0fd
1 parent 6d93090
commit bc4e0fd
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 13 deletions.
diff --git a/clustering/api/src/main/java/org/wildfly/clustering/group/Group.java b/clustering/api/src/main/java/org/wildfly/clustering/group/Group.java
@@ -122,6 +122,15 @@ default void membershipChanged(Membership previousMembership, Membership members
     /**
      * Indicates whether this is a local group.  A local group only ever contains a single member.
      * @return true, if this is a local group, false otherwise.
+     * @deprecated Replaced by {@link #isSingleton()}.
      */
-    boolean isLocal();
+    @Deprecated default boolean isLocal() {
+        return this.isSingleton();
+    }
+
+    /**
+     * Indicates whether or not this is a singleton group.  The membership of a singleton group contains only the local member and never changes.
+     * @return true, if this is a singleton group, false otherwise.
+     */
+    boolean isSingleton();
 }
diff --git a/...c/main/java/org/wildfly/clustering/server/dispatcher/ChannelCommandDispatcherFactory.java b/...c/main/java/org/wildfly/clustering/server/dispatcher/ChannelCommandDispatcherFactory.java
@@ -201,7 +201,7 @@ public Node getLocalNode() {
     }
 
     @Override
-    public boolean isLocal() {
+    public boolean isSingleton() {
         return false;
     }
 

diff --git a/clustering/server/src/main/java/org/wildfly/clustering/server/group/CacheGroup.java b/clustering/server/src/main/java/org/wildfly/clustering/server/group/CacheGroup.java
@@ -107,14 +107,19 @@ public Node getLocalNode() {
 
     @Override
     public Membership getMembership() {
-        Transport transport = this.cache.getCacheManager().getTransport();
+        if (this.isSingleton()) {
-        if (transport == null) {
             return new SingletonMembership(this.getLocalNode());
         }
+        Transport transport = this.cache.getCacheManager().getTransport();
         DistributionManager dist = this.cache.getAdvancedCache().getDistributionManager();
         return (dist != null) ? new CacheMembership(transport.getAddress(), dist.getConsistentHash(), this.factory) : new CacheMembership(transport, this.factory);
     }
 
+    @Override
+    public boolean isSingleton() {
+        return this.cache.getCacheManager().getTransport() == null;
+    }
+
     @Merged
     @ViewChanged
     public void viewChanged(ViewChangedEvent event) {
@@ -201,9 +206,4 @@ private void unregister(GroupListener listener) {
     public void removeListener(Listener listener) {
         this.unregister(listener);
     }
-
-    @Override
-    public boolean isLocal() {
-        return this.cache.getCacheManager().getTransport() == null;
-    }
 }
diff --git a/clustering/server/src/main/java/org/wildfly/clustering/server/group/LocalGroup.java b/clustering/server/src/main/java/org/wildfly/clustering/server/group/LocalGroup.java
@@ -69,7 +69,7 @@ public Membership getMembership() {
     }
 
     @Override
-    public boolean isLocal() {
+    public boolean isSingleton() {
         return true;
     }
 }
diff --git a/ejb3/src/main/java/org/jboss/as/ejb3/remote/AssociationImpl.java b/ejb3/src/main/java/org/jboss/as/ejb3/remote/AssociationImpl.java
@@ -445,7 +445,7 @@ ListenerHandle registerClusterTopologyListener(ClusterTopologyListener listener)
             // Synchronize on the listener to ensure that the initial topology is set before processing any changes from the registry listener
             synchronized (listener) {
                 this.clusterTopologyListeners.add(listener);
-                listener.clusterTopology(!this.clientMappingRegistry.getGroup().isLocal() ? Collections.singletonList(getClusterInfo(this.clientMappingRegistry.getEntries())) : Collections.emptyList());
+                listener.clusterTopology(!this.clientMappingRegistry.getGroup().isSingleton() ? Collections.singletonList(getClusterInfo(this.clientMappingRegistry.getEntries())) : Collections.emptyList());
             }
             return () -> this.clusterTopologyListeners.remove(listener);
         }
@@ -575,7 +575,7 @@ private Affinity getClusterAffinity() {
         Registry<String, List<ClientMapping>> registry = this.clientMappingRegistry;
         Group group = registry != null ? registry.getGroup() : null;
 
-        return group != null && !group.isLocal() ? new ClusterAffinity(group.getName()) : null;
+        return group != null && !group.isSingleton() ? new ClusterAffinity(group.getName()) : null;
     }
 
     Executor getExecutor() {

diff --git a/ejb3/src/main/java/org/jboss/as/ejb3/remote/AssociationService.java b/ejb3/src/main/java/org/jboss/as/ejb3/remote/AssociationService.java
@@ -114,7 +114,7 @@ public void moduleUnavailable(final List<EJBModuleIdentifier> modules) {
                         b.addAttribute(EJBClientContext.FILTER_ATTR_NODE, AttributeValue.fromString(ourNodeName));
                         if (clientMappingsRegistry != null) {
                             Group group = clientMappingsRegistry.getGroup();
-                            if (!group.isLocal()) {
+                            if (!group.isSingleton()) {
                                 b.addAttribute(EJBClientContext.FILTER_ATTR_CLUSTER, AttributeValue.fromString(group.getName()));
                             }
                         }