From 64805b692c3407e0e4400a5c16d3ccbbb8c02f55 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Thu, 3 Aug 2023 20:33:28 +0200 Subject: [PATCH] Remove onRemoteSessionFailed() This method is only invoked in tests, remove it. Change-Id: I79a9dda7cc2fc6f181fa881865b4281c66674efc Signed-off-by: Robert Varga (cherry picked from commit dcbf1bd74c4c72a96197b251e5777f082c58c436) --- .../netconf/test/tool/client/stress/StressClient.java | 5 ----- .../opendaylight/netconf/client/mdsal/NetconfDevice.java | 6 ------ .../netconf/client/mdsal/SchemalessNetconfDevice.java | 5 ----- .../opendaylight/netconf/client/mdsal/api/RemoteDevice.java | 3 --- .../netconf/client/mdsal/SchemalessNetconfDeviceTest.java | 4 ---- 5 files changed, 23 deletions(-) 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 359f1d6c65..502db3eff1 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 @@ -271,11 +271,6 @@ public final class StressClient { LOG.info("Session down"); } - @Override - public void onRemoteSessionFailed(final Throwable throwable) { - LOG.info("Session failed"); - } - @Override public void onNotification(final NetconfMessage notification) { LOG.info("Notification received: {}", notification.toString()); diff --git a/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/NetconfDevice.java b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/NetconfDevice.java index 67e5535940..c087d22e44 100644 --- a/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/NetconfDevice.java +++ b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/NetconfDevice.java @@ -314,12 +314,6 @@ public class NetconfDevice implements RemoteDevice { resetMessageTransformer(); } - @Override - public void onRemoteSessionFailed(final Throwable throwable) { - setConnected(false); - salFacade.onDeviceFailed(throwable); - } - @Override public void onNotification(final NetconfMessage notification) { notificationHandler.handleNotification(notification); diff --git a/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/SchemalessNetconfDevice.java b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/SchemalessNetconfDevice.java index e646f97d17..0cc541a584 100644 --- a/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/SchemalessNetconfDevice.java +++ b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/SchemalessNetconfDevice.java @@ -67,11 +67,6 @@ public class SchemalessNetconfDevice implements RemoteDevice { // FIXME: document this node void onRemoteSessionDown(); - // FIXME: document this node - void onRemoteSessionFailed(Throwable throwable); - // FIXME: document this node void onNotification(NetconfMessage notification); } diff --git a/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/SchemalessNetconfDeviceTest.java b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/SchemalessNetconfDeviceTest.java index cc576af006..fc6cb678cf 100644 --- a/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/SchemalessNetconfDeviceTest.java +++ b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/SchemalessNetconfDeviceTest.java @@ -41,7 +41,6 @@ public class SchemalessNetconfDeviceTest extends AbstractBaseSchemasTest { final SchemalessMessageTransformer messageTransformer = mock(SchemalessMessageTransformer.class); final RemoteDeviceId remoteDeviceId = new RemoteDeviceId("test-D", InetSocketAddress.createUnresolved("localhost", 22)); - final Throwable throwable = new Throwable(); final SchemalessNetconfDevice device = new SchemalessNetconfDevice(BASE_SCHEMAS, remoteDeviceId, facade, messageTransformer); @@ -60,9 +59,6 @@ public class SchemalessNetconfDeviceTest extends AbstractBaseSchemasTest { device.onRemoteSessionDown(); verify(facade).onDeviceDisconnected(); - - device.onRemoteSessionFailed(throwable); - verify(facade).onDeviceFailed(throwable); } private static RemoteDeviceHandler getFacade() throws Exception { -- 2.36.6