From 1b133f5b637b4eedf03ace5228f32f0d01274206 Mon Sep 17 00:00:00 2001
From: David Suarez <david.suarez.fuentes@gmail.com>
Date: Tue, 17 Oct 2017 19:40:53 +0200
Subject: [PATCH] Fix some sonar/checkstyle issues

Change-Id: Id38d1e320f68ca12625dedfc19ea81cd81ea3005
Signed-off-by: David Suarez <david.suarez.fuentes@gmail.com>
---
 .../netconf/callhome/protocol/AuthorizedKeysDecoder.java    | 6 +++---
 .../netconf/callhome/protocol/CallHomeAuthorization.java    | 4 ++--
 .../netconf/callhome/protocol/CallHomeSessionContext.java   | 4 ++--
 .../netconf/callhome/protocol/NetconfCallHomeServer.java    | 2 +-
 .../callhome/protocol/NetconfCallHomeServerBuilder.java     | 3 +--
 .../callhome/protocol/ReverseSshChannelInitializer.java     | 3 +--
 6 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/netconf/callhome-protocol/src/main/java/org/opendaylight/netconf/callhome/protocol/AuthorizedKeysDecoder.java b/netconf/callhome-protocol/src/main/java/org/opendaylight/netconf/callhome/protocol/AuthorizedKeysDecoder.java
index 2f73805778..ac476c6c91 100644
--- a/netconf/callhome-protocol/src/main/java/org/opendaylight/netconf/callhome/protocol/AuthorizedKeysDecoder.java
+++ b/netconf/callhome-protocol/src/main/java/org/opendaylight/netconf/callhome/protocol/AuthorizedKeysDecoder.java
@@ -43,7 +43,7 @@ public class AuthorizedKeysDecoder {
     private static final String KEY_FACTORY_TYPE_DSA = "DSA";
     private static final String KEY_FACTORY_TYPE_ECDSA = "EC";
 
-    private static Map<String, String> ECDSA_CURVES = new HashMap<>();
+    private static final Map<String, String> ECDSA_CURVES = new HashMap<>();
 
     static {
         ECDSA_CURVES.put("nistp256", "secp256r1");
@@ -51,8 +51,8 @@ public class AuthorizedKeysDecoder {
         ECDSA_CURVES.put("nistp512", "secp512r1");
     }
 
-    private static String ECDSA_SUPPORTED_CURVE_NAME = "nistp256";
-    private static String ECDSA_SUPPORTED_CURVE_NAME_SPEC = ECDSA_CURVES.get(ECDSA_SUPPORTED_CURVE_NAME);
+    private static final String ECDSA_SUPPORTED_CURVE_NAME = "nistp256";
+    private static final String ECDSA_SUPPORTED_CURVE_NAME_SPEC = ECDSA_CURVES.get(ECDSA_SUPPORTED_CURVE_NAME);
 
     private static final String KEY_TYPE_RSA = "ssh-rsa";
     private static final String KEY_TYPE_DSA = "ssh-dss";
diff --git a/netconf/callhome-protocol/src/main/java/org/opendaylight/netconf/callhome/protocol/CallHomeAuthorization.java b/netconf/callhome-protocol/src/main/java/org/opendaylight/netconf/callhome/protocol/CallHomeAuthorization.java
index 03edbdac7c..1896b2b005 100644
--- a/netconf/callhome-protocol/src/main/java/org/opendaylight/netconf/callhome/protocol/CallHomeAuthorization.java
+++ b/netconf/callhome-protocol/src/main/java/org/opendaylight/netconf/callhome/protocol/CallHomeAuthorization.java
@@ -100,8 +100,8 @@ public abstract class CallHomeAuthorization {
 
         private final String nodeId;
         private final String username;
-        private Set<String> passwords = new HashSet<>();
-        private Set<KeyPair> clientKeys = new HashSet<>();
+        private final Set<String> passwords = new HashSet<>();
+        private final Set<KeyPair> clientKeys = new HashSet<>();
 
         private Builder(String nodeId, String username) {
             this.nodeId = Preconditions.checkNotNull(nodeId);
diff --git a/netconf/callhome-protocol/src/main/java/org/opendaylight/netconf/callhome/protocol/CallHomeSessionContext.java b/netconf/callhome-protocol/src/main/java/org/opendaylight/netconf/callhome/protocol/CallHomeSessionContext.java
index 4f37f987d5..05c9991677 100644
--- a/netconf/callhome-protocol/src/main/java/org/opendaylight/netconf/callhome/protocol/CallHomeSessionContext.java
+++ b/netconf/callhome-protocol/src/main/java/org/opendaylight/netconf/callhome/protocol/CallHomeSessionContext.java
@@ -48,8 +48,8 @@ class CallHomeSessionContext implements CallHomeProtocolSessionContext {
     private volatile MinaSshNettyChannel nettyChannel = null;
     private volatile boolean activated;
 
-    private InetSocketAddress remoteAddress;
-    private PublicKey serverKey;
+    private final InetSocketAddress remoteAddress;
+    private final PublicKey serverKey;
 
     CallHomeSessionContext(ClientSession sshSession, CallHomeAuthorization authorization,
                            SocketAddress remoteAddress, Factory factory) {
diff --git a/netconf/callhome-protocol/src/main/java/org/opendaylight/netconf/callhome/protocol/NetconfCallHomeServer.java b/netconf/callhome-protocol/src/main/java/org/opendaylight/netconf/callhome/protocol/NetconfCallHomeServer.java
index 34658aae55..723273a763 100644
--- a/netconf/callhome-protocol/src/main/java/org/opendaylight/netconf/callhome/protocol/NetconfCallHomeServer.java
+++ b/netconf/callhome-protocol/src/main/java/org/opendaylight/netconf/callhome/protocol/NetconfCallHomeServer.java
@@ -40,7 +40,7 @@ public class NetconfCallHomeServer implements AutoCloseable, ServerKeyVerifier {
     private final CallHomeAuthorizationProvider authProvider;
     private final CallHomeSessionContext.Factory sessionFactory;
     private final InetSocketAddress bindAddress;
-    private StatusRecorder recorder;
+    private final StatusRecorder recorder;
 
     NetconfCallHomeServer(SshClient sshClient, CallHomeAuthorizationProvider authProvider, Factory factory,
                           InetSocketAddress socketAddress, StatusRecorder recorder) {
diff --git a/netconf/callhome-protocol/src/main/java/org/opendaylight/netconf/callhome/protocol/NetconfCallHomeServerBuilder.java b/netconf/callhome-protocol/src/main/java/org/opendaylight/netconf/callhome/protocol/NetconfCallHomeServerBuilder.java
index 7814842a1d..de8eb106d0 100644
--- a/netconf/callhome-protocol/src/main/java/org/opendaylight/netconf/callhome/protocol/NetconfCallHomeServerBuilder.java
+++ b/netconf/callhome-protocol/src/main/java/org/opendaylight/netconf/callhome/protocol/NetconfCallHomeServerBuilder.java
@@ -15,7 +15,6 @@ import io.netty.util.HashedWheelTimer;
 import java.net.InetSocketAddress;
 import java.util.concurrent.TimeUnit;
 import org.apache.sshd.SshClient;
-import org.opendaylight.netconf.api.messages.NetconfHelloMessageAdditionalHeader;
 import org.opendaylight.netconf.callhome.protocol.CallHomeSessionContext.Factory;
 import org.opendaylight.netconf.client.NetconfClientSessionNegotiatorFactory;
 import org.opendaylight.yangtools.concepts.Builder;
@@ -114,7 +113,7 @@ public class NetconfCallHomeServerBuilder implements Builder<NetconfCallHomeServ
 
     private NetconfClientSessionNegotiatorFactory defaultNegotiationFactory() {
         return new NetconfClientSessionNegotiatorFactory(new HashedWheelTimer(),
-                Optional.<NetconfHelloMessageAdditionalHeader>absent(), DEFAULT_SESSION_TIMEOUT_MILLIS);
+                                                         Optional.absent(), DEFAULT_SESSION_TIMEOUT_MILLIS);
     }
 
     private EventLoopGroup defaultNettyGroup() {
diff --git a/netconf/callhome-protocol/src/main/java/org/opendaylight/netconf/callhome/protocol/ReverseSshChannelInitializer.java b/netconf/callhome-protocol/src/main/java/org/opendaylight/netconf/callhome/protocol/ReverseSshChannelInitializer.java
index a4fb71a17d..09b88a944a 100644
--- a/netconf/callhome-protocol/src/main/java/org/opendaylight/netconf/callhome/protocol/ReverseSshChannelInitializer.java
+++ b/netconf/callhome-protocol/src/main/java/org/opendaylight/netconf/callhome/protocol/ReverseSshChannelInitializer.java
@@ -16,7 +16,7 @@ import org.opendaylight.netconf.client.NetconfClientSessionNegotiatorFactory;
 import org.opendaylight.netconf.nettyutil.AbstractChannelInitializer;
 import org.opendaylight.protocol.framework.SessionListenerFactory;
 
-class ReverseSshChannelInitializer extends AbstractChannelInitializer<NetconfClientSession>
+final class ReverseSshChannelInitializer extends AbstractChannelInitializer<NetconfClientSession>
         implements SessionListenerFactory<NetconfClientSessionListener> {
 
     private final NetconfClientSessionNegotiatorFactory negotiatorFactory;
@@ -24,7 +24,6 @@ class ReverseSshChannelInitializer extends AbstractChannelInitializer<NetconfCli
 
     private ReverseSshChannelInitializer(NetconfClientSessionNegotiatorFactory negotiatorFactory,
                                          NetconfClientSessionListener sessionListener) {
-        super();
         this.negotiatorFactory = negotiatorFactory;
         this.sessionListener = sessionListener;
     }
-- 
2.36.6