Fix findbugs violations in netconf

[netconf.git] / netconf / netconf-client / src / main / java / org / opendaylight / netconf / client / conf / NetconfClientConfiguration.java

diff --git a/netconf/netconf-client/src/main/java/org/opendaylight/netconf/client/conf/NetconfClientConfiguration.java b/netconf/netconf-client/src/main/java/org/opendaylight/netconf/client/conf/NetconfClientConfiguration.java
index b25071156234e1a02b3a174413cfb6766a1893e7..ee41da8a8d165387d4da477d161c2830ac4e4445 100644 (file)
--- a/netconf/netconf-client/src/main/java/org/opendaylight/netconf/client/conf/NetconfClientConfiguration.java
+++ b/netconf/netconf-client/src/main/java/org/opendaylight/netconf/client/conf/NetconfClientConfiguration.java
@@ -85,18 +85,17 @@ public class NetconfClientConfiguration {
         return sslHandlerFactory;
     }
 
-    @SuppressWarnings("checkstyle:FallThrough")
     private void validateConfiguration() {
         Preconditions.checkNotNull(clientProtocol, " ");
         switch (clientProtocol) {
             case TLS:
+                validateTlsConfiguration();
+                validateTcpConfiguration();
+                break;
             case SSH:
-                if (clientProtocol == NetconfClientProtocol.SSH) {
-                    validateSshConfiguration();
-                } else {
-                    validateTlsConfiguration();
-                }
-                // Fall through intentional (ssh or tls validation is a superset of tcp validation)
+                validateSshConfiguration();
+                validateTcpConfiguration();
+                break;
             case TCP:
                 validateTcpConfiguration();
                 break;
@@ -141,4 +140,4 @@ public class NetconfClientConfiguration {
     public enum NetconfClientProtocol {
         TCP, SSH, TLS
     }
-}
\ No newline at end of file
+}