Author: cziegeler Date: Wed Oct 12 09:12:00 2016 New Revision: 1764411 URL: http://svn.apache.org/viewvc?rev=1764411&view=rev Log: SLING-6138 : Use JcrResourceListener for observation. Deprecate attribute methods
Modified: sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/mapping/MapEntries.java sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/providers/ResourceProviderTracker.java Modified: sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/mapping/MapEntries.java URL: http://svn.apache.org/viewvc/sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/mapping/MapEntries.java?rev=1764411&r1=1764410&r2=1764411&view=diff ============================================================================== --- sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/mapping/MapEntries.java (original) +++ sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/mapping/MapEntries.java Wed Oct 12 09:12:00 2016 @@ -805,6 +805,7 @@ public class MapEntries implements Resou } else if (rc.getType() == ResourceChange.ChangeType.ADDED ) { wasResolverRefreshed = doNodeAdded(path, wasResolverRefreshed); } else { + @SuppressWarnings("deprecation") Set<String> addedAttributes = rc.getAddedPropertyNames(); if (addedAttributes != null) { if (log.isDebugEnabled()) { @@ -812,6 +813,7 @@ public class MapEntries implements Resou } wasResolverRefreshed = doAddAttributes(path, addedAttributes, wasResolverRefreshed); + @SuppressWarnings("deprecation") Set<String> changedAttributes = rc.getChangedPropertyNames(); if (changedAttributes != null) { if (log.isDebugEnabled()) { @@ -820,6 +822,7 @@ public class MapEntries implements Resou wasResolverRefreshed = doUpdateAttributes(path, changedAttributes, wasResolverRefreshed); } + @SuppressWarnings("deprecation") Set<String> removedAttributes = rc.getRemovedPropertyNames(); if (removedAttributes != null) { if (log.isDebugEnabled()) { Modified: sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/providers/ResourceProviderTracker.java URL: http://svn.apache.org/viewvc/sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/providers/ResourceProviderTracker.java?rev=1764411&r1=1764410&r2=1764411&view=diff ============================================================================== --- sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/providers/ResourceProviderTracker.java (original) +++ sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/providers/ResourceProviderTracker.java Wed Oct 12 09:12:00 2016 @@ -367,7 +367,7 @@ public class ResourceProviderTracker imp final ObservationReporter or = this.providerReporter; if ( or != null ) { final ResourceChange change = new ResourceChange(event.isAdd ? ChangeType.PROVIDER_ADDED : ChangeType.PROVIDER_REMOVED, - event.path, false, null, null, null); + event.path, false); or.reportChanges(Collections.singletonList(change), false); } }