Migrate deprecated guava methods

sameThreadExecutor() has been deprecated, use its replacement instead.

Change-Id: Icf1fed34977bd64393f48fe9e9829bee7f7db846
Signed-off-by: Robert Varga <rovarga@cisco.com>

diff --git a/opendaylight/md-sal/sal-dom-broker/src/test/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMBrokerPerformanceTest.java b/opendaylight/md-sal/sal-dom-broker/src/test/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMBrokerPerformanceTest.java
index 2f02f981ab198fe248a33a33ac90187b57064211..2a7c8b6682cbdaf0a9f0a8ff7cd194a9f22c5c12 100644 (file)
--- a/opendaylight/md-sal/sal-dom-broker/src/test/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMBrokerPerformanceTest.java
+++ b/opendaylight/md-sal/sal-dom-broker/src/test/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMBrokerPerformanceTest.java
@@ -60,8 +60,8 @@ public class DOMBrokerPerformanceTest {
 
     @Before
     public void setupStore() {
 
     @Before
     public void setupStore() {

-        InMemoryDOMDataStore operStore = new InMemoryDOMDataStore("OPER", MoreExecutors.sameThreadExecutor());
-        InMemoryDOMDataStore configStore = new InMemoryDOMDataStore("CFG", MoreExecutors.sameThreadExecutor());
+        InMemoryDOMDataStore operStore = new InMemoryDOMDataStore("OPER", MoreExecutors.newDirectExecutorService());
+        InMemoryDOMDataStore configStore = new InMemoryDOMDataStore("CFG", MoreExecutors.newDirectExecutorService());

         schemaContext = TestModel.createTestContext();
 
         operStore.onGlobalContextUpdated(schemaContext);
         schemaContext = TestModel.createTestContext();
 
         operStore.onGlobalContextUpdated(schemaContext);

diff --git a/opendaylight/md-sal/sal-dom-broker/src/test/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMBrokerTest.java b/opendaylight/md-sal/sal-dom-broker/src/test/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMBrokerTest.java
index c1d301c549b8cd1964f9b296cf9e13a3a2d29774..cd8ac0998052f73c94a558443b3663583e82125b 100644 (file)
--- a/opendaylight/md-sal/sal-dom-broker/src/test/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMBrokerTest.java
+++ b/opendaylight/md-sal/sal-dom-broker/src/test/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMBrokerTest.java
@@ -57,9 +57,9 @@ public class DOMBrokerTest {
     public void setupStore() {
 
         InMemoryDOMDataStore operStore = new InMemoryDOMDataStore("OPER",
     public void setupStore() {
 
         InMemoryDOMDataStore operStore = new InMemoryDOMDataStore("OPER",

-                MoreExecutors.sameThreadExecutor());
+                MoreExecutors.newDirectExecutorService());

         InMemoryDOMDataStore configStore = new InMemoryDOMDataStore("CFG",
         InMemoryDOMDataStore configStore = new InMemoryDOMDataStore("CFG",

-                MoreExecutors.sameThreadExecutor());
+                MoreExecutors.newDirectExecutorService());

         schemaContext = TestModel.createTestContext();
 
         operStore.onGlobalContextUpdated(schemaContext);
         schemaContext = TestModel.createTestContext();
 
         operStore.onGlobalContextUpdated(schemaContext);

diff --git a/opendaylight/md-sal/sal-dom-broker/src/test/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMTransactionChainTest.java b/opendaylight/md-sal/sal-dom-broker/src/test/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMTransactionChainTest.java
index 03d39a2a62a33cf5b61f468401a338b77133d622..aba78f755912275c1cf001e8225fe02ac7b9b0f6 100644 (file)
--- a/opendaylight/md-sal/sal-dom-broker/src/test/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMTransactionChainTest.java
+++ b/opendaylight/md-sal/sal-dom-broker/src/test/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMTransactionChainTest.java
@@ -41,8 +41,8 @@ public class DOMTransactionChainTest {
 
     @Before
     public void setupStore() {
 
     @Before
     public void setupStore() {

-        InMemoryDOMDataStore operStore = new InMemoryDOMDataStore("OPER", MoreExecutors.sameThreadExecutor());
-        InMemoryDOMDataStore configStore = new InMemoryDOMDataStore("CFG", MoreExecutors.sameThreadExecutor());
+        InMemoryDOMDataStore operStore = new InMemoryDOMDataStore("OPER", MoreExecutors.newDirectExecutorService());
+        InMemoryDOMDataStore configStore = new InMemoryDOMDataStore("CFG", MoreExecutors.newDirectExecutorService());

         schemaContext = TestModel.createTestContext();
 
         operStore.onGlobalContextUpdated(schemaContext);
         schemaContext = TestModel.createTestContext();
 
         operStore.onGlobalContextUpdated(schemaContext);

diff --git a/opendaylight/md-sal/sal-inmemory-datastore/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/InMemoryDataStoreTest.java b/opendaylight/md-sal/sal-inmemory-datastore/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/InMemoryDataStoreTest.java
index 4720f4b4b9f4fcc0c04cad1b2470f2fb15097006..9de4892d9140b1afc7ea3a93ef532ca1bf97edeb 100644 (file)
--- a/opendaylight/md-sal/sal-inmemory-datastore/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/InMemoryDataStoreTest.java
+++ b/opendaylight/md-sal/sal-inmemory-datastore/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/InMemoryDataStoreTest.java
@@ -45,7 +45,7 @@ public class InMemoryDataStoreTest {
 
     @Before
     public void setupStore() {
 
     @Before
     public void setupStore() {

-        domStore = new InMemoryDOMDataStore("TEST", MoreExecutors.sameThreadExecutor());
+        domStore = new InMemoryDOMDataStore("TEST", MoreExecutors.newDirectExecutorService());

         schemaContext = TestModel.createTestContext();
         domStore.onGlobalContextUpdated(schemaContext);
     }
         schemaContext = TestModel.createTestContext();
         domStore.onGlobalContextUpdated(schemaContext);
     }

diff --git a/opendaylight/md-sal/sal-inmemory-datastore/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/SchemaUpdateForTransactionTest.java b/opendaylight/md-sal/sal-inmemory-datastore/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/SchemaUpdateForTransactionTest.java
index 15e5f716f62c17ccb66d29f09430d8aa4dac7f5b..e7af4dffae98b0b0543a8919c8ead80c6132512a 100644 (file)
--- a/opendaylight/md-sal/sal-inmemory-datastore/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/SchemaUpdateForTransactionTest.java
+++ b/opendaylight/md-sal/sal-inmemory-datastore/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/SchemaUpdateForTransactionTest.java
@@ -31,7 +31,7 @@ public class SchemaUpdateForTransactionTest {
 
     @Before
     public void setupStore() {
 
     @Before
     public void setupStore() {

-        domStore = new InMemoryDOMDataStore("TEST", MoreExecutors.sameThreadExecutor());
+        domStore = new InMemoryDOMDataStore("TEST", MoreExecutors.newDirectExecutorService());

         loadSchemas(RockTheHouseInput.class);
     }
 
         loadSchemas(RockTheHouseInput.class);
     }
 

diff --git a/opendaylight/md-sal/sal-inmemory-datastore/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/TestDCLExecutorService.java b/opendaylight/md-sal/sal-inmemory-datastore/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/TestDCLExecutorService.java
index f6e6461bf54707d48fc767d411e321c0672733af..a01933c295bea088f5f86e7f0ad417f4d4e2be58 100644 (file)
--- a/opendaylight/md-sal/sal-inmemory-datastore/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/TestDCLExecutorService.java
+++ b/opendaylight/md-sal/sal-inmemory-datastore/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/TestDCLExecutorService.java
@@ -8,10 +8,9 @@
 
 package org.opendaylight.controller.md.sal.dom.store.impl;
 
 
 package org.opendaylight.controller.md.sal.dom.store.impl;
 

-import java.util.concurrent.ExecutorService;
-

 import com.google.common.util.concurrent.ForwardingExecutorService;
 import com.google.common.util.concurrent.MoreExecutors;
 import com.google.common.util.concurrent.ForwardingExecutorService;
 import com.google.common.util.concurrent.MoreExecutors;

+import java.util.concurrent.ExecutorService;

 
 /**
  * A forwarding Executor used by unit tests for DataChangeListener notifications
 
 /**
  * A forwarding Executor used by unit tests for DataChangeListener notifications


@@ -21,13 +20,13 @@ import com.google.common.util.concurrent.MoreExecutors;
 public class TestDCLExecutorService extends ForwardingExecutorService {
 
     // Start with a same thread executor to avoid timing issues during test setup.
 public class TestDCLExecutorService extends ForwardingExecutorService {
 
     // Start with a same thread executor to avoid timing issues during test setup.

-    private volatile ExecutorService currentExecutor = MoreExecutors.sameThreadExecutor();
+    private volatile ExecutorService currentExecutor = MoreExecutors.newDirectExecutorService();

 
     // The real executor to use when test setup is complete.
     private final ExecutorService postSetupExecutor;
 
 
 
     // The real executor to use when test setup is complete.
     private final ExecutorService postSetupExecutor;
 
 

-    public TestDCLExecutorService( ExecutorService postSetupExecutor ) {
+    public TestDCLExecutorService( final ExecutorService postSetupExecutor ) {

         this.postSetupExecutor = postSetupExecutor;
     }
 
         this.postSetupExecutor = postSetupExecutor;
     }