From 457d586859ba03741a992c40fd8667cd547186e2 Mon Sep 17 00:00:00 2001 From: stsypanov Date: Thu, 26 Jul 2018 23:08:14 +0300 Subject: [PATCH] SPR-17074 pass argument of addAll/putAll into constructor --- .../expression/spel/ast/PropertyOrFieldReference.java | 3 +-- .../jdbc/core/metadata/CallMetaDataContext.java | 3 +-- .../multipart/support/StandardMultipartHttpServletRequest.java | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/PropertyOrFieldReference.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/PropertyOrFieldReference.java index 3f294d38a55..609fca32c69 100644 --- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/PropertyOrFieldReference.java +++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/PropertyOrFieldReference.java @@ -322,8 +322,7 @@ public class PropertyOrFieldReference extends SpelNodeImpl { } } } - List resolvers = new ArrayList<>(); - resolvers.addAll(specificAccessors); + List resolvers = new ArrayList<>(specificAccessors); generalAccessors.removeAll(specificAccessors); resolvers.addAll(generalAccessors); return resolvers; diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/CallMetaDataContext.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/CallMetaDataContext.java index 6d141e80fb1..99fa5bf2d86 100755 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/CallMetaDataContext.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/CallMetaDataContext.java @@ -362,8 +362,7 @@ public class CallMetaDataContext { } setOutParameterNames(outParamNames); - List workParams = new ArrayList<>(); - workParams.addAll(declaredReturnParams); + List workParams = new ArrayList<>(declaredReturnParams); if (!provider.isProcedureColumnMetaDataUsed()) { workParams.addAll(declaredParams.values()); return workParams; diff --git a/spring-web/src/main/java/org/springframework/web/multipart/support/StandardMultipartHttpServletRequest.java b/spring-web/src/main/java/org/springframework/web/multipart/support/StandardMultipartHttpServletRequest.java index c0273ff82c9..57eacd11fa0 100644 --- a/spring-web/src/main/java/org/springframework/web/multipart/support/StandardMultipartHttpServletRequest.java +++ b/spring-web/src/main/java/org/springframework/web/multipart/support/StandardMultipartHttpServletRequest.java @@ -159,8 +159,7 @@ public class StandardMultipartHttpServletRequest extends AbstractMultipartHttpSe // Servlet 3.0 getParameterMap() not guaranteed to include multipart form items // (e.g. on WebLogic 12) -> need to merge them here to be on the safe side - Map paramMap = new LinkedHashMap<>(); - paramMap.putAll(super.getParameterMap()); + Map paramMap = new LinkedHashMap<>(super.getParameterMap()); for (String paramName : this.multipartParameterNames) { if (!paramMap.containsKey(paramName)) { paramMap.put(paramName, getParameterValues(paramName));