From b35af8b3e675cfe4406b79a09baefaf4beb367bb Mon Sep 17 00:00:00 2001 From: Maros Marsalek Date: Tue, 14 Jul 2015 14:26:15 +0200 Subject: [PATCH] Remove deprecated constructors from RemoteDeviceId Change-Id: I26d48930a16213d2264de964f60103e67f80b9bd Signed-off-by: Maros Marsalek --- .../sal/connect/util/RemoteDeviceId.java | 18 +++--------------- .../sal/connect/netconf/NetconfDeviceTest.java | 3 ++- .../NetconfDeviceCommunicatorTest.java | 4 ++-- .../netconf/it/NetconfITSecureTest.java | 2 +- 4 files changed, 8 insertions(+), 19 deletions(-) diff --git a/opendaylight/md-sal/sal-netconf-connector/src/main/java/org/opendaylight/controller/sal/connect/util/RemoteDeviceId.java b/opendaylight/md-sal/sal-netconf-connector/src/main/java/org/opendaylight/controller/sal/connect/util/RemoteDeviceId.java index d1c107c3a4..6ccc954716 100644 --- a/opendaylight/md-sal/sal-netconf-connector/src/main/java/org/opendaylight/controller/sal/connect/util/RemoteDeviceId.java +++ b/opendaylight/md-sal/sal-netconf-connector/src/main/java/org/opendaylight/controller/sal/connect/util/RemoteDeviceId.java @@ -37,26 +37,14 @@ public final class RemoteDeviceId { private InetSocketAddress address; private Host host; - @Deprecated - public RemoteDeviceId(final ModuleIdentifier identifier) { - this(Preconditions.checkNotNull(identifier).getInstanceName()); - } - - public RemoteDeviceId(final ModuleIdentifier identifier, Host host) { - this(identifier); - this.host = host; - } - public RemoteDeviceId(final ModuleIdentifier identifier, InetSocketAddress address) { - this(identifier); + this(Preconditions.checkNotNull(identifier).getInstanceName()); this.address = address; this.host = buildHost(); } - @Deprecated - public RemoteDeviceId(final String name) { - Preconditions.checkNotNull(name); - this.name = name; + private RemoteDeviceId(final String name) { + this.name = Preconditions.checkNotNull(name); this.key = new NodeKey(new NodeId(name)); this.path = createBIPath(name); this.bindingPath = createBindingPath(key); diff --git a/opendaylight/md-sal/sal-netconf-connector/src/test/java/org/opendaylight/controller/sal/connect/netconf/NetconfDeviceTest.java b/opendaylight/md-sal/sal-netconf-connector/src/test/java/org/opendaylight/controller/sal/connect/netconf/NetconfDeviceTest.java index 34972dffe2..6fa109c9ae 100644 --- a/opendaylight/md-sal/sal-netconf-connector/src/test/java/org/opendaylight/controller/sal/connect/netconf/NetconfDeviceTest.java +++ b/opendaylight/md-sal/sal-netconf-connector/src/test/java/org/opendaylight/controller/sal/connect/netconf/NetconfDeviceTest.java @@ -24,6 +24,7 @@ import com.google.common.collect.Lists; import com.google.common.collect.Sets; import com.google.common.util.concurrent.Futures; import java.io.InputStream; +import java.net.InetSocketAddress; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -271,7 +272,7 @@ public class NetconfDeviceTest { } public RemoteDeviceId getId() { - return new RemoteDeviceId("test-D"); + return new RemoteDeviceId("test-D", InetSocketAddress.createUnresolved("localhost", 22)); } public ExecutorService getExecutor() { diff --git a/opendaylight/md-sal/sal-netconf-connector/src/test/java/org/opendaylight/controller/sal/connect/netconf/listener/NetconfDeviceCommunicatorTest.java b/opendaylight/md-sal/sal-netconf-connector/src/test/java/org/opendaylight/controller/sal/connect/netconf/listener/NetconfDeviceCommunicatorTest.java index 0ff5e2d3d5..1fe6885f0c 100644 --- a/opendaylight/md-sal/sal-netconf-connector/src/test/java/org/opendaylight/controller/sal/connect/netconf/listener/NetconfDeviceCommunicatorTest.java +++ b/opendaylight/md-sal/sal-netconf-connector/src/test/java/org/opendaylight/controller/sal/connect/netconf/listener/NetconfDeviceCommunicatorTest.java @@ -85,7 +85,7 @@ public class NetconfDeviceCommunicatorTest { public void setUp() throws Exception { MockitoAnnotations.initMocks( this ); - communicator = new NetconfDeviceCommunicator( new RemoteDeviceId( "test" ), mockDevice); + communicator = new NetconfDeviceCommunicator( new RemoteDeviceId( "test", InetSocketAddress.createUnresolved("localhost", 22)), mockDevice); } @SuppressWarnings("unchecked") @@ -383,7 +383,7 @@ public class NetconfDeviceCommunicatorTest { final EventLoopGroup group = new NioEventLoopGroup(); final Timer time = new HashedWheelTimer(); try { - final NetconfDeviceCommunicator listener = new NetconfDeviceCommunicator(new RemoteDeviceId("test"), device); + final NetconfDeviceCommunicator listener = new NetconfDeviceCommunicator(new RemoteDeviceId("test", InetSocketAddress.createUnresolved("localhost", 22)), device); final NetconfReconnectingClientConfiguration cfg = NetconfReconnectingClientConfigurationBuilder.create() .withAddress(new InetSocketAddress("localhost", 65000)) .withReconnectStrategy(reconnectStrategy) diff --git a/opendaylight/netconf/netconf-it/src/test/java/org/opendaylight/controller/netconf/it/NetconfITSecureTest.java b/opendaylight/netconf/netconf-it/src/test/java/org/opendaylight/controller/netconf/it/NetconfITSecureTest.java index 029aefff6e..f15c41a454 100644 --- a/opendaylight/netconf/netconf-it/src/test/java/org/opendaylight/controller/netconf/it/NetconfITSecureTest.java +++ b/opendaylight/netconf/netconf-it/src/test/java/org/opendaylight/controller/netconf/it/NetconfITSecureTest.java @@ -201,7 +201,7 @@ public class NetconfITSecureTest extends AbstractNetconfConfigTest { RemoteDevice mockedRemoteDevice = mock(RemoteDevice.class); doNothing().when(mockedRemoteDevice).onRemoteSessionUp(any(NetconfSessionPreferences.class), any(NetconfDeviceCommunicator.class)); doNothing().when(mockedRemoteDevice).onRemoteSessionDown(); - return new NetconfDeviceCommunicator(new RemoteDeviceId("secure-test"), mockedRemoteDevice); + return new NetconfDeviceCommunicator(new RemoteDeviceId("secure-test", InetSocketAddress.createUnresolved("localhost", 22)), mockedRemoteDevice); } public AuthProvider getAuthProvider() throws Exception { -- 2.36.6