Merge pull request apache#1465 from davinash/feature/GEODE-4528

[GEODE-4528]Remove singleton calls from product code in org.apache.geode.internal.cache.tier

Author: avdongre

geode-core/src/main/java/org/apache/geode/admin/GemFireMemberStatus.java

@@ -529,7 +529,8 @@ protected void initializeServer() {
       }
 
       // Get client queue sizes
-      Map clientQueueSize = getClientIDMap(InternalClientMembership.getClientQueueSizes());
+      Map clientQueueSize =
+          getClientIDMap(InternalClientMembership.getClientQueueSizes((InternalCache) cache));
       setClientQueueSizes(clientQueueSize);
 
       // Set server acceptor port (set it based on the first CacheServer)

geode-core/src/main/java/org/apache/geode/internal/cache/tier/InternalClientMembership.java

@@ -31,7 +31,6 @@
 
 import org.apache.geode.CancelException;
 import org.apache.geode.SystemFailure;
-import org.apache.geode.cache.CacheFactory;
 import org.apache.geode.cache.client.PoolManager;
 import org.apache.geode.cache.client.internal.PoolImpl;
 import org.apache.geode.cache.server.CacheServer;
@@ -217,14 +216,14 @@ public static void unregisterAllListeners() {
    *
    *
    */
-  public static Map getConnectedClients(boolean onlyClientsNotifiedByThisServer) {
+  public static Map getConnectedClients(boolean onlyClientsNotifiedByThisServer,
+      InternalCache cache) {
     ClientHealthMonitor chMon = ClientHealthMonitor.getInstance();
     Set filterProxyIDs = null;
     if (onlyClientsNotifiedByThisServer) {
       // Note it is not necessary to synchronize on the list of Client servers here,
       // since this is only a status (snapshot) of the system.
-      for (Iterator bsii = CacheFactory.getAnyInstance().getCacheServers().iterator(); bsii
-          .hasNext();) {
+      for (Iterator bsii = cache.getCacheServers().iterator(); bsii.hasNext();) {
         CacheServerImpl bsi = (CacheServerImpl) bsii.next();
         AcceptorImpl ai = bsi.getAcceptor();
         if (ai != null && ai.getCacheClientNotifier() != null) {
@@ -269,12 +268,11 @@ public static Map getStatusForAllClientsIgnoreSubscriptionStatus() {
    *
    * @return all the clients
    */
-  public static Map getConnectedClients() {
+  public static Map getConnectedClients(InternalCache cache) {
 
     // Get all clients
     Map allClients = new HashMap();
-    for (Iterator bsii = CacheFactory.getAnyInstance().getCacheServers().iterator(); bsii
-        .hasNext();) {
+    for (Iterator bsii = cache.getCacheServers().iterator(); bsii.hasNext();) {
       CacheServerImpl bsi = (CacheServerImpl) bsii.next();
       AcceptorImpl ai = bsi.getAcceptor();
       if (ai != null && ai.getCacheClientNotifier() != null) {
@@ -289,10 +287,6 @@ public static Map getConnectedClients() {
     return allClients;
   }
 
-  public static Map getClientQueueSizes() {
-    return getClientQueueSizes((InternalCache) CacheFactory.getAnyInstance());
-  }
-
   public static Map getClientQueueSizes(final InternalCache cache) {
     if (cache == null) {
       return Collections.emptyMap();

geode-core/src/test/java/org/apache/geode/cache30/ClientMembershipDUnitTest.java

@@ -1324,7 +1324,7 @@ public Object call() {
       final int expectedClientCount = clientMemberIds.size();
       Awaitility.await().pollInterval(100, TimeUnit.MILLISECONDS)
           .pollDelay(100, TimeUnit.MILLISECONDS).timeout(300, TimeUnit.SECONDS).until(() -> {
-            Map connectedClients = InternalClientMembership.getConnectedClients(false);
+            Map connectedClients = InternalClientMembership.getConnectedClients(false, getCache());
             if (connectedClients == null) {
               return false;
             }
@@ -1335,7 +1335,7 @@ public Object call() {
           });
     }
 
-    Map connectedClients = InternalClientMembership.getConnectedClients(false);
+    Map connectedClients = InternalClientMembership.getConnectedClients(false, getCache());
     assertNotNull(connectedClients);
     assertEquals(clientMemberIds.size(), connectedClients.size());
     System.out
@@ -1530,7 +1530,7 @@ public void run2() throws CacheException {
       final int whichVM = i;
       final VM vm = Host.getHost(0).getVM(i);
       vm.invoke("Create bridge server", () -> {
-        Map clients = InternalClientMembership.getConnectedClients(true);
+        Map clients = InternalClientMembership.getConnectedClients(true, getCache());
         assertNotNull(clients);
         testGetNotifiedClients_clientCount = clients.size();
         // [bruce] this is not a valid assertion - the server may not use