From ed64a10c386060697a6904825f2e2a6f14ff297a Mon Sep 17 00:00:00 2001 From: OLPMO Date: Thu, 29 Aug 2019 19:59:14 +0800 Subject: [PATCH] Use Collections.addAll where feasible Closes gh-23478 --- .../org/springframework/core/env/AbstractEnvironment.java | 4 +--- .../springframework/core/env/AbstractPropertyResolver.java | 5 ++--- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/spring-core/src/main/java/org/springframework/core/env/AbstractEnvironment.java b/spring-core/src/main/java/org/springframework/core/env/AbstractEnvironment.java index e13e03ed0f..cfb3fd8136 100644 --- a/spring-core/src/main/java/org/springframework/core/env/AbstractEnvironment.java +++ b/spring-core/src/main/java/org/springframework/core/env/AbstractEnvironment.java @@ -462,9 +462,7 @@ public abstract class AbstractEnvironment implements ConfigurableEnvironment { String[] parentActiveProfiles = parent.getActiveProfiles(); if (!ObjectUtils.isEmpty(parentActiveProfiles)) { synchronized (this.activeProfiles) { - for (String profile : parentActiveProfiles) { - this.activeProfiles.add(profile); - } + Collections.addAll(this.activeProfiles, parentActiveProfiles); } } String[] parentDefaultProfiles = parent.getDefaultProfiles(); diff --git a/spring-core/src/main/java/org/springframework/core/env/AbstractPropertyResolver.java b/spring-core/src/main/java/org/springframework/core/env/AbstractPropertyResolver.java index 7c9c68b47c..d5f7fd1110 100644 --- a/spring-core/src/main/java/org/springframework/core/env/AbstractPropertyResolver.java +++ b/spring-core/src/main/java/org/springframework/core/env/AbstractPropertyResolver.java @@ -16,6 +16,7 @@ package org.springframework.core.env; +import java.util.Collections; import java.util.LinkedHashSet; import java.util.Set; @@ -136,9 +137,7 @@ public abstract class AbstractPropertyResolver implements ConfigurablePropertyRe @Override public void setRequiredProperties(String... requiredProperties) { - for (String key : requiredProperties) { - this.requiredProperties.add(key); - } + Collections.addAll(this.requiredProperties, requiredProperties); } @Override