Bug 6794 - Deprecate eventbus, async-eventbus and fixed-threadpool

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 <adetalhouet@inocybe.com>

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 f460cb0021923b5142cd00750c69673187d640f1..0b8f48c2fe263d23422299b8fa8df2f56b97e77c 100644 (file)
--- 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}.
  */
 /**
  * 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;
 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 b56f0e490aaa8796d88584e35963c6946d396c10..ab61bfe723fab79f58c564bd2a6d3ec1dd2b7f6c 100644 (file)
--- 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}.
  */
 /**
  * Closeable {@link EventBus}.
  */

+/**
+ * To be removed in Nitrogen
+ */
+@Deprecated

 public class CloseableEventBus extends EventBus implements Closeable {
 
     private final EventBusRuntimeRegistration rootRegistration;
 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 2dad26490bb50f41be0ddc411ce5994f3e861a84..dcb121abfad4263584f77a94f22b4bdb78f96d9c 100644 (file)
--- 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}.
  */
  * 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;
 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 0bdcbbcca413715de256fd7f965968d1e22b9d96..518301578449d63be31f61321ec092324cf3bbfd 100644 (file)
--- 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;
 
 /**
 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 {
 
 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 17d50562d38b1a71ec460f5ce2db17d7577b03c0..23be62d4bfb39ad549d51f27e03a40324276dd8e 100644 (file)
--- 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;
 
 /**
 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 {
 
 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 6c365990784766410bc143ee0246bfe8bed8099f..70b7a5f73721f3d27937fae57c01a58c4193b85c 100644 (file)
--- 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;
 
 /**
 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 {
 
 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 955d4f16e454b7c56bf94415fb1ae79ac59639a3..38ec21c809f71b9922e056d51ed588cb60c70ccf 100644 (file)
--- 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;
 
 /**
 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 {
 
 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 d06e6164b1b86cbd65a24ff814357a6b04f1a1e3..95e11b90beffb11b9bbb102735bc0f5eaeb1984b 100644 (file)
--- 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;
 
 /**
 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
 {
 
 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 39e5f9a508f078985c9c2ce306884bff210cf5f0..82117e374a9d0b98d4450612ef580f11c88bbe76 100644 (file)
--- 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;
 
 /**
 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
 {
 
 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 b09ce5b28ca3fccfb66a2b8c591c50a8efea1c54..85e4c92409118baf2cbce9d6463df3f9105a6568 100644 (file)
--- 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 {
 
 
     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" {
         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 {
         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 cc4af4d5969fec0fab92146b0732df31fa47b430..8ae7d889321e1865f4237fc323f69af92c868703 100644 (file)
--- 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;
         base config:module-type;
         config:provided-service th:eventbus;
         config:java-name-prefix EventBus;

+        status deprecated;

     }
 
     augment "/config:modules/config:module/config:configuration" {
     }
 
     augment "/config:modules/config:module/config:configuration" {

+        status deprecated;

         case eventbus {
             when "/config:modules/config:module/config:type = 'eventbus'";
             // No real configuration
         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" {
     }
 
     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";
         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;
         base config:module-type;
         config:provided-service th:eventbus;
         config:java-name-prefix AsyncEventBus;

+        status deprecated;

     }
 
     augment "/config:modules/config:module/config:configuration" {
     }
 
     augment "/config:modules/config:module/config:configuration" {

+        status deprecated;

         case async-eventbus {
             when "/config:modules/config:module/config:type = 'async-eventbus'";
             container threadpool {
         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" {
     }
 
     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";
         case async-eventbus {
             when "/config:modules/config:module/config:type = 'async-eventbus'";
             rpcx:rpc-context-instance "event-bus-rpc";