diff options
author | Morten Tokle <mortent@oath.com> | 2018-04-24 09:06:24 +0200 |
---|---|---|
committer | Morten Tokle <mortent@oath.com> | 2018-04-24 11:33:41 +0200 |
commit | a4d740f03a9acd8de9b6c4b3acf0c277360f4122 (patch) | |
tree | 0b7b5edbe8f9b85dbc72ecb5498d04f4311b1095 /jdisc_http_service/src/main/java/com/yahoo/jdisc/http/ssl | |
parent | 7c3160ddd88d7b8ee4a37b8aa59ed561280e8a76 (diff) |
Deprecate legacy SecretStore interface
Diffstat (limited to 'jdisc_http_service/src/main/java/com/yahoo/jdisc/http/ssl')
2 files changed, 8 insertions, 6 deletions
diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/ssl/DefaultSslKeyStoreConfigurator.java b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/ssl/DefaultSslKeyStoreConfigurator.java index fb0a5869bb3..1cf8997b465 100644 --- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/ssl/DefaultSslKeyStoreConfigurator.java +++ b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/ssl/DefaultSslKeyStoreConfigurator.java @@ -3,7 +3,6 @@ package com.yahoo.jdisc.http.ssl; import com.google.inject.Inject; import com.yahoo.jdisc.http.ConnectorConfig; -import com.yahoo.jdisc.http.SecretStore; import com.yahoo.jdisc.http.ssl.pem.PemSslKeyStore; import java.io.IOException; @@ -20,11 +19,13 @@ public class DefaultSslKeyStoreConfigurator implements SslKeyStoreConfigurator { private static final Logger log = Logger.getLogger(DefaultSslKeyStoreConfigurator.class.getName()); - private final SecretStore secretStore; + @SuppressWarnings("deprecation") + private final com.yahoo.jdisc.http.SecretStore secretStore; private final ConnectorConfig.Ssl config; @Inject - public DefaultSslKeyStoreConfigurator(ConnectorConfig config, SecretStore secretStore) { + @SuppressWarnings("deprecation") + public DefaultSslKeyStoreConfigurator(ConnectorConfig config, com.yahoo.jdisc.http.SecretStore secretStore) { validateConfig(config.ssl()); this.secretStore = secretStore; this.config = config.ssl(); diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/ssl/DefaultSslTrustStoreConfigurator.java b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/ssl/DefaultSslTrustStoreConfigurator.java index 8af21d48e9a..5a8c399e6ba 100644 --- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/ssl/DefaultSslTrustStoreConfigurator.java +++ b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/ssl/DefaultSslTrustStoreConfigurator.java @@ -3,18 +3,19 @@ package com.yahoo.jdisc.http.ssl; import com.google.inject.Inject; import com.yahoo.jdisc.http.ConnectorConfig; -import com.yahoo.jdisc.http.SecretStore; /** * @author bjorncs */ public class DefaultSslTrustStoreConfigurator implements SslTrustStoreConfigurator { - private final SecretStore secretStore; + @SuppressWarnings("deprecation") + private final com.yahoo.jdisc.http.SecretStore secretStore; private final ConnectorConfig.Ssl config; @Inject - public DefaultSslTrustStoreConfigurator(ConnectorConfig config, SecretStore secretStore) { + @SuppressWarnings("deprecation") + public DefaultSslTrustStoreConfigurator(ConnectorConfig config, com.yahoo.jdisc.http.SecretStore secretStore) { validateConfig(config.ssl()); this.secretStore = secretStore; this.config = config.ssl(); |