diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/package-info.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/package-info.java index a67971d4cee58deb288994b79668ece9dedcfa77..0fc2f21a0d5c2931b3ec4a6d082ef0b5bf983028 100644 --- a/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/package-info.java +++ b/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/package-info.java @@ -1,19 +1,3 @@ -/* - * Copyright 2002-2019 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - /** * Provides the types that make up Spring's functional web framework for Reactive environments. */ diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/function/DefaultEntityResponseBuilder.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/function/DefaultEntityResponseBuilder.java index d6acce370f2f549c6f728dd164d14470989615ac..8bb868763dd15c971dca387d115425a5550bfe51 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/function/DefaultEntityResponseBuilder.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/function/DefaultEntityResponseBuilder.java @@ -62,8 +62,9 @@ import org.springframework.web.servlet.ModelAndView; * * @author Arjen Poutsma * @since 5.2 + * @param the entity type */ -class DefaultEntityResponseBuilder implements EntityResponse.Builder { +final class DefaultEntityResponseBuilder implements EntityResponse.Builder { private final T entity; diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/function/DefaultServerRequest.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/function/DefaultServerRequest.java index 0803863d1cffc9542a1d7cd637636caf50cbae43..aef87defb31c9eda125604c3742f6aa861b383a5 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/function/DefaultServerRequest.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/function/DefaultServerRequest.java @@ -220,7 +220,8 @@ class DefaultServerRequest implements ServerRequest { .getAttribute(RouterFunctions.URI_TEMPLATE_VARIABLES_ATTRIBUTE); if (pathVariables != null) { return pathVariables; - } else { + } + else { return Collections.emptyMap(); } } @@ -235,7 +236,9 @@ class DefaultServerRequest implements ServerRequest { return Optional.ofNullable(this.serverHttpRequest.getPrincipal()); } - + /** + * Default implementation of {@link Headers}. + */ static class DefaultRequestHeaders implements Headers { private final HttpHeaders delegate; @@ -298,7 +301,7 @@ class DefaultServerRequest implements ServerRequest { } } - private static class ServletParametersMap extends AbstractMap> { + private static final class ServletParametersMap extends AbstractMap> { private final HttpServletRequest servletRequest; @@ -353,7 +356,7 @@ class DefaultServerRequest implements ServerRequest { } - private static class ServletAttributesMap extends AbstractMap { + private static final class ServletAttributesMap extends AbstractMap { private final HttpServletRequest servletRequest; diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/function/DefaultServerRequestBuilder.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/function/DefaultServerRequestBuilder.java index 31eba479cf7872cba98b0142cd53e9b691f4e720..0caee0c7928f6fc39aeccea542050a33994cf2ce 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/function/DefaultServerRequestBuilder.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/function/DefaultServerRequestBuilder.java @@ -283,7 +283,8 @@ class DefaultServerRequestBuilder implements ServerRequest.Builder { .get(RouterFunctions.URI_TEMPLATE_VARIABLES_ATTRIBUTE); if (pathVariables != null) { return pathVariables; - } else { + } + else { return Collections.emptyMap(); } } diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/function/DefaultServerResponseBuilder.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/function/DefaultServerResponseBuilder.java index 1c4045944318e6611a65f1f2e1ea5035e4e6bae4..dae73bdefc350b343b6c3d79f74a6414393dd242 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/function/DefaultServerResponseBuilder.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/function/DefaultServerResponseBuilder.java @@ -286,8 +286,9 @@ class DefaultServerResponseBuilder implements ServerResponse.BodyBuilder { else { return writeToInternal(request, response, context); } - } catch (Throwable t) { - return handleError(t, request, response, context); + } + catch (Throwable throwable) { + return handleError(throwable, request, response, context); } } diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/function/EntityResponse.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/function/EntityResponse.java index 7e859a1dd11518baa4bd5b61a742f8ff3589ff1a..a68e63435c3b0469c157ac88e4ab8a73939bd944 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/function/EntityResponse.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/function/EntityResponse.java @@ -72,6 +72,7 @@ public interface EntityResponse extends ServerResponse { /** * Defines a builder for {@code EntityResponse}. + * @param the entity type */ interface Builder { diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/function/RouterFunctions.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/function/RouterFunctions.java index f6c459398ce321aa32409d802bbeb5f33317c199..a0303baeff20473a605bc36db8021a11cd193c30 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/function/RouterFunctions.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/function/RouterFunctions.java @@ -830,10 +830,11 @@ public abstract class RouterFunctions { "Nested predicate \"%s\" matches against \"%s\"", this.predicate, serverRequest)); } - Optional> result = this.routerFunction.route(nestedRequest); + Optional> result = + this.routerFunction.route(nestedRequest); if (result.isPresent() && nestedRequest != serverRequest) { - serverRequest.attributes().clear(); - serverRequest.attributes().putAll(nestedRequest.attributes()); + serverRequest.attributes().clear(); + serverRequest.attributes().putAll(nestedRequest.attributes()); } return result; } diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/function/ServerRequest.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/function/ServerRequest.java index 247b1d8a51cd1fc3c86ea50702481ce81ece8b26..421c7f91809665bf391870d2474853c149256116 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/function/ServerRequest.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/function/ServerRequest.java @@ -223,7 +223,7 @@ public interface ServerRequest { // Static methods /** - * Create a new {@code ServerRequest} based on the given {@code {@link HttpServletRequest} and + * Create a new {@code ServerRequest} based on the given {@code HttpServletRequest} and * message converters. * @param servletRequest the request * @param messageReaders the message readers diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/function/ServerResponse.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/function/ServerResponse.java index f931698110245659e5d0386ca9f959f20eba8695..23ff9276e6bd8bdf1137a9febd6d5ef7b3cb20f8 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/function/ServerResponse.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/function/ServerResponse.java @@ -71,7 +71,8 @@ public interface ServerResponse { MultiValueMap cookies(); /** - * Write this response to the servlet response (and return {@code null}, or return a + * Write this response to the servlet response (and return {@code null}, or return a model and + * view. * @param request the current request * @param response the response to write to * @param context the context to use when writing diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/function/support/package-info.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/function/support/package-info.java index b5c58ed0ef65092e0daef81978736bca3b8e0b64..a41208ab31f3ec0c21c738d8cf0ff04a4a8a6bdb 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/function/support/package-info.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/function/support/package-info.java @@ -1,19 +1,3 @@ -/* - * Copyright 2002-2019 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - /** * Classes supporting the {@code org.springframework.web.servlet.function} package. * Contains a {@code HandlerAdapter} that supports {@code HandlerFunction}s,