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/test | |
| parent | 7c3160ddd88d7b8ee4a37b8aa59ed561280e8a76 (diff) | |
Deprecate legacy SecretStore interface
Diffstat (limited to 'jdisc_http_service/src/test')
2 files changed, 5 insertions, 4 deletions
diff --git a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/guiceModules/ConnectorFactoryRegistryModule.java b/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/guiceModules/ConnectorFactoryRegistryModule.java index 6281907e083..a0fcce28086 100644 --- a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/guiceModules/ConnectorFactoryRegistryModule.java +++ b/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/guiceModules/ConnectorFactoryRegistryModule.java @@ -8,7 +8,7 @@ import com.yahoo.component.ComponentId; import com.yahoo.component.provider.ComponentRegistry; import com.yahoo.jdisc.http.ConnectorConfig; import com.yahoo.jdisc.http.ConnectorConfig.Builder; -import com.yahoo.jdisc.http.SecretStore; + import com.yahoo.jdisc.http.server.jetty.ConnectorFactory; import com.yahoo.jdisc.http.server.jetty.TestDrivers; import com.yahoo.jdisc.http.ssl.DefaultSslKeyStoreConfigurator; @@ -55,7 +55,8 @@ public class ConnectorFactoryRegistryModule implements Module { } - private static final class MockSecretStore implements SecretStore { + @SuppressWarnings("deprecation") + private static final class MockSecretStore implements com.yahoo.jdisc.http.SecretStore { @Override public String getSecret(String key) { diff --git a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/ConnectorFactoryTest.java b/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/ConnectorFactoryTest.java index 103a317094b..083be36043e 100644 --- a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/ConnectorFactoryTest.java +++ b/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/ConnectorFactoryTest.java @@ -3,7 +3,6 @@ package com.yahoo.jdisc.http.server.jetty; import com.yahoo.jdisc.Metric; import com.yahoo.jdisc.http.ConnectorConfig; -import com.yahoo.jdisc.http.SecretStore; import com.yahoo.jdisc.http.ssl.DefaultSslKeyStoreConfigurator; import com.yahoo.jdisc.http.ssl.DefaultSslTrustStoreConfigurator; import org.eclipse.jetty.server.Request; @@ -139,7 +138,8 @@ public class ConnectorFactoryTest { private static class DummyContext implements Metric.Context { } - private static final class ThrowingSecretStore implements SecretStore { + @SuppressWarnings("deprecation") + private static final class ThrowingSecretStore implements com.yahoo.jdisc.http.SecretStore { @Override public String getSecret(String key) { |