Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "BUG 1839 - HTTP delete of non existing data"
[controller.git]
/
opendaylight
/
config
/
config-manager
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
config
/
manager
/
impl
/
osgi
/
mapping
/
ModuleInfoBundleTracker.java
diff --git
a/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/osgi/mapping/ModuleInfoBundleTracker.java
b/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/osgi/mapping/ModuleInfoBundleTracker.java
index 8e93583e04459c3acb5dfe33b851507081090bd7..c5be03ca4dc1948fe776ef30b5d171ec0667ce83 100644
(file)
--- a/
opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/osgi/mapping/ModuleInfoBundleTracker.java
+++ b/
opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/osgi/mapping/ModuleInfoBundleTracker.java
@@
-7,9
+7,16
@@
*/
package org.opendaylight.controller.config.manager.impl.osgi.mapping;
*/
package org.opendaylight.controller.config.manager.impl.osgi.mapping;
+import static java.lang.String.format;
+
+import java.io.InputStream;
+import java.net.URL;
+import java.util.Collection;
+import java.util.LinkedList;
+import java.util.List;
+
import org.apache.commons.io.IOUtils;
import org.opendaylight.yangtools.concepts.ObjectRegistration;
import org.apache.commons.io.IOUtils;
import org.opendaylight.yangtools.concepts.ObjectRegistration;
-import org.opendaylight.yangtools.concepts.Registration;
import org.opendaylight.yangtools.sal.binding.generator.api.ModuleInfoRegistry;
import org.opendaylight.yangtools.yang.binding.YangModelBindingProvider;
import org.opendaylight.yangtools.yang.binding.YangModuleInfo;
import org.opendaylight.yangtools.sal.binding.generator.api.ModuleInfoRegistry;
import org.opendaylight.yangtools.yang.binding.YangModelBindingProvider;
import org.opendaylight.yangtools.yang.binding.YangModuleInfo;
@@
-19,20
+26,12
@@
import org.osgi.util.tracker.BundleTrackerCustomizer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.io.InputStream;
-import java.net.URL;
-import java.util.Collection;
-import java.util.LinkedList;
-import java.util.List;
-
-import static java.lang.String.format;
-
/**
* Tracks bundles and attempts to retrieve YangModuleInfo, which is then fed into ModuleInfoRegistry
*/
public final class ModuleInfoBundleTracker implements BundleTrackerCustomizer<Collection<ObjectRegistration<YangModuleInfo>>> {
/**
* Tracks bundles and attempts to retrieve YangModuleInfo, which is then fed into ModuleInfoRegistry
*/
public final class ModuleInfoBundleTracker implements BundleTrackerCustomizer<Collection<ObjectRegistration<YangModuleInfo>>> {
- private static final Logger
logger
= LoggerFactory.getLogger(ModuleInfoBundleTracker.class);
+ private static final Logger
LOGGER
= LoggerFactory.getLogger(ModuleInfoBundleTracker.class);
public static final String MODULE_INFO_PROVIDER_PATH_PREFIX = "META-INF/services/";
public static final String MODULE_INFO_PROVIDER_PATH_PREFIX = "META-INF/services/";
@@
-46,7
+45,7
@@
public final class ModuleInfoBundleTracker implements BundleTrackerCustomizer<Co
@Override
public Collection<ObjectRegistration<YangModuleInfo>> addingBundle(Bundle bundle, BundleEvent event) {
URL resource = bundle.getEntry(MODULE_INFO_PROVIDER_PATH_PREFIX + YangModelBindingProvider.class.getName());
@Override
public Collection<ObjectRegistration<YangModuleInfo>> addingBundle(Bundle bundle, BundleEvent event) {
URL resource = bundle.getEntry(MODULE_INFO_PROVIDER_PATH_PREFIX + YangModelBindingProvider.class.getName());
-
logger
.debug("Got addingBundle({}) with YangModelBindingProvider resource {}", bundle, resource);
+
LOGGER
.debug("Got addingBundle({}) with YangModelBindingProvider resource {}", bundle, resource);
if(resource==null) {
return null;
}
if(resource==null) {
return null;
}
@@
-55,16
+54,16
@@
public final class ModuleInfoBundleTracker implements BundleTrackerCustomizer<Co
try (InputStream inputStream = resource.openStream()) {
List<String> lines = IOUtils.readLines(inputStream);
for (String moduleInfoName : lines) {
try (InputStream inputStream = resource.openStream()) {
List<String> lines = IOUtils.readLines(inputStream);
for (String moduleInfoName : lines) {
-
logger
.trace("Retrieve ModuleInfo({}, {})", moduleInfoName, bundle);
+
LOGGER
.trace("Retrieve ModuleInfo({}, {})", moduleInfoName, bundle);
YangModuleInfo moduleInfo = retrieveModuleInfo(moduleInfoName, bundle);
registrations.add(moduleInfoRegistry.registerModuleInfo(moduleInfo));
}
} catch (Exception e) {
YangModuleInfo moduleInfo = retrieveModuleInfo(moduleInfoName, bundle);
registrations.add(moduleInfoRegistry.registerModuleInfo(moduleInfo));
}
} catch (Exception e) {
-
logger
.error("Error while reading {}", resource, e);
+
LOGGER
.error("Error while reading {}", resource, e);
throw new RuntimeException(e);
}
throw new RuntimeException(e);
}
-
logger
.trace("Got following registrations {}", registrations);
+
LOGGER
.trace("Got following registrations {}", registrations);
return registrations;
}
return registrations;
}
@@
-78,7
+77,7
@@
public final class ModuleInfoBundleTracker implements BundleTrackerCustomizer<Co
return;
}
return;
}
- for (Registration<YangModuleInfo> reg : regs) {
+ for (
Object
Registration<YangModuleInfo> reg : regs) {
try {
reg.close();
} catch (Exception e) {
try {
reg.close();
} catch (Exception e) {
@@
-112,7
+111,7
@@
public final class ModuleInfoBundleTracker implements BundleTrackerCustomizer<Co
} catch (NoClassDefFoundError e) {
} catch (NoClassDefFoundError e) {
-
logger
.error("Error while executing getModuleInfo on {}", instance, e);
+
LOGGER
.error("Error while executing getModuleInfo on {}", instance, e);
throw e;
}
}
throw e;
}
}
@@
-127,7
+126,7
@@
public final class ModuleInfoBundleTracker implements BundleTrackerCustomizer<Co
}
public static String logMessage(String slfMessage, Object... params) {
}
public static String logMessage(String slfMessage, Object... params) {
-
logger
.info(slfMessage, params);
+
LOGGER
.info(slfMessage, params);
String formatMessage = slfMessage.replaceAll("\\{\\}", "%s");
return format(formatMessage, params);
}
String formatMessage = slfMessage.replaceAll("\\{\\}", "%s");
return format(formatMessage, params);
}