svn commit: r1764632 - in /sling/trunk/bundles/resourceresolver/src: main/java/org/apache/sling/resourceresolver/impl/observation/ test/java/org/apache/sling/resourceresolver/impl/providers/

[cziegeler]

Author: cziegeler
Date: Thu Oct 13 09:01:46 2016
New Revision: 1764632

URL: http://svn.apache.org/viewvc?rev=1764632&view=rev
Log:
SLING-6056 : achieve 1:1 mapping between observation and resource change 
listener

Modified:
    
sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/observation/BasicObservationReporter.java
    
sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/observation/ResourceChangeListenerWhiteboard.java
    
sling/trunk/bundles/resourceresolver/src/test/java/org/apache/sling/resourceresolver/impl/providers/ResourceProviderTrackerTest.java

Modified: 
sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/observation/BasicObservationReporter.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/observation/BasicObservationReporter.java?rev=1764632&r1=1764631&r2=1764632&view=diff
==============================================================================
--- 
sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/observation/BasicObservationReporter.java
 (original)
+++ 
sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/observation/BasicObservationReporter.java
 Thu Oct 13 09:01:46 2016
@@ -140,6 +140,12 @@ public class BasicObservationReporter im
         // TODO implement distribute
     }
 
+    @Override
+    public void reportChanges(ObserverConfiguration config, 
Iterable<ResourceChange> changes, boolean distribute) {
+        // TODO Auto-generated method stub
+        this.reportChanges(changes, distribute);
+    }
+
     /**
      * Filter the change list based on the configuration
      * @param changes The list of changes

Modified: 
sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/observation/ResourceChangeListenerWhiteboard.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/observation/ResourceChangeListenerWhiteboard.java?rev=1764632&r1=1764631&r2=1764632&view=diff
==============================================================================
--- 
sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/observation/ResourceChangeListenerWhiteboard.java
 (original)
+++ 
sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/observation/ResourceChangeListenerWhiteboard.java
 Thu Oct 13 09:01:46 2016
@@ -127,6 +127,11 @@ public class ResourceChangeListenerWhite
         }
 
         @Override
+        public void reportChanges(ObserverConfiguration config, 
Iterable<ResourceChange> changes, boolean distribute) {
+            // ignore
+        }
+
+        @Override
         public List<ObserverConfiguration> getObserverConfigurations() {
             return Collections.emptyList();
         }

Modified: 
sling/trunk/bundles/resourceresolver/src/test/java/org/apache/sling/resourceresolver/impl/providers/ResourceProviderTrackerTest.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/resourceresolver/src/test/java/org/apache/sling/resourceresolver/impl/providers/ResourceProviderTrackerTest.java?rev=1764632&r1=1764631&r2=1764632&view=diff
==============================================================================
--- 
sling/trunk/bundles/resourceresolver/src/test/java/org/apache/sling/resourceresolver/impl/providers/ResourceProviderTrackerTest.java
 (original)
+++ 
sling/trunk/bundles/resourceresolver/src/test/java/org/apache/sling/resourceresolver/impl/providers/ResourceProviderTrackerTest.java
 Thu Oct 13 09:01:46 2016
@@ -259,6 +259,10 @@ public class ResourceProviderTrackerTest
         }
 
         @Override
+        public void reportChanges(ObserverConfiguration config, 
Iterable<ResourceChange> changes, boolean distribute) {
+        }
+
+        @Override
         public List<ObserverConfiguration> getObserverConfigurations() {
             return Collections.emptyList();
         }