Merge branch '3.0.x'

buildSrc/src/main/java/org/springframework/boot/build/classpath/CheckClasspathForUnnecessaryExclusions.java

@@ -18,7 +18,6 @@ package org.springframework.boot.build.classpath;
 
 import java.util.Collections;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
@@ -107,14 +106,13 @@ public class CheckClasspathForUnnecessaryExclusions extends DefaultTask {
 		this.exclusionsByDependencyId.forEach((dependencyId, exclusions) -> {
 			if (!exclusions.isEmpty()) {
 				Dependency toCheck = this.dependencyById.get(dependencyId);
-				List<String> dependencies = this.configurations.detachedConfiguration(toCheck, this.platform)
+				this.configurations.detachedConfiguration(toCheck, this.platform)
 					.getIncoming()
 					.getArtifacts()
 					.getArtifacts()
 					.stream()
 					.map(this::getId)
-					.toList();
-				exclusions.removeAll(dependencies);
+					.forEach(exclusions::remove);
 				removeProfileExclusions(dependencyId, exclusions);
 				if (!exclusions.isEmpty()) {
 					unnecessaryExclusions.put(dependencyId, exclusions);

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

@@ -147,7 +147,7 @@ public final class ConditionEvaluationReport {
 	 */
 	public Set<String> getUnconditionalClasses() {
 		Set<String> filtered = new HashSet<>(this.unconditionalClasses);
-		filtered.removeAll(this.exclusions);
+		this.exclusions.forEach(filtered::remove);
 		return Collections.unmodifiableSet(filtered);
 	}
 
@@ -166,7 +166,7 @@ public final class ConditionEvaluationReport {
 	 * @return the {@link ConditionEvaluationReport} or {@code null}
 	 */
 	public static ConditionEvaluationReport find(BeanFactory beanFactory) {
-		if (beanFactory != null && beanFactory instanceof ConfigurableListableBeanFactory) {
+		if (beanFactory instanceof ConfigurableListableBeanFactory) {
 			return ConditionEvaluationReport.get((ConfigurableListableBeanFactory) beanFactory);
 		}
 		return null;

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/error/ErrorAttributeOptions.java

@@ -75,7 +75,7 @@ public final class ErrorAttributeOptions {
 	 */
 	public ErrorAttributeOptions excluding(Include... excludes) {
 		EnumSet<Include> updated = copyIncludes();
-		updated.removeAll(Arrays.asList(excludes));
+		Arrays.stream(excludes).forEach(updated::remove);
 		return new ErrorAttributeOptions(Collections.unmodifiableSet(updated));
 	}