Skip to content

Commit 5c0d7f4

Browse files
dreis2211mbhave
authored andcommitted
Avoid creation of unnecessary collections
Closes spring-projectsgh-14916
1 parent 35221c1 commit 5c0d7f4

File tree

4 files changed

+5
-12
lines changed

4 files changed

+5
-12
lines changed

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/web/reactive/ControllerEndpointHandlerMapping.java

+1-3
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,8 @@
1717
package org.springframework.boot.actuate.endpoint.web.reactive;
1818

1919
import java.lang.reflect.Method;
20-
import java.util.Arrays;
2120
import java.util.Collection;
2221
import java.util.Collections;
23-
import java.util.HashSet;
2422
import java.util.LinkedHashMap;
2523
import java.util.Map;
2624
import java.util.Set;
@@ -95,7 +93,7 @@ private RequestMappingInfo withEndpointMappedPatterns(
9593
ExposableControllerEndpoint endpoint, RequestMappingInfo mapping) {
9694
Set<PathPattern> patterns = mapping.getPatternsCondition().getPatterns();
9795
if (patterns.isEmpty()) {
98-
patterns = new HashSet<>(Arrays.asList(getPathPatternParser().parse("")));
96+
patterns = Collections.singleton(getPathPatternParser().parse(""));
9997
}
10098
PathPattern[] endpointMappedPatterns = patterns.stream()
10199
.map((pattern) -> getEndpointMappedPattern(endpoint, pattern))

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/web/servlet/ControllerEndpointHandlerMapping.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import java.lang.reflect.Method;
2020
import java.util.Collection;
2121
import java.util.Collections;
22-
import java.util.HashSet;
2322
import java.util.LinkedHashMap;
2423
import java.util.List;
2524
import java.util.Map;
@@ -95,7 +94,7 @@ private RequestMappingInfo withEndpointMappedPatterns(
9594
ExposableControllerEndpoint endpoint, RequestMappingInfo mapping) {
9695
Set<String> patterns = mapping.getPatternsCondition().getPatterns();
9796
if (patterns.isEmpty()) {
98-
patterns = new HashSet<>(Collections.singletonList(""));
97+
patterns = Collections.singleton("");
9998
}
10099
String[] endpointMappedPatterns = patterns.stream()
101100
.map((pattern) -> getEndpointMappedPattern(endpoint, pattern))

spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/ConfigurationMetadataAnnotationProcessor.java

+2-4
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,7 @@
2020
import java.io.PrintWriter;
2121
import java.io.StringWriter;
2222
import java.time.Duration;
23-
import java.util.Arrays;
2423
import java.util.Collections;
25-
import java.util.HashSet;
2624
import java.util.LinkedHashMap;
2725
import java.util.LinkedList;
2826
import java.util.List;
@@ -97,8 +95,8 @@ public class ConfigurationMetadataAnnotationProcessor extends AbstractProcessor
9795

9896
static final String LOMBOK_ACCESS_LEVEL_PUBLIC = "PUBLIC";
9997

100-
private static final Set<String> SUPPORTED_OPTIONS = Collections.unmodifiableSet(
101-
new HashSet<>(Arrays.asList(ADDITIONAL_METADATA_LOCATIONS_OPTION)));
98+
private static final Set<String> SUPPORTED_OPTIONS = Collections
99+
.unmodifiableSet(Collections.singleton(ADDITIONAL_METADATA_LOCATIONS_OPTION));
102100

103101
private MetadataStore metadataStore;
104102

spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/DefaultLaunchScript.java

+1-3
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,7 @@
2323
import java.io.InputStream;
2424
import java.io.OutputStream;
2525
import java.nio.charset.StandardCharsets;
26-
import java.util.Arrays;
2726
import java.util.Collections;
28-
import java.util.HashSet;
2927
import java.util.Map;
3028
import java.util.Set;
3129
import java.util.regex.Matcher;
@@ -48,7 +46,7 @@ public class DefaultLaunchScript implements LaunchScript {
4846
.compile("\\{\\{(\\w+)(:.*?)?\\}\\}(?!\\})");
4947

5048
private static final Set<String> FILE_PATH_KEYS = Collections
51-
.unmodifiableSet(new HashSet<>(Arrays.asList("inlinedConfScript")));
49+
.unmodifiableSet(Collections.singleton("inlinedConfScript"));
5250

5351
private final String content;
5452

0 commit comments

Comments
 (0)