Browse Source

Polish

pull/30534/merge
Stéphane Nicoll 1 year ago
parent
commit
f5453cc445
  1. 2
      spring-expression/src/main/java/org/springframework/expression/spel/CodeFlow.java
  2. 2
      spring-jdbc/src/main/java/org/springframework/jdbc/core/JdbcTemplate.java
  3. 2
      spring-r2dbc/src/main/java/org/springframework/r2dbc/core/DefaultDatabaseClient.java
  4. 4
      spring-webflux/src/main/java/org/springframework/web/reactive/socket/client/UndertowWebSocketClient.java
  5. 6
      spring-websocket/src/main/java/org/springframework/web/socket/sockjs/client/UndertowXhrTransport.java

2
spring-expression/src/main/java/org/springframework/expression/spel/CodeFlow.java

@ -99,7 +99,7 @@ public class CodeFlow implements Opcodes {
this.className = className; this.className = className;
this.classWriter = classWriter; this.classWriter = classWriter;
this.compilationScopes = new ArrayDeque<>(); this.compilationScopes = new ArrayDeque<>();
this.compilationScopes.add(new ArrayList<String>()); this.compilationScopes.add(new ArrayList<>());
} }

2
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"); Assert.notNull(rse, "ResultSetExtractor must not be null");
logger.debug("Executing prepared SQL query"); logger.debug("Executing prepared SQL query");
return execute(psc, new PreparedStatementCallback<T>() { return execute(psc, new PreparedStatementCallback<>() {
@Override @Override
@Nullable @Nullable
public T doInPreparedStatement(PreparedStatement ps) throws SQLException { public T doInPreparedStatement(PreparedStatement ps) throws SQLException {

2
spring-r2dbc/src/main/java/org/springframework/r2dbc/core/DefaultDatabaseClient.java

@ -364,7 +364,7 @@ final class DefaultDatabaseClient implements DatabaseClient {
@Override @Override
public <R> FetchSpec<R> mapProperties(Class<R> mappedClass) { public <R> FetchSpec<R> mapProperties(Class<R> mappedClass) {
Assert.notNull(mappedClass, "Mapped class must not be null"); Assert.notNull(mappedClass, "Mapped class must not be null");
return execute(this.sqlSupplier, result -> result.map(new DataClassRowMapper<R>(mappedClass))); return execute(this.sqlSupplier, result -> result.map(new DataClassRowMapper<>(mappedClass)));
} }
@Override @Override

4
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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with 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); DefaultNegotiation negotiation = new DefaultNegotiation(protocols, headers, builder);
builder.setClientNegotiation(negotiation); builder.setClientNegotiation(negotiation);
builder.connect().addNotifier( builder.connect().addNotifier(
new IoFuture.HandlingNotifier<WebSocketChannel, Object>() { new IoFuture.HandlingNotifier<>() {
@Override @Override
public void handleDone(WebSocketChannel channel, Object attachment) { public void handleDone(WebSocketChannel channel, Object attachment) {
handleChannel(url, ContextWebSocketHandler.decorate(handler, contextView), handleChannel(url, ContextWebSocketHandler.decorate(handler, contextView),

6
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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with 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<>() { return new ClientCallback<>() {
@Override @Override
public void completed(final ClientExchange exchange) { public void completed(final ClientExchange exchange) {
exchange.setResponseListener(new ClientCallback<ClientExchange>() { exchange.setResponseListener(new ClientCallback<>() {
@Override @Override
public void completed(ClientExchange result) { public void completed(ClientExchange result) {
ClientResponse response = result.getResponse(); ClientResponse response = result.getResponse();
@ -312,7 +312,7 @@ public class UndertowXhrTransport extends AbstractXhrTransport {
return new ClientCallback<>() { return new ClientCallback<>() {
@Override @Override
public void completed(ClientExchange result) { public void completed(ClientExchange result) {
result.setResponseListener(new ClientCallback<ClientExchange>() { result.setResponseListener(new ClientCallback<>() {
@Override @Override
public void completed(final ClientExchange result) { public void completed(final ClientExchange result) {
responses.add(result.getResponse()); responses.add(result.getResponse());

Loading…
Cancel
Save