Merge pull request #1669 from igor-suhorukov

* pr/1669:
  Polish

spring-core/src/main/java/org/springframework/util/comparator/Comparators.java

@@ -52,7 +52,7 @@ public static <T> Comparator<T> nullsLow() {
 	 * @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 static <T> Comparator<T> nullsHigh() {
 	 * @see NullSafeComparator#NullSafeComparator(boolean)
 	 */
 	public static <T> Comparator<T> nullsHigh(Comparator<T> comparator) {
-		return new NullSafeComparator<T>(comparator, false);
+		return new NullSafeComparator<>(comparator, false);
 	}
 
 }

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>());
 	}
 

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

@@ -46,7 +46,7 @@ public ReactorNettyTcpStompClient() {
 	 * @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());
 	}
 
 	/**

spring-web/src/main/java/org/springframework/http/codec/ServerSentEvent.java

@@ -239,7 +239,7 @@ public Builder<T> data(@Nullable T data) {
 
         @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);
         }
     }
 

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

@@ -133,7 +133,7 @@ public Mono<Void> handleResult(ServerWebExchange exchange, HandlerResult result)
 				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(

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

@@ -117,7 +117,7 @@ protected SimpleUrlHandlerMapping buildHandlerMapping() {
 			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());
 		}