From 828f1ee4c7726282fb41a43840b3d69078723992 Mon Sep 17 00:00:00 2001 From: Tom Pantelis Date: Tue, 19 Apr 2016 20:01:00 -0400 Subject: [PATCH] Deprecate netty config modules Marked the md-sal dom/binding config yang modules, 01-md-sal.xml and associated Module classes as deprecated. Change-Id: I5c2b531ac489b3ce06e54078f28ad0ea76a35670 Signed-off-by: Tom Pantelis --- .../src/main/resources/initial/00-netty.xml | 3 +++ .../config/netty-config-api/src/main/yang/netty.yang | 4 ++++ .../netty/eventexecutor/GlobalEventExecutorModule.java | 4 ++++ .../eventexecutor/GlobalEventExecutorModuleFactory.java | 4 ++++ .../eventexecutor/ImmediateEventExecutorModule.java | 4 ++++ .../ImmediateEventExecutorModuleFactory.java | 5 ++++- .../src/main/yang/netty-event-executor.yang | 2 ++ .../yang/netty/threadgroup/NettyThreadgroupModule.java | 5 +++-- .../netty/threadgroup/NettyThreadgroupModuleFactory.java | 4 ++++ .../org/opendaylight/blueprint/netty-threadgroup.xml | 2 +- .../src/main/yang/netty-threadgroup.yang | 9 ++------- .../config/yang/netty/timer/HashedWheelTimerModule.java | 5 +++-- .../yang/netty/timer/HashedWheelTimerModuleFactory.java | 4 ++++ .../netty-timer-config/src/main/yang/netty-timer.yang | 4 ++++ 14 files changed, 46 insertions(+), 13 deletions(-) diff --git a/opendaylight/config/config-netty-config/src/main/resources/initial/00-netty.xml b/opendaylight/config/config-netty-config/src/main/resources/initial/00-netty.xml index 2bf5b36d7a..dc1ace2a41 100644 --- a/opendaylight/config/config-netty-config/src/main/resources/initial/00-netty.xml +++ b/opendaylight/config/config-netty-config/src/main/resources/initial/00-netty.xml @@ -6,6 +6,9 @@ This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html + + NOTE: This file is deprecated as wiring is now done via blueprint. This file is kept for + backwards compatibility. Runtime modifications are not honored. --> diff --git a/opendaylight/config/netty-config-api/src/main/yang/netty.yang b/opendaylight/config/netty-config-api/src/main/yang/netty.yang index 281b76c1b8..9ab19dd959 100644 --- a/opendaylight/config/netty-config-api/src/main/yang/netty.yang +++ b/opendaylight/config/netty-config-api/src/main/yang/netty.yang @@ -27,6 +27,7 @@ module netty { } identity netty-threadgroup { + status deprecated; description "Configuration wrapper around netty's threadgroup"; @@ -36,6 +37,7 @@ module netty { } identity netty-event-executor { + status deprecated; description "Configuration wrapper around netty's event executor"; @@ -45,6 +47,7 @@ module netty { } identity netty-timer { + status deprecated; description "Configuration wrapper around netty's timer"; @@ -54,6 +57,7 @@ module netty { } identity channel-factory { + status deprecated; description "Configuration wrapper around netty's channel factory"; diff --git a/opendaylight/config/netty-event-executor-config/src/main/java/org/opendaylight/controller/config/yang/netty/eventexecutor/GlobalEventExecutorModule.java b/opendaylight/config/netty-event-executor-config/src/main/java/org/opendaylight/controller/config/yang/netty/eventexecutor/GlobalEventExecutorModule.java index da0639187d..476b202921 100644 --- a/opendaylight/config/netty-event-executor-config/src/main/java/org/opendaylight/controller/config/yang/netty/eventexecutor/GlobalEventExecutorModule.java +++ b/opendaylight/config/netty-event-executor-config/src/main/java/org/opendaylight/controller/config/yang/netty/eventexecutor/GlobalEventExecutorModule.java @@ -22,6 +22,10 @@ import org.opendaylight.controller.config.api.osgi.WaitingServiceTracker; import org.opendaylight.controller.config.yang.netty.eventexecutor.AutoCloseableEventExecutor.CloseableEventExecutorMixin; import org.osgi.framework.BundleContext; +/** + * @deprecated Replaced by blueprint wiring + */ +@Deprecated public final class GlobalEventExecutorModule extends org.opendaylight.controller.config.yang.netty.eventexecutor.AbstractGlobalEventExecutorModule { private BundleContext bundleContext; diff --git a/opendaylight/config/netty-event-executor-config/src/main/java/org/opendaylight/controller/config/yang/netty/eventexecutor/GlobalEventExecutorModuleFactory.java b/opendaylight/config/netty-event-executor-config/src/main/java/org/opendaylight/controller/config/yang/netty/eventexecutor/GlobalEventExecutorModuleFactory.java index 467f0689e9..c15d80b15b 100644 --- a/opendaylight/config/netty-event-executor-config/src/main/java/org/opendaylight/controller/config/yang/netty/eventexecutor/GlobalEventExecutorModuleFactory.java +++ b/opendaylight/config/netty-event-executor-config/src/main/java/org/opendaylight/controller/config/yang/netty/eventexecutor/GlobalEventExecutorModuleFactory.java @@ -21,6 +21,10 @@ import static com.google.common.base.Preconditions.checkArgument; import org.opendaylight.controller.config.api.DependencyResolver; import org.osgi.framework.BundleContext; +/** + * @deprecated Replaced by blueprint wiring + */ +@Deprecated public class GlobalEventExecutorModuleFactory extends org.opendaylight.controller.config.yang.netty.eventexecutor.AbstractGlobalEventExecutorModuleFactory { public static final String SINGLETON_NAME = "singleton"; diff --git a/opendaylight/config/netty-event-executor-config/src/main/java/org/opendaylight/controller/config/yang/netty/eventexecutor/ImmediateEventExecutorModule.java b/opendaylight/config/netty-event-executor-config/src/main/java/org/opendaylight/controller/config/yang/netty/eventexecutor/ImmediateEventExecutorModule.java index 9178452a3e..6163ce0041 100644 --- a/opendaylight/config/netty-event-executor-config/src/main/java/org/opendaylight/controller/config/yang/netty/eventexecutor/ImmediateEventExecutorModule.java +++ b/opendaylight/config/netty-event-executor-config/src/main/java/org/opendaylight/controller/config/yang/netty/eventexecutor/ImmediateEventExecutorModule.java @@ -9,6 +9,10 @@ package org.opendaylight.controller.config.yang.netty.eventexecutor; import org.opendaylight.controller.config.yang.netty.eventexecutor.AutoCloseableEventExecutor.CloseableEventExecutorMixin; +/** + * @deprecated Replaced by blueprint wiring + */ +@Deprecated public final class ImmediateEventExecutorModule extends org.opendaylight.controller.config.yang.netty.eventexecutor.AbstractImmediateEventExecutorModule { public ImmediateEventExecutorModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) { diff --git a/opendaylight/config/netty-event-executor-config/src/main/java/org/opendaylight/controller/config/yang/netty/eventexecutor/ImmediateEventExecutorModuleFactory.java b/opendaylight/config/netty-event-executor-config/src/main/java/org/opendaylight/controller/config/yang/netty/eventexecutor/ImmediateEventExecutorModuleFactory.java index 2a804eb40e..f9d6417bdb 100644 --- a/opendaylight/config/netty-event-executor-config/src/main/java/org/opendaylight/controller/config/yang/netty/eventexecutor/ImmediateEventExecutorModuleFactory.java +++ b/opendaylight/config/netty-event-executor-config/src/main/java/org/opendaylight/controller/config/yang/netty/eventexecutor/ImmediateEventExecutorModuleFactory.java @@ -8,10 +8,13 @@ package org.opendaylight.controller.config.yang.netty.eventexecutor; import static com.google.common.base.Preconditions.checkArgument; - import org.opendaylight.controller.config.api.DependencyResolver; import org.osgi.framework.BundleContext; +/** + * @deprecated Replaced by blueprint wiring + */ +@Deprecated public class ImmediateEventExecutorModuleFactory extends org.opendaylight.controller.config.yang.netty.eventexecutor.AbstractImmediateEventExecutorModuleFactory { public static final String SINGLETON_NAME = "singleton"; diff --git a/opendaylight/config/netty-event-executor-config/src/main/yang/netty-event-executor.yang b/opendaylight/config/netty-event-executor-config/src/main/yang/netty-event-executor.yang index 8d812adc4d..ca15334ea2 100644 --- a/opendaylight/config/netty-event-executor-config/src/main/yang/netty-event-executor.yang +++ b/opendaylight/config/netty-event-executor-config/src/main/yang/netty-event-executor.yang @@ -28,6 +28,7 @@ module netty-event-executor { } identity netty-global-event-executor { + status deprecated; base config:module-type; config:provided-service netty:netty-event-executor; config:java-name-prefix GlobalEventExecutor; @@ -40,6 +41,7 @@ module netty-event-executor { } identity netty-immediate-event-executor { + status deprecated; base config:module-type; config:provided-service netty:netty-event-executor; config:java-name-prefix ImmediateEventExecutor; diff --git a/opendaylight/config/netty-threadgroup-config/src/main/java/org/opendaylight/controller/config/yang/netty/threadgroup/NettyThreadgroupModule.java b/opendaylight/config/netty-threadgroup-config/src/main/java/org/opendaylight/controller/config/yang/netty/threadgroup/NettyThreadgroupModule.java index 09ea672001..fa11652850 100644 --- a/opendaylight/config/netty-threadgroup-config/src/main/java/org/opendaylight/controller/config/yang/netty/threadgroup/NettyThreadgroupModule.java +++ b/opendaylight/config/netty-threadgroup-config/src/main/java/org/opendaylight/controller/config/yang/netty/threadgroup/NettyThreadgroupModule.java @@ -26,8 +26,9 @@ import org.opendaylight.controller.config.api.osgi.WaitingServiceTracker; import org.osgi.framework.BundleContext; /** -* -*/ + * @deprecated Replaced by blueprint wiring + */ +@Deprecated public final class NettyThreadgroupModule extends org.opendaylight.controller.config.yang.netty.threadgroup.AbstractNettyThreadgroupModule { private BundleContext bundleContext; diff --git a/opendaylight/config/netty-threadgroup-config/src/main/java/org/opendaylight/controller/config/yang/netty/threadgroup/NettyThreadgroupModuleFactory.java b/opendaylight/config/netty-threadgroup-config/src/main/java/org/opendaylight/controller/config/yang/netty/threadgroup/NettyThreadgroupModuleFactory.java index b509932568..89a5231114 100644 --- a/opendaylight/config/netty-threadgroup-config/src/main/java/org/opendaylight/controller/config/yang/netty/threadgroup/NettyThreadgroupModuleFactory.java +++ b/opendaylight/config/netty-threadgroup-config/src/main/java/org/opendaylight/controller/config/yang/netty/threadgroup/NettyThreadgroupModuleFactory.java @@ -20,6 +20,10 @@ package org.opendaylight.controller.config.yang.netty.threadgroup; import org.opendaylight.controller.config.api.DependencyResolver; import org.osgi.framework.BundleContext; +/** + * @deprecated Replaced by blueprint wiring + */ +@Deprecated public class NettyThreadgroupModuleFactory extends AbstractNettyThreadgroupModuleFactory { @Override public NettyThreadgroupModule instantiateModule(String instanceName, DependencyResolver dependencyResolver, diff --git a/opendaylight/config/netty-threadgroup-config/src/main/resources/org/opendaylight/blueprint/netty-threadgroup.xml b/opendaylight/config/netty-threadgroup-config/src/main/resources/org/opendaylight/blueprint/netty-threadgroup.xml index bfb088f765..5ab81de75a 100644 --- a/opendaylight/config/netty-threadgroup-config/src/main/resources/org/opendaylight/blueprint/netty-threadgroup.xml +++ b/opendaylight/config/netty-threadgroup-config/src/main/resources/org/opendaylight/blueprint/netty-threadgroup.xml @@ -6,7 +6,7 @@ - + diff --git a/opendaylight/config/netty-threadgroup-config/src/main/yang/netty-threadgroup.yang b/opendaylight/config/netty-threadgroup-config/src/main/yang/netty-threadgroup.yang index 71cbff4bcd..44c33f6fea 100644 --- a/opendaylight/config/netty-threadgroup-config/src/main/yang/netty-threadgroup.yang +++ b/opendaylight/config/netty-threadgroup-config/src/main/yang/netty-threadgroup.yang @@ -23,6 +23,7 @@ module threadgroup { } identity netty-threadgroup-fixed { + status deprecated; base config:module-type; config:provided-service netty:netty-threadgroup; config:java-name-prefix NettyThreadgroup; @@ -33,6 +34,7 @@ module threadgroup { when "/config:modules/config:module/config:type = 'netty-threadgroup-fixed'"; leaf thread-count { + status deprecated; type uint16; description "Number of threads to be used by NioEventLoopGroup. This attribute is optional and default value will be 2* Number of CPUs"; @@ -42,11 +44,4 @@ module threadgroup { } } - - augment "/config:modules/config:module/config:state" { - case netty-threadgroup-fixed { - when "/config:modules/config:module/config:type = 'netty-threadgroup-fixed'"; - } - } - } diff --git a/opendaylight/config/netty-timer-config/src/main/java/org/opendaylight/controller/config/yang/netty/timer/HashedWheelTimerModule.java b/opendaylight/config/netty-timer-config/src/main/java/org/opendaylight/controller/config/yang/netty/timer/HashedWheelTimerModule.java index 76d75e8372..d1d55405a9 100644 --- a/opendaylight/config/netty-timer-config/src/main/java/org/opendaylight/controller/config/yang/netty/timer/HashedWheelTimerModule.java +++ b/opendaylight/config/netty-timer-config/src/main/java/org/opendaylight/controller/config/yang/netty/timer/HashedWheelTimerModule.java @@ -26,8 +26,9 @@ import org.opendaylight.controller.config.api.osgi.WaitingServiceTracker; import org.osgi.framework.BundleContext; /** -* -*/ + * @deprecated Replaced by blueprint wiring + */ +@Deprecated public final class HashedWheelTimerModule extends org.opendaylight.controller.config.yang.netty.timer.AbstractHashedWheelTimerModule { private BundleContext bundleContext; diff --git a/opendaylight/config/netty-timer-config/src/main/java/org/opendaylight/controller/config/yang/netty/timer/HashedWheelTimerModuleFactory.java b/opendaylight/config/netty-timer-config/src/main/java/org/opendaylight/controller/config/yang/netty/timer/HashedWheelTimerModuleFactory.java index d8ec0fcf90..a4049c89e6 100644 --- a/opendaylight/config/netty-timer-config/src/main/java/org/opendaylight/controller/config/yang/netty/timer/HashedWheelTimerModuleFactory.java +++ b/opendaylight/config/netty-timer-config/src/main/java/org/opendaylight/controller/config/yang/netty/timer/HashedWheelTimerModuleFactory.java @@ -20,6 +20,10 @@ package org.opendaylight.controller.config.yang.netty.timer; import org.opendaylight.controller.config.api.DependencyResolver; import org.osgi.framework.BundleContext; +/** + * @deprecated Replaced by blueprint wiring + */ +@Deprecated public class HashedWheelTimerModuleFactory extends AbstractHashedWheelTimerModuleFactory { @Override public HashedWheelTimerModule instantiateModule(String instanceName, DependencyResolver dependencyResolver, diff --git a/opendaylight/config/netty-timer-config/src/main/yang/netty-timer.yang b/opendaylight/config/netty-timer-config/src/main/yang/netty-timer.yang index e622be39c7..c9ada0c3d9 100644 --- a/opendaylight/config/netty-timer-config/src/main/yang/netty-timer.yang +++ b/opendaylight/config/netty-timer-config/src/main/yang/netty-timer.yang @@ -29,6 +29,7 @@ module netty-timer { } identity netty-hashed-wheel-timer { + status deprecated; base config:module-type; config:provided-service netty:netty-timer; config:java-name-prefix HashedWheelTimer; @@ -39,14 +40,17 @@ module netty-timer { when "/config:modules/config:module/config:type = 'netty-hashed-wheel-timer'"; leaf tick-duration { + status deprecated; type uint32; } leaf ticks-per-wheel { + status deprecated; type uint16; } container thread-factory { + status deprecated; uses config:service-ref { refine type { mandatory false; -- 2.36.6