You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2015/10/30 08:09:14 UTC
svn commit: r1711409 - in
/sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl:
observation/ providers/ providers/tree/
Author: cziegeler
Date: Fri Oct 30 07:09:13 2015
New Revision: 1711409
URL: http://svn.apache.org/viewvc?rev=1711409&view=rev
Log:
SLING-5220 : Add Path and PathSet
Removed:
sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/providers/tree/Path.java
sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/providers/tree/PathSet.java
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/BasicObserverConfiguration.java
sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/observation/ResourceChangeListenerInfo.java
sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/observation/ResourceChangeListenerWhiteboard.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/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=1711409&r1=1711408&r2=1711409&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 Fri Oct 30 07:09:13 2015
@@ -27,10 +27,10 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
+import org.apache.sling.api.resource.Path;
+import org.apache.sling.api.resource.PathSet;
import org.apache.sling.api.resource.observation.ResourceChange;
import org.apache.sling.api.resource.observation.ResourceChange.ChangeType;
-import org.apache.sling.resourceresolver.impl.providers.tree.Path;
-import org.apache.sling.resourceresolver.impl.providers.tree.PathSet;
import org.apache.sling.spi.resource.provider.ObservationReporter;
import org.apache.sling.spi.resource.provider.ObserverConfiguration;
@@ -76,7 +76,7 @@ public class BasicObservationReporter im
if ( !info.getResourceChangeTypes().isEmpty() ) {
boolean add = false;
for(final Path p : info.getPaths()) {
- if ( providerPath.matches(p.getPath()) && !excludePaths.matches(p.getPath()) ) {
+ if ( providerPath.matches(p.getPath()) && excludePaths.matches(p.getPath()) == null ) {
ObserverConfig config = configMap.get(p);
if ( config == null ) {
config = new ObserverConfig();
@@ -164,7 +164,7 @@ public class BasicObservationReporter im
if (!config.isExternal && change.isExternal()) {
return false;
}
- if (!config.paths.matches(change.getPath())) {
+ if (config.paths.matches(change.getPath()) == null ) {
return false;
}
return true;
Modified: sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/observation/BasicObserverConfiguration.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/observation/BasicObserverConfiguration.java?rev=1711409&r1=1711408&r2=1711409&view=diff
==============================================================================
--- sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/observation/BasicObserverConfiguration.java (original)
+++ sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/observation/BasicObserverConfiguration.java Fri Oct 30 07:09:13 2015
@@ -22,8 +22,8 @@ import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
+import org.apache.sling.api.resource.PathSet;
import org.apache.sling.api.resource.observation.ResourceChange.ChangeType;
-import org.apache.sling.resourceresolver.impl.providers.tree.PathSet;
import org.apache.sling.spi.resource.provider.ObserverConfiguration;
public class BasicObserverConfiguration implements ObserverConfiguration {
@@ -41,7 +41,7 @@ public class BasicObserverConfiguration
this.includeExternal = isExternal;
this.paths = Collections.singleton(path);
this.changeTypes = Collections.unmodifiableSet(types);
- this.excludedPaths = excludePaths.getExcludes(path);
+ this.excludedPaths = excludePaths.getSubset(path).toStringSet();
}
public BasicObserverConfiguration(final Set<String> paths) {
Modified: sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/observation/ResourceChangeListenerInfo.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/observation/ResourceChangeListenerInfo.java?rev=1711409&r1=1711408&r2=1711409&view=diff
==============================================================================
--- sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/observation/ResourceChangeListenerInfo.java (original)
+++ sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/observation/ResourceChangeListenerInfo.java Fri Oct 30 07:09:13 2015
@@ -27,10 +27,10 @@ import java.util.HashSet;
import java.util.Iterator;
import java.util.Set;
+import org.apache.sling.api.resource.PathSet;
import org.apache.sling.api.resource.observation.ExternalResourceChangeListener;
import org.apache.sling.api.resource.observation.ResourceChange.ChangeType;
import org.apache.sling.api.resource.observation.ResourceChangeListener;
-import org.apache.sling.resourceresolver.impl.providers.tree.PathSet;
import org.osgi.framework.ServiceReference;
public class ResourceChangeListenerInfo {
@@ -87,7 +87,7 @@ public class ResourceChangeListenerInfo
}
}
}
- this.paths = new PathSet(pathsSet);
+ this.paths = PathSet.fromStringCollection(pathsSet);
final Set<ChangeType> typesSet = new HashSet<ChangeType>();
if (ref.getProperty(CHANGES) != null ) {
for (String changeName : toStringArray(ref.getProperty(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=1711409&r1=1711408&r2=1711409&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 Fri Oct 30 07:09:13 2015
@@ -23,12 +23,12 @@ import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
+import org.apache.sling.api.resource.Path;
+import org.apache.sling.api.resource.PathSet;
import org.apache.sling.api.resource.observation.ResourceChange;
import org.apache.sling.api.resource.observation.ResourceChangeListener;
import org.apache.sling.resourceresolver.impl.providers.ResourceProviderTracker;
import org.apache.sling.resourceresolver.impl.providers.ResourceProviderTracker.ObservationReporterGenerator;
-import org.apache.sling.resourceresolver.impl.providers.tree.Path;
-import org.apache.sling.resourceresolver.impl.providers.tree.PathSet;
import org.apache.sling.spi.resource.provider.ObservationReporter;
import org.apache.sling.spi.resource.provider.ObserverConfiguration;
import org.osgi.framework.BundleContext;
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=1711409&r1=1711408&r2=1711409&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 Fri Oct 30 07:09:13 2015
@@ -31,6 +31,8 @@ import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import org.apache.sling.api.SlingConstants;
+import org.apache.sling.api.resource.Path;
+import org.apache.sling.api.resource.PathSet;
import org.apache.sling.api.resource.observation.ResourceChange;
import org.apache.sling.api.resource.observation.ResourceChange.ChangeType;
import org.apache.sling.api.resource.runtime.dto.FailureReason;
@@ -38,8 +40,6 @@ import org.apache.sling.api.resource.run
import org.apache.sling.api.resource.runtime.dto.ResourceProviderFailureDTO;
import org.apache.sling.api.resource.runtime.dto.RuntimeDTO;
import org.apache.sling.resourceresolver.impl.legacy.LegacyResourceProviderWhiteboard;
-import org.apache.sling.resourceresolver.impl.providers.tree.Path;
-import org.apache.sling.resourceresolver.impl.providers.tree.PathSet;
import org.apache.sling.spi.resource.provider.ObservationReporter;
import org.apache.sling.spi.resource.provider.ResourceProvider;
import org.osgi.framework.BundleContext;
@@ -388,7 +388,7 @@ public class ResourceProviderTracker {
}
}
handler.getProviderContext().update(
- reporterGenerator.create(handlerPath, new PathSet(excludedPaths)),
+ reporterGenerator.create(handlerPath, PathSet.fromStringCollection(excludedPaths)),
excludedPaths);
}