diff options
| author | Bjørn Christian Seime <bjorn.christian@seime.no> | 2017-11-16 09:55:03 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-16 09:55:03 +0100 |
| commit | 3982fd81899e6a1942b42e1f05dea3ee29e41fb6 (patch) | |
| tree | 5af38e4b268ecde2bb89cfdb93683897ea200b70 /jdisc_http_service/src/test/java/com/yahoo/jdisc/http/guiceModules/ConnectorFactoryRegistryModule.java | |
| parent | e429e4e4fa1d5225d2c16d457bebd420f26b0a3b (diff) | |
| parent | 26a183be1a9f6bad2d0206449666e3a98a5b7c74 (diff) | |
Merge pull request #4132 from vespa-engine/bjorncs/custom-ssl-context
Bjorncs/custom ssl context
Diffstat (limited to 'jdisc_http_service/src/test/java/com/yahoo/jdisc/http/guiceModules/ConnectorFactoryRegistryModule.java')
| -rw-r--r-- | jdisc_http_service/src/test/java/com/yahoo/jdisc/http/guiceModules/ConnectorFactoryRegistryModule.java | 5 |
1 files changed, 4 insertions, 1 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 1200a06be2c..0d8f433cc39 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 @@ -11,6 +11,7 @@ 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; /** * Guice module for test ConnectorFactories @@ -46,7 +47,9 @@ public class ConnectorFactoryRegistryModule implements Module { private static class StaticKeyDbConnectorFactory extends ConnectorFactory { public StaticKeyDbConnectorFactory(ConnectorConfig connectorConfig) { - super(connectorConfig, new MockSecretStore()); + super(connectorConfig, + new MockSecretStore(), + new DefaultSslKeyStoreConfigurator(connectorConfig, new MockSecretStore())); } } |