X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fconfig%2Fconfig-manager%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fconfig%2Fmanager%2Fimpl%2Fosgi%2FModuleFactoryBundleTracker.java;h=e89d6c87aa7aaa1cd89f0c6b832c5945630b280b;hp=3015ed229e28f1c04015d9d488d641c9ebceb161;hb=f43b01b81319959b1907e3e04537f5169e7f33d8;hpb=3dd9d7c6da1baaf72f05e1118c0ca47dc16e3c7b

diff --git a/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/osgi/ModuleFactoryBundleTracker.java b/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/osgi/ModuleFactoryBundleTracker.java
index 3015ed229e..e89d6c87aa 100644
--- a/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/osgi/ModuleFactoryBundleTracker.java
+++ b/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/osgi/ModuleFactoryBundleTracker.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 Cisco Systems, Inc. and others.  All rights reserved.
+ * Copyright (c) 2013, 2017 Cisco Systems, Inc. and others.  All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
@@ -7,14 +7,11 @@
  */
 package org.opendaylight.controller.config.manager.impl.osgi;
 
-import static java.lang.String.format;
-
 import com.google.common.annotations.VisibleForTesting;
-import java.io.InputStream;
+import com.google.common.io.Resources;
+import java.io.IOException;
 import java.net.URL;
-import java.util.List;
-
-import org.apache.commons.io.IOUtils;
+import java.nio.charset.StandardCharsets;
 import org.opendaylight.controller.config.spi.ModuleFactory;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleEvent;
@@ -23,96 +20,91 @@ import org.osgi.util.tracker.BundleTrackerCustomizer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-
 /**
  * OSGi extender that listens for bundle activation events. Reads file
  * META-INF/services/org.opendaylight.controller.config.spi.ModuleFactory, each
  * line should contain an implementation of ModuleFactory interface. Creates new
  * instance with default constructor and registers it into OSGi service
  * registry. There is no need for listening for implementing removedBundle as
- * the services are unregistered automatically.
- * Code based on http://www.toedter.com/blog/?p=236
+ * the services are unregistered automatically. Code based on
+ * http://www.toedter.com/blog/?p=236
  */
-public class ModuleFactoryBundleTracker implements BundleTrackerCustomizer<Object> {
+public class ModuleFactoryBundleTracker implements BundleTrackerCustomizer<Boolean> {
     private final BlankTransactionServiceTracker blankTransactionServiceTracker;
-    private static final Logger logger = LoggerFactory.getLogger(ModuleFactoryBundleTracker.class);
+    private static final Logger LOG = LoggerFactory.getLogger(ModuleFactoryBundleTracker.class);
 
-    public ModuleFactoryBundleTracker(BlankTransactionServiceTracker blankTransactionServiceTracker) {
+    public ModuleFactoryBundleTracker(final BlankTransactionServiceTracker blankTransactionServiceTracker) {
         this.blankTransactionServiceTracker = blankTransactionServiceTracker;
     }
 
     @Override
-    public Object addingBundle(Bundle bundle, BundleEvent event) {
+    public Boolean addingBundle(final Bundle bundle, final BundleEvent event) {
         URL resource = bundle.getEntry("META-INF/services/" + ModuleFactory.class.getName());
-        logger.trace("Got addingBundle event of bundle {}, resource {}, event {}",
-                bundle, resource, event);
+        LOG.trace("Got addingBundle event of bundle {}, resource {}, event {}", bundle, resource, event);
         if (resource != null) {
-            try (InputStream inputStream = resource.openStream()) {
-                List<String> lines = IOUtils.readLines(inputStream);
-                for (String factoryClassName : lines) {
+            try {
+                for (String factoryClassName : Resources.readLines(resource, StandardCharsets.UTF_8)) {
                     registerFactory(factoryClassName, bundle);
                 }
-            } catch (Exception e) {
-                logger.error("Error while reading {}", resource, e);
+
+                return Boolean.TRUE;
+            } catch (final IOException e) {
+                LOG.error("Error while reading {}", resource, e);
                 throw new RuntimeException(e);
             }
         }
-        return bundle;
+
+        return Boolean.FALSE;
     }
 
     @Override
-    public void modifiedBundle(Bundle bundle, BundleEvent event, Object object) {
+    public void modifiedBundle(final Bundle bundle, final BundleEvent event, final Boolean hasFactory) {
         // NOOP
     }
 
     @Override
-    public void removedBundle(Bundle bundle, BundleEvent event, Object object) {
-        // workaround for service tracker not getting removed service event
-        blankTransactionServiceTracker.blankTransaction();
+    public void removedBundle(final Bundle bundle, final BundleEvent event, final Boolean hasFactory) {
+        if (hasFactory) {
+            // workaround for service tracker not getting removed service event
+            blankTransactionServiceTracker.blankTransactionSync();
+        }
     }
 
     @VisibleForTesting
-    protected static ServiceRegistration<?> registerFactory(String factoryClassName, Bundle bundle) {
+    protected static ServiceRegistration<?> registerFactory(final String factoryClassName, final Bundle bundle) {
         String errorMessage;
         Exception ex = null;
         try {
             Class<?> clazz = bundle.loadClass(factoryClassName);
             if (ModuleFactory.class.isAssignableFrom(clazz)) {
                 try {
-                    logger.debug("Registering {} in bundle {}",
-                            clazz.getName(), bundle);
-                    return bundle.getBundleContext().registerService(
-                            ModuleFactory.class.getName(), clazz.newInstance(),
+                    LOG.debug("Registering {} in bundle {}", clazz.getName(), bundle);
+                    return bundle.getBundleContext().registerService(ModuleFactory.class.getName(), clazz.newInstance(),
                             null);
-                } catch (InstantiationException e) {
-                    errorMessage = logMessage(
-                            "Could not instantiate {} in bundle {}, reason {}",
-                            factoryClassName, bundle, e);
+                } catch (final InstantiationException e) {
+                    errorMessage = logMessage("Could not instantiate {} in bundle {}, reason {}", factoryClassName,
+                            bundle, e);
                     ex = e;
-                } catch (IllegalAccessException e) {
-                    errorMessage = logMessage(
-                            "Illegal access during instantiation of class {} in bundle {}, reason {}",
+                } catch (final IllegalAccessException e) {
+                    errorMessage = logMessage("Illegal access during instantiation of class {} in bundle {}, reason {}",
                             factoryClassName, bundle, e);
                     ex = e;
                 }
             } else {
-                errorMessage = logMessage(
-                        "Class {} does not implement {} in bundle {}", clazz,
-                        ModuleFactory.class, bundle);
+                errorMessage = logMessage("Class {} does not implement {} in bundle {}", clazz, ModuleFactory.class,
+                        bundle);
             }
-        } catch (ClassNotFoundException e) {
-            errorMessage = logMessage(
-                    "Could not find class {} in bundle {}, reason {}",
-                    factoryClassName, bundle, e);
+        } catch (final ClassNotFoundException e) {
+            errorMessage = logMessage("Could not find class {} in bundle {}, reason {}", factoryClassName, bundle, e);
             ex = e;
         }
 
         throw ex == null ? new IllegalStateException(errorMessage) : new IllegalStateException(errorMessage, ex);
     }
 
-    public static String logMessage(String slfMessage, Object... params) {
-        logger.info(slfMessage, params);
+    public static String logMessage(final String slfMessage, final Object... params) {
+        LOG.info(slfMessage, params);
         String formatMessage = slfMessage.replaceAll("\\{\\}", "%s");
-        return format(formatMessage, params);
+        return String.format(formatMessage, params);
     }
 }