diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/reader/CompositeMetricReader.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/reader/CompositeMetricReader.java index 98ea655621..a52a1ca191 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/reader/CompositeMetricReader.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/reader/CompositeMetricReader.java @@ -17,6 +17,7 @@ package org.springframework.boot.actuate.metrics.reader; import java.util.ArrayList; +import java.util.Collections; import java.util.List; import org.springframework.boot.actuate.metrics.Metric; @@ -31,9 +32,7 @@ public class CompositeMetricReader implements MetricReader { private final List readers = new ArrayList(); public CompositeMetricReader(MetricReader... readers) { - for (MetricReader reader : readers) { - this.readers.add(reader); - } + Collections.addAll(this.readers, readers); } @Override diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/writer/CompositeMetricWriter.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/writer/CompositeMetricWriter.java index 01b0d1885e..a34b02a3f0 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/writer/CompositeMetricWriter.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/writer/CompositeMetricWriter.java @@ -17,6 +17,7 @@ package org.springframework.boot.actuate.metrics.writer; import java.util.ArrayList; +import java.util.Collections; import java.util.List; import org.springframework.boot.actuate.metrics.Metric; @@ -32,9 +33,7 @@ public class CompositeMetricWriter implements MetricWriter { private final List writers = new ArrayList(); public CompositeMetricWriter(MetricWriter... writers) { - for (MetricWriter writer : writers) { - this.writers.add(writer); - } + Collections.addAll(this.writers, writers); } public CompositeMetricWriter(List writers) { diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnBeanCondition.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnBeanCondition.java index 71be0ed2ee..d3a66cad66 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnBeanCondition.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnBeanCondition.java @@ -241,9 +241,7 @@ public class OnBeanCondition extends SpringBootCondition implements List destination) { List valueList = (List) attributes.get(key); for (String[] valueArray : valueList) { - for (String value : valueArray) { - destination.add(value); - } + Collections.addAll(destination, valueArray); } } diff --git a/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/ExecutableArchiveLauncher.java b/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/ExecutableArchiveLauncher.java index ad6f14cbbb..d86c658518 100644 --- a/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/ExecutableArchiveLauncher.java +++ b/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/ExecutableArchiveLauncher.java @@ -19,6 +19,7 @@ package org.springframework.boot.loader; import java.net.URL; import java.net.URLClassLoader; import java.util.ArrayList; +import java.util.Collections; import java.util.LinkedHashSet; import java.util.List; import java.util.Set; @@ -92,9 +93,7 @@ public abstract class ExecutableArchiveLauncher extends Launcher { } } } - for (URL url : urls) { - copy.add(url); - } + Collections.addAll(copy, urls); return super.createClassLoader(copy.toArray(new URL[copy.size()])); } diff --git a/spring-boot/src/main/java/org/springframework/boot/context/embedded/FilterRegistrationBean.java b/spring-boot/src/main/java/org/springframework/boot/context/embedded/FilterRegistrationBean.java index 02c5cdb7a3..a5efe4396c 100644 --- a/spring-boot/src/main/java/org/springframework/boot/context/embedded/FilterRegistrationBean.java +++ b/spring-boot/src/main/java/org/springframework/boot/context/embedded/FilterRegistrationBean.java @@ -18,6 +18,7 @@ package org.springframework.boot.context.embedded; import java.util.Arrays; import java.util.Collection; +import java.util.Collections; import java.util.EnumSet; import java.util.LinkedHashSet; import java.util.Set; @@ -91,9 +92,7 @@ public class FilterRegistrationBean extends RegistrationBean { Assert.notNull(servletRegistrationBeans, "ServletRegistrationBeans must not be null"); this.filter = filter; - for (ServletRegistrationBean servletRegistrationBean : servletRegistrationBeans) { - this.servletRegistrationBeans.add(servletRegistrationBean); - } + Collections.addAll(this.servletRegistrationBeans, servletRegistrationBeans); } /** @@ -143,9 +142,7 @@ public class FilterRegistrationBean extends RegistrationBean { ServletRegistrationBean... servletRegistrationBeans) { Assert.notNull(servletRegistrationBeans, "ServletRegistrationBeans must not be null"); - for (ServletRegistrationBean servletRegistrationBean : servletRegistrationBeans) { - this.servletRegistrationBeans.add(servletRegistrationBean); - } + Collections.addAll(this.servletRegistrationBeans, servletRegistrationBeans); } /** @@ -205,9 +202,7 @@ public class FilterRegistrationBean extends RegistrationBean { */ public void addUrlPatterns(String... urlPatterns) { Assert.notNull(urlPatterns, "UrlPatterns must not be null"); - for (String urlPattern : urlPatterns) { - this.urlPatterns.add(urlPattern); - } + Collections.addAll(this.urlPatterns, urlPatterns); } /** diff --git a/spring-boot/src/main/java/org/springframework/boot/yaml/SpringProfileDocumentMatcher.java b/spring-boot/src/main/java/org/springframework/boot/yaml/SpringProfileDocumentMatcher.java index b82c18494e..b994c6a007 100644 --- a/spring-boot/src/main/java/org/springframework/boot/yaml/SpringProfileDocumentMatcher.java +++ b/spring-boot/src/main/java/org/springframework/boot/yaml/SpringProfileDocumentMatcher.java @@ -17,6 +17,7 @@ package org.springframework.boot.yaml; import java.util.Arrays; +import java.util.Collections; import java.util.LinkedHashSet; import java.util.Properties; @@ -47,9 +48,7 @@ public class SpringProfileDocumentMatcher implements DocumentMatcher { public void addActiveProfiles(String... profiles) { LinkedHashSet set = new LinkedHashSet( Arrays.asList(this.activeProfiles)); - for (String profile : profiles) { - set.add(profile); - } + Collections.addAll(set, profiles); this.activeProfiles = set.toArray(new String[set.size()]); }