From f5453cc445a6c07636c6ffc82589b10ee445944f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= Date: Fri, 10 Nov 2023 16:41:30 +0100 Subject: [PATCH] Polish --- .../java/org/springframework/expression/spel/CodeFlow.java | 2 +- .../java/org/springframework/jdbc/core/JdbcTemplate.java | 2 +- .../springframework/r2dbc/core/DefaultDatabaseClient.java | 2 +- .../web/reactive/socket/client/UndertowWebSocketClient.java | 4 ++-- .../web/socket/sockjs/client/UndertowXhrTransport.java | 6 +++--- 5 files changed, 8 insertions(+), 8 deletions(-) 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 82eb9bc191..09518a0787 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 @@ -99,7 +99,7 @@ public class CodeFlow implements Opcodes { this.className = className; this.classWriter = classWriter; this.compilationScopes = new ArrayDeque<>(); - this.compilationScopes.add(new ArrayList()); + this.compilationScopes.add(new ArrayList<>()); } diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/JdbcTemplate.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/JdbcTemplate.java index c8a15d79af..37bd61f2b3 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/JdbcTemplate.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/JdbcTemplate.java @@ -716,7 +716,7 @@ public class JdbcTemplate extends JdbcAccessor implements JdbcOperations { Assert.notNull(rse, "ResultSetExtractor must not be null"); logger.debug("Executing prepared SQL query"); - return execute(psc, new PreparedStatementCallback() { + return execute(psc, new PreparedStatementCallback<>() { @Override @Nullable public T doInPreparedStatement(PreparedStatement ps) throws SQLException { diff --git a/spring-r2dbc/src/main/java/org/springframework/r2dbc/core/DefaultDatabaseClient.java b/spring-r2dbc/src/main/java/org/springframework/r2dbc/core/DefaultDatabaseClient.java index ddeefbc749..465d5f9956 100644 --- a/spring-r2dbc/src/main/java/org/springframework/r2dbc/core/DefaultDatabaseClient.java +++ b/spring-r2dbc/src/main/java/org/springframework/r2dbc/core/DefaultDatabaseClient.java @@ -364,7 +364,7 @@ final class DefaultDatabaseClient implements DatabaseClient { @Override public FetchSpec mapProperties(Class mappedClass) { Assert.notNull(mappedClass, "Mapped class must not be null"); - return execute(this.sqlSupplier, result -> result.map(new DataClassRowMapper(mappedClass))); + return execute(this.sqlSupplier, result -> result.map(new DataClassRowMapper<>(mappedClass))); } @Override diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/client/UndertowWebSocketClient.java b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/client/UndertowWebSocketClient.java index e8280c84b4..e9ed39e863 100644 --- a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/client/UndertowWebSocketClient.java +++ b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/client/UndertowWebSocketClient.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2022 the original author or authors. + * Copyright 2002-2023 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -166,7 +166,7 @@ public class UndertowWebSocketClient implements WebSocketClient { DefaultNegotiation negotiation = new DefaultNegotiation(protocols, headers, builder); builder.setClientNegotiation(negotiation); builder.connect().addNotifier( - new IoFuture.HandlingNotifier() { + new IoFuture.HandlingNotifier<>() { @Override public void handleDone(WebSocketChannel channel, Object attachment) { handleChannel(url, ContextWebSocketHandler.decorate(handler, contextView), diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/client/UndertowXhrTransport.java b/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/client/UndertowXhrTransport.java index c38778ed82..310f72b897 100644 --- a/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/client/UndertowXhrTransport.java +++ b/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/client/UndertowXhrTransport.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2022 the original author or authors. + * Copyright 2002-2023 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -185,7 +185,7 @@ public class UndertowXhrTransport extends AbstractXhrTransport { return new ClientCallback<>() { @Override public void completed(final ClientExchange exchange) { - exchange.setResponseListener(new ClientCallback() { + exchange.setResponseListener(new ClientCallback<>() { @Override public void completed(ClientExchange result) { ClientResponse response = result.getResponse(); @@ -312,7 +312,7 @@ public class UndertowXhrTransport extends AbstractXhrTransport { return new ClientCallback<>() { @Override public void completed(ClientExchange result) { - result.setResponseListener(new ClientCallback() { + result.setResponseListener(new ClientCallback<>() { @Override public void completed(final ClientExchange result) { responses.add(result.getResponse());