(sling-org-apache-sling-scripting-core) branch master updated: SLING-12194 : Cycle between scripting services

[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-scripting-core.git


The following commit(s) were added to refs/heads/master by this push:
     new 0170d87  SLING-12194 : Cycle between scripting services
0170d87 is described below

commit 0170d8713d26995d18cfb0b6d5bd01d4288ce7c1
Author: Carsten Ziegeler <cziege...@apache.org>
AuthorDate: Sat Dec 9 12:06:45 2023 +0100

    SLING-12194 : Cycle between scripting services
---
 .../org/apache/sling/scripting/core/impl/ScriptCacheImpl.java  | 10 ----------
 .../core/impl/ScriptingResourceResolverProviderImpl.java       |  4 ++++
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git 
a/src/main/java/org/apache/sling/scripting/core/impl/ScriptCacheImpl.java 
b/src/main/java/org/apache/sling/scripting/core/impl/ScriptCacheImpl.java
index 336f2a6..d16bff8 100644
--- a/src/main/java/org/apache/sling/scripting/core/impl/ScriptCacheImpl.java
+++ b/src/main/java/org/apache/sling/scripting/core/impl/ScriptCacheImpl.java
@@ -27,14 +27,11 @@ import java.util.Set;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 
-import org.apache.sling.api.resource.ResourceResolverFactory;
 import org.apache.sling.scripting.api.CachedScript;
 import org.apache.sling.scripting.api.ScriptCache;
 import org.apache.sling.scripting.core.impl.helper.CachingMap;
-import org.apache.sling.serviceusermapping.ServiceUserMapped;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
-import org.osgi.service.component.annotations.Reference;
 import org.osgi.service.metatype.annotations.Designate;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -58,17 +55,10 @@ public class ScriptCacheImpl implements ScriptCache {
 
     private final Map<String, SoftReference<CachedScript>> internalMap;
 
-    // use a static policy so that we can reconfigure the watched script files 
if the search paths are changed
-    @Reference
-    private ResourceResolverFactory rrf;
-
     private final ReentrantReadWriteLock rwl = new ReentrantReadWriteLock();
     private final Lock readLock = rwl.readLock();
     private final Lock writeLock = rwl.writeLock();
 
-    @Reference
-    private ServiceUserMapped serviceUserMapped;
-
     @Activate
     public ScriptCacheImpl(final ScriptCacheImplConfiguration configuration) {
         this.internalMap = new 
CachingMap<>(configuration.org_apache_sling_scripting_cache_size());
diff --git 
a/src/main/java/org/apache/sling/scripting/core/impl/ScriptingResourceResolverProviderImpl.java
 
b/src/main/java/org/apache/sling/scripting/core/impl/ScriptingResourceResolverProviderImpl.java
index dac10a9..209fec2 100644
--- 
a/src/main/java/org/apache/sling/scripting/core/impl/ScriptingResourceResolverProviderImpl.java
+++ 
b/src/main/java/org/apache/sling/scripting/core/impl/ScriptingResourceResolverProviderImpl.java
@@ -23,6 +23,7 @@ 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.scripting.api.resource.ScriptingResourceResolverProvider;
+import org.apache.sling.serviceusermapping.ServiceUserMapped;
 import org.osgi.framework.Constants;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
@@ -55,6 +56,9 @@ public class ScriptingResourceResolverProviderImpl implements 
ScriptingResourceR
     private final ThreadLocal<ScriptingResourceResolver> 
perThreadResourceResolver = new ThreadLocal<>();
     private boolean logStackTraceOnResolverClose;
 
+    @Reference
+    private ServiceUserMapped serviceUserMapped;
+
     @Reference
     private ResourceResolverFactory rrf;