From 4fd4d3e0089a0f574cf444510639abbc2a9bd485 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Fri, 11 Nov 2022 23:52:28 +0100 Subject: [PATCH] Specialize RemoteDevice to NetconfMessage The only specialization being used is NetconfMessage. Drop the generic and instead require NetconfMessage. This pulls in NetconfDeviceCommunicator in for the ride. JIRA: NETCONF-912 Change-Id: Ie1859554477068b42f6d730744fabf9d199e195f Signed-off-by: Robert Varga --- .../impl/RemoteDeviceConnectorImpl.java | 13 ++++--------- .../topology/spi/AbstractNetconfTopology.java | 18 +++++++----------- .../sal/connect/api/DeviceActionFactory.java | 3 +-- .../netconf/sal/connect/api/RemoteDevice.java | 6 ++++-- .../connect/api/RemoteDeviceCommunicator.java | 5 +++-- .../netconf/DeviceActionFactoryImpl.java | 2 +- .../sal/connect/netconf/NetconfDevice.java | 13 +++++-------- .../netconf/SchemalessNetconfDevice.java | 3 +-- .../listener/NetconfDeviceCommunicator.java | 12 +++++------- .../connect/netconf/sal/NetconfDeviceRpc.java | 5 ++--- .../sal/SchemalessNetconfDeviceRpc.java | 11 +++++------ .../NetconfDeviceCommunicatorTest.java | 5 ++--- .../netconf/sal/NetconfDeviceRpcTest.java | 4 ++-- .../sal/SchemalessNetconfDeviceRpcTest.java | 3 +-- .../netconf/util/NetconfBaseOpsTest.java | 2 +- .../test/tool/client/stress/StressClient.java | 4 +--- .../client/stress/StressClientCallable.java | 2 +- 17 files changed, 46 insertions(+), 65 deletions(-) diff --git a/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/RemoteDeviceConnectorImpl.java b/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/RemoteDeviceConnectorImpl.java index 0de0ea6bc3..0d753b4919 100644 --- a/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/RemoteDeviceConnectorImpl.java +++ b/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/RemoteDeviceConnectorImpl.java @@ -23,7 +23,6 @@ import java.util.List; import java.util.Map; import java.util.Optional; import org.opendaylight.aaa.encrypt.AAAEncryptionService; -import org.opendaylight.netconf.api.NetconfMessage; import org.opendaylight.netconf.client.NetconfClientSessionListener; import org.opendaylight.netconf.client.conf.NetconfClientConfiguration; import org.opendaylight.netconf.client.conf.NetconfReconnectingClientConfiguration; @@ -76,7 +75,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; public class RemoteDeviceConnectorImpl implements RemoteDeviceConnector { - private static final Logger LOG = LoggerFactory.getLogger(RemoteDeviceConnectorImpl.class); // Initializes default constant instances for the case when the default schema repository @@ -195,7 +193,7 @@ public class RemoteDeviceConnectorImpl implements RemoteDeviceConnector { } } - final RemoteDevice device; + final RemoteDevice device; if (node.getSchemaless()) { device = new SchemalessNetconfDevice(netconfTopologyDeviceSetup.getBaseSchemas(), remoteDeviceId, salFacade); @@ -318,12 +316,9 @@ public class RemoteDeviceConnectorImpl implements RemoteDeviceConnector { } private AuthenticationHandler getHandlerFromCredentials(final Credentials credentials) { - if (credentials instanceof org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology - .rev150114.netconf.node.credentials.credentials.LoginPassword) { - final org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology - .rev150114.netconf.node.credentials.credentials.LoginPassword loginPassword - = (org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology - .rev150114.netconf.node.credentials.credentials.LoginPassword) credentials; + if (credentials + instanceof org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.netconf.node + .credentials.credentials.LoginPassword loginPassword) { return new LoginPasswordHandler(loginPassword.getUsername(), loginPassword.getPassword()); } if (credentials instanceof LoginPwUnencrypted) { diff --git a/netconf/netconf-topology/src/main/java/org/opendaylight/netconf/topology/spi/AbstractNetconfTopology.java b/netconf/netconf-topology/src/main/java/org/opendaylight/netconf/topology/spi/AbstractNetconfTopology.java index 2a47a126f4..2903c02627 100644 --- a/netconf/netconf-topology/src/main/java/org/opendaylight/netconf/topology/spi/AbstractNetconfTopology.java +++ b/netconf/netconf-topology/src/main/java/org/opendaylight/netconf/topology/spi/AbstractNetconfTopology.java @@ -29,7 +29,6 @@ import org.opendaylight.controller.config.threadpool.ScheduledThreadPool; import org.opendaylight.controller.config.threadpool.ThreadPool; import org.opendaylight.mdsal.binding.api.DataBroker; import org.opendaylight.mdsal.dom.api.DOMMountPointService; -import org.opendaylight.netconf.api.NetconfMessage; import org.opendaylight.netconf.client.NetconfClientDispatcher; import org.opendaylight.netconf.client.NetconfClientSessionListener; import org.opendaylight.netconf.client.conf.NetconfClientConfiguration; @@ -122,7 +121,7 @@ public abstract class AbstractNetconfTopology implements NetconfTopology { this.encryptionService = encryptionService; this.baseSchemas = requireNonNull(baseSchemas); - this.keystoreAdapter = new NetconfKeystoreAdapter(dataBroker); + keystoreAdapter = new NetconfKeystoreAdapter(dataBroker); } @Override @@ -205,11 +204,11 @@ public abstract class AbstractNetconfTopology implements NetconfTopology { RemoteDeviceHandler salFacade = createSalFacade(remoteDeviceId); if (keepaliveDelay > 0) { LOG.info("Adding keepalive facade, for device {}", nodeId); - salFacade = new KeepaliveSalFacade(remoteDeviceId, salFacade, this.keepaliveExecutor.getExecutor(), + salFacade = new KeepaliveSalFacade(remoteDeviceId, salFacade, keepaliveExecutor.getExecutor(), keepaliveDelay, node.requireDefaultRequestTimeoutMillis().toJava()); } - final RemoteDevice device; + final RemoteDevice device; final List> yanglibRegistrations; if (node.requireSchemaless()) { device = new SchemalessNetconfDevice(baseSchemas, remoteDeviceId, salFacade); @@ -220,7 +219,7 @@ public abstract class AbstractNetconfTopology implements NetconfTopology { device = new NetconfDeviceBuilder() .setReconnectOnSchemasChange(reconnectOnChangedSchema) .setSchemaResourcesDTO(resources) - .setGlobalProcessingExecutor(this.processingExecutor) + .setGlobalProcessingExecutor(processingExecutor) .setId(remoteDeviceId) .setSalFacade(salFacade) .setNode(node) @@ -336,12 +335,9 @@ public abstract class AbstractNetconfTopology implements NetconfTopology { } private AuthenticationHandler getHandlerFromCredentials(final Credentials credentials) { - if (credentials instanceof org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology - .rev150114.netconf.node.credentials.credentials.LoginPassword) { - final org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology - .rev150114.netconf.node.credentials.credentials.LoginPassword loginPassword - = (org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology - .rev150114.netconf.node.credentials.credentials.LoginPassword) credentials; + if (credentials + instanceof org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology + .rev150114.netconf.node.credentials.credentials.LoginPassword loginPassword) { return new LoginPasswordHandler(loginPassword.getUsername(), loginPassword.getPassword()); } if (credentials instanceof LoginPwUnencrypted) { diff --git a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/api/DeviceActionFactory.java b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/api/DeviceActionFactory.java index 2c505e87cb..463b18927b 100644 --- a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/api/DeviceActionFactory.java +++ b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/api/DeviceActionFactory.java @@ -12,7 +12,6 @@ import org.opendaylight.netconf.api.NetconfMessage; import org.opendaylight.yangtools.yang.model.api.SchemaContext; public interface DeviceActionFactory { - /** * Allows user to create DOMActionService for specific device. * @@ -22,7 +21,7 @@ public interface DeviceActionFactory { * @return {@link DOMActionService} of specific device */ default DOMActionService createDeviceAction(final MessageTransformer messageTransformer, - final RemoteDeviceCommunicator listener, final SchemaContext schemaContext) { + final RemoteDeviceCommunicator listener, final SchemaContext schemaContext) { return null; } } diff --git a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/api/RemoteDevice.java b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/api/RemoteDevice.java index e4f45f64bc..6cb4023703 100644 --- a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/api/RemoteDevice.java +++ b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/api/RemoteDevice.java @@ -7,10 +7,12 @@ */ package org.opendaylight.netconf.sal.connect.api; +import org.opendaylight.netconf.api.NetconfMessage; + /** * Remote device. */ -public interface RemoteDevice> { +public interface RemoteDevice { void onRemoteSessionUp(PREF remoteSessionCapabilities, LISTENER listener); @@ -18,5 +20,5 @@ public interface RemoteDevice extends AutoCloseable { +public interface RemoteDeviceCommunicator extends AutoCloseable { - ListenableFuture> sendRequest(M message, QName rpc); + ListenableFuture> sendRequest(NetconfMessage message, QName rpc); @Override void close(); diff --git a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/DeviceActionFactoryImpl.java b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/DeviceActionFactoryImpl.java index 6f48d89bde..76d755fcd9 100644 --- a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/DeviceActionFactoryImpl.java +++ b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/DeviceActionFactoryImpl.java @@ -37,7 +37,7 @@ public class DeviceActionFactoryImpl implements DeviceActionFactory { @Override public DOMActionService createDeviceAction(final MessageTransformer messageTransformer, - final RemoteDeviceCommunicator listener, final SchemaContext schemaContext) { + final RemoteDeviceCommunicator listener, final SchemaContext schemaContext) { return (schemaPath, dataTreeIdentifier, input) -> { requireNonNull(schemaPath); requireNonNull(dataTreeIdentifier); diff --git a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/NetconfDevice.java b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/NetconfDevice.java index 5d9f573177..6e05e89a56 100644 --- a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/NetconfDevice.java +++ b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/NetconfDevice.java @@ -85,8 +85,7 @@ import org.slf4j.LoggerFactory; /** * This is a mediator between NetconfDeviceCommunicator and NetconfDeviceSalFacade. */ -public class NetconfDevice - implements RemoteDevice { +public class NetconfDevice implements RemoteDevice { private static final Logger LOG = LoggerFactory.getLogger(NetconfDevice.class); private static final QName RFC8528_SCHEMA_MOUNTS_QNAME = QName.create( @@ -244,9 +243,8 @@ public class NetconfDevice } private synchronized void handleSalInitializationSuccess(final MountPointContext result, - final NetconfSessionPreferences remoteSessionCapabilities, - final DOMRpcService deviceRpc, - final RemoteDeviceCommunicator listener) { + final NetconfSessionPreferences remoteSessionCapabilities, final DOMRpcService deviceRpc, + final RemoteDeviceCommunicator listener) { //NetconfDevice.SchemaSetup can complete after NetconfDeviceCommunicator was closed. In that case do nothing, //since salFacade.onDeviceDisconnected was already called. if (connected) { @@ -265,8 +263,7 @@ public class NetconfDevice } } - private void handleSalInitializationFailure(final Throwable throwable, - final RemoteDeviceCommunicator listener) { + private void handleSalInitializationFailure(final Throwable throwable, final RemoteDeviceCommunicator listener) { LOG.error("{}: Initialization in sal failed, disconnecting from device", id, throwable); listener.close(); onRemoteSessionDown(); @@ -364,7 +361,7 @@ public class NetconfDevice } protected NetconfDeviceRpc getDeviceSpecificRpc(final MountPointContext result, - final RemoteDeviceCommunicator listener, final BaseSchema schema) { + final RemoteDeviceCommunicator listener, final BaseSchema schema) { return new NetconfDeviceRpc(result.getEffectiveModelContext(), listener, new NetconfMessageTransformer(result, true, schema)); } diff --git a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/SchemalessNetconfDevice.java b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/SchemalessNetconfDevice.java index 2d2d0e29bd..086b595503 100644 --- a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/SchemalessNetconfDevice.java +++ b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/SchemalessNetconfDevice.java @@ -22,8 +22,7 @@ import org.opendaylight.netconf.sal.connect.netconf.schema.mapping.SchemalessMes import org.opendaylight.netconf.sal.connect.util.MessageCounter; import org.opendaylight.netconf.sal.connect.util.RemoteDeviceId; -public class SchemalessNetconfDevice - implements RemoteDevice { +public class SchemalessNetconfDevice implements RemoteDevice { private final BaseNetconfSchemas baseSchemas; private final RemoteDeviceId id; private final RemoteDeviceHandler salFacade; diff --git a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/listener/NetconfDeviceCommunicator.java b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/listener/NetconfDeviceCommunicator.java index e5e93502e3..b70e322fdf 100644 --- a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/listener/NetconfDeviceCommunicator.java +++ b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/listener/NetconfDeviceCommunicator.java @@ -47,12 +47,10 @@ import org.opendaylight.yangtools.yang.common.RpcResultBuilder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class NetconfDeviceCommunicator - implements NetconfClientSessionListener, RemoteDeviceCommunicator { - +public class NetconfDeviceCommunicator implements NetconfClientSessionListener, RemoteDeviceCommunicator { private static final Logger LOG = LoggerFactory.getLogger(NetconfDeviceCommunicator.class); - protected final RemoteDevice remoteDevice; + protected final RemoteDevice remoteDevice; private final Optional overrideNetconfCapabilities; protected final RemoteDeviceId id; private final Lock sessionLock = new ReentrantLock(); @@ -81,21 +79,21 @@ public class NetconfDeviceCommunicator public NetconfDeviceCommunicator( final RemoteDeviceId id, - final RemoteDevice remoteDevice, + final RemoteDevice remoteDevice, final UserPreferences netconfSessionPreferences, final int rpcMessageLimit) { this(id, remoteDevice, Optional.of(netconfSessionPreferences), rpcMessageLimit); } public NetconfDeviceCommunicator( final RemoteDeviceId id, - final RemoteDevice remoteDevice, + final RemoteDevice remoteDevice, final int rpcMessageLimit) { this(id, remoteDevice, Optional.empty(), rpcMessageLimit); } private NetconfDeviceCommunicator( final RemoteDeviceId id, - final RemoteDevice remoteDevice, + final RemoteDevice remoteDevice, final Optional overrideNetconfCapabilities, final int rpcMessageLimit) { concurentRpcMsgs = rpcMessageLimit; this.id = id; diff --git a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/NetconfDeviceRpc.java b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/NetconfDeviceRpc.java index 6c7ecc1fd1..f0f01ec910 100644 --- a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/NetconfDeviceRpc.java +++ b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/NetconfDeviceRpc.java @@ -36,12 +36,11 @@ import org.opendaylight.yangtools.yang.model.api.SchemaContext; * Invokes RPC by sending netconf message via listener. Also transforms result from NetconfMessage to CompositeNode. */ public final class NetconfDeviceRpc implements DOMRpcService { - private final RemoteDeviceCommunicator communicator; + private final RemoteDeviceCommunicator communicator; private final MessageTransformer transformer; private final SchemaContext schemaContext; - public NetconfDeviceRpc(final SchemaContext schemaContext, - final RemoteDeviceCommunicator communicator, + public NetconfDeviceRpc(final SchemaContext schemaContext, final RemoteDeviceCommunicator communicator, final MessageTransformer transformer) { this.communicator = communicator; this.transformer = transformer; diff --git a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/SchemalessNetconfDeviceRpc.java b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/SchemalessNetconfDeviceRpc.java index 0bbff2a2f7..af6bd7515a 100644 --- a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/SchemalessNetconfDeviceRpc.java +++ b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/SchemalessNetconfDeviceRpc.java @@ -36,19 +36,18 @@ import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; */ public final class SchemalessNetconfDeviceRpc implements DOMRpcService { - private final RemoteDeviceCommunicator listener; + private final RemoteDeviceCommunicator listener; private final BaseRpcSchemalessTransformer baseRpcTransformer; private final SchemalessMessageTransformer schemalessTransformer; private final RemoteDeviceId deviceId; - public SchemalessNetconfDeviceRpc(final RemoteDeviceId deviceId, - final RemoteDeviceCommunicator listener, - final BaseRpcSchemalessTransformer baseRpcTransformer, - final SchemalessMessageTransformer messageTransformer) { + public SchemalessNetconfDeviceRpc(final RemoteDeviceId deviceId, final RemoteDeviceCommunicator listener, + final BaseRpcSchemalessTransformer baseRpcTransformer, + final SchemalessMessageTransformer messageTransformer) { this.deviceId = deviceId; this.listener = listener; this.baseRpcTransformer = baseRpcTransformer; - this.schemalessTransformer = messageTransformer; + schemalessTransformer = messageTransformer; } @Override diff --git a/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/listener/NetconfDeviceCommunicatorTest.java b/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/listener/NetconfDeviceCommunicatorTest.java index bc71edb422..d53e2f94f3 100644 --- a/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/listener/NetconfDeviceCommunicatorTest.java +++ b/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/listener/NetconfDeviceCommunicatorTest.java @@ -86,7 +86,7 @@ public class NetconfDeviceCommunicatorTest { NetconfClientSession mockSession; @Mock - RemoteDevice mockDevice; + RemoteDevice mockDevice; NetconfDeviceCommunicator communicator; @@ -385,8 +385,7 @@ public class NetconfDeviceCommunicatorTest { */ @Test public void testNetconfDeviceReconnectInCommunicator() { - final RemoteDevice device = - mock(RemoteDevice.class); + final RemoteDevice device = mock(RemoteDevice.class); final TimedReconnectStrategy timedReconnectStrategy = new TimedReconnectStrategy(GlobalEventExecutor.INSTANCE, 10000, 0, 1.0, null, 100L, null); diff --git a/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/NetconfDeviceRpcTest.java b/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/NetconfDeviceRpcTest.java index defaee1d16..87de50aac2 100644 --- a/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/NetconfDeviceRpcTest.java +++ b/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/NetconfDeviceRpcTest.java @@ -60,7 +60,7 @@ public class NetconfDeviceRpcTest extends AbstractBaseSchemasTest { @Mock private DOMRpcAvailabilityListener listener; @Mock - private RemoteDeviceCommunicator communicator; + private RemoteDeviceCommunicator communicator; private NetconfDeviceRpc rpc; private QName type; @@ -99,7 +99,7 @@ public class NetconfDeviceRpcTest extends AbstractBaseSchemasTest { public void testDeadlock() throws Exception { // when rpc is successful, but transformer fails for some reason final MessageTransformer failingTransformer = mock(MessageTransformer.class); - final RemoteDeviceCommunicator communicatorMock = mock(RemoteDeviceCommunicator.class); + final RemoteDeviceCommunicator communicatorMock = mock(RemoteDeviceCommunicator.class); final NetconfMessage msg = null; final RpcResult result = RpcResultBuilder.success(msg).build(); when(communicatorMock.sendRequest(any(), any())).thenReturn(Futures.immediateFuture(result)); diff --git a/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/SchemalessNetconfDeviceRpcTest.java b/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/SchemalessNetconfDeviceRpcTest.java index 47378ca92d..3445d92323 100644 --- a/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/SchemalessNetconfDeviceRpcTest.java +++ b/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/SchemalessNetconfDeviceRpcTest.java @@ -39,11 +39,10 @@ import org.slf4j.LoggerFactory; @RunWith(MockitoJUnitRunner.StrictStubs.class) public class SchemalessNetconfDeviceRpcTest extends AbstractBaseSchemasTest { - private static final Logger LOG = LoggerFactory.getLogger(SchemalessNetconfDeviceRpcTest.class); @Mock - private RemoteDeviceCommunicator listener; + private RemoteDeviceCommunicator listener; private SchemalessNetconfDeviceRpc deviceRpc; diff --git a/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/util/NetconfBaseOpsTest.java b/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/util/NetconfBaseOpsTest.java index 567fa744d7..ae7ad4b53f 100644 --- a/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/util/NetconfBaseOpsTest.java +++ b/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/util/NetconfBaseOpsTest.java @@ -87,7 +87,7 @@ public class NetconfBaseOpsTest extends AbstractTestModelTest { } @Mock - private RemoteDeviceCommunicator listener; + private RemoteDeviceCommunicator listener; private NetconfRpcFutureCallback callback; private NetconfBaseOps baseOps; 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 967f8ae34f..729223454f 100644 --- 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 @@ -259,8 +259,7 @@ public final class StressClient { return null; } - static class LoggingRemoteDevice - implements RemoteDevice { + static class LoggingRemoteDevice implements RemoteDevice { @Override public void onRemoteSessionUp(final NetconfSessionPreferences remoteSessionCapabilities, final NetconfDeviceCommunicator netconfDeviceCommunicator) { @@ -282,5 +281,4 @@ public final class StressClient { LOG.info("Notification received: {}", notification.toString()); } } - } diff --git a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/client/stress/StressClientCallable.java b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/client/stress/StressClientCallable.java index 62733ba816..600c50cf4a 100644 --- a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/client/stress/StressClientCallable.java +++ b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/client/stress/StressClientCallable.java @@ -75,7 +75,7 @@ public class StressClientCallable implements Callable { private static NetconfDeviceCommunicator getSessionListener( final InetSocketAddress inetAddress, final int messageLimit) { - final RemoteDevice loggingRemoteDevice = + final RemoteDevice loggingRemoteDevice = new StressClient.LoggingRemoteDevice(); return new NetconfDeviceCommunicator( new RemoteDeviceId("secure-test", inetAddress), loggingRemoteDevice, messageLimit); -- 2.36.6