aboutsummaryrefslogtreecommitdiffstats
path: root/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/ConnectorFactoryTest.java
diff options
context:
space:
mode:
authorBjørn Christian Seime <bjorncs@oath.com>2018-09-12 11:26:18 +0200
committerBjørn Christian Seime <bjorncs@oath.com>2018-09-12 11:26:18 +0200
commitc9a3e05f486f7dde2a4f7895a8adcfd54518c108 (patch)
tree7ec074835478efc6a34393c7f50aa158c1727c14 /jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/ConnectorFactoryTest.java
parent7f00722a620ed17116253d61d89728e63bed2299 (diff)
Remove SslKeyStoreConfigurator/SslTrustStoreConfigurator concept
Diffstat (limited to 'jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/ConnectorFactoryTest.java')
-rw-r--r--jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/ConnectorFactoryTest.java9
1 files changed, 1 insertions, 8 deletions
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 d504e8be288..b328e151f51 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
@@ -4,8 +4,6 @@ package com.yahoo.jdisc.http.server.jetty;
import com.yahoo.jdisc.Metric;
import com.yahoo.jdisc.http.ConnectorConfig;
import com.yahoo.jdisc.http.ssl.DefaultSslContextFactoryProvider;
-import com.yahoo.jdisc.http.ssl.DefaultSslKeyStoreConfigurator;
-import com.yahoo.jdisc.http.ssl.DefaultSslTrustStoreConfigurator;
import org.eclipse.jetty.server.Request;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.handler.AbstractHandler;
@@ -107,12 +105,7 @@ public class ConnectorFactoryTest {
}
private static ConnectorFactory createConnectorFactory(ConnectorConfig config) {
- ThrowingSecretStore secretStore = new ThrowingSecretStore();
- return new ConnectorFactory(config,
- new DefaultSslContextFactoryProvider(
- config,
- new DefaultSslKeyStoreConfigurator(config, secretStore),
- new DefaultSslTrustStoreConfigurator(config, secretStore)));
+ return new ConnectorFactory(config, new DefaultSslContextFactoryProvider(config, new ThrowingSecretStore()));
}
private static class HelloWorldHandler extends AbstractHandler {