summaryrefslogtreecommitdiffstats
path: root/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/JksKeyStore.java
diff options
context:
space:
mode:
Diffstat (limited to 'jdisc_http_service/src/test/java/com/yahoo/jdisc/http/JksKeyStore.java')
-rw-r--r--jdisc_http_service/src/test/java/com/yahoo/jdisc/http/JksKeyStore.java12
1 files changed, 3 insertions, 9 deletions
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);