From 903dcd624cc53f38f916e5ea3ab8fd7ea608028a Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Wed, 20 Sep 2023 13:20:49 +0200 Subject: [PATCH] Hide SshIoService This is just an internal utility, hide it. Change-Id: I9debd4390b8e57089850c63a6e119e44cb1d0298 JIRA: NETCONF-590 Signed-off-by: Robert Varga --- .../org/opendaylight/netconf/transport/ssh/SSHClient.java | 3 +-- .../org/opendaylight/netconf/transport/ssh/SSHServer.java | 3 +-- .../org/opendaylight/netconf/transport/ssh/SshIoService.java | 5 ++--- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/transport/transport-ssh/src/main/java/org/opendaylight/netconf/transport/ssh/SSHClient.java b/transport/transport-ssh/src/main/java/org/opendaylight/netconf/transport/ssh/SSHClient.java index 3449b8566d..600cf372ae 100644 --- a/transport/transport-ssh/src/main/java/org/opendaylight/netconf/transport/ssh/SSHClient.java +++ b/transport/transport-ssh/src/main/java/org/opendaylight/netconf/transport/ssh/SSHClient.java @@ -46,7 +46,6 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.tcp.server. * A {@link TransportStack} acting as an SSH client. */ public final class SSHClient extends SSHTransportStack { - private final ClientFactoryManager clientFactoryManager; private final SessionFactory sessionFactory; @@ -68,7 +67,7 @@ public final class SSHClient extends SSHTransportStack { } @Override - protected IoHandler getSessionFactory() { + IoHandler getSessionFactory() { return sessionFactory; } diff --git a/transport/transport-ssh/src/main/java/org/opendaylight/netconf/transport/ssh/SSHServer.java b/transport/transport-ssh/src/main/java/org/opendaylight/netconf/transport/ssh/SSHServer.java index b728ec24ae..d3e398c58b 100644 --- a/transport/transport-ssh/src/main/java/org/opendaylight/netconf/transport/ssh/SSHServer.java +++ b/transport/transport-ssh/src/main/java/org/opendaylight/netconf/transport/ssh/SSHServer.java @@ -46,7 +46,6 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.tcp.server. * A {@link TransportStack} acting as an SSH server. */ public final class SSHServer extends SSHTransportStack { - private final ServerFactoryManager serverFactoryManager; private final SessionFactory serverSessionFactory; @@ -61,7 +60,7 @@ public final class SSHServer extends SSHTransportStack { } @Override - protected IoHandler getSessionFactory() { + IoHandler getSessionFactory() { return serverSessionFactory; } diff --git a/transport/transport-ssh/src/main/java/org/opendaylight/netconf/transport/ssh/SshIoService.java b/transport/transport-ssh/src/main/java/org/opendaylight/netconf/transport/ssh/SshIoService.java index 75a326dc5d..dfb1d38040 100644 --- a/transport/transport-ssh/src/main/java/org/opendaylight/netconf/transport/ssh/SshIoService.java +++ b/transport/transport-ssh/src/main/java/org/opendaylight/netconf/transport/ssh/SshIoService.java @@ -13,9 +13,8 @@ import org.opendaylight.netconf.shaded.sshd.common.io.IoHandler; import org.opendaylight.netconf.shaded.sshd.netty.NettyIoService; import org.opendaylight.netconf.shaded.sshd.netty.NettyIoServiceFactory; -public class SshIoService extends NettyIoService { - - protected SshIoService(FactoryManager factoryManager, final ChannelGroup group, IoHandler handler) { +final class SshIoService extends NettyIoService { + SshIoService(final FactoryManager factoryManager, final ChannelGroup group, final IoHandler handler) { super(new NettyIoServiceFactory(factoryManager, null), handler); channelGroup = group; } -- 2.36.6