Commit 1f775793 authored by Phillip Webb's avatar Phillip Webb

Use Collections.addAll(...) instead of for loops

Replace various for loops which add items to collections with calls
to Collections.addAll(...).

Fixes gh-2277
parent 4940ca37
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
package org.springframework.boot.actuate.metrics.reader; package org.springframework.boot.actuate.metrics.reader;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections;
import java.util.List; import java.util.List;
import org.springframework.boot.actuate.metrics.Metric; import org.springframework.boot.actuate.metrics.Metric;
...@@ -31,9 +32,7 @@ public class CompositeMetricReader implements MetricReader { ...@@ -31,9 +32,7 @@ public class CompositeMetricReader implements MetricReader {
private final List<MetricReader> readers = new ArrayList<MetricReader>(); private final List<MetricReader> readers = new ArrayList<MetricReader>();
public CompositeMetricReader(MetricReader... readers) { public CompositeMetricReader(MetricReader... readers) {
for (MetricReader reader : readers) { Collections.addAll(this.readers, readers);
this.readers.add(reader);
}
} }
@Override @Override
......
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
package org.springframework.boot.actuate.metrics.writer; package org.springframework.boot.actuate.metrics.writer;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections;
import java.util.List; import java.util.List;
import org.springframework.boot.actuate.metrics.Metric; import org.springframework.boot.actuate.metrics.Metric;
...@@ -32,9 +33,7 @@ public class CompositeMetricWriter implements MetricWriter { ...@@ -32,9 +33,7 @@ public class CompositeMetricWriter implements MetricWriter {
private final List<MetricWriter> writers = new ArrayList<MetricWriter>(); private final List<MetricWriter> writers = new ArrayList<MetricWriter>();
public CompositeMetricWriter(MetricWriter... writers) { public CompositeMetricWriter(MetricWriter... writers) {
for (MetricWriter writer : writers) { Collections.addAll(this.writers, writers);
this.writers.add(writer);
}
} }
public CompositeMetricWriter(List<MetricWriter> writers) { public CompositeMetricWriter(List<MetricWriter> writers) {
......
...@@ -241,9 +241,7 @@ public class OnBeanCondition extends SpringBootCondition implements ...@@ -241,9 +241,7 @@ public class OnBeanCondition extends SpringBootCondition implements
List<String> destination) { List<String> destination) {
List<String[]> valueList = (List) attributes.get(key); List<String[]> valueList = (List) attributes.get(key);
for (String[] valueArray : valueList) { for (String[] valueArray : valueList) {
for (String value : valueArray) { Collections.addAll(destination, valueArray);
destination.add(value);
}
} }
} }
......
...@@ -19,6 +19,7 @@ package org.springframework.boot.loader; ...@@ -19,6 +19,7 @@ package org.springframework.boot.loader;
import java.net.URL; import java.net.URL;
import java.net.URLClassLoader; import java.net.URLClassLoader;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections;
import java.util.LinkedHashSet; import java.util.LinkedHashSet;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
...@@ -92,9 +93,7 @@ public abstract class ExecutableArchiveLauncher extends Launcher { ...@@ -92,9 +93,7 @@ public abstract class ExecutableArchiveLauncher extends Launcher {
} }
} }
} }
for (URL url : urls) { Collections.addAll(copy, urls);
copy.add(url);
}
return super.createClassLoader(copy.toArray(new URL[copy.size()])); return super.createClassLoader(copy.toArray(new URL[copy.size()]));
} }
......
...@@ -18,6 +18,7 @@ package org.springframework.boot.context.embedded; ...@@ -18,6 +18,7 @@ package org.springframework.boot.context.embedded;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collection; import java.util.Collection;
import java.util.Collections;
import java.util.EnumSet; import java.util.EnumSet;
import java.util.LinkedHashSet; import java.util.LinkedHashSet;
import java.util.Set; import java.util.Set;
...@@ -91,9 +92,7 @@ public class FilterRegistrationBean extends RegistrationBean { ...@@ -91,9 +92,7 @@ public class FilterRegistrationBean extends RegistrationBean {
Assert.notNull(servletRegistrationBeans, Assert.notNull(servletRegistrationBeans,
"ServletRegistrationBeans must not be null"); "ServletRegistrationBeans must not be null");
this.filter = filter; this.filter = filter;
for (ServletRegistrationBean servletRegistrationBean : servletRegistrationBeans) { Collections.addAll(this.servletRegistrationBeans, servletRegistrationBeans);
this.servletRegistrationBeans.add(servletRegistrationBean);
}
} }
/** /**
...@@ -143,9 +142,7 @@ public class FilterRegistrationBean extends RegistrationBean { ...@@ -143,9 +142,7 @@ public class FilterRegistrationBean extends RegistrationBean {
ServletRegistrationBean... servletRegistrationBeans) { ServletRegistrationBean... servletRegistrationBeans) {
Assert.notNull(servletRegistrationBeans, Assert.notNull(servletRegistrationBeans,
"ServletRegistrationBeans must not be null"); "ServletRegistrationBeans must not be null");
for (ServletRegistrationBean servletRegistrationBean : servletRegistrationBeans) { Collections.addAll(this.servletRegistrationBeans, servletRegistrationBeans);
this.servletRegistrationBeans.add(servletRegistrationBean);
}
} }
/** /**
...@@ -205,9 +202,7 @@ public class FilterRegistrationBean extends RegistrationBean { ...@@ -205,9 +202,7 @@ public class FilterRegistrationBean extends RegistrationBean {
*/ */
public void addUrlPatterns(String... urlPatterns) { public void addUrlPatterns(String... urlPatterns) {
Assert.notNull(urlPatterns, "UrlPatterns must not be null"); Assert.notNull(urlPatterns, "UrlPatterns must not be null");
for (String urlPattern : urlPatterns) { Collections.addAll(this.urlPatterns, urlPatterns);
this.urlPatterns.add(urlPattern);
}
} }
/** /**
......
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
package org.springframework.boot.yaml; package org.springframework.boot.yaml;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collections;
import java.util.LinkedHashSet; import java.util.LinkedHashSet;
import java.util.Properties; import java.util.Properties;
...@@ -47,9 +48,7 @@ public class SpringProfileDocumentMatcher implements DocumentMatcher { ...@@ -47,9 +48,7 @@ public class SpringProfileDocumentMatcher implements DocumentMatcher {
public void addActiveProfiles(String... profiles) { public void addActiveProfiles(String... profiles) {
LinkedHashSet<String> set = new LinkedHashSet<String>( LinkedHashSet<String> set = new LinkedHashSet<String>(
Arrays.asList(this.activeProfiles)); Arrays.asList(this.activeProfiles));
for (String profile : profiles) { Collections.addAll(set, profiles);
set.add(profile);
}
this.activeProfiles = set.toArray(new String[set.size()]); this.activeProfiles = set.toArray(new String[set.size()]);
} }
......
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