From 4c888d0f328c4eb8f50007f297fd3e9fe05fbfda Mon Sep 17 00:00:00 2001
From: igor-suhorukov <igor.suhorukov@gmail.com>
Date: Fri, 9 Feb 2018 00:07:43 +0300
Subject: [PATCH] Polish

Closes gh-1669
---
 .../java/org/springframework/util/comparator/Comparators.java | 4 ++--
 .../java/org/springframework/expression/spel/CodeFlow.java    | 2 +-
 .../messaging/simp/stomp/ReactorNettyTcpStompClient.java      | 2 +-
 .../java/org/springframework/http/codec/ServerSentEvent.java  | 2 +-
 .../result/method/annotation/ResponseEntityResultHandler.java | 2 +-
 .../web/servlet/config/annotation/ViewControllerRegistry.java | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/spring-core/src/main/java/org/springframework/util/comparator/Comparators.java b/spring-core/src/main/java/org/springframework/util/comparator/Comparators.java
index 82a46c66865..93f66273ca9 100644
--- a/spring-core/src/main/java/org/springframework/util/comparator/Comparators.java
+++ b/spring-core/src/main/java/org/springframework/util/comparator/Comparators.java
@@ -52,7 +52,7 @@ public abstract class Comparators {
 	 * @see NullSafeComparator#NullSafeComparator(boolean)
 	 */
 	public static <T> Comparator<T> nullsLow(Comparator<T> comparator) {
-		return new NullSafeComparator<T>(comparator, false);
+		return new NullSafeComparator<>(comparator, false);
 	}
 
 	/**
@@ -71,7 +71,7 @@ public abstract class Comparators {
 	 * @see NullSafeComparator#NullSafeComparator(boolean)
 	 */
 	public static <T> Comparator<T> nullsHigh(Comparator<T> comparator) {
-		return new NullSafeComparator<T>(comparator, false);
+		return new NullSafeComparator<>(comparator, false);
 	}
 
 }
diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/CodeFlow.java b/spring-expression/src/main/java/org/springframework/expression/spel/CodeFlow.java
index e41648e7c5a..84ab1c00a37 100644
--- a/spring-expression/src/main/java/org/springframework/expression/spel/CodeFlow.java
+++ b/spring-expression/src/main/java/org/springframework/expression/spel/CodeFlow.java
@@ -97,7 +97,7 @@ public class CodeFlow implements Opcodes {
 	public CodeFlow(String className, ClassWriter classWriter) {
 		this.className = className;
 		this.classWriter = classWriter;
-		this.compilationScopes = new Stack<ArrayList<String>>();
+		this.compilationScopes = new Stack<>();
 		this.compilationScopes.add(new ArrayList<String>());
 	}
 
diff --git a/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/ReactorNettyTcpStompClient.java b/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/ReactorNettyTcpStompClient.java
index 345b50735f8..be1be18c95c 100644
--- a/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/ReactorNettyTcpStompClient.java
+++ b/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/ReactorNettyTcpStompClient.java
@@ -46,7 +46,7 @@ public class ReactorNettyTcpStompClient extends StompClientSupport {
 	 * @param port the port
 	 */
 	public ReactorNettyTcpStompClient(String host, int port) {
-		this.tcpClient = new ReactorNettyTcpClient<byte[]>(host, port, new StompReactorNettyCodec());
+		this.tcpClient = new ReactorNettyTcpClient<>(host, port, new StompReactorNettyCodec());
 	}
 
 	/**
diff --git a/spring-web/src/main/java/org/springframework/http/codec/ServerSentEvent.java b/spring-web/src/main/java/org/springframework/http/codec/ServerSentEvent.java
index fd7de7fe768..366d1bd615f 100644
--- a/spring-web/src/main/java/org/springframework/http/codec/ServerSentEvent.java
+++ b/spring-web/src/main/java/org/springframework/http/codec/ServerSentEvent.java
@@ -239,7 +239,7 @@ public class ServerSentEvent<T> {
 
         @Override
         public ServerSentEvent<T> build() {
-            return new ServerSentEvent<T>(this.id, this.event, this.retry, this.comment, this.data);
+            return new ServerSentEvent<>(this.id, this.event, this.retry, this.comment, this.data);
         }
     }
 
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/ResponseEntityResultHandler.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/ResponseEntityResultHandler.java
index f3ec45f48d0..7999fc1db8a 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/ResponseEntityResultHandler.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/ResponseEntityResultHandler.java
@@ -133,7 +133,7 @@ public class ResponseEntityResultHandler extends AbstractMessageWriterResultHand
 				httpEntity = (HttpEntity<?>) returnValue;
 			}
 			else if (returnValue instanceof HttpHeaders) {
-				httpEntity = new ResponseEntity<Void>((HttpHeaders) returnValue, HttpStatus.OK);
+				httpEntity = new ResponseEntity<>((HttpHeaders) returnValue, HttpStatus.OK);
 			}
 			else {
 				throw new IllegalArgumentException(
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/ViewControllerRegistry.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/ViewControllerRegistry.java
index c02a40a77ab..f98b06f3874 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/ViewControllerRegistry.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/ViewControllerRegistry.java
@@ -117,7 +117,7 @@ public class ViewControllerRegistry {
 			return null;
 		}
 
-		Map<String, Object> urlMap = new LinkedHashMap<String, Object>();
+		Map<String, Object> urlMap = new LinkedHashMap<>();
 		for (ViewControllerRegistration registration : this.registrations) {
 			urlMap.put(registration.getUrlPath(), registration.getViewController());
 		}