Polishing (#1639)

Author: mipo256

spring-cloud-context/src/main/java/org/springframework/cloud/context/environment/EnvironmentChangeEvent.java

@@ -25,13 +25,17 @@
  * Event published to signal a change in the {@link Environment}.
  *
  * @author Dave Syer
- *
+ * @author Mikhail Polivakha
  */
 @SuppressWarnings("serial")
 public class EnvironmentChangeEvent extends ApplicationEvent {
 
-	private Set<String> keys;
+	private final Set<String> keys;
 
+	/**
+	 * @param keys Key set that represents the difference between old and new versions of
+	 * the {@link Environment}.
+	 */
 	public EnvironmentChangeEvent(Set<String> keys) {
 		// Backwards compatible constructor with less utility (practically no use at all)
 		this(keys, keys);
@@ -43,7 +47,8 @@ public EnvironmentChangeEvent(Object context, Set<String> keys) {
 	}
 
 	/**
-	 * @return The keys.
+	 * @return Key set that represents the difference between old and new versions of the
+	 * {@link Environment}.
 	 */
 	public Set<String> getKeys() {
 		return this.keys;

spring-cloud-context/src/main/java/org/springframework/cloud/context/environment/EnvironmentManager.java

@@ -77,7 +77,6 @@ public Map<String, Object> reset() {
 
 	@ManagedOperation
 	public void setProperty(String name, String value) {
-
 		if (!this.environment.getPropertySources().contains(MANAGER_PROPERTY_SOURCE)) {
 			synchronized (this.map) {
 				if (!this.environment.getPropertySources().contains(MANAGER_PROPERTY_SOURCE)) {

spring-cloud-context/src/main/java/org/springframework/cloud/context/refresh/ConfigDataContextRefresher.java

@@ -106,14 +106,13 @@ protected void updateEnvironment() {
 				else {
 					if (targetName != null) {
 						target.addAfter(targetName, source);
-						// update targetName to preserve ordering
-						targetName = name;
 					}
 					else {
 						// targetName was null so we are at the start of the list
 						target.addFirst(source);
-						targetName = name;
 					}
+					// update targetName to preserve ordering
+					targetName = name;
 				}
 			}
 		}

spring-cloud-context/src/main/java/org/springframework/cloud/context/refresh/ContextRefresher.java

@@ -46,6 +46,7 @@
 /**
  * @author Dave Syer
  * @author Venil Noronha
+ * @author Mikhail Polivakha
  */
 public abstract class ContextRefresher {
 
@@ -64,9 +65,9 @@ public abstract class ContextRefresher {
 
 	protected final List<String> additionalPropertySourcesToRetain;
 
-	private ConfigurableApplicationContext context;
+	private final ConfigurableApplicationContext context;
 
-	private RefreshScope scope;
+	private final RefreshScope scope;
 
 	@Deprecated
 	protected ContextRefresher(ConfigurableApplicationContext context, RefreshScope scope) {
@@ -96,18 +97,22 @@ public synchronized Set<String> refresh() {
 	}
 
 	public synchronized Set<String> refreshEnvironment() {
-		Map<String, Object> before = extract(this.context.getEnvironment().getPropertySources());
+		Map<String, Object> before = getCurrentEnvironmentProperties();
 		updateEnvironment();
-		Set<String> keys = changes(before, extract(this.context.getEnvironment().getPropertySources())).keySet();
+		Set<String> keys = changes(before, getCurrentEnvironmentProperties()).keySet();
 		this.context.publishEvent(new EnvironmentChangeEvent(this.context, keys));
 		return keys;
 	}
 
+	private Map<String, Object> getCurrentEnvironmentProperties() {
+		return extract(this.context.getEnvironment().getPropertySources());
+	}
+
 	protected abstract void updateEnvironment();
 
 	// Don't use ConfigurableEnvironment.merge() in case there are clashes with property
 	// source names
-	protected StandardEnvironment copyEnvironment(ConfigurableEnvironment input) {
+	protected StandardEnvironment copyEnvironment(ConfigurableEnvironment sourceEnv) {
 		StandardEnvironment environment = new StandardEnvironment();
 		MutablePropertySources capturedPropertySources = environment.getPropertySources();
 		// Only copy the default property source(s) and the profiles over from the main
@@ -117,18 +122,17 @@ protected StandardEnvironment copyEnvironment(ConfigurableEnvironment input) {
 			propertySourcesToRetain.addAll(additionalPropertySourcesToRetain);
 		}
 
-		for (String name : propertySourcesToRetain) {
-			if (input.getPropertySources().contains(name)) {
-				if (capturedPropertySources.contains(name)) {
-					capturedPropertySources.replace(name, input.getPropertySources().get(name));
-				}
-				else {
-					capturedPropertySources.addLast(input.getPropertySources().get(name));
-				}
+		propertySourcesToRetain.stream().filter(s -> sourceEnv.getPropertySources().contains(s)).forEach(s -> {
+			if (capturedPropertySources.contains(s)) {
+				capturedPropertySources.replace(s, sourceEnv.getPropertySources().get(s));
 			}
-		}
-		environment.setActiveProfiles(input.getActiveProfiles());
-		environment.setDefaultProfiles(input.getDefaultProfiles());
+			else {
+				capturedPropertySources.addLast(sourceEnv.getPropertySources().get(s));
+			}
+		});
+
+		environment.setActiveProfiles(sourceEnv.getActiveProfiles());
+		environment.setDefaultProfiles(sourceEnv.getDefaultProfiles());
 		return environment;
 	}
 
@@ -164,13 +168,15 @@ private Map<String, Object> extract(MutablePropertySources propertySources) {
 		return result;
 	}
 
-	private void extract(PropertySource<?> parent, Map<String, Object> result) {
-		if (parent instanceof CompositePropertySource) {
+	private void extract(PropertySource<?> propertySource, Map<String, Object> result) {
+		if (propertySource instanceof CompositePropertySource cps) {
 			try {
 				List<PropertySource<?>> sources = new ArrayList<>();
-				for (PropertySource<?> source : ((CompositePropertySource) parent).getPropertySources()) {
+
+				for (PropertySource<?> source : cps.getPropertySources()) {
 					sources.add(0, source);
 				}
+
 				for (PropertySource<?> source : sources) {
 					extract(source, result);
 				}
@@ -179,9 +185,9 @@ private void extract(PropertySource<?> parent, Map<String, Object> result) {
 				return;
 			}
 		}
-		else if (parent instanceof EnumerablePropertySource) {
-			for (String key : ((EnumerablePropertySource<?>) parent).getPropertyNames()) {
-				result.put(key, parent.getProperty(key));
+		else if (propertySource instanceof EnumerablePropertySource<?> eps) {
+			for (String key : eps.getPropertyNames()) {
+				result.put(key, propertySource.getProperty(key));
 			}
 		}
 	}