(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 6be8493  SLING-12194 : Cycle between scripting services
6be8493 is described below

commit 6be8493b45aad7c771ce3f00e5606239e76af948
Author: Carsten Ziegeler <cziege...@apache.org>
AuthorDate: Fri Dec 8 16:14:32 2023 +0100

    SLING-12194 : Cycle between scripting services
---
 .../apache/sling/scripting/core/impl/ScriptCacheConsolePlugin.java | 7 +------
 .../apache/sling/scripting/core/impl/ScriptCacheInvalidator.java   | 7 ++-----
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git 
a/src/main/java/org/apache/sling/scripting/core/impl/ScriptCacheConsolePlugin.java
 
b/src/main/java/org/apache/sling/scripting/core/impl/ScriptCacheConsolePlugin.java
index e520a20..fe5c605 100644
--- 
a/src/main/java/org/apache/sling/scripting/core/impl/ScriptCacheConsolePlugin.java
+++ 
b/src/main/java/org/apache/sling/scripting/core/impl/ScriptCacheConsolePlugin.java
@@ -59,11 +59,7 @@ public class ScriptCacheConsolePlugin extends 
AbstractWebConsolePlugin {
     private static final String POST_SCRIPT = "script";
 
     @Reference
-    private ScriptCache scriptCache = null;
-
-    public ScriptCacheConsolePlugin() {
-        super();
-    }
+    private ScriptCache scriptCache;
 
     @Override
     public String getTitle() {
@@ -132,7 +128,6 @@ public class ScriptCacheConsolePlugin extends 
AbstractWebConsolePlugin {
         } else {
             resp.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
         }
-
     }
 }
 
diff --git 
a/src/main/java/org/apache/sling/scripting/core/impl/ScriptCacheInvalidator.java
 
b/src/main/java/org/apache/sling/scripting/core/impl/ScriptCacheInvalidator.java
index 4961fbc..c5ff61c 100644
--- 
a/src/main/java/org/apache/sling/scripting/core/impl/ScriptCacheInvalidator.java
+++ 
b/src/main/java/org/apache/sling/scripting/core/impl/ScriptCacheInvalidator.java
@@ -49,7 +49,6 @@ import org.osgi.service.component.annotations.Reference;
 import org.osgi.service.event.Event;
 import org.osgi.service.event.EventConstants;
 import org.osgi.service.event.EventHandler;
-import org.osgi.service.metatype.annotations.Designate;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -58,10 +57,8 @@ import org.slf4j.LoggerFactory;
     service = {EventHandler.class},
     property = {
         EventConstants.EVENT_TOPIC + 
"=org/apache/sling/scripting/core/impl/jsr223/SlingScriptEngineManager/*"
-    }
-)
-@Designate(
-    ocd = ScriptCacheImplConfiguration.class
+    },
+    configurationPid = "org.apache.sling.scripting.core.impl.ScriptCacheImpl"
 )
 public class ScriptCacheInvalidator implements ResourceChangeListener, 
ExternalResourceChangeListener, EventHandler {