Use lambdas for map entry iteration where possible

See gh-12626

Author: igor-suhorukov

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/condition/ConditionsReportEndpoint.java

@@ -123,15 +123,14 @@ public ContextConditionEvaluation(ConfigurableApplicationContext context) {
 			this.negativeMatches = new LinkedHashMap<>();
 			this.exclusions = report.getExclusions();
 			this.unconditionalClasses = report.getUnconditionalClasses();
-			for (Map.Entry<String, ConditionAndOutcomes> entry : report
-					.getConditionAndOutcomesBySource().entrySet()) {
-				if (entry.getValue().isFullMatch()) {
-					add(this.positiveMatches, entry.getKey(), entry.getValue());
+			report.getConditionAndOutcomesBySource().forEach((key, value) -> {
+				if (value.isFullMatch()) {
+					add(this.positiveMatches, key, value);
 				}
 				else {
-					add(this.negativeMatches, entry.getKey(), entry.getValue());
+					add(this.negativeMatches, key, value);
 				}
-			}
+			});
 			this.parentId = context.getParent() == null ? null
 					: context.getParent().getId();
 		}

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/health/CompositeHealthIndicatorConfiguration.java

@@ -44,10 +44,7 @@ protected HealthIndicator createHealthIndicator(Map<String, S> beans) {
 		}
 		CompositeHealthIndicator composite = new CompositeHealthIndicator(
 				this.healthAggregator);
-		for (Map.Entry<String, S> entry : beans.entrySet()) {
-			composite.addHealthIndicator(entry.getKey(),
-					createHealthIndicator(entry.getValue()));
-		}
+		beans.forEach((key, value) -> composite.addHealthIndicator(key, createHealthIndicator(value)));
 		return composite;
 	}
 

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/health/CompositeReactiveHealthIndicatorConfiguration.java

@@ -43,10 +43,7 @@ protected ReactiveHealthIndicator createHealthIndicator(Map<String, S> beans) {
 		}
 		CompositeReactiveHealthIndicator composite = new CompositeReactiveHealthIndicator(
 				this.healthAggregator);
-		for (Map.Entry<String, S> entry : beans.entrySet()) {
-			composite.addHealthIndicator(entry.getKey(),
-					createHealthIndicator(entry.getValue()));
-		}
+		beans.forEach((key, value) -> composite.addHealthIndicator(key, createHealthIndicator(value)));
 		return composite;
 	}
 

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/jdbc/DataSourceHealthIndicatorAutoConfiguration.java

@@ -84,11 +84,11 @@ private Map<String, DataSource> filterDataSources(
 			return null;
 		}
 		Map<String, DataSource> dataSources = new LinkedHashMap<>();
-		for (Map.Entry<String, DataSource> entry : candidates.entrySet()) {
-			if (!(entry.getValue() instanceof AbstractRoutingDataSource)) {
-				dataSources.put(entry.getKey(), entry.getValue());
+		candidates.forEach((key, value) -> {
+			if (!(value instanceof AbstractRoutingDataSource)) {
+				dataSources.put(key, value);
 			}
-		}
+		});
 		return dataSources;
 	}
 

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/env/EnvironmentEndpoint.java

@@ -120,13 +120,10 @@ private List<PropertySourceEntryDescriptor> toPropertySourceDescriptors(
 
 	private PropertySummaryDescriptor getPropertySummaryDescriptor(
 			Map<String, PropertyValueDescriptor> descriptors) {
-		for (Map.Entry<String, PropertyValueDescriptor> entry : descriptors.entrySet()) {
-			if (entry.getValue() != null) {
-				return new PropertySummaryDescriptor(entry.getKey(),
-						entry.getValue().getValue());
-			}
-		}
-		return null;
+		return descriptors.entrySet().stream().
+				filter((entry) -> entry.getValue() != null).
+				map((entry) -> new PropertySummaryDescriptor(entry.getKey(), entry.getValue().getValue())).
+				findFirst().orElse(null);
 	}
 
 	private Map<String, PropertyValueDescriptor> getPropertySourceDescriptors(

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/AutoConfigurationSorter.java

@@ -142,12 +142,11 @@ public AutoConfigurationClass get(String className) {
 		public Set<String> getClassesRequestedAfter(String className) {
 			Set<String> rtn = new LinkedHashSet<>();
 			rtn.addAll(get(className).getAfter());
-			for (Map.Entry<String, AutoConfigurationClass> entry : this.classes
-					.entrySet()) {
-				if (entry.getValue().getBefore().contains(className)) {
-					rtn.add(entry.getKey());
+			this.classes.forEach((key, value) -> {
+				if (value.getBefore().contains(className)) {
+					rtn.add(key);
 				}
-			}
+			});
 			return rtn;
 		}
 

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/ImportAutoConfigurationImportSelector.java

@@ -74,9 +74,9 @@ protected List<String> getCandidateConfigurations(AnnotationMetadata metadata,
 			AnnotationAttributes attributes) {
 		List<String> candidates = new ArrayList<>();
 		Map<Class<?>, List<Annotation>> annotations = getAnnotations(metadata);
-		for (Map.Entry<Class<?>, List<Annotation>> entry : annotations.entrySet()) {
-			collectCandidateConfigurations(entry.getKey(), entry.getValue(), candidates);
-		}
+		annotations.forEach((key, value) -> {
+			collectCandidateConfigurations(key, value, candidates);
+		});
 		return candidates;
 	}
 

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/CacheConfigurations.java

@@ -57,13 +57,10 @@ public static String getConfigurationClass(CacheType cacheType) {
 	}
 
 	public static CacheType getType(String configurationClassName) {
-		for (Map.Entry<CacheType, Class<?>> entry : MAPPINGS.entrySet()) {
-			if (entry.getValue().getName().equals(configurationClassName)) {
-				return entry.getKey();
-			}
-		}
-		throw new IllegalStateException(
-				"Unknown configuration class " + configurationClassName);
+		return MAPPINGS.entrySet().stream().filter((entry) ->
+					entry.getValue().getName().equals(configurationClassName)).
+				map(Map.Entry::getKey).findFirst().
+				orElseThrow(() -> new IllegalStateException("Unknown configuration class " + configurationClassName));
 	}
 
 }

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

@@ -159,13 +159,8 @@ private Condition getCondition(String conditionClassName) {
 
 		public List<ConditionOutcome> getMatchOutcomes() {
 			List<ConditionOutcome> outcomes = new ArrayList<>();
-			for (Map.Entry<AnnotationMetadata, List<Condition>> entry : this.memberConditions
-					.entrySet()) {
-				AnnotationMetadata metadata = entry.getKey();
-				List<Condition> conditions = entry.getValue();
-				outcomes.add(new MemberOutcomes(this.context, metadata, conditions)
-						.getUltimateOutcome());
-			}
+			this.memberConditions.forEach((metadata, conditions) ->
+					outcomes.add(new MemberOutcomes(this.context, metadata, conditions).getUltimateOutcome()));
 			return Collections.unmodifiableList(outcomes);
 		}
 

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

@@ -24,6 +24,7 @@
 import java.util.LinkedHashSet;
 import java.util.Map;
 import java.util.Set;
+import java.util.stream.Collectors;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -112,13 +113,9 @@ static BeanTypeRegistry get(ListableBeanFactory beanFactory) {
 	 */
 	Set<String> getNamesForType(Class<?> type) {
 		updateTypesIfNecessary();
-		Set<String> matches = new LinkedHashSet<>();
-		for (Map.Entry<String, Class<?>> entry : this.beanTypes.entrySet()) {
-			if (entry.getValue() != null && type.isAssignableFrom(entry.getValue())) {
-				matches.add(entry.getKey());
-			}
-		}
-		return matches;
+		return this.beanTypes.entrySet().stream().filter((entry) -> entry.getValue() != null &&
+				type.isAssignableFrom(entry.getValue())).
+				map(Map.Entry::getKey).collect(Collectors.toCollection(LinkedHashSet::new));
 	}
 
 	/**
@@ -132,14 +129,9 @@ Set<String> getNamesForType(Class<?> type) {
 	 */
 	Set<String> getNamesForAnnotation(Class<? extends Annotation> annotation) {
 		updateTypesIfNecessary();
-		Set<String> matches = new LinkedHashSet<>();
-		for (Map.Entry<String, Class<?>> entry : this.beanTypes.entrySet()) {
-			if (entry.getValue() != null && AnnotationUtils
-					.findAnnotation(entry.getValue(), annotation) != null) {
-				matches.add(entry.getKey());
-			}
-		}
-		return matches;
+		return this.beanTypes.entrySet().stream().filter((entry) -> entry.getValue() != null &&
+					AnnotationUtils.findAnnotation(entry.getValue(), annotation) != null).
+				map(Map.Entry::getKey).collect(Collectors.toCollection(LinkedHashSet::new));
 	}
 
 	@Override