svn commit: r1793002 - /sling/trunk/bundles/scripting/core/src/main/java/org/apache/sling/scripting/core/impl/ScriptCacheImpl.java

[cziegeler]

Author: cziegeler
Date: Fri Apr 28 08:23:12 2017
New Revision: 1793002

URL: http://svn.apache.org/viewvc?rev=1793002&view=rev
Log:
SLING-6737 Migrate to OSGi R6 annotations - Clean up code

Modified:
    
sling/trunk/bundles/scripting/core/src/main/java/org/apache/sling/scripting/core/impl/ScriptCacheImpl.java

Modified: 
sling/trunk/bundles/scripting/core/src/main/java/org/apache/sling/scripting/core/impl/ScriptCacheImpl.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/core/src/main/java/org/apache/sling/scripting/core/impl/ScriptCacheImpl.java?rev=1793002&r1=1793001&r2=1793002&view=diff
==============================================================================
--- 
sling/trunk/bundles/scripting/core/src/main/java/org/apache/sling/scripting/core/impl/ScriptCacheImpl.java
 (original)
+++ 
sling/trunk/bundles/scripting/core/src/main/java/org/apache/sling/scripting/core/impl/ScriptCacheImpl.java
 Fri Apr 28 08:23:12 2017
@@ -51,7 +51,6 @@ import org.apache.sling.serviceusermappi
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.Constants;
 import org.osgi.framework.ServiceRegistration;
-import org.osgi.service.component.ComponentContext;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Deactivate;
@@ -83,7 +82,7 @@ import org.slf4j.LoggerFactory;
  */
 public class ScriptCacheImpl implements ScriptCache, ResourceChangeListener, 
ExternalResourceChangeListener {
 
-    private static final Logger LOGGER = 
LoggerFactory.getLogger(ScriptCacheImpl.class);
+    private final Logger LOGGER = 
LoggerFactory.getLogger(ScriptCacheImpl.class);
 
     public static final int DEFAULT_CACHE_SIZE = 65536;
 
@@ -95,19 +94,17 @@ public class ScriptCacheImpl implements
     private String[] searchPaths = {};
 
     // use a static policy so that we can reconfigure the watched script files 
if the search paths are changed
-    @Reference(
-        policy = ReferencePolicy.STATIC
-    )
-    private ResourceResolverFactory rrf = null;
+    @Reference
+    private ResourceResolverFactory rrf;
 
     @Reference
-    private ThreadPoolManager threadPoolManager = null;
+    private ThreadPoolManager threadPoolManager;
 
     private ThreadPool threadPool;
     private final ReentrantReadWriteLock rwl = new ReentrantReadWriteLock();
     private final Lock readLock = rwl.readLock();
     private final Lock writeLock = rwl.writeLock();
-    boolean active = false;
+    private volatile boolean active = false;
 
     @Reference
     private ServiceUserMapped serviceUserMapped;
@@ -214,10 +211,9 @@ public class ScriptCacheImpl implements
     }
 
     @Activate
-    @SuppressWarnings("unused")
-    protected void activate(ScriptCacheImplConfiguration configuration, 
ComponentContext componentContext) {
+    protected void activate(ScriptCacheImplConfiguration configuration, 
BundleContext bundleCtx) {
         threadPool = threadPoolManager.get("Script Cache Thread Pool");
-        bundleContext = componentContext.getBundleContext();
+        bundleContext = bundleCtx;
         additionalExtensions = 
configuration.org_apache_sling_scripting_cache_additional__extensions();
         int newMaxCacheSize = 
configuration.org_apache_sling_scripting_cache_size();
         if (newMaxCacheSize != DEFAULT_CACHE_SIZE) {
@@ -242,7 +238,6 @@ public class ScriptCacheImpl implements
         active = true;
     }
 
-    @SuppressWarnings("unchecked")
     private void configureCache() {
         writeLock.lock();
         try {
@@ -252,7 +247,7 @@ public class ScriptCacheImpl implements
             }
             internalMap.clear();
             extensions.addAll(Arrays.asList(additionalExtensions));
-            if (extensions.size() > 0) {
+            if (!extensions.isEmpty()) {
                 Set<String> globPatterns = new HashSet<>(extensions.size());
                 for (String extension : extensions) {
                     globPatterns.add("glob:**/*." + extension);
@@ -274,8 +269,7 @@ public class ScriptCacheImpl implements
     }
 
     @Deactivate
-    @SuppressWarnings("unused")
-    protected void deactivate(ComponentContext componentContext) {
+    protected void deactivate() {
         internalMap.clear();
         if (resourceChangeListener != null) {
             resourceChangeListener.unregister();
@@ -288,7 +282,7 @@ public class ScriptCacheImpl implements
         active = false;
     }
 
-    protected void bindScriptEngineFactory(ScriptEngineFactory 
scriptEngineFactory, Map<String, Object> properties) {
+    protected void bindScriptEngineFactory(ScriptEngineFactory 
scriptEngineFactory) {
         ScriptEngine engine = scriptEngineFactory.getScriptEngine();
         if (engine instanceof Compilable) {
             /**
@@ -303,7 +297,7 @@ public class ScriptCacheImpl implements
         }
     }
 
-    protected void unbindScriptEngineFactory(ScriptEngineFactory 
scriptEngineFactory, Map<String, Object> properties) {
+    protected void unbindScriptEngineFactory(ScriptEngineFactory 
scriptEngineFactory) {
         for (String extension : scriptEngineFactory.getExtensions()) {
             extensions.remove(extension);
         }