From: Martin Bobak Date: Wed, 23 Oct 2013 13:14:46 +0000 (+0200) Subject: added implementation of Identifier and Identifiable from yangtools.concepts X-Git-Tag: jenkins-controller-bulk-release-prepare-only-2-1~570 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=0641db636be750bf98e85c702c4948c7c835b9b6 added implementation of Identifier and Identifiable from yangtools.concepts Change-Id: I33a106e3c7b7db8ea74921409b931c3eea06a548 Signed-off-by: Martin Bobak --- diff --git a/opendaylight/commons/opendaylight/pom.xml b/opendaylight/commons/opendaylight/pom.xml index 30c0e474dc..6bbb2ac048 100644 --- a/opendaylight/commons/opendaylight/pom.xml +++ b/opendaylight/commons/opendaylight/pom.xml @@ -633,7 +633,6 @@ yang-ext ${yang-ext.version} - org.opendaylight.bgpcep @@ -645,13 +644,11 @@ util ${bgpcep.version} - - - org.opendaylight.bgpcep - framework - ${bgpcep.version} - - + + org.opendaylight.bgpcep + framework + ${bgpcep.version} + io.netty diff --git a/opendaylight/config/config-api/.gitignore b/opendaylight/config/config-api/.gitignore index fc1d35eb24..6590c79cf8 100644 --- a/opendaylight/config/config-api/.gitignore +++ b/opendaylight/config/config-api/.gitignore @@ -1,3 +1,4 @@ target .classpath .settings +/target diff --git a/opendaylight/config/config-api/pom.xml b/opendaylight/config/config-api/pom.xml index 218362a07b..394831d252 100644 --- a/opendaylight/config/config-api/pom.xml +++ b/opendaylight/config/config-api/pom.xml @@ -23,6 +23,11 @@ org.osgi org.osgi.core + + org.opendaylight.yangtools + concepts + ${opendaylight.yangtools.version} + @@ -34,7 +39,7 @@ javax.management, - org.opendaylight.protocol.concepts, + org.opendaylight.yangtools.concepts, org.osgi.framework, diff --git a/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/api/ModuleIdentifier.java b/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/api/ModuleIdentifier.java index f5ccb4a53c..c654f5fe0a 100644 --- a/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/api/ModuleIdentifier.java +++ b/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/api/ModuleIdentifier.java @@ -7,7 +7,9 @@ */ package org.opendaylight.controller.config.api; -public class ModuleIdentifier { +import org.opendaylight.yangtools.concepts.Identifier; + +public class ModuleIdentifier implements Identifier { private static final long serialVersionUID = 1L; private final String factoryName, instanceName; diff --git a/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/spi/Module.java b/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/spi/Module.java index 01f81a3d56..ff14841c68 100644 --- a/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/spi/Module.java +++ b/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/spi/Module.java @@ -11,6 +11,7 @@ import javax.annotation.concurrent.NotThreadSafe; import org.opendaylight.controller.config.api.ModuleIdentifier; import org.opendaylight.controller.config.api.annotations.RequireInterface; +import org.opendaylight.yangtools.concepts.Identifiable; /** @@ -28,7 +29,7 @@ import org.opendaylight.controller.config.api.annotations.RequireInterface; *

*/ @NotThreadSafe -public interface Module { +public interface Module extends Identifiable{ /** * This method will be called as first phase in two phase commit. Instance * can check attributes, but is not allowed to do any kind of work that @@ -55,6 +56,4 @@ public interface Module { */ AutoCloseable getInstance(); - ModuleIdentifier getName(); - } diff --git a/opendaylight/config/config-manager/pom.xml b/opendaylight/config/config-manager/pom.xml index 2019cb6a36..138f5007a7 100644 --- a/opendaylight/config/config-manager/pom.xml +++ b/opendaylight/config/config-manager/pom.xml @@ -64,6 +64,11 @@ guava test + + org.opendaylight.yangtools + concepts + ${opendaylight.yangtools.version} + @@ -85,7 +90,7 @@ org.slf4j, javax.management, org.osgi.framework, - org.opendaylight.protocol.concepts, + org.opendaylight.yangtools.concepts.*, org.apache.commons.io, org.osgi.util.tracker, diff --git a/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/ConfigRegistryImpl.java b/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/ConfigRegistryImpl.java index 18b4d3bc57..75db0e8d57 100644 --- a/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/ConfigRegistryImpl.java +++ b/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/ConfigRegistryImpl.java @@ -209,7 +209,7 @@ public class ConfigRegistryImpl implements AutoCloseable, ConfigRegistryImplMXBe // runtime jmx registrator), // also closes osgi registration and ModuleJMXRegistrator // registration - currentConfig.remove(toBeDestroyed.getName()); + currentConfig.remove(toBeDestroyed.getIdentifier()); } // set RuntimeBeanRegistrators on beans implementing diff --git a/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/ConfigTransactionControllerImpl.java b/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/ConfigTransactionControllerImpl.java index 5e8fac6048..740a741927 100644 --- a/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/ConfigTransactionControllerImpl.java +++ b/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/ConfigTransactionControllerImpl.java @@ -37,6 +37,7 @@ import org.opendaylight.controller.config.manager.impl.jmx.TransactionModuleJMXR import org.opendaylight.controller.config.manager.impl.util.LookupBeansUtil; import org.opendaylight.controller.config.spi.Module; import org.opendaylight.controller.config.spi.ModuleFactory; +import org.opendaylight.yangtools.concepts.Identifiable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -47,7 +48,8 @@ import org.slf4j.LoggerFactory; */ class ConfigTransactionControllerImpl implements ConfigTransactionControllerInternal, - ConfigTransactionControllerImplMXBean { + ConfigTransactionControllerImplMXBean, + Identifiable{ private static final Logger logger = LoggerFactory.getLogger(ConfigTransactionControllerImpl.class); private final TransactionIdentifier transactionIdentifier; @@ -131,7 +133,7 @@ class ConfigTransactionControllerImpl implements Set defaultModules = moduleFactory.getDefaultModules(dependencyResolverManager); for (Module module : defaultModules) { try { - putConfigBeanToJMXAndInternalMaps(module.getName(), module, moduleFactory, null); + putConfigBeanToJMXAndInternalMaps(module.getIdentifier(), module, moduleFactory, null); } catch (InstanceAlreadyExistsException e) { throw new IllegalStateException(e); } @@ -197,9 +199,9 @@ class ConfigTransactionControllerImpl implements @Nullable ModuleInternalInfo maybeOldConfigBeanInfo) throws InstanceAlreadyExistsException { logger.debug("Adding module {} to transaction {}", moduleIdentifier, this); - if (moduleIdentifier.equals(module.getName())==false) { + if (moduleIdentifier.equals(module.getIdentifier())==false) { throw new IllegalStateException("Incorrect name reported by module. Expected " - + moduleIdentifier + ", got " + module.getName()); + + moduleIdentifier + ", got " + module.getIdentifier()); } DynamicMBean writableDynamicWrapper = new DynamicWritableWrapper( module, moduleIdentifier, transactionIdentifier, @@ -453,4 +455,9 @@ class ConfigTransactionControllerImpl implements public List getCurrentlyRegisteredFactories() { return currentlyRegisteredFactories; } + + @Override + public TransactionIdentifier getIdentifier() { + return transactionIdentifier; + } } diff --git a/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/DestroyedModule.java b/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/DestroyedModule.java index 4913604512..682d4a1812 100644 --- a/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/DestroyedModule.java +++ b/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/DestroyedModule.java @@ -10,6 +10,7 @@ package org.opendaylight.controller.config.manager.impl; import org.opendaylight.controller.config.api.ModuleIdentifier; import org.opendaylight.controller.config.manager.impl.jmx.ModuleJMXRegistrator; import org.opendaylight.controller.config.manager.impl.osgi.BeanToOsgiServiceManager.OsgiRegistration; +import org.opendaylight.yangtools.concepts.Identifiable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -20,47 +21,43 @@ import org.slf4j.LoggerFactory; * compareTo method. */ public class DestroyedModule implements AutoCloseable, - Comparable { + Comparable, Identifiable { private static final Logger logger = LoggerFactory .getLogger(DestroyedModule.class); - private final ModuleIdentifier name; + private final ModuleIdentifier identifier; private final AutoCloseable instance; private final ModuleJMXRegistrator oldJMXRegistrator; private final OsgiRegistration osgiRegistration; private final int orderingIdx; - DestroyedModule(ModuleIdentifier name, AutoCloseable instance, + DestroyedModule(ModuleIdentifier identifier, AutoCloseable instance, ModuleJMXRegistrator oldJMXRegistrator, OsgiRegistration osgiRegistration, int orderingIdx) { - this.name = name; + this.identifier = identifier; this.instance = instance; this.oldJMXRegistrator = oldJMXRegistrator; this.osgiRegistration = osgiRegistration; this.orderingIdx = orderingIdx; } - public ModuleIdentifier getName() { - return name; - } - @Override public void close() { - logger.info("Destroying {}", name); + logger.info("Destroying {}", identifier); try { instance.close(); } catch (Exception e) { - logger.error("Error while closing instance of {}", name, e); + logger.error("Error while closing instance of {}", identifier, e); } try { oldJMXRegistrator.close(); } catch (Exception e) { - logger.error("Error while closing jmx registrator of {}", name, e); + logger.error("Error while closing jmx registrator of {}", identifier, e); } try { osgiRegistration.close(); } catch (Exception e) { - logger.error("Error while closing osgi registration of {}", name, e); + logger.error("Error while closing osgi registration of {}", identifier, e); } } @@ -68,4 +65,9 @@ public class DestroyedModule implements AutoCloseable, public int compareTo(DestroyedModule o) { return Integer.compare(orderingIdx, o.orderingIdx); } + + @Override + public ModuleIdentifier getIdentifier() { + return identifier; + } } 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..c675db5bff 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 @@ -85,6 +87,7 @@ public class ModuleInternalInfo implements Comparable { return osgiRegistration; } + @Deprecated public ModuleIdentifier getName() { return name; } @@ -109,4 +112,9 @@ public class ModuleInternalInfo implements Comparable { getReadableModule().getInstance(), getModuleJMXRegistrator(), getOsgiRegistration(), getOrderingIdx()); } + + @Override + public ModuleIdentifier getIdentifier() { + return name; + } } diff --git a/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/ModuleInternalTransactionalInfo.java b/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/ModuleInternalTransactionalInfo.java index 571bbad753..1dc8a2bcef 100644 --- a/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/ModuleInternalTransactionalInfo.java +++ b/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/ModuleInternalTransactionalInfo.java @@ -16,8 +16,9 @@ import org.opendaylight.controller.config.manager.impl.jmx.TransactionModuleJMXR .TransactionModuleJMXRegistration; import org.opendaylight.controller.config.spi.Module; import org.opendaylight.controller.config.spi.ModuleFactory; +import org.opendaylight.yangtools.concepts.Identifiable; -public class ModuleInternalTransactionalInfo { +public class ModuleInternalTransactionalInfo implements Identifiable { private final ModuleIdentifier name; private final Module module; private final ModuleFactory moduleFactory; @@ -56,6 +57,7 @@ public class ModuleInternalTransactionalInfo { maybeOldInternalInfo.getOrderingIdx()); } + @Deprecated public Module getModule() { return module; } @@ -74,4 +76,9 @@ public class ModuleInternalTransactionalInfo { public TransactionModuleJMXRegistration getTransactionModuleJMXRegistration() { return transactionModuleJMXRegistration; } + + @Override + public ModuleIdentifier getIdentifier() { + return name; + } } diff --git a/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/TransactionIdentifier.java b/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/TransactionIdentifier.java index de8440cc66..5ab09bea11 100644 --- a/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/TransactionIdentifier.java +++ b/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/TransactionIdentifier.java @@ -7,7 +7,10 @@ */ package org.opendaylight.controller.config.manager.impl; -public class TransactionIdentifier { +import org.opendaylight.yangtools.concepts.Identifier; + +public class TransactionIdentifier implements Identifier { + private final String name; public TransactionIdentifier(String name) { diff --git a/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/dependencyresolver/DependencyResolverImpl.java b/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/dependencyresolver/DependencyResolverImpl.java index ecb02a1c4f..f817b41c5f 100644 --- a/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/dependencyresolver/DependencyResolverImpl.java +++ b/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/dependencyresolver/DependencyResolverImpl.java @@ -25,6 +25,7 @@ import org.opendaylight.controller.config.api.jmx.ObjectNameUtil; import org.opendaylight.controller.config.manager.impl.TransactionStatus; import org.opendaylight.controller.config.spi.Module; import org.opendaylight.controller.config.spi.ModuleFactory; +import org.opendaylight.yangtools.concepts.Identifiable; /** * Protect {@link org.opendaylight.controller.config.spi.Module#getInstance()} @@ -32,7 +33,7 @@ import org.opendaylight.controller.config.spi.ModuleFactory; * during validation. Tracks dependencies for ordering purposes. */ final class DependencyResolverImpl implements DependencyResolver, - Comparable { + Identifiable, Comparable { private final ModulesHolder modulesHolder; private final ModuleIdentifier name; private final TransactionStatus transactionStatus; @@ -46,6 +47,7 @@ final class DependencyResolverImpl implements DependencyResolver, this.modulesHolder = modulesHolder; } + @Deprecated public ModuleIdentifier getName() { return name; } @@ -199,4 +201,9 @@ final class DependencyResolverImpl implements DependencyResolver, impl.maxDependencyDepth = maxDepth; return maxDepth; } + + @Override + public ModuleIdentifier getIdentifier() { + return name; + } } diff --git a/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/impl/AbstractMockedModule.java b/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/impl/AbstractMockedModule.java index 89ac9a3828..87d6e8b698 100644 --- a/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/impl/AbstractMockedModule.java +++ b/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/impl/AbstractMockedModule.java @@ -34,9 +34,5 @@ public abstract class AbstractMockedModule implements Module { return instance; } - @Override - public ModuleIdentifier getName() { - return new ModuleIdentifier(getClass().getCanonicalName(), "mock"); - } } diff --git a/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/impl/util/InterfacesHelperTest.java b/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/impl/util/InterfacesHelperTest.java index 2509750e57..9a5452aa6c 100644 --- a/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/impl/util/InterfacesHelperTest.java +++ b/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/impl/util/InterfacesHelperTest.java @@ -15,6 +15,7 @@ import javax.management.MXBean; import org.junit.Test; import org.opendaylight.controller.config.spi.Module; +import org.opendaylight.yangtools.concepts.Identifiable; import com.google.common.collect.Sets; @@ -48,7 +49,7 @@ public class InterfacesHelperTest { @Test public void testGetAllInterfaces() { Set> expected = Sets.> newHashSet(SuperA.class, SuperBMXBean.class, SuperC.class, - SubA.class, Module.class); + SubA.class, Identifiable.class, Module.class); assertEquals(expected, InterfacesHelper.getAllInterfaces(SubClass.class)); } diff --git a/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/testingservices/parallelapsp/TestingParallelAPSPModule.java b/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/testingservices/parallelapsp/TestingParallelAPSPModule.java index 81ba49e1aa..3c55f4dcc0 100644 --- a/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/testingservices/parallelapsp/TestingParallelAPSPModule.java +++ b/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/testingservices/parallelapsp/TestingParallelAPSPModule.java @@ -40,26 +40,21 @@ public class TestingParallelAPSPModule implements Module, private final DependencyResolver dependencyResolver; private final AutoCloseable oldCloseable; private final TestingParallelAPSPImpl oldInstance; - private final ModuleIdentifier name; + private final ModuleIdentifier identifier; private ObjectName threadPoolON; private TestingParallelAPSPImpl instance; private String someParam; - public TestingParallelAPSPModule(ModuleIdentifier name, + public TestingParallelAPSPModule(ModuleIdentifier identifier, DependencyResolver dependencyResolver, @Nullable AutoCloseable oldCloseable, @Nullable TestingParallelAPSPImpl oldInstance) { - this.name = name; + this.identifier = identifier; this.dependencyResolver = dependencyResolver; this.oldCloseable = oldCloseable; this.oldInstance = oldInstance; } - @Override - public ModuleIdentifier getName() { - return name; - } - @Override public ObjectName getThreadPool() { return threadPoolON; @@ -142,4 +137,11 @@ public class TestingParallelAPSPModule implements Module, } return instance; } + + @Override + public ModuleIdentifier getIdentifier() { + return identifier; + } + + } diff --git a/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/testingservices/parallelapsp/test/MockedDependenciesTest.java b/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/testingservices/parallelapsp/test/MockedDependenciesTest.java index 29e91fd924..e385136abf 100644 --- a/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/testingservices/parallelapsp/test/MockedDependenciesTest.java +++ b/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/testingservices/parallelapsp/test/MockedDependenciesTest.java @@ -60,11 +60,6 @@ public class MockedDependenciesTest extends AbstractParallelAPSPTest { this.moduleIdentifier = moduleIdentifier; } - @Override - public ModuleIdentifier getName() { - return moduleIdentifier; - } - @Override public int getThreadCount() { return threadCount; @@ -84,6 +79,11 @@ public class MockedDependenciesTest extends AbstractParallelAPSPTest { public Closeable getInstance() { return new MockedThreadPool(threadCount); } + + @Override + public ModuleIdentifier getIdentifier() { + return moduleIdentifier; + } } public static class MockedThreadPool implements TestingThreadPoolIfc, diff --git a/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/testingservices/scheduledthreadpool/TestingScheduledThreadPoolModule.java b/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/testingservices/scheduledthreadpool/TestingScheduledThreadPoolModule.java index 4716d589f1..77d1f8bbdf 100644 --- a/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/testingservices/scheduledthreadpool/TestingScheduledThreadPoolModule.java +++ b/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/testingservices/scheduledthreadpool/TestingScheduledThreadPoolModule.java @@ -30,7 +30,7 @@ public class TestingScheduledThreadPoolModule implements Module, RuntimeBeanRegistratorAwareModule, TestingScheduledThreadPoolServiceInterface { - private final ModuleIdentifier name; + private final ModuleIdentifier identifier; @Nullable private final AutoCloseable oldCloseable; @Nullable @@ -41,19 +41,14 @@ public class TestingScheduledThreadPoolModule implements Module, private RootRuntimeBeanRegistrator runtimeBeanRegistrator; private boolean recreate; - public TestingScheduledThreadPoolModule(ModuleIdentifier name, + public TestingScheduledThreadPoolModule(ModuleIdentifier identifier, @Nullable AutoCloseable oldCloseable, @Nullable TestingScheduledThreadPoolImpl oldInstance) { - this.name = name; + this.identifier = identifier; this.oldCloseable = oldCloseable; this.oldInstance = oldInstance; } - @Override - public ModuleIdentifier getName() { - return name; - } - @Override public void setRuntimeBeanRegistrator( RootRuntimeBeanRegistrator runtimeBeanRegistrator) { @@ -108,4 +103,10 @@ public class TestingScheduledThreadPoolModule implements Module, this.recreate = recreate; } + @Override + public ModuleIdentifier getIdentifier() { + return identifier; + } + + } diff --git a/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/testingservices/threadpool/TestingFixedThreadPoolModule.java b/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/testingservices/threadpool/TestingFixedThreadPoolModule.java index ff33b164c5..0069b44c19 100644 --- a/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/testingservices/threadpool/TestingFixedThreadPoolModule.java +++ b/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/testingservices/threadpool/TestingFixedThreadPoolModule.java @@ -37,10 +37,6 @@ public class TestingFixedThreadPoolModule implements this.oldInstance = oldInstance; } - @Override - public ModuleIdentifier getName() { - return name; - } // attributes @Override @@ -100,4 +96,9 @@ public class TestingFixedThreadPoolModule implements return instance; } + @Override + public ModuleIdentifier getIdentifier() { + return name; + } + } diff --git a/opendaylight/config/logback-config/src/main/java/org/opendaylight/controller/config/yang/logback/config/LogbackModule.java b/opendaylight/config/logback-config/src/main/java/org/opendaylight/controller/config/yang/logback/config/LogbackModule.java index 9b5cbfc7f9..09c3cb8326 100644 --- a/opendaylight/config/logback-config/src/main/java/org/opendaylight/controller/config/yang/logback/config/LogbackModule.java +++ b/opendaylight/config/logback-config/src/main/java/org/opendaylight/controller/config/yang/logback/config/LogbackModule.java @@ -12,6 +12,7 @@ import java.util.Set; import org.opendaylight.controller.config.api.JmxAttribute; import org.opendaylight.controller.config.api.JmxAttributeValidationException; +import org.opendaylight.controller.config.api.ModuleIdentifier; import com.google.common.collect.Sets; @@ -149,4 +150,5 @@ public final class LogbackModule return setter; } + } diff --git a/opendaylight/config/pom.xml b/opendaylight/config/pom.xml index 1ea922e07e..a16472b3d6 100755 --- a/opendaylight/config/pom.xml +++ b/opendaylight/config/pom.xml @@ -43,6 +43,7 @@ 1.1.1 0.5.9-SNAPSHOT 0.6.0-SNAPSHOT + 0.1.1-SNAPSHOT ${project.build.directory}/generated-sources/config diff --git a/opendaylight/config/yang-jmx-generator-plugin/src/main/resources/freeMarker/module_abs_template_new.ftl b/opendaylight/config/yang-jmx-generator-plugin/src/main/resources/freeMarker/module_abs_template_new.ftl index 90412d7bb5..7351822db9 100644 --- a/opendaylight/config/yang-jmx-generator-plugin/src/main/resources/freeMarker/module_abs_template_new.ftl +++ b/opendaylight/config/yang-jmx-generator-plugin/src/main/resources/freeMarker/module_abs_template_new.ftl @@ -15,20 +15,20 @@ package ${packageName}; private final ${instanceType} oldInstance; private ${instanceType} instance; private final ${dependencyResolverType} dependencyResolver; - private final ${moduleNameType} name; + private final ${moduleNameType} identifier; <#if runtime=true> private ${registratorType} rootRuntimeBeanRegistratorWrapper; - public ${typeDeclaration.name}(${moduleNameType} name, ${dependencyResolverType} dependencyResolver) { - this.name = name; + public ${typeDeclaration.name}(${moduleNameType} identifier, ${dependencyResolverType} dependencyResolver) { + this.identifier = identifier; this.dependencyResolver = dependencyResolver; this.oldInstance = null; this.oldModule = null; } - public ${typeDeclaration.name}(${moduleNameType} name, ${dependencyResolverType} dependencyResolver, ${typeDeclaration.name} oldModule, ${instanceType} oldInstance) { - this.name = name; + public ${typeDeclaration.name}(${moduleNameType} identifier, ${dependencyResolverType} dependencyResolver, ${typeDeclaration.name} oldModule, ${instanceType} oldInstance) { + this.identifier = identifier; this.dependencyResolver = dependencyResolver; this.oldInstance = oldInstance; this.oldModule = oldModule; @@ -104,8 +104,8 @@ package ${packageName}; } @Override - public final ${moduleNameType} getName() { - return name; + public ${moduleNameType} getIdentifier() { + return identifier; } public boolean canReuseInstance(${typeDeclaration.name} oldModule){ diff --git a/opendaylight/config/yang-jmx-generator-plugin/src/main/resources/freeMarker/module_stub_template.ftl b/opendaylight/config/yang-jmx-generator-plugin/src/main/resources/freeMarker/module_stub_template.ftl index d2350ac40b..23dce9321e 100644 --- a/opendaylight/config/yang-jmx-generator-plugin/src/main/resources/freeMarker/module_stub_template.ftl +++ b/opendaylight/config/yang-jmx-generator-plugin/src/main/resources/freeMarker/module_stub_template.ftl @@ -5,12 +5,12 @@ package ${packageName}; <@typeDeclarationD object=typeDeclaration/> { - public ${typeDeclaration.name}(${moduleNameType} name, ${dependencyResolverType} dependencyResolver) { - super(name, dependencyResolver); + public ${typeDeclaration.name}(${moduleNameType} identifier, ${dependencyResolverType} dependencyResolver) { + super(identifier, dependencyResolver); } - public ${typeDeclaration.name}(${moduleNameType} name, ${dependencyResolverType} dependencyResolver, ${typeDeclaration.name} oldModule, ${instanceType} oldInstance) { - super(name, dependencyResolver, oldModule, oldInstance); + public ${typeDeclaration.name}(${moduleNameType} identifier, ${dependencyResolverType} dependencyResolver, ${typeDeclaration.name} oldModule, ${instanceType} oldInstance) { + super(identifier, dependencyResolver, oldModule, oldInstance); } @Override diff --git a/opendaylight/config/yang-test/src/main/java/org/opendaylight/controller/config/yang/test/impl/DepTestImplModule.java b/opendaylight/config/yang-test/src/main/java/org/opendaylight/controller/config/yang/test/impl/DepTestImplModule.java index 4b37aa1fe5..a47e0a1a3e 100644 --- a/opendaylight/config/yang-test/src/main/java/org/opendaylight/controller/config/yang/test/impl/DepTestImplModule.java +++ b/opendaylight/config/yang-test/src/main/java/org/opendaylight/controller/config/yang/test/impl/DepTestImplModule.java @@ -9,6 +9,8 @@ */ package org.opendaylight.controller.config.yang.test.impl; +import org.opendaylight.controller.config.api.ModuleIdentifier; + /** * */ @@ -43,4 +45,5 @@ public final class DepTestImplModule } }; } + } diff --git a/opendaylight/config/yang-test/src/main/java/org/opendaylight/controller/config/yang/test/impl/NetconfTestImplModule.java b/opendaylight/config/yang-test/src/main/java/org/opendaylight/controller/config/yang/test/impl/NetconfTestImplModule.java index 1cfbd0ec4a..0bb3651535 100644 --- a/opendaylight/config/yang-test/src/main/java/org/opendaylight/controller/config/yang/test/impl/NetconfTestImplModule.java +++ b/opendaylight/config/yang-test/src/main/java/org/opendaylight/controller/config/yang/test/impl/NetconfTestImplModule.java @@ -9,6 +9,8 @@ */ package org.opendaylight.controller.config.yang.test.impl; +import org.opendaylight.controller.config.api.ModuleIdentifier; + /** * */ @@ -43,4 +45,5 @@ public final class NetconfTestImplModule } }; } + } diff --git a/opendaylight/config/yang-test/src/main/java/org/opendaylight/controller/config/yang/test/impl/TestImplModule.java b/opendaylight/config/yang-test/src/main/java/org/opendaylight/controller/config/yang/test/impl/TestImplModule.java index bc5f1bb67c..dfd9ebc021 100644 --- a/opendaylight/config/yang-test/src/main/java/org/opendaylight/controller/config/yang/test/impl/TestImplModule.java +++ b/opendaylight/config/yang-test/src/main/java/org/opendaylight/controller/config/yang/test/impl/TestImplModule.java @@ -9,6 +9,7 @@ */ package org.opendaylight.controller.config.yang.test.impl; + /** * */ @@ -43,4 +44,5 @@ public final class TestImplModule } }; } + } diff --git a/opendaylight/netconf/config-netconf-connector/pom.xml b/opendaylight/netconf/config-netconf-connector/pom.xml index 3e3e3f2341..989bd9e676 100755 --- a/opendaylight/netconf/config-netconf-connector/pom.xml +++ b/opendaylight/netconf/config-netconf-connector/pom.xml @@ -90,6 +90,7 @@ org.opendaylight.bgpcep mockito-configuration + ${bgpcep.version} test diff --git a/opendaylight/netconf/config-persister-impl/pom.xml b/opendaylight/netconf/config-persister-impl/pom.xml index ffc80c0a19..603f40b020 100644 --- a/opendaylight/netconf/config-persister-impl/pom.xml +++ b/opendaylight/netconf/config-persister-impl/pom.xml @@ -50,6 +50,7 @@ org.opendaylight.bgpcep mockito-configuration + ${bgpcep.version} test diff --git a/opendaylight/netconf/netconf-api/pom.xml b/opendaylight/netconf/netconf-api/pom.xml index 69c0660dc5..3c6209485d 100644 --- a/opendaylight/netconf/netconf-api/pom.xml +++ b/opendaylight/netconf/netconf-api/pom.xml @@ -21,6 +21,7 @@ org.opendaylight.bgpcep framework + ${bgpcep.version} diff --git a/opendaylight/netconf/netconf-client/pom.xml b/opendaylight/netconf/netconf-client/pom.xml index edd84937d6..0864a52356 100644 --- a/opendaylight/netconf/netconf-client/pom.xml +++ b/opendaylight/netconf/netconf-client/pom.xml @@ -24,6 +24,7 @@ org.opendaylight.bgpcep framework + ${bgpcep.version} com.google.guava diff --git a/opendaylight/netconf/netconf-impl/pom.xml b/opendaylight/netconf/netconf-impl/pom.xml index ba0723d787..c355cb0638 100644 --- a/opendaylight/netconf/netconf-impl/pom.xml +++ b/opendaylight/netconf/netconf-impl/pom.xml @@ -59,6 +59,7 @@ org.opendaylight.bgpcep mockito-configuration + ${bgpcep.version} test diff --git a/opendaylight/netconf/netconf-util/pom.xml b/opendaylight/netconf/netconf-util/pom.xml index b180a67823..20603c4774 100644 --- a/opendaylight/netconf/netconf-util/pom.xml +++ b/opendaylight/netconf/netconf-util/pom.xml @@ -50,6 +50,7 @@ io.netty netty-handler + ${netconf.netty.version}