X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fconfig%2Fconfig-manager%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fconfig%2Fmanager%2Fimpl%2FModuleInternalInfo.java;h=941aec10969fd90c700d257579b02c88520e40e9;hb=ba4f2e7197ba694576dda2c163f0b2edc3552c8f;hp=0d5f18eff0b727454582ba2bb18fb457dc32d7a5;hpb=397cc9012f67596848019ca7874f3a303523b7e6;p=controller.git diff --git a/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/ModuleInternalInfo.java b/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/ModuleInternalInfo.java index 0d5f18eff0..941aec1096 100644 --- a/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/ModuleInternalInfo.java +++ b/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/ModuleInternalInfo.java @@ -14,11 +14,13 @@ import org.opendaylight.controller.config.manager.impl.dynamicmbean.DynamicReada import org.opendaylight.controller.config.manager.impl.jmx.ModuleJMXRegistrator; import org.opendaylight.controller.config.manager.impl.jmx.RootRuntimeBeanRegistratorImpl; import org.opendaylight.controller.config.manager.impl.osgi.BeanToOsgiServiceManager.OsgiRegistration; +import org.opendaylight.yangtools.concepts.Identifiable; /** * Provides metadata about Module from controller to registry. */ -public class ModuleInternalInfo implements Comparable { +public class ModuleInternalInfo implements Comparable, + Identifiable{ private final ModuleIdentifier name; // this registrator is passed to runtime bean registrator and config @@ -33,12 +35,14 @@ public class ModuleInternalInfo implements Comparable { private final OsgiRegistration osgiRegistration; private final ModuleJMXRegistrator moduleJMXRegistrator; private final int orderingIdx; + private final boolean isDefaultBean; public ModuleInternalInfo(ModuleIdentifier name, @Nullable DynamicReadableWrapper readableModule, OsgiRegistration osgiRegistration, RootRuntimeBeanRegistratorImpl runtimeBeanRegistrator, - ModuleJMXRegistrator moduleJMXRegistrator, int orderingIdx) { + ModuleJMXRegistrator moduleJMXRegistrator, int orderingIdx, + boolean isDefaultBean) { if (osgiRegistration == null) { throw new IllegalArgumentException( @@ -54,6 +58,7 @@ public class ModuleInternalInfo implements Comparable { this.name = name; this.moduleJMXRegistrator = moduleJMXRegistrator; this.orderingIdx = orderingIdx; + this.isDefaultBean = isDefaultBean; } public DynamicReadableWrapper getReadableModule() { @@ -85,10 +90,6 @@ public class ModuleInternalInfo implements Comparable { return osgiRegistration; } - public ModuleIdentifier getName() { - return name; - } - /** * Get index representing dependency ordering within a transaction. */ @@ -105,8 +106,17 @@ public class ModuleInternalInfo implements Comparable { } public DestroyedModule toDestroyedModule() { - return new DestroyedModule(getName(), + return new DestroyedModule(getIdentifier(), getReadableModule().getInstance(), getModuleJMXRegistrator(), getOsgiRegistration(), getOrderingIdx()); } + + @Override + public ModuleIdentifier getIdentifier() { + return name; + } + + public boolean isDefaultBean() { + return isDefaultBean; + } }