Commit e9566187 authored by Stephane Nicoll's avatar Stephane Nicoll

Merge branch '2.0.x'

parents 91af9e2c e034b383
...@@ -68,7 +68,7 @@ public class JettyReactiveWebServerFactoryTests ...@@ -68,7 +68,7 @@ public class JettyReactiveWebServerFactoryTests
HttpHandler handler = mock(HttpHandler.class); HttpHandler handler = mock(HttpHandler.class);
JettyReactiveWebServerFactory factory = getFactory(); JettyReactiveWebServerFactory factory = getFactory();
JettyServerCustomizer[] configurations = new JettyServerCustomizer[4]; JettyServerCustomizer[] configurations = new JettyServerCustomizer[4];
Arrays.setAll(configurations, i -> mock(JettyServerCustomizer.class)); Arrays.setAll(configurations, (i) -> mock(JettyServerCustomizer.class));
factory.setServerCustomizers(Arrays.asList(configurations[0], configurations[1])); factory.setServerCustomizers(Arrays.asList(configurations[0], configurations[1]));
factory.addServerCustomizers(configurations[2], configurations[3]); factory.addServerCustomizers(configurations[2], configurations[3]);
this.webServer = factory.getWebServer(handler); this.webServer = factory.getWebServer(handler);
......
...@@ -75,7 +75,7 @@ public class JettyServletWebServerFactoryTests ...@@ -75,7 +75,7 @@ public class JettyServletWebServerFactoryTests
public void jettyConfigurations() throws Exception { public void jettyConfigurations() throws Exception {
JettyServletWebServerFactory factory = getFactory(); JettyServletWebServerFactory factory = getFactory();
Configuration[] configurations = new Configuration[4]; Configuration[] configurations = new Configuration[4];
Arrays.setAll(configurations, i -> mock(Configuration.class)); Arrays.setAll(configurations, (i) -> mock(Configuration.class));
factory.setConfigurations(Arrays.asList(configurations[0], configurations[1])); factory.setConfigurations(Arrays.asList(configurations[0], configurations[1]));
factory.addConfigurations(configurations[2], configurations[3]); factory.addConfigurations(configurations[2], configurations[3]);
this.webServer = factory.getWebServer(); this.webServer = factory.getWebServer();
...@@ -89,7 +89,7 @@ public class JettyServletWebServerFactoryTests ...@@ -89,7 +89,7 @@ public class JettyServletWebServerFactoryTests
public void jettyCustomizations() { public void jettyCustomizations() {
JettyServletWebServerFactory factory = getFactory(); JettyServletWebServerFactory factory = getFactory();
JettyServerCustomizer[] configurations = new JettyServerCustomizer[4]; JettyServerCustomizer[] configurations = new JettyServerCustomizer[4];
Arrays.setAll(configurations, i -> mock(JettyServerCustomizer.class)); Arrays.setAll(configurations, (i) -> mock(JettyServerCustomizer.class));
factory.setServerCustomizers(Arrays.asList(configurations[0], configurations[1])); factory.setServerCustomizers(Arrays.asList(configurations[0], configurations[1]));
factory.addServerCustomizers(configurations[2], configurations[3]); factory.addServerCustomizers(configurations[2], configurations[3]);
this.webServer = factory.getWebServer(); this.webServer = factory.getWebServer();
......
...@@ -55,7 +55,7 @@ public class TomcatReactiveWebServerFactoryTests ...@@ -55,7 +55,7 @@ public class TomcatReactiveWebServerFactoryTests
public void tomcatCustomizers() { public void tomcatCustomizers() {
TomcatReactiveWebServerFactory factory = getFactory(); TomcatReactiveWebServerFactory factory = getFactory();
TomcatContextCustomizer[] listeners = new TomcatContextCustomizer[4]; TomcatContextCustomizer[] listeners = new TomcatContextCustomizer[4];
Arrays.setAll(listeners, i -> mock(TomcatContextCustomizer.class)); Arrays.setAll(listeners, (i) -> mock(TomcatContextCustomizer.class));
factory.setTomcatContextCustomizers(Arrays.asList(listeners[0], listeners[1])); factory.setTomcatContextCustomizers(Arrays.asList(listeners[0], listeners[1]));
factory.addContextCustomizers(listeners[2], listeners[3]); factory.addContextCustomizers(listeners[2], listeners[3]);
this.webServer = factory.getWebServer(mock(HttpHandler.class)); this.webServer = factory.getWebServer(mock(HttpHandler.class));
...@@ -87,7 +87,7 @@ public class TomcatReactiveWebServerFactoryTests ...@@ -87,7 +87,7 @@ public class TomcatReactiveWebServerFactoryTests
public void tomcatListeners() { public void tomcatListeners() {
TomcatReactiveWebServerFactory factory = getFactory(); TomcatReactiveWebServerFactory factory = getFactory();
LifecycleListener[] listeners = new LifecycleListener[4]; LifecycleListener[] listeners = new LifecycleListener[4];
Arrays.setAll(listeners, i -> mock(LifecycleListener.class)); Arrays.setAll(listeners, (i) -> mock(LifecycleListener.class));
factory.setContextLifecycleListeners(Arrays.asList(listeners[0], listeners[1])); factory.setContextLifecycleListeners(Arrays.asList(listeners[0], listeners[1]));
factory.addContextLifecycleListeners(listeners[2], listeners[3]); factory.addContextLifecycleListeners(listeners[2], listeners[3]);
this.webServer = factory.getWebServer(mock(HttpHandler.class)); this.webServer = factory.getWebServer(mock(HttpHandler.class));
...@@ -118,7 +118,7 @@ public class TomcatReactiveWebServerFactoryTests ...@@ -118,7 +118,7 @@ public class TomcatReactiveWebServerFactoryTests
TomcatReactiveWebServerFactory factory = getFactory(); TomcatReactiveWebServerFactory factory = getFactory();
HttpHandler handler = mock(HttpHandler.class); HttpHandler handler = mock(HttpHandler.class);
TomcatConnectorCustomizer[] listeners = new TomcatConnectorCustomizer[4]; TomcatConnectorCustomizer[] listeners = new TomcatConnectorCustomizer[4];
Arrays.setAll(listeners, i -> mock(TomcatConnectorCustomizer.class)); Arrays.setAll(listeners, (i) -> mock(TomcatConnectorCustomizer.class));
factory.setTomcatConnectorCustomizers(Arrays.asList(listeners[0], listeners[1])); factory.setTomcatConnectorCustomizers(Arrays.asList(listeners[0], listeners[1]));
factory.addConnectorCustomizers(listeners[2], listeners[3]); factory.addConnectorCustomizers(listeners[2], listeners[3]);
this.webServer = factory.getWebServer(handler); this.webServer = factory.getWebServer(handler);
......
...@@ -120,7 +120,7 @@ public class TomcatServletWebServerFactoryTests ...@@ -120,7 +120,7 @@ public class TomcatServletWebServerFactoryTests
public void tomcatListeners() { public void tomcatListeners() {
TomcatServletWebServerFactory factory = getFactory(); TomcatServletWebServerFactory factory = getFactory();
LifecycleListener[] listeners = new LifecycleListener[4]; LifecycleListener[] listeners = new LifecycleListener[4];
Arrays.setAll(listeners, i -> mock(LifecycleListener.class)); Arrays.setAll(listeners, (i) -> mock(LifecycleListener.class));
factory.setContextLifecycleListeners(Arrays.asList(listeners[0], listeners[1])); factory.setContextLifecycleListeners(Arrays.asList(listeners[0], listeners[1]));
factory.addContextLifecycleListeners(listeners[2], listeners[3]); factory.addContextLifecycleListeners(listeners[2], listeners[3]);
this.webServer = factory.getWebServer(); this.webServer = factory.getWebServer();
...@@ -134,7 +134,7 @@ public class TomcatServletWebServerFactoryTests ...@@ -134,7 +134,7 @@ public class TomcatServletWebServerFactoryTests
public void tomcatCustomizers() { public void tomcatCustomizers() {
TomcatServletWebServerFactory factory = getFactory(); TomcatServletWebServerFactory factory = getFactory();
TomcatContextCustomizer[] listeners = new TomcatContextCustomizer[4]; TomcatContextCustomizer[] listeners = new TomcatContextCustomizer[4];
Arrays.setAll(listeners, i -> mock(TomcatContextCustomizer.class)); Arrays.setAll(listeners, (i) -> mock(TomcatContextCustomizer.class));
factory.setTomcatContextCustomizers(Arrays.asList(listeners[0], listeners[1])); factory.setTomcatContextCustomizers(Arrays.asList(listeners[0], listeners[1]));
factory.addContextCustomizers(listeners[2], listeners[3]); factory.addContextCustomizers(listeners[2], listeners[3]);
this.webServer = factory.getWebServer(); this.webServer = factory.getWebServer();
...@@ -159,7 +159,7 @@ public class TomcatServletWebServerFactoryTests ...@@ -159,7 +159,7 @@ public class TomcatServletWebServerFactoryTests
public void tomcatConnectorCustomizers() { public void tomcatConnectorCustomizers() {
TomcatServletWebServerFactory factory = getFactory(); TomcatServletWebServerFactory factory = getFactory();
TomcatConnectorCustomizer[] listeners = new TomcatConnectorCustomizer[4]; TomcatConnectorCustomizer[] listeners = new TomcatConnectorCustomizer[4];
Arrays.setAll(listeners, i -> mock(TomcatConnectorCustomizer.class)); Arrays.setAll(listeners, (i) -> mock(TomcatConnectorCustomizer.class));
factory.setTomcatConnectorCustomizers(Arrays.asList(listeners[0], listeners[1])); factory.setTomcatConnectorCustomizers(Arrays.asList(listeners[0], listeners[1]));
factory.addConnectorCustomizers(listeners[2], listeners[3]); factory.addConnectorCustomizers(listeners[2], listeners[3]);
this.webServer = factory.getWebServer(); this.webServer = factory.getWebServer();
...@@ -173,7 +173,7 @@ public class TomcatServletWebServerFactoryTests ...@@ -173,7 +173,7 @@ public class TomcatServletWebServerFactoryTests
public void tomcatAdditionalConnectors() { public void tomcatAdditionalConnectors() {
TomcatServletWebServerFactory factory = getFactory(); TomcatServletWebServerFactory factory = getFactory();
Connector[] listeners = new Connector[4]; Connector[] listeners = new Connector[4];
Arrays.setAll(listeners, i -> new Connector()); Arrays.setAll(listeners, (i) -> new Connector());
factory.addAdditionalTomcatConnectors(listeners); factory.addAdditionalTomcatConnectors(listeners);
this.webServer = factory.getWebServer(); this.webServer = factory.getWebServer();
Map<Service, Connector[]> connectors = ((TomcatWebServer) this.webServer) Map<Service, Connector[]> connectors = ((TomcatWebServer) this.webServer)
......
...@@ -77,7 +77,7 @@ public class UndertowReactiveWebServerFactoryTests ...@@ -77,7 +77,7 @@ public class UndertowReactiveWebServerFactoryTests
UndertowReactiveWebServerFactory factory = getFactory(); UndertowReactiveWebServerFactory factory = getFactory();
HttpHandler handler = mock(HttpHandler.class); HttpHandler handler = mock(HttpHandler.class);
UndertowBuilderCustomizer[] customizers = new UndertowBuilderCustomizer[4]; UndertowBuilderCustomizer[] customizers = new UndertowBuilderCustomizer[4];
Arrays.setAll(customizers, i -> mock(UndertowBuilderCustomizer.class)); Arrays.setAll(customizers, (i) -> mock(UndertowBuilderCustomizer.class));
factory.setBuilderCustomizers(Arrays.asList(customizers[0], customizers[1])); factory.setBuilderCustomizers(Arrays.asList(customizers[0], customizers[1]));
factory.addBuilderCustomizers(customizers[2], customizers[3]); factory.addBuilderCustomizers(customizers[2], customizers[3]);
this.webServer = factory.getWebServer(handler); this.webServer = factory.getWebServer(handler);
......
...@@ -102,7 +102,7 @@ public class UndertowServletWebServerFactoryTests ...@@ -102,7 +102,7 @@ public class UndertowServletWebServerFactoryTests
public void builderCustomizers() { public void builderCustomizers() {
UndertowServletWebServerFactory factory = getFactory(); UndertowServletWebServerFactory factory = getFactory();
UndertowBuilderCustomizer[] customizers = new UndertowBuilderCustomizer[4]; UndertowBuilderCustomizer[] customizers = new UndertowBuilderCustomizer[4];
Arrays.setAll(customizers, i -> mock(UndertowBuilderCustomizer.class)); Arrays.setAll(customizers, (i) -> mock(UndertowBuilderCustomizer.class));
factory.setBuilderCustomizers(Arrays.asList(customizers[0], customizers[1])); factory.setBuilderCustomizers(Arrays.asList(customizers[0], customizers[1]));
factory.addBuilderCustomizers(customizers[2], customizers[3]); factory.addBuilderCustomizers(customizers[2], customizers[3]);
this.webServer = factory.getWebServer(); this.webServer = factory.getWebServer();
...@@ -132,7 +132,7 @@ public class UndertowServletWebServerFactoryTests ...@@ -132,7 +132,7 @@ public class UndertowServletWebServerFactoryTests
public void deploymentInfo() { public void deploymentInfo() {
UndertowServletWebServerFactory factory = getFactory(); UndertowServletWebServerFactory factory = getFactory();
UndertowDeploymentInfoCustomizer[] customizers = new UndertowDeploymentInfoCustomizer[4]; UndertowDeploymentInfoCustomizer[] customizers = new UndertowDeploymentInfoCustomizer[4];
Arrays.setAll(customizers, i -> mock(UndertowDeploymentInfoCustomizer.class)); Arrays.setAll(customizers, (i) -> mock(UndertowDeploymentInfoCustomizer.class));
factory.setDeploymentInfoCustomizers( factory.setDeploymentInfoCustomizers(
Arrays.asList(customizers[0], customizers[1])); Arrays.asList(customizers[0], customizers[1]));
factory.addDeploymentInfoCustomizers(customizers[2], customizers[3]); factory.addDeploymentInfoCustomizers(customizers[2], customizers[3]);
......
...@@ -305,7 +305,7 @@ public abstract class AbstractServletWebServerFactoryTests { ...@@ -305,7 +305,7 @@ public abstract class AbstractServletWebServerFactoryTests {
public void multipleConfigurations() throws Exception { public void multipleConfigurations() throws Exception {
AbstractServletWebServerFactory factory = getFactory(); AbstractServletWebServerFactory factory = getFactory();
ServletContextInitializer[] initializers = new ServletContextInitializer[6]; ServletContextInitializer[] initializers = new ServletContextInitializer[6];
Arrays.setAll(initializers, i -> mock(ServletContextInitializer.class)); Arrays.setAll(initializers, (i) -> mock(ServletContextInitializer.class));
factory.setInitializers(Arrays.asList(initializers[2], initializers[3])); factory.setInitializers(Arrays.asList(initializers[2], initializers[3]));
factory.addInitializers(initializers[4], initializers[5]); factory.addInitializers(initializers[4], initializers[5]);
this.webServer = factory.getWebServer(initializers[0], initializers[1]); this.webServer = factory.getWebServer(initializers[0], initializers[1]);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment