From 0b8ab14e766054a865b9d1678311e9247c5db12a Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Tue, 10 Jan 2017 13:13:38 +0100 Subject: [PATCH] BUG-7446: fix tests' usage of MoreExecutors MoreExecutors.sameThreadExecutor() is deprecated, use its appropriate replacement instead. Change-Id: I487285b156d3fbe7b558fecd5cbc13cb66f02a2c Signed-off-by: Robert Varga --- .../binding/dom/adapter/test/DataBrokerTestCustomizer.java | 6 +++--- .../binding/dom/adapter/test/util/BindingTestContext.java | 6 ++++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/test/DataBrokerTestCustomizer.java b/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/test/DataBrokerTestCustomizer.java index df0ee65d3d..dc0bbfc095 100644 --- a/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/test/DataBrokerTestCustomizer.java +++ b/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/test/DataBrokerTestCustomizer.java @@ -60,13 +60,13 @@ public class DataBrokerTestCustomizer { } public DOMStore createConfigurationDatastore() { - final InMemoryDOMDataStore store = new InMemoryDOMDataStore("CFG", MoreExecutors.sameThreadExecutor()); + final InMemoryDOMDataStore store = new InMemoryDOMDataStore("CFG", MoreExecutors.newDirectExecutorService()); schemaService.registerSchemaContextListener(store); return store; } public DOMStore createOperationalDatastore() { - final InMemoryDOMDataStore store = new InMemoryDOMDataStore("OPER", MoreExecutors.sameThreadExecutor()); + final InMemoryDOMDataStore store = new InMemoryDOMDataStore("OPER", MoreExecutors.newDirectExecutorService()); schemaService.registerSchemaContextListener(store); return store; } @@ -85,7 +85,7 @@ public class DataBrokerTestCustomizer { public ListeningExecutorService getCommitCoordinatorExecutor() { - return MoreExecutors.sameThreadExecutor(); + return MoreExecutors.newDirectExecutorService(); } public DataBroker createDataBroker() { diff --git a/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/test/util/BindingTestContext.java b/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/test/util/BindingTestContext.java index a9f36c336a..d333077378 100644 --- a/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/test/util/BindingTestContext.java +++ b/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/test/util/BindingTestContext.java @@ -112,8 +112,10 @@ public class BindingTestContext implements AutoCloseable { public void startNewDomDataBroker() { checkState(executor != null, "Executor needs to be set"); - final InMemoryDOMDataStore operStore = new InMemoryDOMDataStore("OPER", MoreExecutors.sameThreadExecutor()); - final InMemoryDOMDataStore configStore = new InMemoryDOMDataStore("CFG", MoreExecutors.sameThreadExecutor()); + final InMemoryDOMDataStore operStore = new InMemoryDOMDataStore("OPER", + MoreExecutors.newDirectExecutorService()); + final InMemoryDOMDataStore configStore = new InMemoryDOMDataStore("CFG", + MoreExecutors.newDirectExecutorService()); newDatastores = ImmutableMap.builder() .put(LogicalDatastoreType.OPERATIONAL, operStore) .put(LogicalDatastoreType.CONFIGURATION, configStore) -- 2.36.6