svn commit: r1710561 - in /sling/trunk/bundles/extensions/discovery/oak/src: main/java/org/apache/sling/discovery/oak/ main/java/org/apache/sling/discovery/oak/pinger/ test/java/org/apache/sling/discovery/oak/

[st...@apache.org]

Author: stefanegli
Date: Mon Oct 26 10:47:52 2015
New Revision: 1710561

URL: http://svn.apache.org/viewvc?rev=1710561&view=rev
Log:
SLING-4603 : method renamed : handlePotentialTopologyChange, which is slightly confusing anyway, renamed to checkForTopologyChange

Modified:
    sling/trunk/bundles/extensions/discovery/oak/src/main/java/org/apache/sling/discovery/oak/OakDiscoveryService.java
    sling/trunk/bundles/extensions/discovery/oak/src/main/java/org/apache/sling/discovery/oak/pinger/OakViewChecker.java
    sling/trunk/bundles/extensions/discovery/oak/src/test/java/org/apache/sling/discovery/oak/OakDiscoveryServiceTest.java

Modified: sling/trunk/bundles/extensions/discovery/oak/src/main/java/org/apache/sling/discovery/oak/OakDiscoveryService.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/discovery/oak/src/main/java/org/apache/sling/discovery/oak/OakDiscoveryService.java?rev=1710561&r1=1710560&r2=1710561&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/discovery/oak/src/main/java/org/apache/sling/discovery/oak/OakDiscoveryService.java (original)
+++ sling/trunk/bundles/extensions/discovery/oak/src/main/java/org/apache/sling/discovery/oak/OakDiscoveryService.java Mon Oct 26 10:47:52 2015
@@ -384,7 +384,7 @@ public class OakDiscoveryService extends
         this.providerInfos.add(info);
         Collections.sort(this.providerInfos);
         this.doUpdateProperties();
-        handlePotentialTopologyChange();
+        checkForTopologyChange();
     }
 
     /**
@@ -423,7 +423,7 @@ public class OakDiscoveryService extends
         final ProviderInfo info = new ProviderInfo(propertyProvider, props);
         if ( this.providerInfos.remove(info) && update ) {
             this.doUpdateProperties();
-            this.handlePotentialTopologyChange();
+            this.checkForTopologyChange();
         }
     }
 
@@ -527,7 +527,7 @@ public class OakDiscoveryService extends
             logger.debug("updateProperties: calling doUpdateProperties.");
             doUpdateProperties();
             logger.debug("updateProperties: calling handlePotentialTopologyChange.");
-            handlePotentialTopologyChange();
+            checkForTopologyChange();
             logger.debug("updateProperties: done.");
         }
     }
@@ -610,13 +610,13 @@ public class OakDiscoveryService extends
     }
 
     /**
-     * Handle the fact that the topology has likely changed
+     * Check the current topology for any potential change
      */
-    public void handlePotentialTopologyChange() {
+    public void checkForTopologyChange() {
         viewStateManagerLock.lock();
         try{
             if (!activated) {
-                logger.debug("handlePotentialTopologyChange: not yet activated, ignoring");
+                logger.debug("checkForTopologyChange: not yet activated, ignoring");
                 return;
             }
             BaseTopologyView t = (BaseTopologyView) getTopology();

Modified: sling/trunk/bundles/extensions/discovery/oak/src/main/java/org/apache/sling/discovery/oak/pinger/OakViewChecker.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/discovery/oak/src/main/java/org/apache/sling/discovery/oak/pinger/OakViewChecker.java?rev=1710561&r1=1710560&r2=1710561&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/discovery/oak/src/main/java/org/apache/sling/discovery/oak/pinger/OakViewChecker.java (original)
+++ sling/trunk/bundles/extensions/discovery/oak/src/main/java/org/apache/sling/discovery/oak/pinger/OakViewChecker.java Mon Oct 26 10:47:52 2015
@@ -219,7 +219,7 @@ public class OakViewChecker extends Base
             // all that we can therefore do here is assume something
             // might have changed and let discoveryService/viewStateManager
             // filter out the 99.99% of unchanged cases.
-            discoveryService.handlePotentialTopologyChange();
+            discoveryService.checkForTopologyChange();
         }
         logger.debug("discoveryLiteCheck: end. [for slingId="+slingId+"]");
     }
@@ -310,7 +310,7 @@ public class OakViewChecker extends Base
         // all that we can therefore do here is assume something
         // might have changed and let discoveryService/viewStateManager
         // filter out the 99.99% of unchanged cases.
-        discoveryService.handlePotentialTopologyChange();
+        discoveryService.checkForTopologyChange();
     }
 
     protected void updateProperties() {

Modified: sling/trunk/bundles/extensions/discovery/oak/src/test/java/org/apache/sling/discovery/oak/OakDiscoveryServiceTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/discovery/oak/src/test/java/org/apache/sling/discovery/oak/OakDiscoveryServiceTest.java?rev=1710561&r1=1710560&r2=1710561&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/discovery/oak/src/test/java/org/apache/sling/discovery/oak/OakDiscoveryServiceTest.java (original)
+++ sling/trunk/bundles/extensions/discovery/oak/src/test/java/org/apache/sling/discovery/oak/OakDiscoveryServiceTest.java Mon Oct 26 10:47:52 2015
@@ -103,7 +103,7 @@ public class OakDiscoveryServiceTest {
         discoBuilder.setFinal(true);
         DescriptorHelper.setDiscoveryLiteDescriptor(builder.getResourceResolverFactory(), 
                 discoBuilder);
-        discoveryService.handlePotentialTopologyChange();
+        discoveryService.checkForTopologyChange();
         assertEquals(0, discoveryService.getViewStateManager().waitForAsyncEvents(2000));
         assertEquals(1, listener.countEvents());
         discoveryService.unbindTopologyEventListener(listener);