From 2b3fb2f5cc64b914759f2bdc83f4eb9847a91172 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Tue, 28 Feb 2017 18:37:33 +0100 Subject: [PATCH] Polishing --- .../AbstractFallbackTransactionAttributeSource.java | 2 +- .../web/reactive/function/server/ServerRequest.java | 6 +++--- .../web/reactive/function/server/ServerResponse.java | 3 +-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/spring-tx/src/main/java/org/springframework/transaction/interceptor/AbstractFallbackTransactionAttributeSource.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/AbstractFallbackTransactionAttributeSource.java index b5bb24d5f1..b1c310f1c6 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/interceptor/AbstractFallbackTransactionAttributeSource.java +++ b/spring-tx/src/main/java/org/springframework/transaction/interceptor/AbstractFallbackTransactionAttributeSource.java @@ -69,7 +69,7 @@ public abstract class AbstractFallbackTransactionAttributeSource implements Tran *

As this base class is not marked Serializable, the cache will be recreated * after serialization - provided that the concrete subclass is Serializable. */ - final Map attributeCache = new ConcurrentHashMap<>(1024); + private final Map attributeCache = new ConcurrentHashMap<>(1024); /** diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/ServerRequest.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/ServerRequest.java index 5f58aff6fa..373293a7e8 100644 --- a/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/ServerRequest.java +++ b/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/ServerRequest.java @@ -40,7 +40,7 @@ import org.springframework.web.server.WebSession; /** * Represents a server-side HTTP request, as handled by a {@code HandlerFunction}. * Access to headers and body is offered by {@link Headers} and - * {@link #body(BodyExtractor)} respectively. + * {@link #body(BodyExtractor)}, respectively. * * @author Arjen Poutsma * @author Sebastien Deleuze @@ -154,8 +154,8 @@ public interface ServerRequest { } /** - * Return all path variables. - * @return the path variables + * Return all path variables for the current request. + * @return a {@code Map} from path variable name to associated value */ Map pathVariables(); diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/ServerResponse.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/ServerResponse.java index 0fe59a7d95..33744f9136 100644 --- a/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/ServerResponse.java +++ b/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/ServerResponse.java @@ -78,7 +78,7 @@ public interface ServerResponse { * @return the created builder */ static BodyBuilder from(ServerResponse other) { - Assert.notNull(other, "'other' must not be null"); + Assert.notNull(other, "Other ServerResponse must not be null"); DefaultServerResponseBuilder builder = new DefaultServerResponseBuilder(other.statusCode()); return builder.headers(other.headers()); } @@ -362,7 +362,6 @@ public interface ServerResponse { * @return the built response */ Mono render(String name, Map model); - } } -- GitLab