Remove RemoteDeviceCommunicator#sendRequest method

Remove deprecated RemoteDeviceCommunicator#sendRequest method
with unused parameter.

JIRA: NETCONF-1223
Change-Id: I84a01dc67e55b6f6d5cb997944b635950d521efb
Signed-off-by: Samuel Schneider <samuel.schneider@pantheon.tech>

diff --git a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/client/stress/AsyncExecutionStrategy.java b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/client/stress/AsyncExecutionStrategy.java
index 35b7c3701ef8d891152975bf430a1487e95fe0bf..914d7268ba0c288681434623019977e33d18fa4b 100644 (file)
--- a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/client/stress/AsyncExecutionStrategy.java
+++ b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/client/stress/AsyncExecutionStrategy.java
@@ -45,13 +45,13 @@ class AsyncExecutionStrategy extends AbstractExecutionStrategy {
                     LOG.debug("Sending message {}", XmlUtil.toString(msg.getDocument()));
                 }
                 final ListenableFuture<RpcResult<NetconfMessage>> netconfMessageFuture =
-                        getSessionListener().sendRequest(msg, StressClient.EDIT_QNAME);
+                        getSessionListener().sendRequest(msg);
                 futures.add(netconfMessageFuture);
             }
             batchI++;
             LOG.info("Batch {} with size {} sent. Committing", batchI, editBatch);
             if (getParams().candidateDatastore) {
-                futures.add(getSessionListener().sendRequest(StressClient.COMMIT_MSG, StressClient.COMMIT_QNAME));
+                futures.add(getSessionListener().sendRequest(StressClient.COMMIT_MSG));
             }
         }
 

diff --git a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/client/stress/StressClient.java b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/client/stress/StressClient.java
index f7348d435a3393459e79f63b827f43ed20b3cef3..0ee31ee751ba868c753571b147c0e1d969f3d0a0 100644 (file)
--- a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/client/stress/StressClient.java
+++ b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/client/stress/StressClient.java
@@ -32,8 +32,6 @@ import org.opendaylight.netconf.client.mdsal.api.NetconfSessionPreferences;
 import org.opendaylight.netconf.client.mdsal.api.RemoteDevice;
 import org.opendaylight.netconf.common.impl.DefaultNetconfTimer;
 import org.opendaylight.netconf.test.tool.TestToolUtils;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.netconf.base._1._0.rev110601.CommitInput;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.netconf.base._1._0.rev110601.EditConfigInput;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.crypto.types.rev240208.password.grouping.password.type.CleartextPasswordBuilder;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Host;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IetfInetUtil;
@@ -43,7 +41,6 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.cli
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.client.rev240208.netconf.client.initiate.stack.grouping.transport.ssh.ssh.TcpClientParametersBuilder;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ssh.client.rev240208.ssh.client.grouping.ClientIdentityBuilder;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ssh.client.rev240208.ssh.client.grouping.client.identity.PasswordBuilder;
-import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.common.Uint16;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -72,13 +69,10 @@ public final class StressClient {
         }
     };
 
-    static final QName COMMIT_QNAME = QName.create(CommitInput.QNAME, "commit");
     public static final NetconfMessage COMMIT_MSG = new NetconfMessage(readString("""
         <rpc message-id="commit-batch" xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
             <commit/>
         </rpc>"""));
-
-    static final QName EDIT_QNAME = QName.create(EditConfigInput.QNAME, "edit-config");
     static final Document EDIT_CANDIDATE_BLUEPRINT = readString("""
         <rpc xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
             <edit-config>

diff --git a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/client/stress/SyncExecutionStrategy.java b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/client/stress/SyncExecutionStrategy.java
index f5e34022421bf247b14c92c91e8eec4716acad1e..3c89eaced89be17e42a8a1911cec3fbf8ae9dfff 100644 (file)
--- a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/client/stress/SyncExecutionStrategy.java
+++ b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/client/stress/SyncExecutionStrategy.java
@@ -44,7 +44,7 @@ class SyncExecutionStrategy extends AbstractExecutionStrategy {
                     LOG.debug("Sending message {}", XmlUtil.toString(msg.getDocument()));
                 }
                 final ListenableFuture<RpcResult<NetconfMessage>> netconfMessageFuture =
-                        getSessionListener().sendRequest(msg, StressClient.EDIT_QNAME);
+                        getSessionListener().sendRequest(msg);
                 // Wait for response
                 waitForResponse(responseCounter, netconfMessageFuture);
 
@@ -55,7 +55,7 @@ class SyncExecutionStrategy extends AbstractExecutionStrategy {
             // Commit batch sync
             if (getParams().candidateDatastore) {
                 waitForResponse(responseCounter,
-                        getSessionListener().sendRequest(StressClient.COMMIT_MSG, StressClient.COMMIT_QNAME));
+                        getSessionListener().sendRequest(StressClient.COMMIT_MSG));
             }
         }
 

diff --git a/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/DeviceActionFactoryImpl.java b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/DeviceActionFactoryImpl.java
index e0f551098ce5d8006f31e8a056241d8177dc3196..1656de17d6f4f879934226a285322f60301f137f 100644 (file)
--- a/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/DeviceActionFactoryImpl.java
+++ b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/DeviceActionFactoryImpl.java
@@ -41,7 +41,7 @@ public class DeviceActionFactoryImpl implements DeviceActionFactory {
             requireNonNull(input);
 
             final var actionResultFuture = listener.sendRequest(
-                messageTransformer.toActionRequest(schemaPath, dataTreeIdentifier, input), input.name().getNodeType());
+                messageTransformer.toActionRequest(schemaPath, dataTreeIdentifier, input));
 
             return Futures.transform(actionResultFuture, netconfMessageRpcResult -> {
                 if (netconfMessageRpcResult != null) {

diff --git a/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/NetconfDeviceCommunicator.java b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/NetconfDeviceCommunicator.java
index 91ebb859abdbab49717fb5c996570b82c0cf6d98..5c16c12e880d8bc824d49efe3a62df4901af850f 100644 (file)
--- a/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/NetconfDeviceCommunicator.java
+++ b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/NetconfDeviceCommunicator.java
@@ -42,7 +42,6 @@ import org.opendaylight.netconf.client.mdsal.api.RemoteDeviceId;
 import org.opendaylight.yangtools.yang.common.ErrorSeverity;
 import org.opendaylight.yangtools.yang.common.ErrorTag;
 import org.opendaylight.yangtools.yang.common.ErrorType;
-import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.common.RpcError;
 import org.opendaylight.yangtools.yang.common.RpcResult;
 import org.opendaylight.yangtools.yang.common.RpcResultBuilder;
@@ -351,11 +350,6 @@ public class NetconfDeviceCommunicator implements NetconfClientSessionListener,
                 infoString, ex.getCause());
     }
 
-    @Override
-    public ListenableFuture<RpcResult<NetconfMessage>> sendRequest(final NetconfMessage message, final QName rpc) {
-        return sendRequest(message);
-    }
-
     @Override
     public ListenableFuture<RpcResult<NetconfMessage>> sendRequest(final NetconfMessage message) {
         sessionLock.lock();

diff --git a/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/api/RemoteDeviceCommunicator.java b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/api/RemoteDeviceCommunicator.java
index 44dda858c2890168cab850e39e9b53b02d0f18c7..4606d3fa00e8cafc72e6585ed2b050e5102010cb 100644 (file)
--- a/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/api/RemoteDeviceCommunicator.java
+++ b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/api/RemoteDeviceCommunicator.java
@@ -9,19 +9,9 @@ package org.opendaylight.netconf.client.mdsal.api;
 
 import com.google.common.util.concurrent.ListenableFuture;
 import org.opendaylight.netconf.api.messages.NetconfMessage;
-import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.common.RpcResult;
 
 public interface RemoteDeviceCommunicator extends AutoCloseable {
-    /**
-     * Send request message to current client session.
-     *
-     * @deprecated The parameter rpc is never used.
-     *             Use {@link RemoteDeviceCommunicator#sendRequest(NetconfMessage)}.
-     */
-    @Deprecated(forRemoval = true)
-    ListenableFuture<RpcResult<NetconfMessage>> sendRequest(NetconfMessage message, QName rpc);
-
     /**
      * Send request message to current client session.
      *

diff --git a/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/spi/NetconfDeviceDOMRpcService.java b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/spi/NetconfDeviceDOMRpcService.java
index 569fe91a3350f014d89f9a87b6a97c604787e571..bf0f5e34970f6c87ea3ea18936749fc03bbf8565 100644 (file)
--- a/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/spi/NetconfDeviceDOMRpcService.java
+++ b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/spi/NetconfDeviceDOMRpcService.java
@@ -41,7 +41,7 @@ record NetconfDeviceDOMRpcService(
     @Override
     @SuppressWarnings("checkstyle:IllegalCatch")
     public ListenableFuture<DOMRpcResult> invokeRpc(final QName type, final ContainerNode input) {
-        final var delegateFuture = communicator.sendRequest(transformer.toRpcRequest(type, input), type);
+        final var delegateFuture = communicator.sendRequest(transformer.toRpcRequest(type, input));
 
         final var ret = SettableFuture.<DOMRpcResult>create();
         Futures.addCallback(delegateFuture, new FutureCallback<>() {

diff --git a/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/spi/SchemalessNetconfDeviceRpc.java b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/spi/SchemalessNetconfDeviceRpc.java
index 139a5752dcaf2cb426ce79c741733d0f7691673e..e6fe6f67be89495a5c56830aa41fd2c2298a562a 100644 (file)
--- a/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/spi/SchemalessNetconfDeviceRpc.java
+++ b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/spi/SchemalessNetconfDeviceRpc.java
@@ -63,7 +63,7 @@ public final class SchemalessNetconfDeviceRpc implements Rpcs.Schemaless {
 
     private @NonNull <I, R> ListenableFuture<R> handleRpc(final @NonNull QName type,
             final @NonNull I input, final RpcTransformer<I, R> transformer) {
-        final var delegateFuture = listener.sendRequest(transformer.toRpcRequest(type, input), type);
+        final var delegateFuture = listener.sendRequest(transformer.toRpcRequest(type, input));
         final var ret = SettableFuture.<R>create();
         Futures.addCallback(delegateFuture, new FutureCallback<>() {
             @Override

diff --git a/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/NetconfDeviceCommunicatorTest.java b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/NetconfDeviceCommunicatorTest.java
index 57d0f427242504cfd38a77efe7fc2c853a0847b5..3af378a76db08af5d5a162c1edda526bd546bf4b 100644 (file)
--- a/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/NetconfDeviceCommunicatorTest.java
+++ b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/NetconfDeviceCommunicatorTest.java
@@ -110,7 +110,7 @@ class NetconfDeviceCommunicatorTest {
                 .addListener(any(GenericFutureListener.class));
         doReturn(mockChannelFuture).when(spySession).sendMessage(same(message));
 
-        final var resultFuture = communicator.sendRequest(message, QName.create("", "mockRpc"));
+        final var resultFuture = communicator.sendRequest(message);
         if (doLastTest) {
             assertNotNull(resultFuture, "ListenableFuture is null");
         }
@@ -127,7 +127,7 @@ class NetconfDeviceCommunicatorTest {
         final var message = new NetconfMessage(doc);
 
         final var resultFuture =
-            communicator.sendRequest(message, QName.create("", "mockRpc"));
+            communicator.sendRequest(message);
         if (doLastTest) {
             assertNotNull(resultFuture, "ListenableFuture is null");
         }
@@ -218,14 +218,13 @@ class NetconfDeviceCommunicatorTest {
         setupSession();
 
         final var message = new NetconfMessage(UntrustedXML.newDocumentBuilder().newDocument());
-        final var rpc = QName.create("", "mockRpc");
 
         final var futureListener = ArgumentCaptor.forClass(GenericFutureListener.class);
 
         doReturn(mockChannelFuture).when(mockChannelFuture).addListener(futureListener.capture());
         doReturn(mockChannelFuture).when(spySession).sendMessage(same(message));
 
-        final var resultFuture = communicator.sendRequest(message, rpc);
+        final var resultFuture = communicator.sendRequest(message);
 
         verify(spySession).sendMessage(same(message));
 
@@ -242,9 +241,8 @@ class NetconfDeviceCommunicatorTest {
     @Test
     void testSendRequestWithNoSession() throws Exception {
         final var message = new NetconfMessage(UntrustedXML.newDocumentBuilder().newDocument());
-        final var rpc = QName.create("", "mockRpc");
 
-        final var resultFuture = communicator.sendRequest(message, rpc);
+        final var resultFuture = communicator.sendRequest(message);
 
         assertNotNull(resultFuture, "ListenableFuture is null");
 
@@ -272,14 +270,13 @@ class NetconfDeviceCommunicatorTest {
         setupSession();
 
         final var message = new NetconfMessage(UntrustedXML.newDocumentBuilder().newDocument());
-        final var rpc = QName.create("", "mockRpc");
 
         final var futureListener = ArgumentCaptor.forClass(GenericFutureListener.class);
 
         doReturn(mockChannelFuture).when(mockChannelFuture).addListener(futureListener.capture());
         doReturn(mockChannelFuture).when(spySession).sendMessage(same(message));
 
-        final var resultFuture = communicator.sendRequest(message, rpc);
+        final var resultFuture = communicator.sendRequest(message);
 
         assertNotNull(resultFuture, "ListenableFuture is null");
 

diff --git a/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/NetconfDeviceTest.java b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/NetconfDeviceTest.java
index bc48d89b26462df9917b7112f5f5b84ebb25a640..b976296b7961a424e47f4a1b3f7af97119667c11 100644 (file)
--- a/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/NetconfDeviceTest.java
+++ b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/NetconfDeviceTest.java
@@ -48,7 +48,6 @@ import org.opendaylight.netconf.client.mdsal.api.RemoteDeviceHandler;
 import org.opendaylight.netconf.client.mdsal.api.RemoteDeviceId;
 import org.opendaylight.netconf.client.mdsal.api.RemoteDeviceServices;
 import org.opendaylight.netconf.client.mdsal.impl.DefaultDeviceNetconfSchemaProvider;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.netconf.base._1._0.rev110601.Get;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.monitoring.rev101004.NetconfState;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.device.rev240319.connection.oper.available.capabilities.AvailableCapability.CapabilityOrigin;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.device.rev240319.connection.oper.available.capabilities.AvailableCapabilityBuilder;
@@ -170,7 +169,7 @@ class NetconfDeviceTest extends AbstractTestModelTest {
 
     @Test
     void testNetconfDeviceReconnect() {
-        doReturn(RpcResultBuilder.failed().buildFuture()).when(listener).sendRequest(any(), eq(Get.QNAME));
+        doReturn(RpcResultBuilder.failed().buildFuture()).when(listener).sendRequest(any());
 
         final var device = new NetconfDeviceBuilder()
             .setReconnectOnSchemasChange(true)
@@ -228,7 +227,7 @@ class NetconfDeviceTest extends AbstractTestModelTest {
         final var schemaFuture = SettableFuture.<EffectiveModelContext>create();
         doReturn(schemaFuture).when(schemaFactory).createEffectiveModelContext(anyCollection());
 
-        doReturn(RpcResultBuilder.failed().buildFuture()).when(listener).sendRequest(any(), eq(Get.QNAME));
+        doReturn(RpcResultBuilder.failed().buildFuture()).when(listener).sendRequest(any());
 
         final var device = new NetconfDeviceBuilder()
             .setReconnectOnSchemasChange(true)
@@ -260,7 +259,7 @@ class NetconfDeviceTest extends AbstractTestModelTest {
 
     @Test
     void testNetconfDeviceAvailableCapabilitiesBuilding() {
-        doReturn(RpcResultBuilder.failed().buildFuture()).when(listener).sendRequest(any(), eq(Get.QNAME));
+        doReturn(RpcResultBuilder.failed().buildFuture()).when(listener).sendRequest(any());
 
         final var netconfSpy = spy(new NetconfDeviceBuilder()
             .setReconnectOnSchemasChange(true)

diff --git a/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/impl/NetconfBaseOpsTest.java b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/impl/NetconfBaseOpsTest.java
index 85e099554e9095279669ce6ee14d437c74156ffa..efbfea1effece100969749d75da3b0e8f38db65c 100644 (file)
--- a/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/impl/NetconfBaseOpsTest.java
+++ b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/impl/NetconfBaseOpsTest.java
@@ -12,7 +12,6 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.argThat;
-import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
@@ -40,15 +39,6 @@ import org.opendaylight.netconf.client.mdsal.api.NetconfSessionPreferences;
 import org.opendaylight.netconf.client.mdsal.api.RemoteDeviceCommunicator;
 import org.opendaylight.netconf.client.mdsal.api.RemoteDeviceId;
 import org.opendaylight.netconf.client.mdsal.spi.NetconfDeviceRpc;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.netconf.base._1._0.rev110601.Commit;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.netconf.base._1._0.rev110601.CopyConfig;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.netconf.base._1._0.rev110601.DiscardChanges;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.netconf.base._1._0.rev110601.EditConfig;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.netconf.base._1._0.rev110601.Get;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.netconf.base._1._0.rev110601.GetConfig;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.netconf.base._1._0.rev110601.Lock;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.netconf.base._1._0.rev110601.Unlock;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.netconf.base._1._0.rev110601.Validate;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.netconf.base._1._0.rev110601.get.config.output.Data;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.common.QNameModule;
@@ -81,14 +71,11 @@ class NetconfBaseOpsTest extends AbstractTestModelTest {
     private static final NodeIdentifier CONTAINER_E_NID = NodeIdentifier.create(CONTAINER_E_QNAME);
     private static final QName LEAF_Z_QNAME = QName.create(TEST_MODULE, "z");
     private static final NodeIdentifier LEAF_Z_NID = NodeIdentifier.create(LEAF_Z_QNAME);
-    private static final NetconfMessage NETCONF_OK_MESSAGE;
     private static final NetconfMessage NETCONF_DATA_MESSAGE;
 
     static {
-        final var okStream = NetconfBaseOpsTest.class.getResourceAsStream("/netconfMessages/rpc-reply_ok.xml");
         final var dataStream = NetconfBaseOpsTest.class.getResourceAsStream("/netconfMessages/rpc-reply_get.xml");
         try {
-            NETCONF_OK_MESSAGE = new NetconfMessage(XmlUtil.readXmlToDocument(okStream));
             NETCONF_DATA_MESSAGE = new NetconfMessage(XmlUtil.readXmlToDocument(dataStream));
         } catch (SAXException | IOException e) {
             throw new ExceptionInInitializerError(e);
@@ -114,100 +101,93 @@ class NetconfBaseOpsTest extends AbstractTestModelTest {
 
     @Test
     void testLock() {
-        mockLock();
+        when(listener.sendRequest(any())).thenReturn(RpcResultBuilder.success(NETCONF_DATA_MESSAGE).buildFuture());
         baseOps.lock(callback, NetconfMessageTransformUtil.NETCONF_CANDIDATE_NODEID);
-        verifyMessageSent("lock", Lock.QNAME);
+        verifyMessageSent("lock");
     }
 
     @Test
     void testLockCandidate() {
-        mockLock();
+        when(listener.sendRequest(any())).thenReturn(RpcResultBuilder.success(NETCONF_DATA_MESSAGE).buildFuture());
         baseOps.lockCandidate(callback);
-        verifyMessageSent("lock", Lock.QNAME);
+        verifyMessageSent("lock");
     }
 
     @Test
     void testUnlock() {
-        mockUnlock();
+        when(listener.sendRequest(any())).thenReturn(RpcResultBuilder.success(NETCONF_DATA_MESSAGE).buildFuture());
         baseOps.unlock(callback, NetconfMessageTransformUtil.NETCONF_CANDIDATE_NODEID);
-        verifyMessageSent("unlock", Unlock.QNAME);
+        verifyMessageSent("unlock");
     }
 
     @Test
     void testUnlockCandidate() {
-        mockUnlock();
+        when(listener.sendRequest(any())).thenReturn(RpcResultBuilder.success(NETCONF_DATA_MESSAGE).buildFuture());
         baseOps.unlockCandidate(callback);
-        verifyMessageSent("unlock", Unlock.QNAME);
+        verifyMessageSent("unlock");
     }
 
     @Test
     void testLockRunning() {
-        mockLock();
+        when(listener.sendRequest(any())).thenReturn(RpcResultBuilder.success(NETCONF_DATA_MESSAGE).buildFuture());
         baseOps.lockRunning(callback);
-        verifyMessageSent("lock-running", Lock.QNAME);
+        verifyMessageSent("lock-running");
     }
 
     @Test
     void testUnlockRunning() {
-        mockUnlock();
+        when(listener.sendRequest(any())).thenReturn(RpcResultBuilder.success(NETCONF_DATA_MESSAGE).buildFuture());
         baseOps.unlockRunning(callback);
-        verifyMessageSent("unlock-running", Unlock.QNAME);
+        verifyMessageSent("unlock-running");
     }
 
     @Test
     void testDiscardChanges() {
-        when(listener.sendRequest(any(), eq(DiscardChanges.QNAME)))
-            .thenReturn(RpcResultBuilder.success(NETCONF_OK_MESSAGE).buildFuture());
+        when(listener.sendRequest(any())).thenReturn(RpcResultBuilder.success(NETCONF_DATA_MESSAGE).buildFuture());
         baseOps.discardChanges(callback);
-        verifyMessageSent("discardChanges", DiscardChanges.QNAME);
+        verifyMessageSent("discardChanges");
     }
 
     @Test
     void testCommit() {
-        when(listener.sendRequest(any(), eq(Commit.QNAME))).thenReturn(RpcResultBuilder.success(NETCONF_OK_MESSAGE)
-            .buildFuture());
+        when(listener.sendRequest(any())).thenReturn(RpcResultBuilder.success(NETCONF_DATA_MESSAGE).buildFuture());
         baseOps.commit(callback);
-        verifyMessageSent("commit", Commit.QNAME);
+        verifyMessageSent("commit");
     }
 
     @Test
     void testValidateCandidate() {
-        when(listener.sendRequest(any(), eq(Validate.QNAME))).thenReturn(RpcResultBuilder.success(NETCONF_OK_MESSAGE)
-            .buildFuture());
+        when(listener.sendRequest(any())).thenReturn(RpcResultBuilder.success(NETCONF_DATA_MESSAGE).buildFuture());
         baseOps.validateCandidate(callback);
-        verifyMessageSent("validate", Validate.QNAME);
+        verifyMessageSent("validate");
     }
 
     @Test
     void testValidateRunning() {
-        when(listener.sendRequest(any(), eq(Validate.QNAME))).thenReturn(RpcResultBuilder.success(NETCONF_OK_MESSAGE)
-            .buildFuture());
+        when(listener.sendRequest(any())).thenReturn(RpcResultBuilder.success(NETCONF_DATA_MESSAGE).buildFuture());
         baseOps.validateRunning(callback);
-        verifyMessageSent("validate-running", Validate.QNAME);
+        verifyMessageSent("validate-running");
     }
 
 
     @Test
     void testCopyConfig() {
-        when(listener.sendRequest(any(), eq(CopyConfig.QNAME))).thenReturn(RpcResultBuilder.success(NETCONF_OK_MESSAGE)
-            .buildFuture());
+        when(listener.sendRequest(any())).thenReturn(RpcResultBuilder.success(NETCONF_DATA_MESSAGE).buildFuture());
         baseOps.copyConfig(callback, NetconfMessageTransformUtil.NETCONF_RUNNING_NODEID,
                 NetconfMessageTransformUtil.NETCONF_CANDIDATE_NODEID);
-        verifyMessageSent("copy-config", CopyConfig.QNAME);
+        verifyMessageSent("copy-config");
     }
 
     @Test
     void testCopyRunningToCandidate() {
-        when(listener.sendRequest(any(), eq(CopyConfig.QNAME))).thenReturn(RpcResultBuilder.success(NETCONF_OK_MESSAGE)
-            .buildFuture());
+        when(listener.sendRequest(any())).thenReturn(RpcResultBuilder.success(NETCONF_DATA_MESSAGE).buildFuture());
         baseOps.copyRunningToCandidate(callback);
-        verifyMessageSent("copy-config", CopyConfig.QNAME);
+        verifyMessageSent("copy-config");
     }
 
     @Test
     void testGetConfigRunningData() throws Exception {
-        when(listener.sendRequest(any(), eq(GetConfig.QNAME))).thenReturn(RpcResultBuilder.success(NETCONF_DATA_MESSAGE)
-            .buildFuture());
+        when(listener.sendRequest(any())).thenReturn(RpcResultBuilder.success(NETCONF_DATA_MESSAGE).buildFuture());
         final var dataOpt = baseOps.getConfigRunningData(callback, Optional.of(YangInstanceIdentifier.of())).get();
         assertTrue(dataOpt.isPresent());
         assertEquals(Data.QNAME, dataOpt.orElseThrow().name().getNodeType());
@@ -215,8 +195,7 @@ class NetconfBaseOpsTest extends AbstractTestModelTest {
 
     @Test
     void testGetData() throws Exception {
-        when(listener.sendRequest(any(), eq(Get.QNAME))).thenReturn(RpcResultBuilder.success(NETCONF_DATA_MESSAGE)
-            .buildFuture());
+        when(listener.sendRequest(any())).thenReturn(RpcResultBuilder.success(NETCONF_DATA_MESSAGE).buildFuture());
         final var dataOpt = baseOps.getData(callback, Optional.of(YangInstanceIdentifier.of())).get();
         assertTrue(dataOpt.isPresent());
         assertEquals(Data.QNAME, dataOpt.orElseThrow().name().getNodeType());
@@ -224,102 +203,92 @@ class NetconfBaseOpsTest extends AbstractTestModelTest {
 
     @Test
     void testGetConfigRunning() {
-        when(listener.sendRequest(any(), eq(GetConfig.QNAME))).thenReturn(RpcResultBuilder.success(NETCONF_DATA_MESSAGE)
-            .buildFuture());
+        when(listener.sendRequest(any())).thenReturn(RpcResultBuilder.success(NETCONF_DATA_MESSAGE).buildFuture());
         baseOps.getConfigRunning(callback, Optional.empty());
-        verifyMessageSent("getConfig", GetConfig.QNAME);
+        verifyMessageSent("getConfig");
     }
 
     @Test
     void testGetConfigCandidate() {
-        when(listener.sendRequest(any(), eq(GetConfig.QNAME))).thenReturn(RpcResultBuilder.success(NETCONF_DATA_MESSAGE)
-            .buildFuture());
+        when(listener.sendRequest(any())).thenReturn(RpcResultBuilder.success(NETCONF_DATA_MESSAGE).buildFuture());
         baseOps.getConfigCandidate(callback, Optional.empty());
-        verifyMessageSent("getConfig_candidate", GetConfig.QNAME);
+        verifyMessageSent("getConfig_candidate");
     }
 
     @Test
     void testGetConfigCandidateWithFilter() {
-        when(listener.sendRequest(any(), eq(GetConfig.QNAME))).thenReturn(RpcResultBuilder.success(NETCONF_DATA_MESSAGE)
-            .buildFuture());
+        when(listener.sendRequest(any())).thenReturn(RpcResultBuilder.success(NETCONF_DATA_MESSAGE).buildFuture());
         baseOps.getConfigCandidate(callback, Optional.of(YangInstanceIdentifier.of(CONTAINER_C_QNAME)));
-        verifyMessageSent("getConfig_candidate-filter", GetConfig.QNAME);
+        verifyMessageSent("getConfig_candidate-filter");
     }
 
     @Test
     void testGet() {
-        when(listener.sendRequest(any(), eq(Get.QNAME))).thenReturn(RpcResultBuilder.success(NETCONF_DATA_MESSAGE)
-            .buildFuture());
+        when(listener.sendRequest(any())).thenReturn(RpcResultBuilder.success(NETCONF_DATA_MESSAGE).buildFuture());
         baseOps.get(callback, Optional.empty());
-        verifyMessageSent("get", Get.QNAME);
+        verifyMessageSent("get");
     }
 
     @Test
     void testEditConfigCandidate() {
-        when(listener.sendRequest(any(), eq(EditConfig.QNAME))).thenReturn(RpcResultBuilder.success(NETCONF_OK_MESSAGE)
-            .buildFuture());
+        when(listener.sendRequest(any())).thenReturn(RpcResultBuilder.success(NETCONF_DATA_MESSAGE).buildFuture());
         baseOps.editConfigCandidate(callback, baseOps.createEditConfigStructure(
             Optional.of(ImmutableNodes.leafNode(LEAF_A_NID, "leaf-value")),
             Optional.of(EffectiveOperation.REPLACE), YangInstanceIdentifier.builder()
             .node(CONTAINER_C_QNAME)
             .node(LEAF_A_NID)
             .build()), true);
-        verifyMessageSent("edit-config-test-module", EditConfig.QNAME);
+        verifyMessageSent("edit-config-test-module");
     }
 
     @Test
     void testDeleteContainerNodeCandidate() {
-        when(listener.sendRequest(any(), eq(EditConfig.QNAME))).thenReturn(RpcResultBuilder.success(NETCONF_OK_MESSAGE)
-            .buildFuture());
+        when(listener.sendRequest(any())).thenReturn(RpcResultBuilder.success(NETCONF_DATA_MESSAGE).buildFuture());
         baseOps.editConfigCandidate(callback, baseOps.createEditConfigStructure(Optional.empty(),
             Optional.of(EffectiveOperation.DELETE), YangInstanceIdentifier.of(CONTAINER_C_QNAME)), true);
-        verifyMessageSent("edit-config-delete-container-node-candidate", EditConfig.QNAME);
+        verifyMessageSent("edit-config-delete-container-node-candidate");
     }
 
     @Test
     void testDeleteLeafNodeCandidate() {
-        when(listener.sendRequest(any(), eq(EditConfig.QNAME))).thenReturn(RpcResultBuilder.success(NETCONF_OK_MESSAGE)
-            .buildFuture());
+        when(listener.sendRequest(any())).thenReturn(RpcResultBuilder.success(NETCONF_DATA_MESSAGE).buildFuture());
         baseOps.editConfigCandidate(callback, baseOps.createEditConfigStructure(Optional.empty(),
             Optional.of(EffectiveOperation.DELETE),
             YangInstanceIdentifier.builder().node(CONTAINER_C_QNAME).node(LEAF_A_NID).build()), true);
-        verifyMessageSent("edit-config-delete-leaf-node-candidate", EditConfig.QNAME);
+        verifyMessageSent("edit-config-delete-leaf-node-candidate");
     }
 
     @Test
     void testEditConfigRunning() {
-        when(listener.sendRequest(any(), eq(EditConfig.QNAME))).thenReturn(RpcResultBuilder.success(NETCONF_OK_MESSAGE)
-            .buildFuture());
+        when(listener.sendRequest(any())).thenReturn(RpcResultBuilder.success(NETCONF_DATA_MESSAGE).buildFuture());
         baseOps.editConfigRunning(callback, baseOps.createEditConfigStructure(
             Optional.of(ImmutableNodes.leafNode(LEAF_A_NID, "leaf-value")),
             Optional.of(EffectiveOperation.REPLACE),
             YangInstanceIdentifier.builder().node(CONTAINER_C_NID).node(LEAF_A_NID).build()),
             EffectiveOperation.MERGE, true);
-        verifyMessageSent("edit-config-test-module-running", EditConfig.QNAME);
+        verifyMessageSent("edit-config-test-module-running");
     }
 
     @Test
     void testGetWithFields() throws Exception {
-        when(listener.sendRequest(any(), eq(Get.QNAME))).thenReturn(RpcResultBuilder.success(NETCONF_DATA_MESSAGE)
-            .buildFuture());
+        when(listener.sendRequest(any())).thenReturn(RpcResultBuilder.success(NETCONF_DATA_MESSAGE).buildFuture());
         final YangInstanceIdentifier path = YangInstanceIdentifier.of(CONTAINER_C_NID);
         final YangInstanceIdentifier leafAField = YangInstanceIdentifier.of(LEAF_A_NID);
         final YangInstanceIdentifier leafBField = YangInstanceIdentifier.of(LEAF_B_NID);
 
         baseOps.getData(callback, Optional.of(path), List.of(leafAField, leafBField)).get();
-        verify(listener).sendRequest(msg("/netconfMessages/get-fields-request.xml"), eq(Get.QNAME));
+        verify(listener).sendRequest(msg("/netconfMessages/get-fields-request.xml"));
     }
 
     @Test
     void testGetConfigWithFields() throws Exception {
-        when(listener.sendRequest(any(), eq(GetConfig.QNAME))).thenReturn(RpcResultBuilder.success(NETCONF_DATA_MESSAGE)
-            .buildFuture());
+        when(listener.sendRequest(any())).thenReturn(RpcResultBuilder.success(NETCONF_DATA_MESSAGE).buildFuture());
         final YangInstanceIdentifier path = YangInstanceIdentifier.of(CONTAINER_C_NID);
         final YangInstanceIdentifier leafAField = YangInstanceIdentifier.of(LEAF_A_NID);
         final YangInstanceIdentifier leafBField = YangInstanceIdentifier.of(LEAF_B_NID);
 
         baseOps.getConfigRunningData(callback, Optional.of(path), List.of(leafAField, leafBField)).get();
-        verify(listener).sendRequest(msg("/netconfMessages/get-config-fields-request.xml"), eq(GetConfig.QNAME));
+        verify(listener).sendRequest(msg("/netconfMessages/get-config-fields-request.xml"));
     }
 
     @Test
@@ -336,8 +305,7 @@ class NetconfBaseOpsTest extends AbstractTestModelTest {
 
     @Test
     void testGetWithFieldsAndEmptyParentPath() throws Exception {
-        when(listener.sendRequest(any(), eq(Get.QNAME))).thenReturn(RpcResultBuilder.success(NETCONF_DATA_MESSAGE)
-            .buildFuture());
+        when(listener.sendRequest(any())).thenReturn(RpcResultBuilder.success(NETCONF_DATA_MESSAGE).buildFuture());
         final YangInstanceIdentifier leafAField = YangInstanceIdentifier.of(CONTAINER_C_NID, LEAF_A_NID);
         final YangInstanceIdentifier leafXField = YangInstanceIdentifier.of(
                 CONTAINER_C_NID, CONTAINER_D_NID, LEAF_X_NID);
@@ -345,13 +313,12 @@ class NetconfBaseOpsTest extends AbstractTestModelTest {
 
         baseOps.getData(callback, Optional.of(YangInstanceIdentifier.of()),
                 List.of(leafAField, leafXField, leafZField)).get();
-        verify(listener).sendRequest(msg("/netconfMessages/get-with-multiple-subtrees.xml"), eq(Get.QNAME));
+        verify(listener).sendRequest(msg("/netconfMessages/get-with-multiple-subtrees.xml"));
     }
 
     @Test
     void testGetConfigWithFieldsAndEmptyParentPath() throws Exception {
-        when(listener.sendRequest(any(), eq(GetConfig.QNAME))).thenReturn(RpcResultBuilder.success(NETCONF_DATA_MESSAGE)
-            .buildFuture());
+        when(listener.sendRequest(any())).thenReturn(RpcResultBuilder.success(NETCONF_DATA_MESSAGE).buildFuture());
         final YangInstanceIdentifier leafAField = YangInstanceIdentifier.of(CONTAINER_C_NID, LEAF_A_NID);
         final YangInstanceIdentifier leafXField = YangInstanceIdentifier.of(
                 CONTAINER_C_NID, CONTAINER_D_NID, LEAF_X_NID);
@@ -359,34 +326,22 @@ class NetconfBaseOpsTest extends AbstractTestModelTest {
 
         baseOps.getConfigRunningData(callback, Optional.of(YangInstanceIdentifier.of()),
                 List.of(leafAField, leafXField, leafZField)).get();
-        verify(listener).sendRequest(msg("/netconfMessages/get-config-with-multiple-subtrees.xml"),
-                eq(GetConfig.QNAME));
+        verify(listener).sendRequest(msg("/netconfMessages/get-config-with-multiple-subtrees.xml"));
     }
 
     @Test
     void testGetWithRootFieldsAndEmptyParentPath() throws Exception {
-        when(listener.sendRequest(any(), eq(Get.QNAME))).thenReturn(RpcResultBuilder.success(NETCONF_DATA_MESSAGE)
-            .buildFuture());
+        when(listener.sendRequest(any())).thenReturn(RpcResultBuilder.success(NETCONF_DATA_MESSAGE).buildFuture());
         final YangInstanceIdentifier contCField = YangInstanceIdentifier.of(CONTAINER_C_NID);
         final YangInstanceIdentifier contDField = YangInstanceIdentifier.of(CONTAINER_E_NID);
 
         baseOps.getData(callback, Optional.of(YangInstanceIdentifier.of()), List.of(contCField, contDField)).get();
-        verify(listener).sendRequest(msg("/netconfMessages/get-with-multiple-root-subtrees.xml"), eq(Get.QNAME));
+        verify(listener).sendRequest(msg("/netconfMessages/get-with-multiple-root-subtrees.xml"));
     }
 
-    private void mockLock() {
-        when(listener.sendRequest(any(), eq(Lock.QNAME))).thenReturn(RpcResultBuilder.success(NETCONF_OK_MESSAGE)
-            .buildFuture());
-    }
-
-    private void mockUnlock() {
-        when(listener.sendRequest(any(), eq(Unlock.QNAME))).thenReturn(RpcResultBuilder.success(NETCONF_OK_MESSAGE)
-            .buildFuture());
-    }
-
-    private void verifyMessageSent(final String fileName, final QName name) {
+    private void verifyMessageSent(final String fileName) {
         final String path = "/netconfMessages/" + fileName + ".xml";
-        verify(listener).sendRequest(msg(path), eq(name));
+        verify(listener).sendRequest(msg(path));
     }
 
     private static NetconfMessage msg(final String name) {

diff --git a/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/spi/NetconfDeviceRpcTest.java b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/spi/NetconfDeviceRpcTest.java
index 53c37f38e56a284efde78d144331c4e2fe344387..311b0dd22404447eebdced4b2b604a65a999754b 100644 (file)
--- a/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/spi/NetconfDeviceRpcTest.java
+++ b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/spi/NetconfDeviceRpcTest.java
@@ -102,7 +102,7 @@ class NetconfDeviceRpcTest extends AbstractBaseSchemasTest {
         final RemoteDeviceCommunicator communicatorMock = mock(RemoteDeviceCommunicator.class);
         final NetconfMessage msg = null;
         final RpcResult<NetconfMessage> result = RpcResultBuilder.success(msg).build();
-        when(communicatorMock.sendRequest(any(), any())).thenReturn(Futures.immediateFuture(result));
+        when(communicatorMock.sendRequest(any())).thenReturn(Futures.immediateFuture(result));
         when(failingTransformer.toRpcResult(any(), any())).thenThrow(new RuntimeException("FAIL"));
         final var failingRpc = new NetconfDeviceRpc(SCHEMA_CONTEXT, communicatorMock, failingTransformer)
             .domRpcService();
@@ -113,8 +113,7 @@ class NetconfDeviceRpcTest extends AbstractBaseSchemasTest {
     @Test
     void testInvokeRpc() throws Exception {
         final var rpcResult = RpcResultBuilder.success(reply).build();
-        doReturn(Futures.immediateFuture(rpcResult)).when(communicator).sendRequest(any(NetconfMessage.class),
-            any(QName.class));
+        doReturn(Futures.immediateFuture(rpcResult)).when(communicator).sendRequest(any(NetconfMessage.class));
         ContainerNode input = createNode("urn:ietf:params:xml:ns:netconf:base:1.0", "2011-06-01", "filter");
         final DOMRpcResult result = rpc.domRpcService().invokeRpc(type, input).get();
         assertEquals(expectedReply.value().name(), result.value().name());

diff --git a/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/spi/SchemalessNetconfDeviceRpcTest.java b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/spi/SchemalessNetconfDeviceRpcTest.java
index da2b84f19c80ae20697ce2d690a4edd9ce7310c9..e31668ad344a2f6367f4496e9f0d60ddc672ee62 100644 (file)
--- a/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/spi/SchemalessNetconfDeviceRpcTest.java
+++ b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/spi/SchemalessNetconfDeviceRpcTest.java
@@ -46,7 +46,7 @@ class SchemalessNetconfDeviceRpcTest extends AbstractBaseSchemasTest {
     void setUp() throws Exception {
         RpcResult<NetconfMessage> msg = null;
         ListenableFuture<RpcResult<NetconfMessage>> future = Futures.immediateFuture(msg);
-        doReturn(future).when(listener).sendRequest(any(), any());
+        doReturn(future).when(listener).sendRequest(any());
         final MessageCounter counter = new MessageCounter();
         deviceRpc = new SchemalessNetconfDeviceRpc(
                 new RemoteDeviceId("device1", InetSocketAddress.createUnresolved("0.0.0.0", 17830)), listener,
@@ -71,8 +71,7 @@ class SchemalessNetconfDeviceRpcTest extends AbstractBaseSchemasTest {
                 + "  </get-config>"));
         deviceRpc.schemalessRpcService().invokeRpc(qName, src);
         final var msgCaptor = ArgumentCaptor.forClass(NetconfMessage.class);
-        final var qnameCaptor = ArgumentCaptor.forClass(QName.class);
-        verify(listener).sendRequest(msgCaptor.capture(), qnameCaptor.capture());
+        verify(listener).sendRequest(msgCaptor.capture());
         assertEquals("""
             <rpc xmlns="urn:ietf:params:xml:ns:netconf:base:1.0" message-id="m-0">
                 <get-config xmlns="dd">