From: Tom Pantelis Date: Thu, 22 Mar 2018 23:38:01 +0000 (-0400) Subject: Remove deprecated AsyncWriteTransaction#commit method X-Git-Tag: release/fluorine~113^2 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=74f902f0d61c2077a50c57f40c5f7b040fdddc29;p=netconf.git Remove deprecated AsyncWriteTransaction#commit method This method has been deprecated for quite some time and now has a default implementation so can be safely removed from sub-classes. Change-Id: I118d749f744d7253651f06927f490d8f17718832 Signed-off-by: Tom Pantelis Signed-off-by: Jakub Morvay --- diff --git a/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/tx/ProxyReadWriteTransaction.java b/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/tx/ProxyReadWriteTransaction.java index 2b2759ba0f..e0075476e7 100644 --- a/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/tx/ProxyReadWriteTransaction.java +++ b/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/tx/ProxyReadWriteTransaction.java @@ -13,14 +13,11 @@ import akka.actor.ActorSystem; import akka.util.Timeout; import com.google.common.base.Optional; import com.google.common.util.concurrent.CheckedFuture; -import com.google.common.util.concurrent.ListenableFuture; -import org.opendaylight.controller.md.sal.common.api.TransactionStatus; import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException; import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException; import org.opendaylight.controller.md.sal.dom.api.DOMDataReadWriteTransaction; import org.opendaylight.netconf.sal.connect.util.RemoteDeviceId; -import org.opendaylight.yangtools.yang.common.RpcResult; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; @@ -53,11 +50,6 @@ public class ProxyReadWriteTransaction implements DOMDataReadWriteTransaction { return delegateWrite.cancel(); } - @Override - public ListenableFuture> commit() { - return delegateWrite.commit(getIdentifier()); - } - @Override public CheckedFuture>, ReadFailedException> read(final LogicalDatastoreType store, final YangInstanceIdentifier path) { diff --git a/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/tx/ProxyWriteAdapter.java b/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/tx/ProxyWriteAdapter.java index a833e3bb42..703cfce42c 100644 --- a/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/tx/ProxyWriteAdapter.java +++ b/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/tx/ProxyWriteAdapter.java @@ -17,11 +17,9 @@ import com.google.common.base.Function; import com.google.common.base.Preconditions; import com.google.common.util.concurrent.CheckedFuture; import com.google.common.util.concurrent.Futures; -import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.SettableFuture; import java.util.concurrent.atomic.AtomicBoolean; import javax.annotation.Nullable; -import org.opendaylight.controller.md.sal.common.api.TransactionStatus; import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException; import org.opendaylight.netconf.sal.connect.util.RemoteDeviceId; @@ -33,8 +31,6 @@ import org.opendaylight.netconf.topology.singleton.messages.transactions.MergeRe import org.opendaylight.netconf.topology.singleton.messages.transactions.PutRequest; import org.opendaylight.netconf.topology.singleton.messages.transactions.SubmitFailedReply; import org.opendaylight.netconf.topology.singleton.messages.transactions.SubmitRequest; -import org.opendaylight.yangtools.yang.common.RpcResult; -import org.opendaylight.yangtools.yang.common.RpcResultBuilder; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; import org.slf4j.Logger; @@ -120,19 +116,6 @@ public class ProxyWriteAdapter { }); } - public ListenableFuture> commit(final Object identifier) { - LOG.trace("{}: Commit", id); - - final CheckedFuture submit = submit(identifier); - return Futures.transform(submit, new Function>() { - @Nullable - @Override - public RpcResult apply(@Nullable final Void input) { - return RpcResultBuilder.success(TransactionStatus.SUBMITED).build(); - } - }); - } - public void delete(final LogicalDatastoreType store, final YangInstanceIdentifier identifier) { Preconditions.checkState(opened.get(), "%s: Transaction was closed %s", id, identifier); LOG.trace("{}: Delete {} via NETCONF: {}", id, store, identifier); diff --git a/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/tx/ProxyWriteTransaction.java b/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/tx/ProxyWriteTransaction.java index f8504c029c..f2ed8b7e04 100644 --- a/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/tx/ProxyWriteTransaction.java +++ b/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/tx/ProxyWriteTransaction.java @@ -12,13 +12,10 @@ import akka.actor.ActorRef; import akka.actor.ActorSystem; import akka.util.Timeout; import com.google.common.util.concurrent.CheckedFuture; -import com.google.common.util.concurrent.ListenableFuture; -import org.opendaylight.controller.md.sal.common.api.TransactionStatus; import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException; import org.opendaylight.controller.md.sal.dom.api.DOMDataWriteTransaction; import org.opendaylight.netconf.sal.connect.util.RemoteDeviceId; -import org.opendaylight.yangtools.yang.common.RpcResult; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; @@ -54,11 +51,6 @@ public class ProxyWriteTransaction implements DOMDataWriteTransaction { return proxyWriteAdapter.submit(getIdentifier()); } - @Override - public ListenableFuture> commit() { - return proxyWriteAdapter.commit(getIdentifier()); - } - @Override public void delete(final LogicalDatastoreType store, final YangInstanceIdentifier identifier) { proxyWriteAdapter.delete(store, identifier); diff --git a/netconf/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/tx/ProxyReadWriteTransactionTest.java b/netconf/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/tx/ProxyReadWriteTransactionTest.java index 30a6867f1a..ee692518db 100644 --- a/netconf/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/tx/ProxyReadWriteTransactionTest.java +++ b/netconf/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/tx/ProxyReadWriteTransactionTest.java @@ -14,7 +14,6 @@ import akka.testkit.TestProbe; import akka.util.Timeout; import com.google.common.base.Optional; import com.google.common.util.concurrent.CheckedFuture; -import com.google.common.util.concurrent.ListenableFuture; import java.net.InetSocketAddress; import java.util.concurrent.Executors; import java.util.concurrent.Future; @@ -24,7 +23,6 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; import org.opendaylight.controller.config.util.xml.DocumentedException; -import org.opendaylight.controller.md.sal.common.api.TransactionStatus; import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException; import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException; @@ -40,7 +38,6 @@ import org.opendaylight.netconf.topology.singleton.messages.transactions.ReadReq import org.opendaylight.netconf.topology.singleton.messages.transactions.SubmitReply; import org.opendaylight.netconf.topology.singleton.messages.transactions.SubmitRequest; import org.opendaylight.yangtools.yang.common.QName; -import org.opendaylight.yangtools.yang.common.RpcResult; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; @@ -112,14 +109,6 @@ public class ProxyReadWriteTransactionTest { } } - @Test - public void testCommit() throws Exception { - final ListenableFuture> submitFuture = tx.commit(); - masterActor.expectMsgClass(SubmitRequest.class); - masterActor.reply(new SubmitReply()); - Assert.assertEquals(TransactionStatus.SUBMITED, submitFuture.get().getResult()); - } - @Test public void testDelete() throws Exception { tx.delete(STORE, PATH); @@ -244,4 +233,4 @@ public class ProxyReadWriteTransactionTest { Assert.assertEquals(DocumentedException.ErrorType.APPLICATION, de.getErrorType()); } } -} \ No newline at end of file +} diff --git a/netconf/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/tx/ProxyWriteTransactionTest.java b/netconf/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/tx/ProxyWriteTransactionTest.java index b51375b145..159bdc1a7e 100644 --- a/netconf/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/tx/ProxyWriteTransactionTest.java +++ b/netconf/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/tx/ProxyWriteTransactionTest.java @@ -22,7 +22,6 @@ import org.junit.After; import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import org.opendaylight.controller.md.sal.common.api.TransactionStatus; import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException; import org.opendaylight.netconf.sal.connect.util.RemoteDeviceId; @@ -33,7 +32,6 @@ import org.opendaylight.netconf.topology.singleton.messages.transactions.PutRequ import org.opendaylight.netconf.topology.singleton.messages.transactions.SubmitReply; import org.opendaylight.netconf.topology.singleton.messages.transactions.SubmitRequest; import org.opendaylight.yangtools.yang.common.QName; -import org.opendaylight.yangtools.yang.common.RpcResult; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode; import org.opendaylight.yangtools.yang.data.impl.schema.Builders; @@ -104,14 +102,6 @@ public class ProxyWriteTransactionTest { } } - @Test - public void testCommit() throws Exception { - final ListenableFuture> submitFuture = tx.commit(); - masterActor.expectMsgClass(SubmitRequest.class); - masterActor.reply(new SubmitReply()); - Assert.assertEquals(TransactionStatus.SUBMITED, submitFuture.get().getResult()); - } - @Test public void testDelete() throws Exception { tx.delete(STORE, PATH); @@ -175,4 +165,4 @@ public class ProxyWriteTransactionTest { submit.checkedGet(); } -} \ No newline at end of file +} diff --git a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/AbstractWriteTx.java b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/AbstractWriteTx.java index 7d6dd3e9e8..8e5c4de458 100644 --- a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/AbstractWriteTx.java +++ b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/AbstractWriteTx.java @@ -20,7 +20,6 @@ import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; import javax.annotation.Nullable; import org.opendaylight.controller.config.util.xml.DocumentedException; -import org.opendaylight.controller.md.sal.common.api.TransactionStatus; import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException; import org.opendaylight.controller.md.sal.dom.api.DOMDataWriteTransaction; @@ -147,15 +146,14 @@ public abstract class AbstractWriteTx implements DOMDataWriteTransaction { editStructure, Optional.of(ModifyAction.NONE), "delete"); } - @Override - public final ListenableFuture> commit() { + protected final ListenableFuture> commitConfiguration() { listeners.forEach(listener -> listener.onTransactionSubmitted(this)); checkNotFinished(); finished = true; - final ListenableFuture> result = performCommit(); - Futures.addCallback(result, new FutureCallback>() { + final ListenableFuture> result = performCommit(); + Futures.addCallback(result, new FutureCallback>() { @Override - public void onSuccess(@Nullable final RpcResult result) { + public void onSuccess(@Nullable final RpcResult result) { if (result != null && result.isSuccessful()) { listeners.forEach(txListener -> txListener.onTransactionSuccessful(AbstractWriteTx.this)); } else { @@ -174,7 +172,7 @@ public abstract class AbstractWriteTx implements DOMDataWriteTransaction { return result; } - protected abstract ListenableFuture> performCommit(); + protected abstract ListenableFuture> performCommit(); private void checkEditable(final LogicalDatastoreType store) { checkNotFinished(); @@ -186,8 +184,8 @@ public abstract class AbstractWriteTx implements DOMDataWriteTransaction { DataContainerChild editStructure, Optional defaultOperation, String operation); - protected ListenableFuture> resultsToTxStatus() { - final SettableFuture> transformed = SettableFuture.create(); + protected ListenableFuture> resultsToTxStatus() { + final SettableFuture> transformed = SettableFuture.create(); Futures.addCallback(Futures.allAsList(resultsFutures), new FutureCallback>() { @Override @@ -204,7 +202,7 @@ public abstract class AbstractWriteTx implements DOMDataWriteTransaction { }); if (!transformed.isDone()) { - transformed.set(RpcResultBuilder.success(TransactionStatus.COMMITED).build()); + transformed.set(RpcResultBuilder.success().build()); } } diff --git a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/ReadWriteTx.java b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/ReadWriteTx.java index c6012bbf21..1c44b40f84 100644 --- a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/ReadWriteTx.java +++ b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/ReadWriteTx.java @@ -10,15 +10,12 @@ package org.opendaylight.netconf.sal.connect.netconf.sal.tx; import com.google.common.base.Optional; import com.google.common.util.concurrent.CheckedFuture; -import com.google.common.util.concurrent.ListenableFuture; -import org.opendaylight.controller.md.sal.common.api.TransactionStatus; import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException; import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException; import org.opendaylight.controller.md.sal.dom.api.DOMDataReadTransaction; import org.opendaylight.controller.md.sal.dom.api.DOMDataReadWriteTransaction; import org.opendaylight.controller.md.sal.dom.api.DOMDataWriteTransaction; -import org.opendaylight.yangtools.yang.common.RpcResult; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; @@ -59,11 +56,6 @@ public class ReadWriteTx implements DOMDataReadWriteTransaction { return delegateWriteTx.submit(); } - @Override - public ListenableFuture> commit() { - return delegateWriteTx.commit(); - } - @Override public CheckedFuture>, ReadFailedException> read( final LogicalDatastoreType store, final YangInstanceIdentifier path) { diff --git a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/WriteCandidateTx.java b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/WriteCandidateTx.java index d3f5b1e94d..23803f5751 100644 --- a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/WriteCandidateTx.java +++ b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/WriteCandidateTx.java @@ -17,7 +17,6 @@ import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.MoreExecutors; import javax.annotation.Nullable; -import org.opendaylight.controller.md.sal.common.api.TransactionStatus; import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException; import org.opendaylight.controller.md.sal.dom.api.DOMRpcResult; import org.opendaylight.netconf.sal.connect.netconf.util.NetconfBaseOps; @@ -96,8 +95,8 @@ public class WriteCandidateTx extends AbstractWriteTx { @Override public synchronized CheckedFuture submit() { - final ListenableFuture commitFutureAsVoid = Futures.transform(commit(), - (Function, Void>) input -> { + final ListenableFuture commitFutureAsVoid = Futures.transform(commitConfiguration(), + (Function, Void>) input -> { Preconditions.checkArgument(input.isSuccessful() && input.getErrors().isEmpty(), "Submit failed with errors: %s", input.getErrors()); return null; @@ -116,13 +115,13 @@ public class WriteCandidateTx extends AbstractWriteTx { } @Override - public synchronized ListenableFuture> performCommit() { + public synchronized ListenableFuture> performCommit() { resultsFutures.add(netOps.commit(new NetconfRpcFutureCallback("Commit", id))); - final ListenableFuture> txResult = resultsToTxStatus(); + final ListenableFuture> txResult = resultsToTxStatus(); - Futures.addCallback(txResult, new FutureCallback>() { + Futures.addCallback(txResult, new FutureCallback>() { @Override - public void onSuccess(@Nullable final RpcResult result) { + public void onSuccess(@Nullable final RpcResult result) { cleanupOnSuccess(); } diff --git a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/WriteRunningTx.java b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/WriteRunningTx.java index ddc66fb5f1..6b1999f74e 100644 --- a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/WriteRunningTx.java +++ b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/WriteRunningTx.java @@ -16,7 +16,6 @@ import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.MoreExecutors; import java.util.ArrayList; import java.util.List; -import org.opendaylight.controller.md.sal.common.api.TransactionStatus; import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException; import org.opendaylight.controller.md.sal.dom.api.DOMRpcResult; import org.opendaylight.netconf.sal.connect.netconf.util.NetconfBaseOps; @@ -73,8 +72,8 @@ public class WriteRunningTx extends AbstractWriteTx { @Override public synchronized CheckedFuture submit() { - final ListenableFuture commmitFutureAsVoid = Futures.transform(commit(), - (Function, Void>) input -> null, MoreExecutors.directExecutor()); + final ListenableFuture commmitFutureAsVoid = Futures.transform(commitConfiguration(), + (Function, Void>) input -> null, MoreExecutors.directExecutor()); return Futures.makeChecked(commmitFutureAsVoid, input -> new TransactionCommitFailedException("Submit of transaction " + getIdentifier() + " failed", @@ -82,7 +81,7 @@ public class WriteRunningTx extends AbstractWriteTx { } @Override - public synchronized ListenableFuture> performCommit() { + public synchronized ListenableFuture> performCommit() { for (final Change change : changes) { resultsFutures.add(change.execute(id, netOps, rollbackSupport)); } diff --git a/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/ReadWriteTxTest.java b/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/ReadWriteTxTest.java index 795af83945..0fe89343e2 100644 --- a/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/ReadWriteTxTest.java +++ b/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/ReadWriteTxTest.java @@ -55,12 +55,6 @@ public class ReadWriteTxTest { verify(delegateWriteTx).submit(); } - @Test - public void commit() throws Exception { - tx.commit(); - verify(delegateWriteTx).commit(); - } - @Test public void cancel() throws Exception { tx.cancel(); @@ -89,4 +83,4 @@ public class ReadWriteTxTest { Assert.assertNotEquals(tx.getIdentifier(), tx2.getIdentifier()); } -} \ No newline at end of file +} diff --git a/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestPostOperationTest.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestPostOperationTest.java index 294decd754..910bd7e1be 100644 --- a/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestPostOperationTest.java +++ b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestPostOperationTest.java @@ -35,7 +35,6 @@ import org.junit.Ignore; import org.junit.Test; import org.mockito.ArgumentCaptor; import org.mockito.Mockito; -import org.opendaylight.controller.md.sal.common.api.TransactionStatus; import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException; import org.opendaylight.controller.md.sal.dom.api.DOMMountPoint; import org.opendaylight.controller.md.sal.dom.api.DOMMountPointService; @@ -48,7 +47,6 @@ import org.opendaylight.netconf.sal.rest.impl.XmlNormalizedNodeBodyReader; import org.opendaylight.netconf.sal.restconf.impl.BrokerFacade; import org.opendaylight.netconf.sal.restconf.impl.ControllerContext; import org.opendaylight.netconf.sal.restconf.impl.RestconfImpl; -import org.opendaylight.yangtools.yang.common.RpcResult; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; import org.opendaylight.yangtools.yang.model.api.Module; @@ -137,9 +135,6 @@ public class RestPostOperationTest extends JerseyTest { // - we expecting problems with singletons ControllerContext as schemaContext holder public void createConfigurationDataTest() throws UnsupportedEncodingException, ParseException { initMocking(); - final RpcResult rpcResult = new DummyRpcResult.Builder().result( - TransactionStatus.COMMITED).build(); - when(brokerFacade.commitConfigurationDataPost((SchemaContext) null, any(YangInstanceIdentifier.class), any(NormalizedNode.class), null, null)) .thenReturn(mock(CheckedFuture.class));