Remove meaningless SslKeyStore interface

5 files changed, 7 insertions, 32 deletions

diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/ConnectorFactory.java b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/ConnectorFactory.java
index 7ec51f35b74..64d77e41f3c 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/ConnectorFactory.java
+++ b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/ConnectorFactory.java
@@ -200,8 +200,7 @@ public class ConnectorFactory {
         try {
             Path certificatePath = Paths.get(pemKeyStore.certificatePath());
             Path keyPath = Paths.get(pemKeyStore.keyPath());
-            return new PemSslKeyStore(certificatePath, keyPath)
-                    .loadJavaKeyStore();
+            return new PemSslKeyStore(certificatePath, keyPath).loadJavaKeyStore();
         } catch (IOException e) {
             throw new UncheckedIOException(e);
         } catch (Exception e) {
diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/ssl/SslKeyStore.java b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/ssl/SslKeyStore.java
deleted file mode 100644
index c282c94c1bd..00000000000
--- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/ssl/SslKeyStore.java
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.jdisc.http.ssl;
-
-import java.security.KeyStore;
-
-/**
- *
- * @author bjorncs
- */
-public interface SslKeyStore {
-    KeyStore loadJavaKeyStore() throws Exception;
-}
diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/ssl/package-info.java b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/ssl/package-info.java
deleted file mode 100644
index c47d36991d4..00000000000
--- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/ssl/package-info.java
+++ /dev/null
@@ -1,4 +0,0 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-@ExportPackage
-package com.yahoo.jdisc.http.ssl;
-import com.yahoo.osgi.annotation.ExportPackage;
diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/ssl/pem/PemSslKeyStore.java b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/ssl/pem/PemSslKeyStore.java
index 9f0a635f7c1..2ae1894a8d4 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/ssl/pem/PemSslKeyStore.java
+++ b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/ssl/pem/PemSslKeyStore.java
@@ -1,7 +1,6 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.jdisc.http.ssl.pem;
 
-import com.yahoo.jdisc.http.ssl.SslKeyStore;
 import com.yahoo.jdisc.http.ssl.pem.PemKeyStore.KeyStoreLoadParameter;
 import com.yahoo.jdisc.http.ssl.pem.PemKeyStore.TrustStoreLoadParameter;
 
@@ -21,7 +20,7 @@ import java.security.cert.CertificateException;
  * @author Tony Vaagenes
  * @author bjorncs
  */
-public class PemSslKeyStore implements SslKeyStore {
+public class PemSslKeyStore {
 
     static {
         Security.addProvider(new PemKeyStoreProvider());
@@ -40,9 +39,8 @@ public class PemSslKeyStore implements SslKeyStore {
         this.loadParameter = new TrustStoreLoadParameter(certificatePath);
     }
 
-    @Override
-    public KeyStore loadJavaKeyStore() throws KeyStoreException, IOException, NoSuchAlgorithmException, CertificateException {
-        //cached since Reader(in loadParameter) can only be used one time.
+    public KeyStore loadJavaKeyStore()
+            throws KeyStoreException, CertificateException, NoSuchAlgorithmException, IOException {
         if (keyStore == null) {
             keyStore = KeyStore.getInstance(KEY_STORE_TYPE);
             keyStore.load(loadParameter);
diff --git a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/JksKeyStore.java b/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/JksKeyStore.java
index 7e29e26b045..1c7a917c688 100644
--- a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/JksKeyStore.java
+++ b/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/JksKeyStore.java
@@ -1,24 +1,19 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.jdisc.http;
 
-import com.yahoo.jdisc.http.ssl.SslKeyStore;
-
-import java.io.IOException;
 import java.io.InputStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.security.KeyStore;
-import java.security.KeyStoreException;
-import java.security.NoSuchAlgorithmException;
-import java.security.cert.CertificateException;
 
 /**
  * @author Tony Vaagenes
  * @author bjorncs
  */
-public class JksKeyStore implements SslKeyStore {
+public class JksKeyStore {
 
     private static final String KEY_STORE_TYPE = "JKS";
+
     private final Path keyStoreFile;
     private final String keyStorePassword;
 
@@ -35,8 +30,7 @@ public class JksKeyStore implements SslKeyStore {
         return keyStorePassword;
     }
 
-    @Override
-    public KeyStore loadJavaKeyStore() throws KeyStoreException, IOException, NoSuchAlgorithmException, CertificateException {
+    public KeyStore loadJavaKeyStore() throws Exception {
         try(InputStream stream = Files.newInputStream(keyStoreFile)) {
             KeyStore keystore = KeyStore.getInstance(KEY_STORE_TYPE);
             keystore.load(stream, keyStorePassword != null ? keyStorePassword.toCharArray() : null);