From c490cc2556312f1cef2b48b139232fa9950954c8 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Sun, 25 Feb 2024 10:57:39 +0100 Subject: [PATCH] Guarantee a non-null protocol NetconfClientConfiguration always has its protocol, make sure we express that. Change-Id: I47e13fba756eefaa4075d754913f213a2b50dda1 Signed-off-by: Robert Varga --- .../client/conf/NetconfClientConfiguration.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/protocol/netconf-client/src/main/java/org/opendaylight/netconf/client/conf/NetconfClientConfiguration.java b/protocol/netconf-client/src/main/java/org/opendaylight/netconf/client/conf/NetconfClientConfiguration.java index cdb0f1946a..221623624c 100644 --- a/protocol/netconf-client/src/main/java/org/opendaylight/netconf/client/conf/NetconfClientConfiguration.java +++ b/protocol/netconf-client/src/main/java/org/opendaylight/netconf/client/conf/NetconfClientConfiguration.java @@ -14,6 +14,7 @@ import com.google.common.base.Preconditions; import java.util.List; import java.util.Optional; import org.checkerframework.checker.index.qual.NonNegative; +import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.netconf.api.messages.NetconfHelloMessageAdditionalHeader; import org.opendaylight.netconf.client.NetconfClientSessionListener; import org.opendaylight.netconf.transport.ssh.ClientFactoryManagerConfigurator; @@ -24,8 +25,11 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.tcp.client. import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.tls.client.rev240208.TlsClientGrouping; public final class NetconfClientConfiguration { + public enum NetconfClientProtocol { + TCP, SSH, TLS + } - private final NetconfClientProtocol clientProtocol; + private final @NonNull NetconfClientProtocol clientProtocol; private final Long connectionTimeoutMillis; private final NetconfHelloMessageAdditionalHeader additionalHeader; private final NetconfClientSessionListener sessionListener; @@ -88,7 +92,7 @@ public final class NetconfClientConfiguration { return sessionListener; } - public NetconfClientProtocol getProtocol() { + public @NonNull NetconfClientProtocol getProtocol() { return clientProtocol; } @@ -134,8 +138,4 @@ public final class NetconfClientConfiguration { .add("sslHandlerFactory (defined)", sshConfigurator != null) .toString(); } - - public enum NetconfClientProtocol { - TCP, SSH, TLS - } } -- 2.36.6