diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/MethodOverrides.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/MethodOverrides.java index 976e3780cd..41f2d2ec23 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/support/MethodOverrides.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/MethodOverrides.java @@ -37,8 +37,7 @@ import org.springframework.lang.Nullable; */ public class MethodOverrides { - private final Set overrides = - Collections.synchronizedSet(new LinkedHashSet(0)); + private final Set overrides = Collections.synchronizedSet(new LinkedHashSet<>(0)); private volatile boolean modified = false; diff --git a/spring-context-indexer/src/main/java/org/springframework/context/index/MetadataCollector.java b/spring-context-indexer/src/main/java/org/springframework/context/index/MetadataCollector.java index 11752917c5..59e6361f3f 100644 --- a/spring-context-indexer/src/main/java/org/springframework/context/index/MetadataCollector.java +++ b/spring-context-indexer/src/main/java/org/springframework/context/index/MetadataCollector.java @@ -33,7 +33,7 @@ import javax.lang.model.element.TypeElement; */ class MetadataCollector { - private final List metadataItems = new ArrayList(); + private final List metadataItems = new ArrayList<>(); private final ProcessingEnvironment processingEnvironment; @@ -41,7 +41,7 @@ class MetadataCollector { private final TypeHelper typeHelper; - private final Set processedSourceTypes = new HashSet(); + private final Set processedSourceTypes = new HashSet<>(); /** diff --git a/spring-context/src/main/java/org/springframework/context/support/DefaultLifecycleProcessor.java b/spring-context/src/main/java/org/springframework/context/support/DefaultLifecycleProcessor.java index ff43af3a3a..2c360f5817 100644 --- a/spring-context/src/main/java/org/springframework/context/support/DefaultLifecycleProcessor.java +++ b/spring-context/src/main/java/org/springframework/context/support/DefaultLifecycleProcessor.java @@ -362,7 +362,7 @@ public class DefaultLifecycleProcessor implements LifecycleProcessor, BeanFactor } Collections.sort(this.members, Collections.reverseOrder()); CountDownLatch latch = new CountDownLatch(this.smartMemberCount); - Set countDownBeanNames = Collections.synchronizedSet(new LinkedHashSet()); + Set countDownBeanNames = Collections.synchronizedSet(new LinkedHashSet<>()); for (LifecycleGroupMember member : this.members) { if (this.lifecycleBeans.containsKey(member.name)) { doStop(this.lifecycleBeans, member.name, latch, countDownBeanNames); diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/RowMapperResultSetExtractor.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/RowMapperResultSetExtractor.java index 810ea8c1f8..abd18df26f 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/RowMapperResultSetExtractor.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/RowMapperResultSetExtractor.java @@ -87,7 +87,7 @@ public class RowMapperResultSetExtractor implements ResultSetExtractor extractData(ResultSet rs) throws SQLException { - List results = (this.rowsExpected > 0 ? new ArrayList<>(this.rowsExpected) : new ArrayList()); + List results = (this.rowsExpected > 0 ? new ArrayList<>(this.rowsExpected) : new ArrayList<>()); int rowNum = 0; while (rs.next()) { results.add(this.rowMapper.mapRow(rs, rowNum++)); diff --git a/spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/AbstractMethodMessageHandler.java b/spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/AbstractMethodMessageHandler.java index 54c905c8bf..9272d3e56f 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/AbstractMethodMessageHandler.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/AbstractMethodMessageHandler.java @@ -424,7 +424,7 @@ public abstract class AbstractMethodMessageHandler } protected void handleMessageInternal(Message message, String lookupDestination) { - List matches = new ArrayList(); + List matches = new ArrayList<>(); List mappingsByUrl = this.destinationLookup.get(lookupDestination); if (mappingsByUrl != null) { diff --git a/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/BufferingStompDecoder.java b/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/BufferingStompDecoder.java index fac9ad90ca..6212cef1ee 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/BufferingStompDecoder.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/BufferingStompDecoder.java @@ -51,7 +51,7 @@ public class BufferingStompDecoder { private final int bufferSizeLimit; - private final Queue chunks = new LinkedBlockingQueue(); + private final Queue chunks = new LinkedBlockingQueue<>(); private volatile Integer expectedContentLength; @@ -107,7 +107,7 @@ public class BufferingStompDecoder { } ByteBuffer bufferToDecode = assembleChunksAndReset(); - MultiValueMap headers = new LinkedMultiValueMap(); + MultiValueMap headers = new LinkedMultiValueMap<>(); List> messages = this.stompDecoder.decode(bufferToDecode, headers); if (bufferToDecode.hasRemaining()) { diff --git a/spring-messaging/src/test/java/org/springframework/messaging/core/MessageReceivingTemplateTests.java b/spring-messaging/src/test/java/org/springframework/messaging/core/MessageReceivingTemplateTests.java index cc082f9593..5f5792912f 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/core/MessageReceivingTemplateTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/core/MessageReceivingTemplateTests.java @@ -53,7 +53,7 @@ public class MessageReceivingTemplateTests { @Test public void receive() { - Message expected = new GenericMessage("payload"); + Message expected = new GenericMessage<>("payload"); this.template.setDefaultDestination("home"); this.template.setReceiveMessage(expected); Message actual = this.template.receive(); @@ -69,7 +69,7 @@ public class MessageReceivingTemplateTests { @Test public void receiveFromDestination() { - Message expected = new GenericMessage("payload"); + Message expected = new GenericMessage<>("payload"); this.template.setReceiveMessage(expected); Message actual = this.template.receive("somewhere"); @@ -79,7 +79,7 @@ public class MessageReceivingTemplateTests { @Test public void receiveAndConvert() { - Message expected = new GenericMessage("payload"); + Message expected = new GenericMessage<>("payload"); this.template.setDefaultDestination("home"); this.template.setReceiveMessage(expected); String payload = this.template.receiveAndConvert(String.class); @@ -90,7 +90,7 @@ public class MessageReceivingTemplateTests { @Test public void receiveAndConvertFromDestination() { - Message expected = new GenericMessage("payload"); + Message expected = new GenericMessage<>("payload"); this.template.setReceiveMessage(expected); String payload = this.template.receiveAndConvert("somewhere", String.class); @@ -100,7 +100,7 @@ public class MessageReceivingTemplateTests { @Test public void receiveAndConvertFailed() { - Message expected = new GenericMessage("not a number test"); + Message expected = new GenericMessage<>("not a number test"); this.template.setReceiveMessage(expected); this.template.setMessageConverter(new GenericMessageConverter()); @@ -111,7 +111,7 @@ public class MessageReceivingTemplateTests { @Test public void receiveAndConvertNoConverter() { - Message expected = new GenericMessage("payload"); + Message expected = new GenericMessage<>("payload"); this.template.setDefaultDestination("home"); this.template.setReceiveMessage(expected); this.template.setMessageConverter(new GenericMessageConverter()); diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilder.java b/spring-test/src/main/java/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilder.java index c7938e6f68..5405bfe581 100644 --- a/spring-test/src/main/java/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilder.java +++ b/spring-test/src/main/java/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilder.java @@ -288,7 +288,7 @@ public class MockHttpServletRequestBuilder */ public MockHttpServletRequestBuilder accept(String... mediaTypes) { Assert.notEmpty(mediaTypes, "'mediaTypes' must not be empty"); - List result = new ArrayList(mediaTypes.length); + List result = new ArrayList<>(mediaTypes.length); for (String mediaType : mediaTypes) { result.add(MediaType.parseMediaType(mediaType)); } diff --git a/spring-web/src/main/java/org/springframework/web/filter/CompositeFilter.java b/spring-web/src/main/java/org/springframework/web/filter/CompositeFilter.java index 0f88930163..ad373aaf9d 100644 --- a/spring-web/src/main/java/org/springframework/web/filter/CompositeFilter.java +++ b/spring-web/src/main/java/org/springframework/web/filter/CompositeFilter.java @@ -45,7 +45,7 @@ public class CompositeFilter implements Filter { public void setFilters(List filters) { - this.filters = new ArrayList(filters); + this.filters = new ArrayList<>(filters); } diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/DefaultRenderingResponseBuilder.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/DefaultRenderingResponseBuilder.java index 309214a90a..cf76d9e57d 100644 --- a/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/DefaultRenderingResponseBuilder.java +++ b/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/DefaultRenderingResponseBuilder.java @@ -52,7 +52,7 @@ class DefaultRenderingResponseBuilder implements RenderingResponse.Builder { private final HttpHeaders headers = new HttpHeaders(); - private final Map model = new LinkedHashMap(); + private final Map model = new LinkedHashMap<>(); public DefaultRenderingResponseBuilder(String name) { diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/result/condition/HeadersRequestCondition.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/condition/HeadersRequestCondition.java index 291b36b7cd..4fc3784611 100644 --- a/spring-webflux/src/main/java/org/springframework/web/reactive/result/condition/HeadersRequestCondition.java +++ b/spring-webflux/src/main/java/org/springframework/web/reactive/result/condition/HeadersRequestCondition.java @@ -61,7 +61,7 @@ public final class HeadersRequestCondition extends AbstractRequestCondition parseExpressions(String... headers) { - Set expressions = new LinkedHashSet(); + Set expressions = new LinkedHashSet<>(); if (headers != null) { for (String header : headers) { HeaderExpression expr = new HeaderExpression(header); diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/AbstractHandlerMethodMapping.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/AbstractHandlerMethodMapping.java index d2be1d6127..829edf94dd 100644 --- a/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/AbstractHandlerMethodMapping.java +++ b/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/AbstractHandlerMethodMapping.java @@ -301,7 +301,7 @@ public abstract class AbstractHandlerMethodMapping extends AbstractHandlerMap protected HandlerMethod lookupHandlerMethod(String lookupPath, ServerWebExchange exchange) throws Exception { - List matches = new ArrayList(); + List matches = new ArrayList<>(); List directPathMatches = this.mappingRegistry.getMappingsByUrl(lookupPath); if (directPathMatches != null) { addMatchingMappings(directPathMatches, matches, exchange); diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurerComposite.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurerComposite.java index c2b62ee2d3..cdbb0a347d 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurerComposite.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurerComposite.java @@ -36,7 +36,7 @@ import org.springframework.web.servlet.HandlerExceptionResolver; */ class WebMvcConfigurerComposite implements WebMvcConfigurer { - private final List delegates = new ArrayList(); + private final List delegates = new ArrayList<>(); public void addWebMvcConfigurers(List configurers) { diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMethodMapping.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMethodMapping.java index 5108187df0..59a167b81b 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMethodMapping.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMethodMapping.java @@ -340,7 +340,7 @@ public abstract class AbstractHandlerMethodMapping extends AbstractHandlerMap */ @Nullable protected HandlerMethod lookupHandlerMethod(String lookupPath, HttpServletRequest request) throws Exception { - List matches = new ArrayList(); + List matches = new ArrayList<>(); List directPathMatches = this.mappingRegistry.getMappingsByUrl(lookupPath); if (directPathMatches != null) { addMatchingMappings(directPathMatches, matches, request); diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/WebSocketExtension.java b/spring-websocket/src/main/java/org/springframework/web/socket/WebSocketExtension.java index c3fe73915a..be885c3460 100644 --- a/spring-websocket/src/main/java/org/springframework/web/socket/WebSocketExtension.java +++ b/spring-websocket/src/main/java/org/springframework/web/socket/WebSocketExtension.java @@ -139,7 +139,7 @@ public class WebSocketExtension { public static List parseExtensions(String extensions) { if (StringUtils.hasText(extensions)) { String[] tokens = StringUtils.tokenizeToStringArray(extensions, ","); - List result = new ArrayList(tokens.length); + List result = new ArrayList<>(tokens.length); for (String token : tokens) { result.add(parseExtension(token)); } diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/messaging/StompSubProtocolHandler.java b/spring-websocket/src/main/java/org/springframework/web/socket/messaging/StompSubProtocolHandler.java index f2aee930cb..e11fca8e2c 100644 --- a/spring-websocket/src/main/java/org/springframework/web/socket/messaging/StompSubProtocolHandler.java +++ b/spring-websocket/src/main/java/org/springframework/web/socket/messaging/StompSubProtocolHandler.java @@ -102,7 +102,7 @@ public class StompSubProtocolHandler implements SubProtocolHandler, ApplicationE private MessageHeaderInitializer headerInitializer; - private final Map stompAuthentications = new ConcurrentHashMap(); + private final Map stompAuthentications = new ConcurrentHashMap<>(); private Boolean immutableMessageInterceptorPresent;