Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '5.3.x'

Browse Source
This commit is contained in:
Sam Brannen
2021-09-28 10:35:18 +02:00
parent d483992177 2567b20949
commit 16bf39ea1b
166 changed files with 201 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
spring-webflux/src/main/java/org/springframework/web/reactive/accept/ParameterContentTypeResolver.java
View File

@@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.web.reactive.accept;
import java.util.ArrayList;

12
spring-webflux/src/main/java/org/springframework/web/reactive/config/ResourceHandlerRegistration.java
View File

@@ -75,15 +75,13 @@ public class ResourceHandlerRegistration {
/**
* Add one or more resource locations from which to serve static content.
* Each location must point to a valid directory. Multiple locations may
* <p>Each location must point to a valid directory. Multiple locations may
* be specified as a comma-separated list, and the locations will be checked
* for a given resource in the order specified.
*
* <p>For example, {{@code "/"},
* {@code "classpath:/META-INF/public-web-resources/"}} allows resources to
* be served both from the web application root and from any JAR on the
* classpath that contains a {@code /META-INF/public-web-resources/} directory,
* with resources in the web application root taking precedence.
* <p>For example, {@code "/", "classpath:/META-INF/public-web-resources/"}
* allows resources to be served both from the web application root and from
* any JAR on the classpath that contains a {@code /META-INF/public-web-resources/}
* directory, with resources in the web application root taking precedence.
* @return the same {@link ResourceHandlerRegistration} instance, for
* chained method invocation
*/

1
spring-webflux/src/main/java/org/springframework/web/reactive/function/client/ExchangeFilterFunction.java
View File

@@ -45,7 +45,6 @@ public interface ExchangeFilterFunction {
* always consume its content or otherwise propagate it downstream for
* further handling, for example by the {@link WebClient}. Please, see the
* reference documentation for more details on this.
*
* @param request the current request
* @param next the next exchange function in the chain
* @return the filtered response

1
spring-webflux/src/main/java/org/springframework/web/reactive/function/client/ExchangeFunction.java
View File

@@ -50,7 +50,6 @@ public interface ExchangeFunction {
* propagate it downstream for further handling, for example by the
* {@link WebClient}. Please, see the reference documentation for more
* details on this.
*
* @param request the request to exchange
* @return the delayed response
*/

12
spring-webflux/src/main/java/org/springframework/web/reactive/function/server/RequestPredicates.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2020 the original author or authors.
* Copyright 2002-2021 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.
@@ -796,10 +796,10 @@ public abstract class RequestPredicates {
@Override
public void changeParser(PathPatternParser parser) {
if (this.left instanceof ChangePathPatternParserVisitor.Target) {
((ChangePathPatternParserVisitor.Target) left).changeParser(parser);
((ChangePathPatternParserVisitor.Target) this.left).changeParser(parser);
}
if (this.right instanceof ChangePathPatternParserVisitor.Target) {
((ChangePathPatternParserVisitor.Target) right).changeParser(parser);
((ChangePathPatternParserVisitor.Target) this.right).changeParser(parser);
}
}
@@ -841,7 +841,7 @@ public abstract class RequestPredicates {
@Override
public void changeParser(PathPatternParser parser) {
if (this.delegate instanceof ChangePathPatternParserVisitor.Target) {
((ChangePathPatternParserVisitor.Target) delegate).changeParser(parser);
((ChangePathPatternParserVisitor.Target) this.delegate).changeParser(parser);
}
}
@@ -908,10 +908,10 @@ public abstract class RequestPredicates {
@Override
public void changeParser(PathPatternParser parser) {
if (this.left instanceof ChangePathPatternParserVisitor.Target) {
((ChangePathPatternParserVisitor.Target) left).changeParser(parser);
((ChangePathPatternParserVisitor.Target) this.left).changeParser(parser);
}
if (this.right instanceof ChangePathPatternParserVisitor.Target) {
((ChangePathPatternParserVisitor.Target) right).changeParser(parser);
((ChangePathPatternParserVisitor.Target) this.right).changeParser(parser);
}
}

1
spring-webflux/src/main/java/org/springframework/web/reactive/function/server/ServerResponse.java
View File

@@ -265,7 +265,6 @@ public interface ServerResponse {
/**
* Set the set of allowed {@link HttpMethod HTTP methods}, as specified
* by the {@code Allow} header.
*
* @param allowedMethods the allowed methods
* @return this builder
* @see HttpHeaders#setAllow(Set)

1
spring-webflux/src/main/java/org/springframework/web/reactive/resource/ResourceTransformerSupport.java
View File

@@ -89,7 +89,6 @@ public abstract class ResourceTransformerSupport implements ResourceTransformer
* Transform the given relative request path to an absolute path,
* taking the path of the given request as a point of reference.
* The resulting path is also cleaned from sequences like "path/..".
*
* @param path the relative path to transform
* @param exchange the current exchange
* @return the absolute request path for the given resource path

1
spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/ArgumentResolverConfigurer.java
View File

@@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.web.reactive.result.method.annotation;
import java.util.ArrayList;

1
spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/SessionAttributesHandler.java
View File

@@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.web.reactive.result.method.annotation;
import java.util.Collections;

2
spring-webflux/src/main/java/org/springframework/web/reactive/result/view/Rendering.java
View File

@@ -149,7 +149,6 @@ public interface Rendering {
* Whether to the provided redirect URL should be prepended with the
* application context path (if any).
* <p>By default this is set to {@code true}.
*
* @see RedirectView#setContextRelative(boolean)
*/
RedirectBuilder contextRelative(boolean contextRelative);
@@ -158,7 +157,6 @@ public interface Rendering {
* Whether to append the query string of the current URL to the target
* redirect URL or not.
* <p>By default this is set to {@code false}.
*
* @see RedirectView#setPropagateQuery(boolean)
*/
RedirectBuilder propagateQuery(boolean propagate);

1
spring-webflux/src/main/java/org/springframework/web/reactive/result/view/RequestDataValueProcessor.java
View File

@@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.web.reactive.result.view;
import java.util.Map;

7
spring-webflux/src/main/java/org/springframework/web/reactive/socket/WebSocketHandler.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2020 the original author or authors.
* Copyright 2002-2021 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.
@@ -40,7 +40,7 @@ import reactor.core.publisher.Mono;
*
* <pre class="code">
* class ExampleHandler implements WebSocketHandler {
*
* &#064;Override
* public Mono&lt;Void&gt; handle(WebSocketSession session) {
*
@@ -63,7 +63,7 @@ import reactor.core.publisher.Mono;
*
* <pre class="code">
* class ExampleHandler implements WebSocketHandler {
*
* &#064;Override
* public Mono&lt;Void&gt; handle(WebSocketSession session) {
*
@@ -110,7 +110,6 @@ public interface WebSocketHandler {
*
* <p>See the class-level doc and the reference manual for more details and
* examples of how to handle the session.
*
* @param session the session to handle
* @return indicates when application handling of the session is complete,
* which should reflect the completion of the inbound message stream

1
spring-webflux/src/main/java/org/springframework/web/reactive/socket/WebSocketMessage.java
View File

@@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.web.reactive.socket;
import java.nio.charset.Charset;

1
spring-webflux/src/main/java/org/springframework/web/reactive/socket/WebSocketSession.java
View File

@@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.web.reactive.socket;
import java.util.Map;

1
spring-webflux/src/main/java/org/springframework/web/reactive/socket/adapter/ContextWebSocketHandler.java
View File

@@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.web.reactive.socket.adapter;
import java.util.List;

1
spring-webflux/src/main/java/org/springframework/web/reactive/socket/client/WebSocketClient.java
View File

@@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.web.reactive.socket.client;
import java.net.URI;

1
spring-webflux/src/main/java/org/springframework/web/reactive/socket/server/support/WebSocketHandlerAdapter.java
View File

@@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.web.reactive.socket.server.support;
import reactor.core.publisher.Mono;

1
spring-webflux/src/test/java/org/springframework/web/reactive/accept/ParameterContentTypeResolverTests.java
View File

@@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.web.reactive.accept;
import java.util.Collections;

1
spring-webflux/src/test/java/org/springframework/web/reactive/accept/RequestedContentTypeResolverBuilderTests.java
View File

@@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.web.reactive.accept;
import java.util.Collections;

1
spring-webflux/src/test/java/org/springframework/web/reactive/config/ViewResolverRegistryTests.java
View File

@@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.web.reactive.config;
import java.util.List;

1
spring-webflux/src/test/java/org/springframework/web/reactive/handler/CorsUrlHandlerMappingTests.java
View File

@@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.web.reactive.handler;
import java.util.Collections;

1
spring-webflux/src/test/java/org/springframework/web/reactive/resource/PathResourceResolverTests.java
View File

@@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.web.reactive.resource;
import java.io.IOException;

1
spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/MatrixVariablesMapMethodArgumentResolverTests.java
View File

@@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.web.reactive.result.method.annotation;
import java.time.Duration;

1
spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/MatrixVariablesMethodArgumentResolverTests.java
View File

@@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.web.reactive.result.method.annotation;
import java.time.Duration;

1
spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/WebSessionMethodArgumentResolverTests.java
View File

@@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.web.reactive.result.method.annotation;
import io.reactivex.rxjava3.core.Single;

1
spring-webflux/src/test/java/org/springframework/web/reactive/result/view/ZeroDemandResponse.java
View File

@@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.web.reactive.result.view;
import java.util.function.Supplier;

1
spring-webflux/src/test/java/org/springframework/web/reactive/socket/server/support/WebSocketUpgradeHandlerPredicateTests.java
View File

@@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.web.reactive.socket.server.support;
import java.util.Collections;

1
spring-webflux/src/test/java/org/springframework/web/reactive/socket/server/upgrade/ReactorNettyRequestUpgradeStrategyTests.java
View File

@@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.web.reactive.socket.server.upgrade;
import org.junit.jupiter.api.Test;