Skip to content

Commit 1f77579

Browse files
committed
Use Collections.addAll(...) instead of for loops
Replace various for loops which add items to collections with calls to Collections.addAll(...). Fixes spring-projectsgh-2277
1 parent 4940ca3 commit 1f77579

File tree

6 files changed

+13
-24
lines changed

6 files changed

+13
-24
lines changed

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/reader/CompositeMetricReader.java

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

1919
import java.util.ArrayList;
20+
import java.util.Collections;
2021
import java.util.List;
2122

2223
import org.springframework.boot.actuate.metrics.Metric;
@@ -31,9 +32,7 @@ public class CompositeMetricReader implements MetricReader {
3132
private final List<MetricReader> readers = new ArrayList<MetricReader>();
3233

3334
public CompositeMetricReader(MetricReader... readers) {
34-
for (MetricReader reader : readers) {
35-
this.readers.add(reader);
36-
}
35+
Collections.addAll(this.readers, readers);
3736
}
3837

3938
@Override

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/writer/CompositeMetricWriter.java

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

1919
import java.util.ArrayList;
20+
import java.util.Collections;
2021
import java.util.List;
2122

2223
import org.springframework.boot.actuate.metrics.Metric;
@@ -32,9 +33,7 @@ public class CompositeMetricWriter implements MetricWriter {
3233
private final List<MetricWriter> writers = new ArrayList<MetricWriter>();
3334

3435
public CompositeMetricWriter(MetricWriter... writers) {
35-
for (MetricWriter writer : writers) {
36-
this.writers.add(writer);
37-
}
36+
Collections.addAll(this.writers, writers);
3837
}
3938

4039
public CompositeMetricWriter(List<MetricWriter> writers) {

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnBeanCondition.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -241,9 +241,7 @@ private void collect(MultiValueMap<String, Object> attributes, String key,
241241
List<String> destination) {
242242
List<String[]> valueList = (List) attributes.get(key);
243243
for (String[] valueArray : valueList) {
244-
for (String value : valueArray) {
245-
destination.add(value);
246-
}
244+
Collections.addAll(destination, valueArray);
247245
}
248246
}
249247

spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/ExecutableArchiveLauncher.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import java.net.URL;
2020
import java.net.URLClassLoader;
2121
import java.util.ArrayList;
22+
import java.util.Collections;
2223
import java.util.LinkedHashSet;
2324
import java.util.List;
2425
import java.util.Set;
@@ -92,9 +93,7 @@ protected ClassLoader createClassLoader(URL[] urls) throws Exception {
9293
}
9394
}
9495
}
95-
for (URL url : urls) {
96-
copy.add(url);
97-
}
96+
Collections.addAll(copy, urls);
9897
return super.createClassLoader(copy.toArray(new URL[copy.size()]));
9998
}
10099

spring-boot/src/main/java/org/springframework/boot/context/embedded/FilterRegistrationBean.java

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
import java.util.Arrays;
2020
import java.util.Collection;
21+
import java.util.Collections;
2122
import java.util.EnumSet;
2223
import java.util.LinkedHashSet;
2324
import java.util.Set;
@@ -91,9 +92,7 @@ public FilterRegistrationBean(Filter filter,
9192
Assert.notNull(servletRegistrationBeans,
9293
"ServletRegistrationBeans must not be null");
9394
this.filter = filter;
94-
for (ServletRegistrationBean servletRegistrationBean : servletRegistrationBeans) {
95-
this.servletRegistrationBeans.add(servletRegistrationBean);
96-
}
95+
Collections.addAll(this.servletRegistrationBeans, servletRegistrationBeans);
9796
}
9897

9998
/**
@@ -143,9 +142,7 @@ public void addServletRegistrationBeans(
143142
ServletRegistrationBean... servletRegistrationBeans) {
144143
Assert.notNull(servletRegistrationBeans,
145144
"ServletRegistrationBeans must not be null");
146-
for (ServletRegistrationBean servletRegistrationBean : servletRegistrationBeans) {
147-
this.servletRegistrationBeans.add(servletRegistrationBean);
148-
}
145+
Collections.addAll(this.servletRegistrationBeans, servletRegistrationBeans);
149146
}
150147

151148
/**
@@ -205,9 +202,7 @@ public Collection<String> getUrlPatterns() {
205202
*/
206203
public void addUrlPatterns(String... urlPatterns) {
207204
Assert.notNull(urlPatterns, "UrlPatterns must not be null");
208-
for (String urlPattern : urlPatterns) {
209-
this.urlPatterns.add(urlPattern);
210-
}
205+
Collections.addAll(this.urlPatterns, urlPatterns);
211206
}
212207

213208
/**

spring-boot/src/main/java/org/springframework/boot/yaml/SpringProfileDocumentMatcher.java

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

1919
import java.util.Arrays;
20+
import java.util.Collections;
2021
import java.util.LinkedHashSet;
2122
import java.util.Properties;
2223

@@ -47,9 +48,7 @@ public SpringProfileDocumentMatcher(String... profiles) {
4748
public void addActiveProfiles(String... profiles) {
4849
LinkedHashSet<String> set = new LinkedHashSet<String>(
4950
Arrays.asList(this.activeProfiles));
50-
for (String profile : profiles) {
51-
set.add(profile);
52-
}
51+
Collections.addAll(set, profiles);
5352
this.activeProfiles = set.toArray(new String[set.size()]);
5453
}
5554

0 commit comments

Comments
 (0)