Clean up KeyStoreConstant

We have two single-use constants and a few package-private ones. Make
sure to inline single-use callers and hide package-private strings.

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

diff --git a/aaa-cert/src/main/java/org/opendaylight/aaa/cert/impl/CertificateManagerService.java b/aaa-cert/src/main/java/org/opendaylight/aaa/cert/impl/CertificateManagerService.java
index df51257fb658e2f8ab373aa529e9c8d258378f93..b9e47dc7b250d217848453bfc96dac3b6a8c1021 100644 (file)
--- a/aaa-cert/src/main/java/org/opendaylight/aaa/cert/impl/CertificateManagerService.java
+++ b/aaa-cert/src/main/java/org/opendaylight/aaa/cert/impl/CertificateManagerService.java
@@ -145,7 +145,7 @@ public class CertificateManagerService implements ICertificateManager {
             TrustManagerFactory tmf = TrustManagerFactory.getInstance(algorithm);
             tmf.init(aaaCertProvider.getTrustKeyStore());
 
-            serverContext = SSLContext.getInstance(KeyStoreConstant.TLS_PROTOCOL);
+            serverContext = SSLContext.getInstance("TLS");
             serverContext.init(kmf.getKeyManagers(), tmf.getTrustManagers(), null);
         } catch (final NoSuchAlgorithmException | UnrecoverableKeyException | KeyStoreException
                 | KeyManagementException e) {

diff --git a/aaa-cert/src/main/java/org/opendaylight/aaa/cert/impl/KeyStoreConstant.java b/aaa-cert/src/main/java/org/opendaylight/aaa/cert/impl/KeyStoreConstant.java
index 316cd13f01a70b37b4028a2cdb76b94e8401c8bb..32eac1c88619d898688a2c417d2ddc4c36dcfa97 100644 (file)
--- a/aaa-cert/src/main/java/org/opendaylight/aaa/cert/impl/KeyStoreConstant.java
+++ b/aaa-cert/src/main/java/org/opendaylight/aaa/cert/impl/KeyStoreConstant.java
@@ -20,22 +20,18 @@ import org.slf4j.LoggerFactory;
  * @author mserngawy
  */
 public final class KeyStoreConstant {
-    private static final Logger LOG = LoggerFactory.getLogger(KeyStoreConstant.class);
-
-    public static final String BEGIN_CERTIFICATE = "-----BEGIN CERTIFICATE-----";
-
-    public static final String BEGIN_CERTIFICATE_REQUEST = "-----BEGIN CERTIFICATE REQUEST-----";
-    // Day time in millisecond
-    public static final long DAY_TIME = 1000L * 60 * 60 * 24;
+    public static final String KEY_STORE_PATH = "configuration" + File.separator + "ssl" + File.separator;
     public static final String DEFAULT_KEY_ALG = "RSA"; // DES
     public static final int DEFAULT_KEY_SIZE = 2048; // 1024
     public static final String DEFAULT_SIGN_ALG = "SHA1WithRSAEncryption"; // MD5WithRSAEncryption
-
     public static final int DEFAULT_VALIDITY = 365;
-    public static final String END_CERTIFICATE = "-----END CERTIFICATE-----";
-    public static final String END_CERTIFICATE_REQUEST = "-----END CERTIFICATE REQUEST-----";
-    public static final String TLS_PROTOCOL = "TLS";
-    public static final String KEY_STORE_PATH = "configuration" + File.separator + "ssl" + File.separator;
+
+    static final String BEGIN_CERTIFICATE = "-----BEGIN CERTIFICATE-----";
+    static final String END_CERTIFICATE = "-----END CERTIFICATE-----";
+    static final String BEGIN_CERTIFICATE_REQUEST = "-----BEGIN CERTIFICATE REQUEST-----";
+    static final String END_CERTIFICATE_REQUEST = "-----END CERTIFICATE REQUEST-----";
+
+    private static final Logger LOG = LoggerFactory.getLogger(KeyStoreConstant.class);
 
     private KeyStoreConstant() {
 

diff --git a/aaa-cert/src/main/java/org/opendaylight/aaa/cert/impl/ODLKeyTool.java b/aaa-cert/src/main/java/org/opendaylight/aaa/cert/impl/ODLKeyTool.java
index 14e8f30e8431ebf041fa7dcba7894f2aa51c73eb..ec1aea0564295d73c68eb8c79a28b706ffa11837 100644 (file)
--- a/aaa-cert/src/main/java/org/opendaylight/aaa/cert/impl/ODLKeyTool.java
+++ b/aaa-cert/src/main/java/org/opendaylight/aaa/cert/impl/ODLKeyTool.java
@@ -30,6 +30,7 @@ import java.security.cert.CertificateFactory;
 import java.security.cert.X509Certificate;
 import java.util.Base64;
 import java.util.Date;
+import java.util.concurrent.TimeUnit;
 import org.apache.commons.lang3.StringUtils;
 import org.bouncycastle.asn1.x500.X500Name;
 import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
@@ -175,7 +176,7 @@ public class ODLKeyTool {
             final X509v3CertificateBuilder x509V3CertBuilder =
                     new X509v3CertificateBuilder(new X500Name(distinguishedName), getSecureRandomeInt(),
                             new Date(currTime),
-                            new Date(currTime + KeyStoreConstant.DAY_TIME * validity),
+                            new Date(currTime + TimeUnit.DAYS.toMillis(validity)),
                             new X500Name(distinguishedName), keyInfo);
             final X509CertificateHolder x509Cert = x509V3CertBuilder
                     .build(new JcaContentSignerBuilder(signAlg).build(keyPair.getPrivate()));

diff --git a/aaa-shiro/impl/src/main/java/org/opendaylight/aaa/shiro/realm/util/http/UntrustedSSL.java b/aaa-shiro/impl/src/main/java/org/opendaylight/aaa/shiro/realm/util/http/UntrustedSSL.java
index 32dd57c0515174890a9918ea8028856d02e1edb1..d1ac923b2983032b01e8a3d0cae66227ee57bb29 100644 (file)
--- a/aaa-shiro/impl/src/main/java/org/opendaylight/aaa/shiro/realm/util/http/UntrustedSSL.java
+++ b/aaa-shiro/impl/src/main/java/org/opendaylight/aaa/shiro/realm/util/http/UntrustedSSL.java
@@ -15,7 +15,6 @@ import javax.net.ssl.HostnameVerifier;
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.TrustManager;
 import javax.net.ssl.X509TrustManager;
-import org.opendaylight.aaa.cert.impl.KeyStoreConstant;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -75,7 +74,7 @@ public final class UntrustedSSL {
 
         private static SSLContext buildSSLContext() {
             try {
-                SSLContext sslContext = SSLContext.getInstance(KeyStoreConstant.TLS_PROTOCOL);
+                SSLContext sslContext = SSLContext.getInstance("TLS");
                 sslContext.init(null, InsecureTrustManager.INSTANCE, null);
                 return sslContext;
             } catch (NoSuchAlgorithmException | KeyManagementException e) {