X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fusermanager%2Fimplementation%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fusermanager%2Finternal%2FActivator.java;h=3898ca589ae710d36ea847eae03aa3742a6cccd6;hb=ad5259857a88eca09d08ee2580cc1373ec4e552d;hp=a1fdce5d587e9e99cad23ac401773accd85e4286;hpb=a6af1afe08cb0f5dfef8c7bb370714df8ecd1e11;p=controller.git

diff --git a/opendaylight/usermanager/implementation/src/main/java/org/opendaylight/controller/usermanager/internal/Activator.java b/opendaylight/usermanager/implementation/src/main/java/org/opendaylight/controller/usermanager/internal/Activator.java
index a1fdce5d58..3898ca589a 100644
--- a/opendaylight/usermanager/implementation/src/main/java/org/opendaylight/controller/usermanager/internal/Activator.java
+++ b/opendaylight/usermanager/implementation/src/main/java/org/opendaylight/controller/usermanager/internal/Activator.java
@@ -9,13 +9,7 @@
 
 package org.opendaylight.controller.usermanager.internal;
 
-import java.util.Dictionary;
-import java.util.HashSet;
-import java.util.Hashtable;
-import java.util.Set;
-
 import org.apache.felix.dm.Component;
-import org.opendaylight.controller.clustering.services.ICacheUpdateAware;
 import org.opendaylight.controller.clustering.services.IClusterGlobalServices;
 import org.opendaylight.controller.configuration.IConfigurationAware;
 import org.opendaylight.controller.containermanager.IContainerAuthorization;
@@ -41,6 +35,7 @@ public class Activator extends ComponentActivatorAbstractBase {
      * ComponentActivatorAbstractBase.
      *
      */
+    @Override
     public void init() {
 
     }
@@ -50,6 +45,7 @@ public class Activator extends ComponentActivatorAbstractBase {
      * cleanup done by ComponentActivatorAbstractBase
      *
      */
+    @Override
     public void destroy() {
 
     }
@@ -63,8 +59,9 @@ public class Activator extends ComponentActivatorAbstractBase {
      * instantiated in order to get an fully working implementation
      * Object
      */
+    @Override
     public Object[] getImplementations() {
-        return null;
+        return new Object[]{};
     }
 
     /**
@@ -80,6 +77,7 @@ public class Activator extends ComponentActivatorAbstractBase {
      * also optional per-container different behavior if needed, usually
      * should not be the case though.
      */
+    @Override
     public void configureInstance(Component c, Object imp, String containerName) {
     }
 
@@ -96,8 +94,9 @@ public class Activator extends ComponentActivatorAbstractBase {
      * @return The list of implementations the bundle will support,
      * in Global version
      */
+    @Override
     protected Object[] getGlobalImplementations() {
-        Object[] res = { UserManagerImpl.class };
+        Object[] res = { UserManager.class };
         return res;
     }
 
@@ -109,20 +108,14 @@ public class Activator extends ComponentActivatorAbstractBase {
      * @param imp implementation to be configured
      * @param containerName container on which the configuration happens
      */
+    @Override
     protected void configureGlobalInstance(Component c, Object imp) {
-        if (imp.equals(UserManagerImpl.class)) {
-            // export the service
-            Dictionary<String, Set<String>> props = new Hashtable<String, Set<String>>();
-            Set<String> propSet = new HashSet<String>();
-            propSet.add("usermanager.localUserSaveConfigEvent");
-            propSet.add("usermanager.remoteServerSaveConfigEvent");
-            propSet.add("usermanager.authorizationSaveConfigEvent");
-            props.put("cachenames", propSet);
+        if (imp.equals(UserManager.class)) {
 
             // export the service
-            c.setInterface(new String[] { ICacheUpdateAware.class.getName(),
+            c.setInterface(new String[] {
                     IUserManager.class.getName(),
-                    IConfigurationAware.class.getName() }, props);
+                    IConfigurationAware.class.getName() }, null);
 
             c.add(createServiceDependency().setService(
                     IClusterGlobalServices.class).setCallbacks(