Merge branch '5.3.x'

# Conflicts:
#	spring-webflux/src/main/java/org/springframework/web/reactive/result/view/RedirectView.java
This commit is contained in:
Sam Brannen
2022-07-12 12:01:27 +02:00
34 changed files with 45 additions and 45 deletions

View File

@@ -290,7 +290,7 @@ public class DefaultWebClientTests {
.defaultCookie("baz", "qux")
.build();
// Now, verify what each client has..
// Now, verify what each client has.
WebClient.Builder builder1 = client1.mutate();
builder1.filters(filters -> assertThat(filters.size()).isEqualTo(1));

View File

@@ -44,7 +44,7 @@ import static org.springframework.web.bind.annotation.RequestMethod.PUT;
*/
public class RequestMethodsRequestConditionTests {
// TODO: custom method, CORS pre-flight (see @Disabledd)
// TODO: custom method, CORS pre-flight (see @Disabled)
@Test
public void getMatchingCondition() throws Exception {

View File

@@ -167,7 +167,7 @@ public class RequestMappingMessageConversionIntegrationTests extends AbstractReq
assertThat(responseEntity.getBody()).isNull();
// As we're on the same connection, the 2nd request proves server response handling
// did complete after the 1st request..
// did complete after the 1st request.
responseEntity = performGet("/person-response/mono-empty", JSON, Person.class);
assertThat(responseEntity.getHeaders().getContentLength()).isEqualTo(0);
assertThat(responseEntity.getBody()).isNull();

View File

@@ -67,7 +67,7 @@ import org.springframework.web.testfixture.http.server.reactive.bootstrap.Tomcat
import org.springframework.web.testfixture.http.server.reactive.bootstrap.UndertowHttpServer;
/**
* Base class for WebSocket integration tests. Sub-classes must implement
* Base class for WebSocket integration tests. Subclasses must implement
* {@link #getWebConfigClass()} to return Spring config class with (server-side)
* handler mappings to {@code WebSocketHandler}'s.
*