Skip to content

Commit b26dedb

Browse files
snicollsnicoll
committed
Merge branch '2.0.x'
2 parents 8ae6f0c + e90c8e4 commit b26dedb

File tree

9 files changed

+18
-48
lines changed

9 files changed

+18
-48
lines changed

‎spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/TypeUtils.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
package org.springframework.boot.configurationprocessor;
1818

19+
import java.util.Arrays;
1920
import java.util.Collection;
2021
import java.util.Collections;
2122
import java.util.EnumMap;
@@ -86,9 +87,7 @@ class TypeUtils {
8687
private TypeMirror getDeclaredType(Types types, Class<?> typeClass,
8788
int numberOfTypeArgs) {
8889
TypeMirror[] typeArgs = new TypeMirror[numberOfTypeArgs];
89-
for (int i = 0; i < typeArgs.length; i++) {
90-
typeArgs[i] = types.getWildcardType(null, null);
91-
}
90+
Arrays.setAll(typeArgs, i -> types.getWildcardType(null, null));
9291
TypeElement typeElement = this.env.getElementUtils()
9392
.getTypeElement(typeClass.getName());
9493
try {

‎spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/web/servlet/MockServletWebServer.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
package org.springframework.boot.testsupport.web.servlet;
1818

1919
import java.util.ArrayList;
20+
import java.util.Arrays;
2021
import java.util.Collections;
2122
import java.util.HashMap;
2223
import java.util.List;
@@ -114,9 +115,7 @@ public ServletContext getServletContext() {
114115

115116
public Servlet[] getServlets() {
116117
Servlet[] servlets = new Servlet[this.registeredServlets.size()];
117-
for (int i = 0; i < servlets.length; i++) {
118-
servlets[i] = this.registeredServlets.get(i).getServlet();
119-
}
118+
Arrays.setAll(servlets, (i) -> this.registeredServlets.get(i).getServlet());
120119
return servlets;
121120
}
122121

‎spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/jetty/JettyReactiveWebServerFactoryTests.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,7 @@ public void jettyCustomizersShouldBeInvoked() {
6868
HttpHandler handler = mock(HttpHandler.class);
6969
JettyReactiveWebServerFactory factory = getFactory();
7070
JettyServerCustomizer[] configurations = new JettyServerCustomizer[4];
71-
for (int i = 0; i < configurations.length; i++) {
72-
configurations[i] = mock(JettyServerCustomizer.class);
73-
}
71+
Arrays.setAll(configurations, i -> mock(JettyServerCustomizer.class));
7472
factory.setServerCustomizers(Arrays.asList(configurations[0], configurations[1]));
7573
factory.addServerCustomizers(configurations[2], configurations[3]);
7674
this.webServer = factory.getWebServer(handler);

‎spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/jetty/JettyServletWebServerFactoryTests.java‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,7 @@ protected JettyServletWebServerFactory getFactory() {
7575
public void jettyConfigurations() throws Exception {
7676
JettyServletWebServerFactory factory = getFactory();
7777
Configuration[] configurations = new Configuration[4];
78-
for (int i = 0; i < configurations.length; i++) {
79-
configurations[i] = mock(Configuration.class);
80-
}
78+
Arrays.setAll(configurations, i -> mock(Configuration.class));
8179
factory.setConfigurations(Arrays.asList(configurations[0], configurations[1]));
8280
factory.addConfigurations(configurations[2], configurations[3]);
8381
this.webServer = factory.getWebServer();
@@ -91,9 +89,7 @@ public void jettyConfigurations() throws Exception {
9189
public void jettyCustomizations() {
9290
JettyServletWebServerFactory factory = getFactory();
9391
JettyServerCustomizer[] configurations = new JettyServerCustomizer[4];
94-
for (int i = 0; i < configurations.length; i++) {
95-
configurations[i] = mock(JettyServerCustomizer.class);
96-
}
92+
Arrays.setAll(configurations, i -> mock(JettyServerCustomizer.class));
9793
factory.setServerCustomizers(Arrays.asList(configurations[0], configurations[1]));
9894
factory.addServerCustomizers(configurations[2], configurations[3]);
9995
this.webServer = factory.getWebServer();

‎spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/tomcat/TomcatReactiveWebServerFactoryTests.java‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,7 @@ protected TomcatReactiveWebServerFactory getFactory() {
5555
public void tomcatCustomizers() {
5656
TomcatReactiveWebServerFactory factory = getFactory();
5757
TomcatContextCustomizer[] listeners = new TomcatContextCustomizer[4];
58-
for (int i = 0; i < listeners.length; i++) {
59-
listeners[i] = mock(TomcatContextCustomizer.class);
60-
}
58+
Arrays.setAll(listeners, i -> mock(TomcatContextCustomizer.class));
6159
factory.setTomcatContextCustomizers(Arrays.asList(listeners[0], listeners[1]));
6260
factory.addContextCustomizers(listeners[2], listeners[3]);
6361
this.webServer = factory.getWebServer(mock(HttpHandler.class));
@@ -89,9 +87,7 @@ public void defaultTomcatListeners() {
8987
public void tomcatListeners() {
9088
TomcatReactiveWebServerFactory factory = getFactory();
9189
LifecycleListener[] listeners = new LifecycleListener[4];
92-
for (int i = 0; i < listeners.length; i++) {
93-
listeners[i] = mock(LifecycleListener.class);
94-
}
90+
Arrays.setAll(listeners, i -> mock(LifecycleListener.class));
9591
factory.setContextLifecycleListeners(Arrays.asList(listeners[0], listeners[1]));
9692
factory.addContextLifecycleListeners(listeners[2], listeners[3]);
9793
this.webServer = factory.getWebServer(mock(HttpHandler.class));
@@ -122,9 +118,7 @@ public void tomcatConnectorCustomizersShouldBeInvoked() {
122118
TomcatReactiveWebServerFactory factory = getFactory();
123119
HttpHandler handler = mock(HttpHandler.class);
124120
TomcatConnectorCustomizer[] listeners = new TomcatConnectorCustomizer[4];
125-
for (int i = 0; i < listeners.length; i++) {
126-
listeners[i] = mock(TomcatConnectorCustomizer.class);
127-
}
121+
Arrays.setAll(listeners, i -> mock(TomcatConnectorCustomizer.class));
128122
factory.setTomcatConnectorCustomizers(Arrays.asList(listeners[0], listeners[1]));
129123
factory.addConnectorCustomizers(listeners[2], listeners[3]);
130124
this.webServer = factory.getWebServer(handler);

‎spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/tomcat/TomcatServletWebServerFactoryTests.java‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -120,9 +120,7 @@ public void defaultTomcatListeners() {
120120
public void tomcatListeners() {
121121
TomcatServletWebServerFactory factory = getFactory();
122122
LifecycleListener[] listeners = new LifecycleListener[4];
123-
for (int i = 0; i < listeners.length; i++) {
124-
listeners[i] = mock(LifecycleListener.class);
125-
}
123+
Arrays.setAll(listeners, i -> mock(LifecycleListener.class));
126124
factory.setContextLifecycleListeners(Arrays.asList(listeners[0], listeners[1]));
127125
factory.addContextLifecycleListeners(listeners[2], listeners[3]);
128126
this.webServer = factory.getWebServer();
@@ -136,9 +134,7 @@ public void tomcatListeners() {
136134
public void tomcatCustomizers() {
137135
TomcatServletWebServerFactory factory = getFactory();
138136
TomcatContextCustomizer[] listeners = new TomcatContextCustomizer[4];
139-
for (int i = 0; i < listeners.length; i++) {
140-
listeners[i] = mock(TomcatContextCustomizer.class);
141-
}
137+
Arrays.setAll(listeners, i -> mock(TomcatContextCustomizer.class));
142138
factory.setTomcatContextCustomizers(Arrays.asList(listeners[0], listeners[1]));
143139
factory.addContextCustomizers(listeners[2], listeners[3]);
144140
this.webServer = factory.getWebServer();
@@ -163,9 +159,7 @@ public void contextIsAddedToHostBeforeCustomizersAreCalled() {
163159
public void tomcatConnectorCustomizers() {
164160
TomcatServletWebServerFactory factory = getFactory();
165161
TomcatConnectorCustomizer[] listeners = new TomcatConnectorCustomizer[4];
166-
for (int i = 0; i < listeners.length; i++) {
167-
listeners[i] = mock(TomcatConnectorCustomizer.class);
168-
}
162+
Arrays.setAll(listeners, i -> mock(TomcatConnectorCustomizer.class));
169163
factory.setTomcatConnectorCustomizers(Arrays.asList(listeners[0], listeners[1]));
170164
factory.addConnectorCustomizers(listeners[2], listeners[3]);
171165
this.webServer = factory.getWebServer();
@@ -179,9 +173,7 @@ public void tomcatConnectorCustomizers() {
179173
public void tomcatAdditionalConnectors() {
180174
TomcatServletWebServerFactory factory = getFactory();
181175
Connector[] listeners = new Connector[4];
182-
for (int i = 0; i < listeners.length; i++) {
183-
listeners[i] = new Connector();
184-
}
176+
Arrays.setAll(listeners, i -> new Connector());
185177
factory.addAdditionalTomcatConnectors(listeners);
186178
this.webServer = factory.getWebServer();
187179
Map<Service, Connector[]> connectors = ((TomcatWebServer) this.webServer)

‎spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/undertow/UndertowReactiveWebServerFactoryTests.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,7 @@ public void builderCustomizersShouldBeInvoked() {
7777
UndertowReactiveWebServerFactory factory = getFactory();
7878
HttpHandler handler = mock(HttpHandler.class);
7979
UndertowBuilderCustomizer[] customizers = new UndertowBuilderCustomizer[4];
80-
for (int i = 0; i < customizers.length; i++) {
81-
customizers[i] = mock(UndertowBuilderCustomizer.class);
82-
}
80+
Arrays.setAll(customizers, i -> mock(UndertowBuilderCustomizer.class));
8381
factory.setBuilderCustomizers(Arrays.asList(customizers[0], customizers[1]));
8482
factory.addBuilderCustomizers(customizers[2], customizers[3]);
8583
this.webServer = factory.getWebServer(handler);

‎spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/undertow/UndertowServletWebServerFactoryTests.java‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -102,9 +102,7 @@ public void addNullAddBuilderCustomizersThrows() {
102102
public void builderCustomizers() {
103103
UndertowServletWebServerFactory factory = getFactory();
104104
UndertowBuilderCustomizer[] customizers = new UndertowBuilderCustomizer[4];
105-
for (int i = 0; i < customizers.length; i++) {
106-
customizers[i] = mock(UndertowBuilderCustomizer.class);
107-
}
105+
Arrays.setAll(customizers, i -> mock(UndertowBuilderCustomizer.class));
108106
factory.setBuilderCustomizers(Arrays.asList(customizers[0], customizers[1]));
109107
factory.addBuilderCustomizers(customizers[2], customizers[3]);
110108
this.webServer = factory.getWebServer();
@@ -134,9 +132,7 @@ public void addNullAddDeploymentInfoCustomizersThrows() {
134132
public void deploymentInfo() {
135133
UndertowServletWebServerFactory factory = getFactory();
136134
UndertowDeploymentInfoCustomizer[] customizers = new UndertowDeploymentInfoCustomizer[4];
137-
for (int i = 0; i < customizers.length; i++) {
138-
customizers[i] = mock(UndertowDeploymentInfoCustomizer.class);
139-
}
135+
Arrays.setAll(customizers, i -> mock(UndertowDeploymentInfoCustomizer.class));
140136
factory.setDeploymentInfoCustomizers(
141137
Arrays.asList(customizers[0], customizers[1]));
142138
factory.addDeploymentInfoCustomizers(customizers[2], customizers[3]);

‎spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/server/AbstractServletWebServerFactoryTests.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -305,9 +305,7 @@ public void contextRootPathMustNotBeSlash() {
305305
public void multipleConfigurations() throws Exception {
306306
AbstractServletWebServerFactory factory = getFactory();
307307
ServletContextInitializer[] initializers = new ServletContextInitializer[6];
308-
for (int i = 0; i < initializers.length; i++) {
309-
initializers[i] = mock(ServletContextInitializer.class);
310-
}
308+
Arrays.setAll(initializers, i -> mock(ServletContextInitializer.class));
311309
factory.setInitializers(Arrays.asList(initializers[2], initializers[3]));
312310
factory.addInitializers(initializers[4], initializers[5]);
313311
this.webServer = factory.getWebServer(initializers[0], initializers[1]);

0 commit comments

Comments
 (0)