Clean up NetconfKeystoreAdapter

We can safely import java.security.KeyStore, simplifying code. Also
migrate to Objects.requireNonNull().

Change-Id: Iddd3cbfc8adb919833643294b7e99a5a0a07ace0
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/NetconfKeystoreAdapter.java b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/NetconfKeystoreAdapter.java
index 58d072a62b30f76d33f818978403bf4ada8445ea..0fbdc69505f636214be4d71589303c78bf2cec56 100644 (file)
--- a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/NetconfKeystoreAdapter.java
+++ b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/NetconfKeystoreAdapter.java
@@ -7,11 +7,13 @@
  */
 package org.opendaylight.netconf.sal.connect.netconf.sal;
 
-import com.google.common.base.Preconditions;
+import static java.util.Objects.requireNonNull;
+
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.security.GeneralSecurityException;
 import java.security.KeyFactory;
+import java.security.KeyStore;
 import java.security.KeyStoreException;
 import java.security.cert.Certificate;
 import java.security.cert.CertificateException;
@@ -62,8 +64,7 @@ public class NetconfKeystoreAdapter implements ClusteredDataTreeChangeListener<K
     }
 
     public Optional<KeyCredential> getKeypairFromId(final String keyId) {
-        final KeyCredential keypair = pairs.get(keyId);
-        return Optional.ofNullable(keypair);
+        return Optional.ofNullable(pairs.get(keyId));
     }
 
     /**
@@ -75,7 +76,7 @@ public class NetconfKeystoreAdapter implements ClusteredDataTreeChangeListener<K
      * @throws GeneralSecurityException If any security exception occurred
      * @throws IOException If there is an I/O problem with the keystore data
      */
-    public java.security.KeyStore getJavaKeyStore() throws GeneralSecurityException, IOException {
+    public KeyStore getJavaKeyStore() throws GeneralSecurityException, IOException {
         return getJavaKeyStore(Collections.emptySet());
     }
 
@@ -90,11 +91,10 @@ public class NetconfKeystoreAdapter implements ClusteredDataTreeChangeListener<K
      * @throws GeneralSecurityException If any security exception occurred
      * @throws IOException If there is an I/O problem with the keystore data
      */
-    public java.security.KeyStore getJavaKeyStore(Set<String> allowedKeys) throws GeneralSecurityException,
-        IOException {
-        Preconditions.checkNotNull(allowedKeys);
+    public KeyStore getJavaKeyStore(final Set<String> allowedKeys) throws GeneralSecurityException, IOException {
+        requireNonNull(allowedKeys);
 
-        final java.security.KeyStore keyStore = java.security.KeyStore.getInstance("JKS");
+        final KeyStore keyStore = KeyStore.getInstance("JKS");
 
         keyStore.load(null, null);
 
@@ -194,7 +194,6 @@ public class NetconfKeystoreAdapter implements ClusteredDataTreeChangeListener<K
     }
 
     private void onPrivateKeyChanged(final DataObjectModification<PrivateKey> objectModification) {
-
         switch (objectModification.getModificationType()) {
             case SUBTREE_MODIFIED:
             case WRITE: