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%2Fdependencyresolver%2FDependencyResolverManager.java;h=645aab37ff770cfc3cbe6399f139a7cf68a07470;hp=fe94af89fa3b6b8479c82bcc9c9fa1e9cafa1a5a;hb=6117dc1c03128e9f7eac249b4a997449e254cdd6;hpb=2c6fd09ad16f5c2968390a674865efbbe5f1fcec diff --git a/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/dependencyresolver/DependencyResolverManager.java b/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/dependencyresolver/DependencyResolverManager.java index fe94af89fa..645aab37ff 100644 --- a/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/dependencyresolver/DependencyResolverManager.java +++ b/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/dependencyresolver/DependencyResolverManager.java @@ -7,11 +7,6 @@ */ package org.opendaylight.controller.config.manager.impl.dependencyresolver; -import java.util.*; - -import javax.annotation.concurrent.GuardedBy; -import javax.management.InstanceAlreadyExistsException; - import org.opendaylight.controller.config.api.DependencyResolver; import org.opendaylight.controller.config.api.DependencyResolverFactory; import org.opendaylight.controller.config.api.JmxAttribute; @@ -22,6 +17,14 @@ import org.opendaylight.controller.config.manager.impl.TransactionStatus; import org.opendaylight.controller.config.spi.Module; import org.opendaylight.controller.config.spi.ModuleFactory; +import javax.annotation.concurrent.GuardedBy; +import javax.management.InstanceAlreadyExistsException; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + /** * Holds information about modules being created and destroyed within this * transaction. Observes usage of DependencyResolver within modules to figure @@ -76,7 +79,7 @@ public class DependencyResolverManager implements TransactionHolder, DependencyR List result = new ArrayList<>( moduleIdentifiersToDependencyResolverMap.size()); for (DependencyResolverImpl dri : getAllSorted()) { - ModuleIdentifier driName = dri.getName(); + ModuleIdentifier driName = dri.getIdentifier(); result.add(driName); } return result; @@ -114,6 +117,11 @@ public class DependencyResolverManager implements TransactionHolder, DependencyR jmxAttributeForReporting); } + @Override + public ModuleInternalTransactionalInfo findModuleInternalTransactionalInfo(ModuleIdentifier moduleIdentifier) { + return modulesHolder.findModuleInternalTransactionalInfo(moduleIdentifier); + } + @Override public ModuleFactory findModuleFactory(ModuleIdentifier moduleIdentifier, JmxAttribute jmxAttributeForReporting) { @@ -136,7 +144,7 @@ public class DependencyResolverManager implements TransactionHolder, DependencyR List result = new ArrayList<>(); for( ModuleInternalTransactionalInfo info : modulesHolder.getAllInfos()) { if (factory.equals(info.getModuleFactory())) { - result.add(info.getName()); + result.add(info.getIdentifier()); } } return result;