Adjust to yangtools-2.0.0 changes

[controller.git] / opendaylight / md-sal / sal-dom-broker-config / src / main / java / org / opendaylight / controller / config / yang / md / sal / dom / impl / DomInmemoryDataBrokerModule.java

diff --git a/opendaylight/md-sal/sal-dom-broker-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/impl/DomInmemoryDataBrokerModule.java b/opendaylight/md-sal/sal-dom-broker-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/impl/DomInmemoryDataBrokerModule.java
index fffee73b9e8576ea6fccdb71e3ab554cd0e8966e..001b4fdeacd8650222d12eb094dc546b6915e0ba 100644 (file)
--- a/opendaylight/md-sal/sal-dom-broker-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/impl/DomInmemoryDataBrokerModule.java
+++ b/opendaylight/md-sal/sal-dom-broker-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/impl/DomInmemoryDataBrokerModule.java
@@ -25,8 +25,9 @@ import org.opendaylight.yangtools.util.concurrent.DeadlockDetectingListeningExec
 import org.opendaylight.yangtools.util.concurrent.SpecialExecutors;
 
 /**
 import org.opendaylight.yangtools.util.concurrent.SpecialExecutors;
 
 /**

-*
-*/
+ * @deprecated Replaced by the clustered data store.
+ */
+@Deprecated

 public final class DomInmemoryDataBrokerModule extends
         org.opendaylight.controller.config.yang.md.sal.dom.impl.AbstractDomInmemoryDataBrokerModule {
 
 public final class DomInmemoryDataBrokerModule extends
         org.opendaylight.controller.config.yang.md.sal.dom.impl.AbstractDomInmemoryDataBrokerModule {
 


@@ -78,7 +79,7 @@ public final class DomInmemoryDataBrokerModule extends
          */
         ExecutorService listenableFutureExecutor = SpecialExecutors.newBlockingBoundedCachedThreadPool(
                 getMaxDataBrokerFutureCallbackPoolSize(), getMaxDataBrokerFutureCallbackQueueSize(),
          */
         ExecutorService listenableFutureExecutor = SpecialExecutors.newBlockingBoundedCachedThreadPool(
                 getMaxDataBrokerFutureCallbackPoolSize(), getMaxDataBrokerFutureCallbackQueueSize(),

-                "CommitFutures");
+                "CommitFutures", SerializedDOMDataBroker.class);

 
         final List<AbstractMXBean> mBeans = Lists.newArrayList();
         final DurationStatisticsTracker commitStatsTracker;
 
         final List<AbstractMXBean> mBeans = Lists.newArrayList();
         final DurationStatisticsTracker commitStatsTracker;


@@ -92,7 +93,7 @@ public final class DomInmemoryDataBrokerModule extends
          * system it's running on.
          */
         ExecutorService commitExecutor = SpecialExecutors.newBoundedSingleThreadExecutor(
          * system it's running on.
          */
         ExecutorService commitExecutor = SpecialExecutors.newBoundedSingleThreadExecutor(

-            getMaxDataBrokerCommitQueueSize(), "WriteTxCommit");
+            getMaxDataBrokerCommitQueueSize(), "WriteTxCommit", SerializedDOMDataBroker.class);

 
         SerializedDOMDataBroker sdb = new SerializedDOMDataBroker(datastores,
             new DeadlockDetectingListeningExecutorService(commitExecutor,
 
         SerializedDOMDataBroker sdb = new SerializedDOMDataBroker(datastores,
             new DeadlockDetectingListeningExecutorService(commitExecutor,


@@ -121,14 +122,7 @@ public final class DomInmemoryDataBrokerModule extends
             mBeans.add(commitFutureStatsMXBean);
         }
 
             mBeans.add(commitFutureStatsMXBean);
         }
 

-        sdb.setCloseable(new AutoCloseable() {
-            @Override
-            public void close() {
-                for(AbstractMXBean mBean: mBeans) {
-                    mBean.unregisterMBean();
-                }
-            }
-        });
+        sdb.setCloseable(() -> mBeans.forEach(AbstractMXBean::unregisterMBean));

 
         return sdb;
     }
 
         return sdb;
     }