Skip to content

Commit 700e890

Browse files

File tree

3 files changed

+5
-7
lines changed

3 files changed

+5
-7
lines changed

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818

1919
import java.util.Collections;
2020
import java.util.HashMap;
21-
import java.util.List;
2221
import java.util.Map;
2322
import java.util.Map.Entry;
2423
import java.util.Set;
@@ -107,14 +106,13 @@ public void checkForUnnecessaryExclusions() {
107106
this.exclusionsByDependencyId.forEach((dependencyId, exclusions) -> {
108107
if (!exclusions.isEmpty()) {
109108
Dependency toCheck = this.dependencyById.get(dependencyId);
110-
List<String> dependencies = this.configurations.detachedConfiguration(toCheck, this.platform)
109+
this.configurations.detachedConfiguration(toCheck, this.platform)
111110
.getIncoming()
112111
.getArtifacts()
113112
.getArtifacts()
114113
.stream()
115114
.map(this::getId)
116-
.collect(Collectors.toList());
117-
exclusions.removeAll(dependencies);
115+
.forEach(exclusions::remove);
118116
removeProfileExclusions(dependencyId, exclusions);
119117
if (!exclusions.isEmpty()) {
120118
unnecessaryExclusions.put(dependencyId, exclusions);

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ public List<String> getExclusions() {
147147
*/
148148
public Set<String> getUnconditionalClasses() {
149149
Set<String> filtered = new HashSet<>(this.unconditionalClasses);
150-
filtered.removeAll(this.exclusions);
150+
this.exclusions.forEach(filtered::remove);
151151
return Collections.unmodifiableSet(filtered);
152152
}
153153

@@ -166,7 +166,7 @@ public ConditionEvaluationReport getParent() {
166166
* @return the {@link ConditionEvaluationReport} or {@code null}
167167
*/
168168
public static ConditionEvaluationReport find(BeanFactory beanFactory) {
169-
if (beanFactory != null && beanFactory instanceof ConfigurableListableBeanFactory) {
169+
if (beanFactory instanceof ConfigurableListableBeanFactory) {
170170
return ConditionEvaluationReport.get((ConfigurableListableBeanFactory) beanFactory);
171171
}
172172
return null;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ public ErrorAttributeOptions including(Include... includes) {
7575
*/
7676
public ErrorAttributeOptions excluding(Include... excludes) {
7777
EnumSet<Include> updated = copyIncludes();
78-
updated.removeAll(Arrays.asList(excludes));
78+
Arrays.stream(excludes).forEach(updated::remove);
7979
return new ErrorAttributeOptions(Collections.unmodifiableSet(updated));
8080
}
8181

0 commit comments

Comments
 (0)