Skip to content

Commit a665da4

Browse files
committed
Merge pull request spring-projects#1450 from diguage:diamond
* pr/1450: Use the diamond syntax
2 parents ca1e682 + c1d44d9 commit a665da4

File tree

16 files changed

+23
-24
lines changed

16 files changed

+23
-24
lines changed

spring-beans/src/main/java/org/springframework/beans/factory/support/MethodOverrides.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,7 @@
3737
*/
3838
public class MethodOverrides {
3939

40-
private final Set<MethodOverride> overrides =
41-
Collections.synchronizedSet(new LinkedHashSet<MethodOverride>(0));
40+
private final Set<MethodOverride> overrides = Collections.synchronizedSet(new LinkedHashSet<>(0));
4241

4342
private volatile boolean modified = false;
4443

spring-context-indexer/src/main/java/org/springframework/context/index/MetadataCollector.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,15 @@
3333
*/
3434
class MetadataCollector {
3535

36-
private final List<ItemMetadata> metadataItems = new ArrayList<ItemMetadata>();
36+
private final List<ItemMetadata> metadataItems = new ArrayList<>();
3737

3838
private final ProcessingEnvironment processingEnvironment;
3939

4040
private final CandidateComponentsMetadata previousMetadata;
4141

4242
private final TypeHelper typeHelper;
4343

44-
private final Set<String> processedSourceTypes = new HashSet<String>();
44+
private final Set<String> processedSourceTypes = new HashSet<>();
4545

4646

4747
/**

spring-context/src/main/java/org/springframework/context/support/DefaultLifecycleProcessor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -362,7 +362,7 @@ public void stop() {
362362
}
363363
Collections.sort(this.members, Collections.reverseOrder());
364364
CountDownLatch latch = new CountDownLatch(this.smartMemberCount);
365-
Set<String> countDownBeanNames = Collections.synchronizedSet(new LinkedHashSet<String>());
365+
Set<String> countDownBeanNames = Collections.synchronizedSet(new LinkedHashSet<>());
366366
for (LifecycleGroupMember member : this.members) {
367367
if (this.lifecycleBeans.containsKey(member.name)) {
368368
doStop(this.lifecycleBeans, member.name, latch, countDownBeanNames);

spring-jdbc/src/main/java/org/springframework/jdbc/core/RowMapperResultSetExtractor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ public RowMapperResultSetExtractor(RowMapper<T> rowMapper, int rowsExpected) {
8787

8888
@Override
8989
public List<T> extractData(ResultSet rs) throws SQLException {
90-
List<T> results = (this.rowsExpected > 0 ? new ArrayList<>(this.rowsExpected) : new ArrayList<T>());
90+
List<T> results = (this.rowsExpected > 0 ? new ArrayList<>(this.rowsExpected) : new ArrayList<>());
9191
int rowNum = 0;
9292
while (rs.next()) {
9393
results.add(this.rowMapper.mapRow(rs, rowNum++));

spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/AbstractMethodMessageHandler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -424,7 +424,7 @@ protected String getLookupDestination(@Nullable String destination) {
424424
}
425425

426426
protected void handleMessageInternal(Message<?> message, String lookupDestination) {
427-
List<Match> matches = new ArrayList<Match>();
427+
List<Match> matches = new ArrayList<>();
428428

429429
List<T> mappingsByUrl = this.destinationLookup.get(lookupDestination);
430430
if (mappingsByUrl != null) {

spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/BufferingStompDecoder.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public class BufferingStompDecoder {
5151

5252
private final int bufferSizeLimit;
5353

54-
private final Queue<ByteBuffer> chunks = new LinkedBlockingQueue<ByteBuffer>();
54+
private final Queue<ByteBuffer> chunks = new LinkedBlockingQueue<>();
5555

5656
private volatile Integer expectedContentLength;
5757

@@ -107,7 +107,7 @@ public List<Message<byte[]>> decode(ByteBuffer newBuffer) {
107107
}
108108

109109
ByteBuffer bufferToDecode = assembleChunksAndReset();
110-
MultiValueMap<String, String> headers = new LinkedMultiValueMap<String, String>();
110+
MultiValueMap<String, String> headers = new LinkedMultiValueMap<>();
111111
List<Message<byte[]>> messages = this.stompDecoder.decode(bufferToDecode, headers);
112112

113113
if (bufferToDecode.hasRemaining()) {

spring-messaging/src/test/java/org/springframework/messaging/core/MessageReceivingTemplateTests.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public void setup() {
5353

5454
@Test
5555
public void receive() {
56-
Message<?> expected = new GenericMessage<Object>("payload");
56+
Message<?> expected = new GenericMessage<>("payload");
5757
this.template.setDefaultDestination("home");
5858
this.template.setReceiveMessage(expected);
5959
Message<?> actual = this.template.receive();
@@ -69,7 +69,7 @@ public void receiveMissingDefaultDestination() {
6969

7070
@Test
7171
public void receiveFromDestination() {
72-
Message<?> expected = new GenericMessage<Object>("payload");
72+
Message<?> expected = new GenericMessage<>("payload");
7373
this.template.setReceiveMessage(expected);
7474
Message<?> actual = this.template.receive("somewhere");
7575

@@ -79,7 +79,7 @@ public void receiveFromDestination() {
7979

8080
@Test
8181
public void receiveAndConvert() {
82-
Message<?> expected = new GenericMessage<Object>("payload");
82+
Message<?> expected = new GenericMessage<>("payload");
8383
this.template.setDefaultDestination("home");
8484
this.template.setReceiveMessage(expected);
8585
String payload = this.template.receiveAndConvert(String.class);
@@ -90,7 +90,7 @@ public void receiveAndConvert() {
9090

9191
@Test
9292
public void receiveAndConvertFromDestination() {
93-
Message<?> expected = new GenericMessage<Object>("payload");
93+
Message<?> expected = new GenericMessage<>("payload");
9494
this.template.setReceiveMessage(expected);
9595
String payload = this.template.receiveAndConvert("somewhere", String.class);
9696

@@ -100,7 +100,7 @@ public void receiveAndConvertFromDestination() {
100100

101101
@Test
102102
public void receiveAndConvertFailed() {
103-
Message<?> expected = new GenericMessage<Object>("not a number test");
103+
Message<?> expected = new GenericMessage<>("not a number test");
104104
this.template.setReceiveMessage(expected);
105105
this.template.setMessageConverter(new GenericMessageConverter());
106106

@@ -111,7 +111,7 @@ public void receiveAndConvertFailed() {
111111

112112
@Test
113113
public void receiveAndConvertNoConverter() {
114-
Message<?> expected = new GenericMessage<Object>("payload");
114+
Message<?> expected = new GenericMessage<>("payload");
115115
this.template.setDefaultDestination("home");
116116
this.template.setReceiveMessage(expected);
117117
this.template.setMessageConverter(new GenericMessageConverter());

spring-test/src/main/java/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilder.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,7 @@ public MockHttpServletRequestBuilder accept(MediaType... mediaTypes) {
288288
*/
289289
public MockHttpServletRequestBuilder accept(String... mediaTypes) {
290290
Assert.notEmpty(mediaTypes, "'mediaTypes' must not be empty");
291-
List<MediaType> result = new ArrayList<MediaType>(mediaTypes.length);
291+
List<MediaType> result = new ArrayList<>(mediaTypes.length);
292292
for (String mediaType : mediaTypes) {
293293
result.add(MediaType.parseMediaType(mediaType));
294294
}

spring-web/src/main/java/org/springframework/web/filter/CompositeFilter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public class CompositeFilter implements Filter {
4545

4646

4747
public void setFilters(List<? extends Filter> filters) {
48-
this.filters = new ArrayList<Filter>(filters);
48+
this.filters = new ArrayList<>(filters);
4949
}
5050

5151

spring-webflux/src/main/java/org/springframework/web/reactive/function/server/DefaultRenderingResponseBuilder.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ class DefaultRenderingResponseBuilder implements RenderingResponse.Builder {
5252

5353
private final HttpHeaders headers = new HttpHeaders();
5454

55-
private final Map<String, Object> model = new LinkedHashMap<String, Object>();
55+
private final Map<String, Object> model = new LinkedHashMap<>();
5656

5757

5858
public DefaultRenderingResponseBuilder(String name) {

spring-webflux/src/main/java/org/springframework/web/reactive/result/condition/HeadersRequestCondition.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ private HeadersRequestCondition(Collection<HeaderExpression> conditions) {
6161

6262

6363
private static Collection<HeaderExpression> parseExpressions(String... headers) {
64-
Set<HeaderExpression> expressions = new LinkedHashSet<HeaderExpression>();
64+
Set<HeaderExpression> expressions = new LinkedHashSet<>();
6565
if (headers != null) {
6666
for (String header : headers) {
6767
HeaderExpression expr = new HeaderExpression(header);

spring-webflux/src/main/java/org/springframework/web/reactive/result/method/AbstractHandlerMethodMapping.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,7 @@ public Mono<HandlerMethod> getHandlerInternal(ServerWebExchange exchange) {
301301
protected HandlerMethod lookupHandlerMethod(String lookupPath, ServerWebExchange exchange)
302302
throws Exception {
303303

304-
List<Match> matches = new ArrayList<Match>();
304+
List<Match> matches = new ArrayList<>();
305305
List<T> directPathMatches = this.mappingRegistry.getMappingsByUrl(lookupPath);
306306
if (directPathMatches != null) {
307307
addMatchingMappings(directPathMatches, matches, exchange);

spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurerComposite.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
*/
3737
class WebMvcConfigurerComposite implements WebMvcConfigurer {
3838

39-
private final List<WebMvcConfigurer> delegates = new ArrayList<WebMvcConfigurer>();
39+
private final List<WebMvcConfigurer> delegates = new ArrayList<>();
4040

4141

4242
public void addWebMvcConfigurers(List<WebMvcConfigurer> configurers) {

spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMethodMapping.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,7 @@ protected HandlerMethod getHandlerInternal(HttpServletRequest request) throws Ex
340340
*/
341341
@Nullable
342342
protected HandlerMethod lookupHandlerMethod(String lookupPath, HttpServletRequest request) throws Exception {
343-
List<Match> matches = new ArrayList<Match>();
343+
List<Match> matches = new ArrayList<>();
344344
List<T> directPathMatches = this.mappingRegistry.getMappingsByUrl(lookupPath);
345345
if (directPathMatches != null) {
346346
addMatchingMappings(directPathMatches, matches, request);

spring-websocket/src/main/java/org/springframework/web/socket/WebSocketExtension.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ public String toString() {
139139
public static List<WebSocketExtension> parseExtensions(String extensions) {
140140
if (StringUtils.hasText(extensions)) {
141141
String[] tokens = StringUtils.tokenizeToStringArray(extensions, ",");
142-
List<WebSocketExtension> result = new ArrayList<WebSocketExtension>(tokens.length);
142+
List<WebSocketExtension> result = new ArrayList<>(tokens.length);
143143
for (String token : tokens) {
144144
result.add(parseExtension(token));
145145
}

spring-websocket/src/main/java/org/springframework/web/socket/messaging/StompSubProtocolHandler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ public class StompSubProtocolHandler implements SubProtocolHandler, ApplicationE
102102

103103
private MessageHeaderInitializer headerInitializer;
104104

105-
private final Map<String, Principal> stompAuthentications = new ConcurrentHashMap<String, Principal>();
105+
private final Map<String, Principal> stompAuthentications = new ConcurrentHashMap<>();
106106

107107
private Boolean immutableMessageInterceptorPresent;
108108

0 commit comments

Comments
 (0)