[sling-org-apache-sling-servlets-resolver] branch master updated: SLING-7536 : Refactor implementation

[cziegeler]

This is an automated email from the ASF dual-hosted git repository.

cziegeler pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-servlets-resolver.git


The following commit(s) were added to refs/heads/master by this push:
     new e84052c  SLING-7536 : Refactor implementation
e84052c is described below

commit e84052ccf36092ab48453b43cb8a6a7fece0cb15
Author: Carsten Ziegeler <czieg...@adobe.com>
AuthorDate: Fri Mar 9 11:13:17 2018 +0100

    SLING-7536 : Refactor implementation
---
 .../internal/resolution/ResolutionCache.java       | 25 +++++-----------------
 1 file changed, 5 insertions(+), 20 deletions(-)

diff --git 
a/src/main/java/org/apache/sling/servlets/resolver/internal/resolution/ResolutionCache.java
 
b/src/main/java/org/apache/sling/servlets/resolver/internal/resolution/ResolutionCache.java
index 2cf4034..eb14302 100644
--- 
a/src/main/java/org/apache/sling/servlets/resolver/internal/resolution/ResolutionCache.java
+++ 
b/src/main/java/org/apache/sling/servlets/resolver/internal/resolution/ResolutionCache.java
@@ -33,12 +33,10 @@ import javax.script.ScriptEngineManager;
 import javax.servlet.Servlet;
 
 import org.apache.sling.api.resource.LoginException;
-import org.apache.sling.api.resource.ResourceResolver;
-import org.apache.sling.api.resource.ResourceResolverFactory;
 import 
org.apache.sling.api.resource.observation.ExternalResourceChangeListener;
 import org.apache.sling.api.resource.observation.ResourceChange;
+import org.apache.sling.api.resource.observation.ResourceChangeList;
 import org.apache.sling.api.resource.observation.ResourceChangeListener;
-import org.apache.sling.serviceusermapping.ServiceUserMapped;
 import org.apache.sling.servlets.resolver.internal.SlingServletResolver;
 import 
org.apache.sling.servlets.resolver.internal.helper.AbstractResourceCollector;
 import org.apache.sling.servlets.resolver.jmx.SlingServletResolverCacheMBean;
@@ -67,12 +65,6 @@ public class ResolutionCache
     private final Logger logger = LoggerFactory.getLogger(this.getClass());
 
     @Reference
-    private ResourceResolverFactory resourceResolverFactory;
-
-    @Reference(target="("+ServiceUserMapped.SUBSERVICENAME+"=scripts)")
-    private ServiceUserMapped scriptServiceUserMapped;
-
-    @Reference
     private ScriptEngineManager scriptEngineManager;
 
     private volatile List<String> scriptEnginesExtensions = 
Collections.emptyList();
@@ -86,11 +78,6 @@ public class ResolutionCache
     /** Flag to log warning if cache size exceed only once. */
     private volatile boolean logCacheSizeWarning;
 
-    /**
-     * The search paths
-     */
-    private String[] searchPaths;
-
     /** Registration as event handler. */
     private volatile ServiceRegistration<EventHandler> 
eventHandlerRegistration;
 
@@ -104,10 +91,6 @@ public class ResolutionCache
     @Activate
     protected void activate(final BundleContext context,
             final SlingServletResolver.Config config) throws LoginException {
-        try ( final ResourceResolver scriptRR = 
resourceResolverFactory.getServiceResourceResolver(Collections.singletonMap(ResourceResolverFactory.SUBSERVICE,
 (Object)"scripts"))) {
-            this.searchPaths = scriptRR.getSearchPath();
-        }
-
         // create cache - if a cache size is configured
         this.cacheSize = config.servletresolver_cacheSize();
         if (this.cacheSize > 5) {
@@ -219,14 +202,16 @@ public class ResolutionCache
         if ( resourceListenerRegistration == null ) {
             return;
         }
+        final ResourceChangeList changeList = (ResourceChangeList)changes;
+        final String[] searchPath = changeList.getSearchPath();
         boolean flushCache = false;
         for(final ResourceChange change : changes){
             // if the path of the event is a sub path of a search path
             // we flush the whole cache
             final String path = change.getPath();
             int index = 0;
-            while (!flushCache && index < searchPaths.length) {
-                if (path.startsWith(this.searchPaths[index])) {
+            while (!flushCache && index < searchPath.length) {
+                if (path.startsWith(searchPath[index])) {
                     flushCache = true;
                     break;
                 }

-- 
To stop receiving notification emails like this one, please contact
cziege...@apache.org.