diff options
author | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2021-01-15 15:25:11 +0100 |
---|---|---|
committer | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2021-01-15 15:25:11 +0100 |
commit | b81f58097056713fc060b13acabbe8fb0250fbd7 (patch) | |
tree | de5df29e861965990e8ed468eea91eebb99432ab /jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty | |
parent | 9f8d75c168a44d191267d7ee70bd4bed1e7d2f84 (diff) |
Guice modules passed to TestDrivers will always override config module
Diffstat (limited to 'jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty')
-rw-r--r-- | jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/TestDrivers.java | 41 |
1 files changed, 20 insertions, 21 deletions
diff --git a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/TestDrivers.java b/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/TestDrivers.java index aa72ff55ffe..4b8a9bed1f3 100644 --- a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/TestDrivers.java +++ b/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/TestDrivers.java @@ -12,7 +12,6 @@ import com.yahoo.jdisc.http.ServletPathsConfig; import com.yahoo.jdisc.http.guiceModules.ConnectorFactoryRegistryModule; import com.yahoo.jdisc.http.guiceModules.ServletModule; -import java.io.IOException; import java.nio.file.Path; /** @@ -24,14 +23,14 @@ public class TestDrivers { public static TestDriver newConfiguredInstance(RequestHandler requestHandler, ServerConfig.Builder serverConfig, ConnectorConfig.Builder connectorConfig, - Module... guiceModules) throws IOException { + Module... guiceModules) { return TestDriver.newInstance( JettyHttpServer.class, requestHandler, newConfigModule(serverConfig, connectorConfig, guiceModules)); } - public static TestDriver newInstance(RequestHandler requestHandler, Module... guiceModules) throws IOException { + public static TestDriver newInstance(RequestHandler requestHandler, Module... guiceModules) { return TestDriver.newInstance( JettyHttpServer.class, requestHandler, @@ -48,11 +47,10 @@ public class TestDrivers { Path certificateFile, Path privateKeyFile, TlsClientAuth tlsClientAuth, - Module... guiceModules) throws IOException { + Module... guiceModules) { return TestDriver.newInstance( JettyHttpServer.class, requestHandler, - Modules.override( newConfigModule( new ServerConfig.Builder().connectionLog(new ServerConfig.ConnectionLog.Builder().enabled(true)), new ConnectorConfig.Builder() @@ -67,27 +65,28 @@ public class TestDrivers { : ConnectorConfig.Ssl.ClientAuth.Enum.WANT_AUTH) .privateKeyFile(privateKeyFile.toString()) .certificateFile(certificateFile.toString()) - .caCertificateFile(certificateFile.toString())))) - .with(guiceModules)); + .caCertificateFile(certificateFile.toString())), + guiceModules)); } private static Module newConfigModule(ServerConfig.Builder serverConfig, ConnectorConfig.Builder connectorConfigBuilder, Module... guiceModules) { - return Modules.combine( - new AbstractModule() { - @Override - protected void configure() { - bind(ServletPathsConfig.class).toInstance(new ServletPathsConfig(new ServletPathsConfig.Builder())); - bind(ServerConfig.class).toInstance(new ServerConfig(serverConfig)); - bind(ConnectorConfig.class).toInstance(new ConnectorConfig(connectorConfigBuilder)); - bind(FilterBindings.class).toInstance(new FilterBindings.Builder().build()); - bind(ConnectionLog.class).toInstance(new VoidConnectionLog()); - } - }, - new ConnectorFactoryRegistryModule(connectorConfigBuilder), - new ServletModule(), - Modules.combine(guiceModules)); + return Modules.override( + Modules.combine( + new AbstractModule() { + @Override + protected void configure() { + bind(ServletPathsConfig.class).toInstance(new ServletPathsConfig(new ServletPathsConfig.Builder())); + bind(ServerConfig.class).toInstance(new ServerConfig(serverConfig)); + bind(ConnectorConfig.class).toInstance(new ConnectorConfig(connectorConfigBuilder)); + bind(FilterBindings.class).toInstance(new FilterBindings.Builder().build()); + bind(ConnectionLog.class).toInstance(new VoidConnectionLog()); + } + }, + new ConnectorFactoryRegistryModule(connectorConfigBuilder), + new ServletModule())) + .with(guiceModules); } } |