Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fix Eclipse warnings in config-manager
[controller.git]
/
opendaylight
/
config
/
config-manager
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
config
/
manager
/
impl
/
osgi
/
ModuleFactoryBundleTracker.java
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 05ca43c3e2d88e01ea9458fc15bc621a0cd9daa4..8ca5da282511b88ee4cf5e7ea2887ecfba634b4b 100644
(file)
--- 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
@@
-7,13
+7,11
@@
*/
package org.opendaylight.controller.config.manager.impl.osgi;
*/
package org.opendaylight.controller.config.manager.impl.osgi;
-import
static java.lang.String.format
;
-
-import java.io.I
nputStream
;
+import
com.google.common.annotations.VisibleForTesting
;
+import com.google.common.io.Resources;
+import java.io.I
OException
;
import java.net.URL;
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;
import org.opendaylight.controller.config.spi.ModuleFactory;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleEvent;
@@
-22,7
+20,6
@@
import org.osgi.util.tracker.BundleTrackerCustomizer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
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
/**
* OSGi extender that listens for bundle activation events. Reads file
* META-INF/services/org.opendaylight.controller.config.spi.ModuleFactory, each
@@
-32,52
+29,57
@@
import org.slf4j.LoggerFactory;
* 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 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) {
this.blankTransactionServiceTracker = blankTransactionServiceTracker;
}
@Override
public ModuleFactoryBundleTracker(BlankTransactionServiceTracker blankTransactionServiceTracker) {
this.blankTransactionServiceTracker = blankTransactionServiceTracker;
}
@Override
- public
Object
addingBundle(Bundle bundle, BundleEvent event) {
+ public
Boolean
addingBundle(Bundle bundle, BundleEvent event) {
URL resource = bundle.getEntry("META-INF/services/" + ModuleFactory.class.getName());
URL resource = bundle.getEntry("META-INF/services/" + ModuleFactory.class.getName());
-
logger
.trace("Got addingBundle event of bundle {}, resource {}, event {}",
+
LOG
.trace("Got addingBundle event of bundle {}, resource {}, event {}",
bundle, resource, event);
if (resource != null) {
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);
}
registerFactory(factoryClassName, bundle);
}
- } catch (Exception e) {
- logger.error("Error while reading {}", resource, e);
+
+ return Boolean.TRUE;
+ } catch (IOException e) {
+ LOG.error("Error while reading {}", resource, e);
throw new RuntimeException(e);
}
}
throw new RuntimeException(e);
}
}
- return bundle;
+
+ return Boolean.FALSE;
}
@Override
}
@Override
- public void modifiedBundle(Bundle bundle, BundleEvent event,
Object object
) {
+ public void modifiedBundle(Bundle bundle, BundleEvent event,
Boolean hasFactory
) {
// NOOP
}
@Override
// 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(Bundle bundle, BundleEvent event, Boolean hasFactory) {
+ if(hasFactory) {
+ // workaround for service tracker not getting removed service event
+ blankTransactionServiceTracker.blankTransactionSync();
+ }
}
}
- // TODO:test
- pr
ivate
static ServiceRegistration<?> registerFactory(String factoryClassName, Bundle bundle) {
+ @VisibleForTesting
+ pr
otected
static ServiceRegistration<?> registerFactory(String factoryClassName, Bundle bundle) {
String errorMessage;
String errorMessage;
+ Exception ex = null;
try {
Class<?> clazz = bundle.loadClass(factoryClassName);
if (ModuleFactory.class.isAssignableFrom(clazz)) {
try {
try {
Class<?> clazz = bundle.loadClass(factoryClassName);
if (ModuleFactory.class.isAssignableFrom(clazz)) {
try {
-
logger
.debug("Registering {} in bundle {}",
+
LOG
.debug("Registering {} in bundle {}",
clazz.getName(), bundle);
return bundle.getBundleContext().registerService(
ModuleFactory.class.getName(), clazz.newInstance(),
clazz.getName(), bundle);
return bundle.getBundleContext().registerService(
ModuleFactory.class.getName(), clazz.newInstance(),
@@
-86,10
+88,12
@@
public class ModuleFactoryBundleTracker implements BundleTrackerCustomizer<Objec
errorMessage = logMessage(
"Could not instantiate {} in bundle {}, reason {}",
factoryClassName, bundle, e);
errorMessage = logMessage(
"Could not instantiate {} in bundle {}, reason {}",
factoryClassName, bundle, e);
+ ex = e;
} catch (IllegalAccessException e) {
errorMessage = logMessage(
} catch (IllegalAccessException e) {
errorMessage = logMessage(
- "Illegal access during instatiation of class {} in bundle {}, reason {}",
+ "Illegal access during insta
n
tiation of class {} in bundle {}, reason {}",
factoryClassName, bundle, e);
factoryClassName, bundle, e);
+ ex = e;
}
} else {
errorMessage = logMessage(
}
} else {
errorMessage = logMessage(
@@
-98,15
+102,17
@@
public class ModuleFactoryBundleTracker implements BundleTrackerCustomizer<Objec
}
} catch (ClassNotFoundException e) {
errorMessage = logMessage(
}
} catch (ClassNotFoundException e) {
errorMessage = logMessage(
- "Could not find class {} in bunde {}, reason {}",
+ "Could not find class {} in bund
l
e {}, reason {}",
factoryClassName, bundle, e);
factoryClassName, bundle, e);
+ ex = e;
}
}
- throw new IllegalStateException(errorMessage);
+
+ throw ex == null ? new IllegalStateException(errorMessage) : new IllegalStateException(errorMessage, ex);
}
public static String logMessage(String slfMessage, Object... params) {
}
public static String logMessage(String slfMessage, Object... params) {
-
logger
.info(slfMessage, params);
+
LOG
.info(slfMessage, params);
String formatMessage = slfMessage.replaceAll("\\{\\}", "%s");
String formatMessage = slfMessage.replaceAll("\\{\\}", "%s");
- return format(formatMessage, params);
+ return
String.
format(formatMessage, params);
}
}
}
}