From 07d721d409cefe0ec307ec96b5e90881b1ddcbc8 Mon Sep 17 00:00:00 2001 From: Tomas Olvecky Date: Mon, 21 Oct 2013 16:43:59 +0200 Subject: [PATCH] Remove deprecated methods from config-api. Remove methods that were supporting users before code generation was in place. Change-Id: I6bb2106c98d7f4a1c0bcaa23bb7c565e93243fe2 Signed-off-by: Tomas Olvecky --- .../controller/config/api/DependencyResolver.java | 9 --------- .../DependencyResolverImpl.java | 15 --------------- .../config/manager/impl/AbstractConfigTest.java | 10 ---------- .../parallelapsp/TestingParallelAPSPModule.java | 10 +++++++--- 4 files changed, 7 insertions(+), 37 deletions(-) diff --git a/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/api/DependencyResolver.java b/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/api/DependencyResolver.java index a2b171aec0..7cac1060ba 100644 --- a/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/api/DependencyResolver.java +++ b/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/api/DependencyResolver.java @@ -38,12 +38,6 @@ public interface DependencyResolver { Class expectedServiceInterface, ObjectName objectName, JmxAttribute jmxAttribute); - @Deprecated - // TODO remove once all config code is generated - void validateDependency( - Class expectedServiceInterface, - ObjectName objectName, String attributeNameForErrorReporting); - /** * To be used during commit phase to wire actual dependencies. * @@ -54,7 +48,4 @@ public interface DependencyResolver { T resolveInstance(Class expectedType, ObjectName objectName, JmxAttribute jmxAttribute); - @Deprecated - T resolveInstance(Class expectedType, ObjectName objectName); - } 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 87b2e1f752..b355a5e365 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 @@ -105,14 +105,6 @@ final class DependencyResolverImpl implements DependencyResolver, } } - @Override - public void validateDependency( - Class expectedServiceInterface, - ObjectName objectName, String attributeNameForErrorReporting) { - validateDependency(expectedServiceInterface, objectName, - new JmxAttribute(attributeNameForErrorReporting)); - } - /** * {@inheritDoc} */ @@ -155,13 +147,6 @@ final class DependencyResolverImpl implements DependencyResolver, } } - @Deprecated - @Override - public T resolveInstance(Class expectedType, ObjectName objectName) { - return resolveInstance(expectedType, objectName, new JmxAttribute( - "unknown attribute")); - } - @Override public int compareTo(DependencyResolverImpl o) { transactionStatus.checkCommitted(); diff --git a/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/impl/AbstractConfigTest.java b/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/impl/AbstractConfigTest.java index 3eaa9b1c7d..0b84d905df 100644 --- a/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/impl/AbstractConfigTest.java +++ b/opendaylight/config/config-manager/src/test/java/org/opendaylight/controller/config/manager/impl/AbstractConfigTest.java @@ -117,16 +117,6 @@ public abstract class AbstractConfigTest extends .size()); } - @Deprecated - protected ObjectName createTestConfigBean( - ConfigTransactionJMXClient transaction, String implementationName, - String name, Class clz) throws InstanceAlreadyExistsException { - ObjectName nameCreated = transaction.createModule(implementationName, - name); - transaction.newMXBeanProxy(nameCreated, clz); - return nameCreated; - } - protected ObjectName createTestConfigBean( ConfigTransactionJMXClient transaction, String implementationName, String name) throws InstanceAlreadyExistsException { 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 de283fec03..81ba49e1aa 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 @@ -17,6 +17,7 @@ import javax.annotation.concurrent.NotThreadSafe; import javax.management.ObjectName; import org.opendaylight.controller.config.api.DependencyResolver; +import org.opendaylight.controller.config.api.JmxAttribute; import org.opendaylight.controller.config.api.ModuleIdentifier; import org.opendaylight.controller.config.api.annotations.RequireInterface; import org.opendaylight.controller.config.manager.testingservices.seviceinterface.TestingThreadPoolServiceInterface; @@ -87,19 +88,22 @@ public class TestingParallelAPSPModule implements Module, return instance.getMaxNumberOfThreads(); } + // this would be generated: + private final JmxAttribute threadPoolONJMXAttribute = new JmxAttribute("threadPoolON"); + @Override public void validate() { checkNotNull(threadPoolON, "Parameter 'threadPool' must be set"); dependencyResolver.validateDependency( TestingThreadPoolServiceInterface.class, threadPoolON, - "threadPoolON"); + threadPoolONJMXAttribute); checkState(Strings.isNullOrEmpty(someParam) == false, "Parameter 'SomeParam' is blank"); // check that calling resolveInstance fails try { dependencyResolver.resolveInstance(TestingThreadPoolIfc.class, - threadPoolON); + threadPoolON, threadPoolONJMXAttribute); throw new RuntimeException("fail"); } catch (IllegalStateException e) { checkState("Commit was not triggered".equals(e.getMessage()), @@ -111,7 +115,7 @@ public class TestingParallelAPSPModule implements Module, public Closeable getInstance() { if (instance == null) { TestingThreadPoolIfc threadPoolInstance = dependencyResolver - .resolveInstance(TestingThreadPoolIfc.class, threadPoolON); + .resolveInstance(TestingThreadPoolIfc.class, threadPoolON, threadPoolONJMXAttribute); if (oldInstance != null) { // changing thread pool is not supported -- 2.36.6