X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fnetconf%2Fconfig-netconf-connector%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fnetconf%2Fconfignetconfconnector%2Fmapping%2Fruntime%2FModuleRuntime.java;h=4d67c75893a59cc9160902b35a9af34309d74936;hp=59767fec6e79546595d9a6bf9207e80482b09a94;hb=8720a3f3498bbc6fab675431f4200d26641a8ec8;hpb=7e0e35596dde2a0cbcf077b26f9797b6e0cdfa43 diff --git a/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/mapping/runtime/ModuleRuntime.java b/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/mapping/runtime/ModuleRuntime.java index 59767fec6e..4d67c75893 100644 --- a/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/mapping/runtime/ModuleRuntime.java +++ b/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/mapping/runtime/ModuleRuntime.java @@ -9,27 +9,21 @@ package org.opendaylight.controller.netconf.confignetconfconnector.mapping.runtime; import com.google.common.collect.Sets; +import java.util.Collection; +import java.util.Set; +import javax.management.ObjectName; import org.opendaylight.controller.netconf.confignetconfconnector.mapping.config.ModuleConfig; -import org.opendaylight.controller.netconf.confignetconfconnector.mapping.config.ServiceRegistryWrapper; import org.w3c.dom.Document; import org.w3c.dom.Element; -import javax.management.ObjectName; -import java.util.Collection; -import java.util.Set; - public class ModuleRuntime { private final InstanceRuntime instanceRuntime; - public ModuleRuntime(String moduleName, InstanceRuntime instanceRuntime) { + public ModuleRuntime(InstanceRuntime instanceRuntime) { this.instanceRuntime = instanceRuntime; } - public InstanceRuntime getMbeanMapping() { - return instanceRuntime; - } - private ObjectName findRoot(Collection runtimeBeanOns) { for (ObjectName objectName : runtimeBeanOns) { if (objectName.getKeyPropertyList().size() == 3){ @@ -40,15 +34,16 @@ public class ModuleRuntime { } public Element toXml(String namespace, Collection runtimeBeanOns, - Document document, ModuleConfig moduleConfig, ObjectName configBeanON, ServiceRegistryWrapper serviceTracker) { + Document document, ModuleConfig moduleConfig, ObjectName configBeanON) { - Element moduleElement = moduleConfig.toXml(configBeanON, serviceTracker, document, namespace); + Element moduleElement = moduleConfig.toXml(configBeanON, document, namespace); ObjectName rootName = findRoot(runtimeBeanOns); Set childrenRuntimeBeans = Sets.newHashSet(runtimeBeanOns); childrenRuntimeBeans.remove(rootName); + // FIXME: why is this called and not used? instanceRuntime.toXml(rootName, childrenRuntimeBeans, document, moduleElement, namespace); return moduleElement;