diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/ConstructorInvocationTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/ConstructorInvocationTests.java index a1618232b55..a37364afc8d 100644 --- a/spring-expression/src/test/java/org/springframework/expression/spel/ConstructorInvocationTests.java +++ b/spring-expression/src/test/java/org/springframework/expression/spel/ConstructorInvocationTests.java @@ -162,8 +162,7 @@ public class ConstructorInvocationTests extends AbstractExpressionTests { ctx.addConstructorResolver(dummy); assertThat(ctx.getConstructorResolvers().size()).isEqualTo(2); - List copy = new ArrayList<>(); - copy.addAll(ctx.getConstructorResolvers()); + List copy = new ArrayList<>(ctx.getConstructorResolvers()); assertThat(ctx.removeConstructorResolver(dummy)).isTrue(); assertThat(ctx.removeConstructorResolver(dummy)).isFalse(); assertThat(ctx.getConstructorResolvers().size()).isEqualTo(1); diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/ExpressionLanguageScenarioTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/ExpressionLanguageScenarioTests.java index 08e370d16cc..af335a849b0 100644 --- a/spring-expression/src/test/java/org/springframework/expression/spel/ExpressionLanguageScenarioTests.java +++ b/spring-expression/src/test/java/org/springframework/expression/spel/ExpressionLanguageScenarioTests.java @@ -96,8 +96,7 @@ public class ExpressionLanguageScenarioTests extends AbstractExpressionTests { // Use the standard evaluation context StandardEvaluationContext ctx = new StandardEvaluationContext(); ctx.setVariable("favouriteColour","blue"); - List primes = new ArrayList<>(); - primes.addAll(Arrays.asList(2,3,5,7,11,13,17)); + List primes = Arrays.asList(2, 3, 5, 7, 11, 13, 17); ctx.setVariable("primes",primes); Expression expr = parser.parseRaw("#favouriteColour"); diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/MethodInvocationTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/MethodInvocationTests.java index 03236fc41b3..e2dd8fc6ff1 100644 --- a/spring-expression/src/test/java/org/springframework/expression/spel/MethodInvocationTests.java +++ b/spring-expression/src/test/java/org/springframework/expression/spel/MethodInvocationTests.java @@ -221,8 +221,7 @@ public class MethodInvocationTests extends AbstractExpressionTests { ctx.addMethodResolver(dummy); assertThat(ctx.getMethodResolvers().size()).isEqualTo(2); - List copy = new ArrayList<>(); - copy.addAll(ctx.getMethodResolvers()); + List copy = new ArrayList<>(ctx.getMethodResolvers()); assertThat(ctx.removeMethodResolver(dummy)).isTrue(); assertThat(ctx.removeMethodResolver(dummy)).isFalse(); assertThat(ctx.getMethodResolvers().size()).isEqualTo(1); diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/PropertyAccessTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/PropertyAccessTests.java index b0bd27ef35c..b33027ea403 100644 --- a/spring-expression/src/test/java/org/springframework/expression/spel/PropertyAccessTests.java +++ b/spring-expression/src/test/java/org/springframework/expression/spel/PropertyAccessTests.java @@ -135,8 +135,7 @@ public class PropertyAccessTests extends AbstractExpressionTests { ctx.addPropertyAccessor(spa); assertThat(ctx.getPropertyAccessors().size()).isEqualTo(2); - List copy = new ArrayList<>(); - copy.addAll(ctx.getPropertyAccessors()); + List copy = new ArrayList<>(ctx.getPropertyAccessors()); assertThat(ctx.removePropertyAccessor(spa)).isTrue(); assertThat(ctx.removePropertyAccessor(spa)).isFalse(); assertThat(ctx.getPropertyAccessors().size()).isEqualTo(1); diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/SpelDocumentationTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/SpelDocumentationTests.java index 884401a934e..dcc4511f4cd 100644 --- a/spring-expression/src/test/java/org/springframework/expression/spel/SpelDocumentationTests.java +++ b/spring-expression/src/test/java/org/springframework/expression/spel/SpelDocumentationTests.java @@ -420,8 +420,7 @@ public class SpelDocumentationTests extends AbstractExpressionTests { @Test public void testSpecialVariables() throws Exception { // create an array of integers - List primes = new ArrayList<>(); - primes.addAll(Arrays.asList(2,3,5,7,11,13,17)); + List primes = Arrays.asList(2, 3, 5, 7, 11, 13, 17); // create parser and set variable 'primes' as the array of integers ExpressionParser parser = new SpelExpressionParser(); @@ -518,4 +517,3 @@ public class SpelDocumentationTests extends AbstractExpressionTests { } } - diff --git a/spring-messaging/src/test/java/org/springframework/messaging/handler/invocation/MethodMessageHandlerTests.java b/spring-messaging/src/test/java/org/springframework/messaging/handler/invocation/MethodMessageHandlerTests.java index 89d036a8706..f1c38cb479b 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/handler/invocation/MethodMessageHandlerTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/handler/invocation/MethodMessageHandlerTests.java @@ -205,8 +205,7 @@ public class MethodMessageHandlerTests { @Override protected List initReturnValueHandlers() { - List handlers = new ArrayList<>(); - handlers.addAll(getCustomReturnValueHandlers()); + List handlers = new ArrayList<>(getCustomReturnValueHandlers()); return handlers; } diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/ExtendedEntityManagerCreator.java b/spring-orm/src/main/java/org/springframework/orm/jpa/ExtendedEntityManagerCreator.java index fdebec4ae19..5840646ac4f 100644 --- a/spring-orm/src/main/java/org/springframework/orm/jpa/ExtendedEntityManagerCreator.java +++ b/spring-orm/src/main/java/org/springframework/orm/jpa/ExtendedEntityManagerCreator.java @@ -240,8 +240,7 @@ public abstract class ExtendedEntityManagerCreator { } else { interfaces = cachedEntityManagerInterfaces.computeIfAbsent(rawEm.getClass(), key -> { - Set> ifcs = new LinkedHashSet<>(); - ifcs.addAll(ClassUtils + Set> ifcs = new LinkedHashSet<>(ClassUtils .getAllInterfacesForClassAsSet(key, cl)); ifcs.add(EntityManagerProxy.class); return ClassUtils.toClassArray(ifcs); diff --git a/spring-web/src/main/java/org/springframework/http/codec/protobuf/ProtobufDecoder.java b/spring-web/src/main/java/org/springframework/http/codec/protobuf/ProtobufDecoder.java index ec530bcbf38..b90dd9abc20 100644 --- a/spring-web/src/main/java/org/springframework/http/codec/protobuf/ProtobufDecoder.java +++ b/spring-web/src/main/java/org/springframework/http/codec/protobuf/ProtobufDecoder.java @@ -227,8 +227,7 @@ public class ProtobufDecoder extends ProtobufCodecSupport implements Decoder= input.readableByteCount() ? - input.readableByteCount() : this.messageBytesToRead; + chunkBytesToRead = Math.min(this.messageBytesToRead, input.readableByteCount()); remainingBytesToRead = input.readableByteCount() - chunkBytesToRead; byte[] bytesToWrite = new byte[chunkBytesToRead]; diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletAnnotationControllerHandlerMethodTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletAnnotationControllerHandlerMethodTests.java index 403258a144f..cf9397a5a6e 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletAnnotationControllerHandlerMethodTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletAnnotationControllerHandlerMethodTests.java @@ -320,8 +320,7 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl assertThat(response.getStatus()).as("Invalid response status").isEqualTo(HttpServletResponse.SC_METHOD_NOT_ALLOWED); String allowHeader = response.getHeader("Allow"); assertThat(allowHeader).as("No Allow header").isNotNull(); - Set allowedMethods = new HashSet<>(); - allowedMethods.addAll(Arrays.asList(StringUtils.delimitedListToStringArray(allowHeader, ", "))); + Set allowedMethods = new HashSet<>(Arrays.asList(StringUtils.delimitedListToStringArray(allowHeader, ", "))); assertThat(allowedMethods.size()).as("Invalid amount of supported methods").isEqualTo(6); assertThat(allowedMethods.contains("PUT")).as("PUT not allowed").isTrue(); assertThat(allowedMethods.contains("DELETE")).as("DELETE not allowed").isTrue();