diff --git a/spring-aop/src/main/java/org/springframework/aop/config/AbstractInterceptorDrivenBeanDefinitionDecorator.java b/spring-aop/src/main/java/org/springframework/aop/config/AbstractInterceptorDrivenBeanDefinitionDecorator.java index 28fc6cdbb6..6cf8ccd602 100644 --- a/spring-aop/src/main/java/org/springframework/aop/config/AbstractInterceptorDrivenBeanDefinitionDecorator.java +++ b/spring-aop/src/main/java/org/springframework/aop/config/AbstractInterceptorDrivenBeanDefinitionDecorator.java @@ -89,7 +89,7 @@ public abstract class AbstractInterceptorDrivenBeanDefinitionDecorator implement proxyDefinition.setDecoratedDefinition(targetHolder); proxyDefinition.getPropertyValues().add("target", targetHolder); // create the interceptor names list - proxyDefinition.getPropertyValues().add("interceptorNames", new ManagedList()); + proxyDefinition.getPropertyValues().add("interceptorNames", new ManagedList<>()); // copy autowire settings from original bean definition. proxyDefinition.setAutowireCandidate(targetDefinition.isAutowireCandidate()); proxyDefinition.setPrimary(targetDefinition.isPrimary()); diff --git a/spring-beans/src/test/java/org/springframework/beans/BeanWrapperGenericsTests.java b/spring-beans/src/test/java/org/springframework/beans/BeanWrapperGenericsTests.java index 522e13c5b9..312c3d7a14 100644 --- a/spring-beans/src/test/java/org/springframework/beans/BeanWrapperGenericsTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/BeanWrapperGenericsTests.java @@ -144,7 +144,7 @@ class BeanWrapperGenericsTests { @Test void testGenericMapElementWithKeyType() { GenericBean gb = new GenericBean<>(); - gb.setLongMap(new HashMap()); + gb.setLongMap(new HashMap<>()); BeanWrapper bw = new BeanWrapperImpl(gb); bw.setPropertyValue("longMap[4]", "5"); assertThat(gb.getLongMap().get(Long.valueOf("4"))).isEqualTo("5"); diff --git a/spring-core/src/test/java/org/springframework/core/CollectionFactoryTests.java b/spring-core/src/test/java/org/springframework/core/CollectionFactoryTests.java index fd8810c151..9898f27dc9 100644 --- a/spring-core/src/test/java/org/springframework/core/CollectionFactoryTests.java +++ b/spring-core/src/test/java/org/springframework/core/CollectionFactoryTests.java @@ -154,7 +154,7 @@ class CollectionFactoryTests { @Test void createApproximateCollectionFromEmptyHashSet() { - Collection set = createApproximateCollection(new HashSet(), 2); + Collection set = createApproximateCollection(new HashSet<>(), 2); assertThat(set).isEmpty(); } @@ -180,7 +180,7 @@ class CollectionFactoryTests { @Test void createApproximateMapFromEmptyHashMap() { - Map map = createApproximateMap(new HashMap(), 2); + Map map = createApproximateMap(new HashMap<>(), 2); assertThat(map).isEmpty(); } @@ -194,7 +194,7 @@ class CollectionFactoryTests { @Test void createApproximateMapFromEmptyEnumMap() { - Map colors = createApproximateMap(new EnumMap(Color.class), 2); + Map colors = createApproximateMap(new EnumMap<>(Color.class), 2); assertThat(colors).isEmpty(); } diff --git a/spring-core/src/test/java/org/springframework/core/ResolvableTypeTests.java b/spring-core/src/test/java/org/springframework/core/ResolvableTypeTests.java index 0516c2fb32..b4b55c9a56 100644 --- a/spring-core/src/test/java/org/springframework/core/ResolvableTypeTests.java +++ b/spring-core/src/test/java/org/springframework/core/ResolvableTypeTests.java @@ -170,7 +170,7 @@ class ResolvableTypeTests { @Test void forInstanceProviderNull() { - ResolvableType type = ResolvableType.forInstance(new MyGenericInterfaceType(null)); + ResolvableType type = ResolvableType.forInstance(new MyGenericInterfaceType<>(null)); assertThat(type.getType()).isEqualTo(MyGenericInterfaceType.class); assertThat(type.resolve()).isEqualTo(MyGenericInterfaceType.class); } diff --git a/spring-core/src/test/java/org/springframework/core/convert/support/GenericConversionServiceTests.java b/spring-core/src/test/java/org/springframework/core/convert/support/GenericConversionServiceTests.java index bec17c058b..114f712e29 100644 --- a/spring-core/src/test/java/org/springframework/core/convert/support/GenericConversionServiceTests.java +++ b/spring-core/src/test/java/org/springframework/core/convert/support/GenericConversionServiceTests.java @@ -485,7 +485,7 @@ class GenericConversionServiceTests { void enumWithInterfaceToStringConversion() { // SPR-9692 conversionService.addConverter(new EnumToStringConverter(conversionService)); - conversionService.addConverter(new MyEnumInterfaceToStringConverter()); + conversionService.addConverter(new MyEnumInterfaceToStringConverter<>()); assertThat(conversionService.convert(MyEnum.A, String.class)).isEqualTo("1"); } diff --git a/spring-core/src/test/java/org/springframework/core/type/AnnotationMetadataTests.java b/spring-core/src/test/java/org/springframework/core/type/AnnotationMetadataTests.java index 497217db8c..6e829cddab 100644 --- a/spring-core/src/test/java/org/springframework/core/type/AnnotationMetadataTests.java +++ b/spring-core/src/test/java/org/springframework/core/type/AnnotationMetadataTests.java @@ -423,9 +423,9 @@ class AnnotationMetadataTests { assertThat(method.getAnnotationAttributes(DirectAnnotation.class.getName()).get("value")).isEqualTo("direct"); assertThat(method.getAnnotationAttributes(DirectAnnotation.class.getName()).get("myValue")).isEqualTo("direct"); List allMeta = method.getAllAnnotationAttributes(DirectAnnotation.class.getName()).get("value"); - assertThat(new HashSet<>(allMeta)).isEqualTo(new HashSet(Arrays.asList("direct", "meta"))); + assertThat(new HashSet<>(allMeta)).isEqualTo(new HashSet<>(Arrays.asList("direct", "meta"))); allMeta = method.getAllAnnotationAttributes(DirectAnnotation.class.getName()).get("additional"); - assertThat(new HashSet<>(allMeta)).isEqualTo(new HashSet(List.of("direct"))); + assertThat(new HashSet<>(allMeta)).isEqualTo(new HashSet<>(List.of("direct"))); assertThat(metadata.isAnnotated(IsAnnotatedAnnotation.class.getName())).isTrue(); @@ -465,9 +465,9 @@ class AnnotationMetadataTests { assertThat(metadata.getAnnotationAttributes(DirectAnnotation.class.getName()).get("value")).isEqualTo("direct"); allMeta = metadata.getAllAnnotationAttributes(DirectAnnotation.class.getName()).get("value"); - assertThat(new HashSet<>(allMeta)).isEqualTo(new HashSet(Arrays.asList("direct", "meta"))); + assertThat(new HashSet<>(allMeta)).isEqualTo(new HashSet<>(Arrays.asList("direct", "meta"))); allMeta = metadata.getAllAnnotationAttributes(DirectAnnotation.class.getName()).get("additional"); - assertThat(new HashSet<>(allMeta)).isEqualTo(new HashSet(Arrays.asList("direct", ""))); + assertThat(new HashSet<>(allMeta)).isEqualTo(new HashSet<>(Arrays.asList("direct", ""))); assertThat(metadata.getAnnotationAttributes(DirectAnnotation.class.getName()).get("additional")).isEqualTo(""); assertThat(((String[]) metadata.getAnnotationAttributes(DirectAnnotation.class.getName()).get("additionalArray"))).isEmpty(); } @@ -498,7 +498,7 @@ class AnnotationMetadataTests { assertThat(metadata.getAnnotationAttributes(DirectAnnotation.class.getName()).get("value")).isEqualTo("direct"); allMeta = metadata.getAllAnnotationAttributes(DirectAnnotation.class.getName()).get("value"); - assertThat(new HashSet<>(allMeta)).isEqualTo(new HashSet(Arrays.asList("direct", "meta"))); + assertThat(new HashSet<>(allMeta)).isEqualTo(new HashSet<>(Arrays.asList("direct", "meta"))); } } diff --git a/spring-core/src/test/java/org/springframework/util/CollectionUtilsTests.java b/spring-core/src/test/java/org/springframework/util/CollectionUtilsTests.java index df7f94472c..34324570c9 100644 --- a/spring-core/src/test/java/org/springframework/util/CollectionUtilsTests.java +++ b/spring-core/src/test/java/org/springframework/util/CollectionUtilsTests.java @@ -47,7 +47,7 @@ class CollectionUtilsTests { void isEmpty() { assertThat(CollectionUtils.isEmpty((Set) null)).isTrue(); assertThat(CollectionUtils.isEmpty((Map) null)).isTrue(); - assertThat(CollectionUtils.isEmpty(new HashMap())).isTrue(); + assertThat(CollectionUtils.isEmpty(new HashMap<>())).isTrue(); assertThat(CollectionUtils.isEmpty(new HashSet<>())).isTrue(); List list = new ArrayList<>(); diff --git a/spring-messaging/src/test/java/org/springframework/messaging/core/DestinationResolvingMessagingTemplateTests.java b/spring-messaging/src/test/java/org/springframework/messaging/core/DestinationResolvingMessagingTemplateTests.java index 6a3f8b4c08..4fb1006d1d 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/core/DestinationResolvingMessagingTemplateTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/core/DestinationResolvingMessagingTemplateTests.java @@ -77,7 +77,7 @@ class DestinationResolvingMessagingTemplateTests { void sendNoDestinationResolver() { TestDestinationResolvingMessagingTemplate template = new TestDestinationResolvingMessagingTemplate(); assertThatIllegalStateException().isThrownBy(() -> - template.send("myChannel", new GenericMessage("payload"))); + template.send("myChannel", new GenericMessage<>("payload"))); } @Test diff --git a/spring-messaging/src/test/java/org/springframework/messaging/core/MessageRequestReplyTemplateTests.java b/spring-messaging/src/test/java/org/springframework/messaging/core/MessageRequestReplyTemplateTests.java index 272af387c7..725dc9cb82 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/core/MessageRequestReplyTemplateTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/core/MessageRequestReplyTemplateTests.java @@ -67,7 +67,7 @@ class MessageRequestReplyTemplateTests { @Test void sendAndReceiveMissingDestination() { assertThatIllegalStateException().isThrownBy(() -> - this.template.sendAndReceive(new GenericMessage("request"))); + this.template.sendAndReceive(new GenericMessage<>("request"))); } @Test diff --git a/spring-messaging/src/test/java/org/springframework/messaging/simp/SimpAttributesContextHolderTests.java b/spring-messaging/src/test/java/org/springframework/messaging/simp/SimpAttributesContextHolderTests.java index bf4bc105ef..1132f54587 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/simp/SimpAttributesContextHolderTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/simp/SimpAttributesContextHolderTests.java @@ -103,7 +103,7 @@ class SimpAttributesContextHolderTests { @Test void setAttributesFromMessageWithMissingSessionId() { assertThatIllegalStateException().isThrownBy(() -> - SimpAttributesContextHolder.setAttributesFromMessage(new GenericMessage(""))) + SimpAttributesContextHolder.setAttributesFromMessage(new GenericMessage<>(""))) .withMessageStartingWith("No session id in"); } diff --git a/spring-messaging/src/test/java/org/springframework/messaging/simp/SimpMessagingTemplateTests.java b/spring-messaging/src/test/java/org/springframework/messaging/simp/SimpMessagingTemplateTests.java index 43ece3dce9..47fd91b65b 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/simp/SimpMessagingTemplateTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/simp/SimpMessagingTemplateTests.java @@ -111,7 +111,7 @@ class SimpMessagingTemplateTests { void convertAndSendWithCustomHeaderNonNative() { Map headers = new HashMap<>(); headers.put("key", "value"); - headers.put(NativeMessageHeaderAccessor.NATIVE_HEADERS, new LinkedMultiValueMap()); + headers.put(NativeMessageHeaderAccessor.NATIVE_HEADERS, new LinkedMultiValueMap<>()); this.messagingTemplate.convertAndSend("/foo", "data", headers); List> messages = this.messageChannel.getMessages(); diff --git a/spring-messaging/src/test/java/org/springframework/messaging/simp/broker/BrokerMessageHandlerTests.java b/spring-messaging/src/test/java/org/springframework/messaging/simp/broker/BrokerMessageHandlerTests.java index b669b68a49..d9e598b03b 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/simp/broker/BrokerMessageHandlerTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/simp/broker/BrokerMessageHandlerTests.java @@ -69,7 +69,7 @@ class BrokerMessageHandlerTests { @Test void handleMessageWhenBrokerNotRunning() { - this.handler.handleMessage(new GenericMessage("payload")); + this.handler.handleMessage(new GenericMessage<>("payload")); assertThat(this.handler.messages).isEqualTo(Collections.emptyList()); } diff --git a/spring-web/src/test/java/org/springframework/http/HttpEntityTests.java b/spring-web/src/test/java/org/springframework/http/HttpEntityTests.java index 7e0736b8f0..c6a7582910 100644 --- a/spring-web/src/test/java/org/springframework/http/HttpEntityTests.java +++ b/spring-web/src/test/java/org/springframework/http/HttpEntityTests.java @@ -75,8 +75,8 @@ class HttpEntityTests { assertThat(new HttpEntity<>(map1).equals(new HttpEntity<>(map1))).isTrue(); assertThat(new HttpEntity<>(map1).equals(new HttpEntity<>(map2))).isFalse(); - assertThat(new HttpEntity(null, null).equals(new HttpEntity(null, null))).isTrue(); - assertThat(new HttpEntity<>("foo", null).equals(new HttpEntity(null, null))).isFalse(); + assertThat(new HttpEntity(null, null).equals(new HttpEntity<>(null, null))).isTrue(); + assertThat(new HttpEntity<>("foo", null).equals(new HttpEntity<>(null, null))).isFalse(); assertThat(new HttpEntity(null, null).equals(new HttpEntity<>("bar", null))).isFalse(); assertThat(new HttpEntity<>("foo", map1).equals(new HttpEntity<>("foo", map1))).isTrue(); diff --git a/spring-web/src/test/java/org/springframework/http/codec/FormHttpMessageReaderTests.java b/spring-web/src/test/java/org/springframework/http/codec/FormHttpMessageReaderTests.java index bbec03d2da..7b0e221dba 100644 --- a/spring-web/src/test/java/org/springframework/http/codec/FormHttpMessageReaderTests.java +++ b/spring-web/src/test/java/org/springframework/http/codec/FormHttpMessageReaderTests.java @@ -53,7 +53,7 @@ class FormHttpMessageReaderTests extends AbstractLeakCheckingTests { MediaType.APPLICATION_FORM_URLENCODED)).isTrue(); assertThat(this.reader.canRead( - ResolvableType.forInstance(new LinkedMultiValueMap()), + ResolvableType.forInstance(new LinkedMultiValueMap<>()), MediaType.APPLICATION_FORM_URLENCODED)).isTrue(); assertThat(this.reader.canRead( diff --git a/spring-web/src/test/java/org/springframework/http/codec/FormHttpMessageWriterTests.java b/spring-web/src/test/java/org/springframework/http/codec/FormHttpMessageWriterTests.java index d0de1dcaf8..6d66ee2fd0 100644 --- a/spring-web/src/test/java/org/springframework/http/codec/FormHttpMessageWriterTests.java +++ b/spring-web/src/test/java/org/springframework/http/codec/FormHttpMessageWriterTests.java @@ -52,7 +52,7 @@ class FormHttpMessageWriterTests extends AbstractLeakCheckingTests { // No generic information assertThat(this.writer.canWrite( - ResolvableType.forInstance(new LinkedMultiValueMap()), + ResolvableType.forInstance(new LinkedMultiValueMap<>()), MediaType.APPLICATION_FORM_URLENCODED)).isTrue(); assertThat(this.writer.canWrite( diff --git a/spring-web/src/test/java/org/springframework/web/context/request/async/WebAsyncManagerTests.java b/spring-web/src/test/java/org/springframework/web/context/request/async/WebAsyncManagerTests.java index e0ddfa6210..52a13d80cf 100644 --- a/spring-web/src/test/java/org/springframework/web/context/request/async/WebAsyncManagerTests.java +++ b/spring-web/src/test/java/org/springframework/web/context/request/async/WebAsyncManagerTests.java @@ -72,7 +72,7 @@ class WebAsyncManagerTests { .withMessage("AsyncWebRequest must not be null"); assertThatIllegalStateException() - .isThrownBy(() -> manager.startDeferredResultProcessing(new DeferredResult())) + .isThrownBy(() -> manager.startDeferredResultProcessing(new DeferredResult<>())) .withMessage("AsyncWebRequest must not be null"); } diff --git a/spring-web/src/test/java/org/springframework/web/method/annotation/ModelFactoryOrderingTests.java b/spring-web/src/test/java/org/springframework/web/method/annotation/ModelFactoryOrderingTests.java index 59e1a2c3db..b96eee362b 100644 --- a/spring-web/src/test/java/org/springframework/web/method/annotation/ModelFactoryOrderingTests.java +++ b/spring-web/src/test/java/org/springframework/web/method/annotation/ModelFactoryOrderingTests.java @@ -67,7 +67,7 @@ class ModelFactoryOrderingTests { @BeforeEach void setup() { - this.mavContainer.addAttribute("methods", new ArrayList()); + this.mavContainer.addAttribute("methods", new ArrayList<>()); } @Test diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/MethodValidationTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/MethodValidationTests.java index f678629f16..172979e0fe 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/MethodValidationTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/MethodValidationTests.java @@ -101,7 +101,7 @@ class MethodValidationTests { this.request.setMethod("POST"); this.request.setContentType(MediaType.APPLICATION_FORM_URLENCODED_VALUE); this.request.addHeader("Accept", "text/plain"); - this.request.setAttribute(HandlerMapping.URI_TEMPLATE_VARIABLES_ATTRIBUTE, new HashMap(0)); + this.request.setAttribute(HandlerMapping.URI_TEMPLATE_VARIABLES_ATTRIBUTE, new HashMap<>(0)); } private static RequestMappingHandlerAdapter initHandlerAdapter(Validator validator) {