Skip to content

Commit 92053bb

Browse files
stsypanovjhoeller
authored andcommitted
Some very simple improvements regarding ArrayList
1 parent 5e0cd9f commit 92053bb

File tree

4 files changed

+12
-11
lines changed

4 files changed

+12
-11
lines changed

spring-context-support/src/main/java/org/springframework/cache/jcache/interceptor/AbstractJCacheOperation.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -138,8 +138,9 @@ protected StringBuilder getOperationDescription() {
138138

139139

140140
private static List<CacheParameterDetail> initializeAllParameterDetails(Method method) {
141-
List<CacheParameterDetail> result = new ArrayList<>();
142-
for (int i = 0; i < method.getParameterCount(); i++) {
141+
int parameterCount = method.getParameterCount();
142+
List<CacheParameterDetail> result = new ArrayList<>(parameterCount);
143+
for (int i = 0; i < parameterCount; i++) {
143144
CacheParameterDetail detail = new CacheParameterDetail(method, i);
144145
result.add(detail);
145146
}

spring-core/src/main/java/org/springframework/util/StringUtils.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -936,8 +936,7 @@ public static String[] mergeStringArrays(@Nullable String[] array1, @Nullable St
936936
return array1;
937937
}
938938

939-
List<String> result = new ArrayList<>();
940-
result.addAll(Arrays.asList(array1));
939+
List<String> result = new ArrayList<>(Arrays.asList(array1));
941940
for (String str : array2) {
942941
if (!result.contains(str)) {
943942
result.add(str);

spring-messaging/src/main/java/org/springframework/messaging/support/MessageHeaderAccessor.java

+7-5
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import java.nio.charset.StandardCharsets;
2121
import java.util.ArrayList;
2222
import java.util.Arrays;
23+
import java.util.Collections;
2324
import java.util.HashMap;
2425
import java.util.List;
2526
import java.util.Map;
@@ -373,12 +374,13 @@ public void removeHeaders(String... headerPatterns) {
373374
}
374375

375376
private List<String> getMatchingHeaderNames(String pattern, @Nullable Map<String, Object> headers) {
377+
if (headers == null) {
378+
return Collections.emptyList();
379+
}
376380
List<String> matchingHeaderNames = new ArrayList<>();
377-
if (headers != null) {
378-
for (String key : headers.keySet()) {
379-
if (PatternMatchUtils.simpleMatch(pattern, key)) {
380-
matchingHeaderNames.add(key);
381-
}
381+
for (String key : headers.keySet()) {
382+
if (PatternMatchUtils.simpleMatch(pattern, key)) {
383+
matchingHeaderNames.add(key);
382384
}
383385
}
384386
return matchingHeaderNames;

spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/ErrorsTag.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -317,8 +317,7 @@ protected void renderDefaultContent(TagWriter tagWriter) throws JspException {
317317
*/
318318
@Override
319319
protected void exposeAttributes() throws JspException {
320-
List<String> errorMessages = new ArrayList<>();
321-
errorMessages.addAll(Arrays.asList(getBindStatus().getErrorMessages()));
320+
List<String> errorMessages = new ArrayList<>(Arrays.asList(getBindStatus().getErrorMessages()));
322321
this.oldMessages = this.pageContext.getAttribute(MESSAGES_ATTRIBUTE, PageContext.PAGE_SCOPE);
323322
this.pageContext.setAttribute(MESSAGES_ATTRIBUTE, errorMessages, PageContext.PAGE_SCOPE);
324323
this.errorMessagesWereExposed = true;

0 commit comments

Comments
 (0)