From 6abfdf26a32608b543bede44aa9c5afa080afb99 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Alexis=20de=20Talhou=C3=ABt?= Date: Fri, 23 Sep 2016 11:46:58 -0400 Subject: [PATCH] Bug 6794 - Deprecate eventbus, async-eventbus and fixed-threadpool MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Those modules aren't used anymore, I couldn't find any reference of them, expect some in netconf regarding the fixed-threadpool. But those reference are coming from big xml test files that I suppose are pretty odl. This deprecation notice is to warn potential downstream consumer that those are now deprecated, and that those will be removed in next release, Nitrogen. Change-Id: I8810b39a632c2d4c678c31bb46b8284aa33593f2 Signed-off-by: Alexis de Talhouët --- .../config/threadpool/util/CloseableAsyncEventBus.java | 4 ++++ .../config/threadpool/util/CloseableEventBus.java | 4 ++++ .../config/threadpool/util/FixedThreadPoolWrapper.java | 4 ++++ .../config/yang/threadpool/impl/AsyncEventBusModule.java | 3 ++- .../yang/threadpool/impl/AsyncEventBusModuleFactory.java | 5 +++-- .../config/yang/threadpool/impl/EventBusModule.java | 5 +++-- .../config/yang/threadpool/impl/EventBusModuleFactory.java | 5 +++-- .../yang/threadpool/impl/fixed/FixedThreadPoolModule.java | 5 +++-- .../threadpool/impl/fixed/FixedThreadPoolModuleFactory.java | 5 +++-- .../src/main/yang/threadpool-impl-fixed.yang | 2 ++ .../src/main/yang/threadpool-impl.yang | 6 ++++++ 11 files changed, 37 insertions(+), 11 deletions(-) diff --git a/opendaylight/config/threadpool-config-impl/src/main/java/org/opendaylight/controller/config/threadpool/util/CloseableAsyncEventBus.java b/opendaylight/config/threadpool-config-impl/src/main/java/org/opendaylight/controller/config/threadpool/util/CloseableAsyncEventBus.java index f460cb0021..0b8f48c2fe 100644 --- a/opendaylight/config/threadpool-config-impl/src/main/java/org/opendaylight/controller/config/threadpool/util/CloseableAsyncEventBus.java +++ b/opendaylight/config/threadpool-config-impl/src/main/java/org/opendaylight/controller/config/threadpool/util/CloseableAsyncEventBus.java @@ -21,6 +21,10 @@ import org.opendaylight.controller.config.yang.threadpool.impl.AsyncEventBusRunt /** * Closeable version of {@link AsyncEventBus}. */ +/** + * To be removed in Nitrogen + */ +@Deprecated public class CloseableAsyncEventBus extends AsyncEventBus implements Closeable { private final ThreadPool threadPool; private final AsyncEventBusRuntimeRegistration rootRegistration; diff --git a/opendaylight/config/threadpool-config-impl/src/main/java/org/opendaylight/controller/config/threadpool/util/CloseableEventBus.java b/opendaylight/config/threadpool-config-impl/src/main/java/org/opendaylight/controller/config/threadpool/util/CloseableEventBus.java index b56f0e490a..ab61bfe723 100644 --- a/opendaylight/config/threadpool-config-impl/src/main/java/org/opendaylight/controller/config/threadpool/util/CloseableEventBus.java +++ b/opendaylight/config/threadpool-config-impl/src/main/java/org/opendaylight/controller/config/threadpool/util/CloseableEventBus.java @@ -19,6 +19,10 @@ import org.opendaylight.controller.config.yang.threadpool.impl.EventBusRuntimeRe /** * Closeable {@link EventBus}. */ +/** + * To be removed in Nitrogen + */ +@Deprecated public class CloseableEventBus extends EventBus implements Closeable { private final EventBusRuntimeRegistration rootRegistration; diff --git a/opendaylight/config/threadpool-config-impl/src/main/java/org/opendaylight/controller/config/threadpool/util/FixedThreadPoolWrapper.java b/opendaylight/config/threadpool-config-impl/src/main/java/org/opendaylight/controller/config/threadpool/util/FixedThreadPoolWrapper.java index 2dad26490b..dcb121abfa 100644 --- a/opendaylight/config/threadpool-config-impl/src/main/java/org/opendaylight/controller/config/threadpool/util/FixedThreadPoolWrapper.java +++ b/opendaylight/config/threadpool-config-impl/src/main/java/org/opendaylight/controller/config/threadpool/util/FixedThreadPoolWrapper.java @@ -19,6 +19,10 @@ import org.opendaylight.controller.config.threadpool.ThreadPool; * Implementation of {@link ThreadPool} using fixed number of threads wraps * {@link ExecutorService}. */ +/** + * To be removed in Nitrogen + */ +@Deprecated public class FixedThreadPoolWrapper implements ThreadPool, Closeable { private final ThreadPoolExecutor executor; diff --git a/opendaylight/config/threadpool-config-impl/src/main/java/org/opendaylight/controller/config/yang/threadpool/impl/AsyncEventBusModule.java b/opendaylight/config/threadpool-config-impl/src/main/java/org/opendaylight/controller/config/yang/threadpool/impl/AsyncEventBusModule.java index 0bdcbbcca4..5183015784 100644 --- a/opendaylight/config/threadpool-config-impl/src/main/java/org/opendaylight/controller/config/yang/threadpool/impl/AsyncEventBusModule.java +++ b/opendaylight/config/threadpool-config-impl/src/main/java/org/opendaylight/controller/config/yang/threadpool/impl/AsyncEventBusModule.java @@ -20,8 +20,9 @@ package org.opendaylight.controller.config.yang.threadpool.impl; import org.opendaylight.controller.config.threadpool.util.CloseableAsyncEventBus; /** -* +* To be removed in Nitrogen */ +@Deprecated public final class AsyncEventBusModule extends org.opendaylight.controller.config.yang.threadpool.impl.AbstractAsyncEventBusModule { diff --git a/opendaylight/config/threadpool-config-impl/src/main/java/org/opendaylight/controller/config/yang/threadpool/impl/AsyncEventBusModuleFactory.java b/opendaylight/config/threadpool-config-impl/src/main/java/org/opendaylight/controller/config/yang/threadpool/impl/AsyncEventBusModuleFactory.java index 17d50562d3..23be62d4bf 100644 --- a/opendaylight/config/threadpool-config-impl/src/main/java/org/opendaylight/controller/config/yang/threadpool/impl/AsyncEventBusModuleFactory.java +++ b/opendaylight/config/threadpool-config-impl/src/main/java/org/opendaylight/controller/config/yang/threadpool/impl/AsyncEventBusModuleFactory.java @@ -18,8 +18,9 @@ package org.opendaylight.controller.config.yang.threadpool.impl; /** -* -*/ + * To be removed in Nitrogen + */ +@Deprecated public class AsyncEventBusModuleFactory extends org.opendaylight.controller.config.yang.threadpool.impl.AbstractAsyncEventBusModuleFactory { diff --git a/opendaylight/config/threadpool-config-impl/src/main/java/org/opendaylight/controller/config/yang/threadpool/impl/EventBusModule.java b/opendaylight/config/threadpool-config-impl/src/main/java/org/opendaylight/controller/config/yang/threadpool/impl/EventBusModule.java index 6c36599078..70b7a5f737 100644 --- a/opendaylight/config/threadpool-config-impl/src/main/java/org/opendaylight/controller/config/yang/threadpool/impl/EventBusModule.java +++ b/opendaylight/config/threadpool-config-impl/src/main/java/org/opendaylight/controller/config/yang/threadpool/impl/EventBusModule.java @@ -20,8 +20,9 @@ package org.opendaylight.controller.config.yang.threadpool.impl; import org.opendaylight.controller.config.threadpool.util.CloseableEventBus; /** -* -*/ + * To be removed in Nitrogen + */ +@Deprecated public final class EventBusModule extends org.opendaylight.controller.config.yang.threadpool.impl.AbstractEventBusModule { diff --git a/opendaylight/config/threadpool-config-impl/src/main/java/org/opendaylight/controller/config/yang/threadpool/impl/EventBusModuleFactory.java b/opendaylight/config/threadpool-config-impl/src/main/java/org/opendaylight/controller/config/yang/threadpool/impl/EventBusModuleFactory.java index 955d4f16e4..38ec21c809 100644 --- a/opendaylight/config/threadpool-config-impl/src/main/java/org/opendaylight/controller/config/yang/threadpool/impl/EventBusModuleFactory.java +++ b/opendaylight/config/threadpool-config-impl/src/main/java/org/opendaylight/controller/config/yang/threadpool/impl/EventBusModuleFactory.java @@ -18,8 +18,9 @@ package org.opendaylight.controller.config.yang.threadpool.impl; /** -* -*/ + * To be removed in Nitrogen + */ +@Deprecated public class EventBusModuleFactory extends org.opendaylight.controller.config.yang.threadpool.impl.AbstractEventBusModuleFactory { diff --git a/opendaylight/config/threadpool-config-impl/src/main/java/org/opendaylight/controller/config/yang/threadpool/impl/fixed/FixedThreadPoolModule.java b/opendaylight/config/threadpool-config-impl/src/main/java/org/opendaylight/controller/config/yang/threadpool/impl/fixed/FixedThreadPoolModule.java index d06e6164b1..95e11b90be 100644 --- a/opendaylight/config/threadpool-config-impl/src/main/java/org/opendaylight/controller/config/yang/threadpool/impl/fixed/FixedThreadPoolModule.java +++ b/opendaylight/config/threadpool-config-impl/src/main/java/org/opendaylight/controller/config/yang/threadpool/impl/fixed/FixedThreadPoolModule.java @@ -21,8 +21,9 @@ import org.opendaylight.controller.config.api.JmxAttributeValidationException; import org.opendaylight.controller.config.threadpool.util.FixedThreadPoolWrapper; /** -* -*/ + * To be removed in Nitrogen + */ +@Deprecated public final class FixedThreadPoolModule extends org.opendaylight.controller.config.yang.threadpool.impl.fixed.AbstractFixedThreadPoolModule { diff --git a/opendaylight/config/threadpool-config-impl/src/main/java/org/opendaylight/controller/config/yang/threadpool/impl/fixed/FixedThreadPoolModuleFactory.java b/opendaylight/config/threadpool-config-impl/src/main/java/org/opendaylight/controller/config/yang/threadpool/impl/fixed/FixedThreadPoolModuleFactory.java index 39e5f9a508..82117e374a 100644 --- a/opendaylight/config/threadpool-config-impl/src/main/java/org/opendaylight/controller/config/yang/threadpool/impl/fixed/FixedThreadPoolModuleFactory.java +++ b/opendaylight/config/threadpool-config-impl/src/main/java/org/opendaylight/controller/config/yang/threadpool/impl/fixed/FixedThreadPoolModuleFactory.java @@ -18,8 +18,9 @@ package org.opendaylight.controller.config.yang.threadpool.impl.fixed; /** -* -*/ + * To be removed in Nitrogen + */ +@Deprecated public class FixedThreadPoolModuleFactory extends org.opendaylight.controller.config.yang.threadpool.impl.fixed.AbstractFixedThreadPoolModuleFactory { diff --git a/opendaylight/config/threadpool-config-impl/src/main/yang/threadpool-impl-fixed.yang b/opendaylight/config/threadpool-config-impl/src/main/yang/threadpool-impl-fixed.yang index b09ce5b28c..85e4c92409 100644 --- a/opendaylight/config/threadpool-config-impl/src/main/yang/threadpool-impl-fixed.yang +++ b/opendaylight/config/threadpool-config-impl/src/main/yang/threadpool-impl-fixed.yang @@ -29,12 +29,14 @@ module threadpool-impl-fixed { identity threadpool-fixed { + status deprecated; base config:module-type; config:provided-service th:threadpool; config:java-name-prefix FixedThreadPool; } augment "/config:modules/config:module/config:configuration" { + status deprecated; case threadpool-fixed { when "/config:modules/config:module/config:type = 'threadpool-fixed'"; leaf max-thread-count { diff --git a/opendaylight/config/threadpool-config-impl/src/main/yang/threadpool-impl.yang b/opendaylight/config/threadpool-config-impl/src/main/yang/threadpool-impl.yang index cc4af4d596..8ae7d88932 100644 --- a/opendaylight/config/threadpool-config-impl/src/main/yang/threadpool-impl.yang +++ b/opendaylight/config/threadpool-config-impl/src/main/yang/threadpool-impl.yang @@ -37,9 +37,11 @@ module threadpool-impl { base config:module-type; config:provided-service th:eventbus; config:java-name-prefix EventBus; + status deprecated; } augment "/config:modules/config:module/config:configuration" { + status deprecated; case eventbus { when "/config:modules/config:module/config:type = 'eventbus'"; // No real configuration @@ -47,6 +49,7 @@ module threadpool-impl { } augment "/config:modules/config:module/config:state" { + status deprecated; case eventbus { when "/config:modules/config:module/config:type = 'eventbus'"; rpcx:rpc-context-instance "event-bus-rpc"; @@ -59,9 +62,11 @@ module threadpool-impl { base config:module-type; config:provided-service th:eventbus; config:java-name-prefix AsyncEventBus; + status deprecated; } augment "/config:modules/config:module/config:configuration" { + status deprecated; case async-eventbus { when "/config:modules/config:module/config:type = 'async-eventbus'"; container threadpool { @@ -76,6 +81,7 @@ module threadpool-impl { } augment "/config:modules/config:module/config:state" { + status deprecated; case async-eventbus { when "/config:modules/config:module/config:type = 'async-eventbus'"; rpcx:rpc-context-instance "event-bus-rpc"; -- 2.36.6