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

[cziegeler]

Author: cziegeler
Date: Fri Apr 28 07:59:00 2017
New Revision: 1792998

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

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

Modified: 
sling/trunk/bundles/scripting/core/src/main/java/org/apache/sling/scripting/core/impl/ScriptEngineManagerFactory.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/core/src/main/java/org/apache/sling/scripting/core/impl/ScriptEngineManagerFactory.java?rev=1792998&r1=1792997&r2=1792998&view=diff
==============================================================================
--- 
sling/trunk/bundles/scripting/core/src/main/java/org/apache/sling/scripting/core/impl/ScriptEngineManagerFactory.java
 (original)
+++ 
sling/trunk/bundles/scripting/core/src/main/java/org/apache/sling/scripting/core/impl/ScriptEngineManagerFactory.java
 Fri Apr 28 07:59:00 2017
@@ -55,8 +55,7 @@ import org.slf4j.LoggerFactory;
  * Component which exposes a ScriptEngineManager service.
  *
  */
-@Component(
-    immediate = true,
+@Component(service = {},
     reference = @Reference(
         name = "ScriptEngineFactory",
         service = ScriptEngineFactory.class,
@@ -84,9 +83,9 @@ public class ScriptEngineManagerFactory
      */
     private final ProxyScriptEngineManager scriptEngineManager = new 
ProxyScriptEngineManager();
 
-    private final Set<Bundle> engineSpiBundles = new HashSet<Bundle>();
+    private final Set<Bundle> engineSpiBundles = new HashSet<>();
 
-    private final Map<ScriptEngineFactory, Map<Object, Object>> 
engineSpiServices = new HashMap<ScriptEngineFactory, Map<Object, Object>>();
+    private final Map<ScriptEngineFactory, Map<Object, Object>> 
engineSpiServices = new HashMap<>();
 
     private ServiceRegistration scriptEngineManagerRegistration;
 
@@ -280,7 +279,7 @@ public class ScriptEngineManagerFactory
     private void postEvent(final String topic, final ScriptEngineFactory 
scriptEngineFactory) {
         final EventAdmin localEA = this.getEventAdmin();
         if (localEA != null) {
-            final Dictionary<String, Object> props = new Hashtable<String, 
Object>();
+            final Dictionary<String, Object> props = new Hashtable<>();
             
props.put(SlingScriptConstants.PROPERTY_SCRIPT_ENGINE_FACTORY_NAME, 
scriptEngineFactory.getEngineName());
             
props.put(SlingScriptConstants.PROPERTY_SCRIPT_ENGINE_FACTORY_VERSION, 
scriptEngineFactory.getEngineVersion());
             
props.put(SlingScriptConstants.PROPERTY_SCRIPT_ENGINE_FACTORY_EXTENSIONS, 
toArray(scriptEngineFactory.getExtensions()));