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

Merge branch '5.3.x'

Browse Source 
# Conflicts:
#	spring-web/src/main/java/org/springframework/web/accept/AbstractMappingContentNegotiationStrategy.java
This commit is contained in:
Sam Brannen
2022-07-12 12:14:52 +02:00
parent 983c6e233f 6f494ef438
commit 3f993f8639
61 changed files with 101 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-web/src/test/java/org/springframework/http/server/reactive/ListenerWriteProcessorTests.java
View File

@@ -87,7 +87,7 @@ public class ListenerWriteProcessorTests {
@Test // SPR-17410
public void onNextWithoutDemand() {
// Disable writing: next item will be cached..
// Disable writing: next item will be cached.
this.processor.setWritePossible(false);
DataBuffer buffer1 = mock(DataBuffer.class);
this.processor.onNext(buffer1);

2
spring-web/src/test/java/org/springframework/web/accept/MappingContentNegotiationStrategyTests.java
View File

@@ -28,7 +28,7 @@ import org.springframework.web.context.request.NativeWebRequest;
import static org.assertj.core.api.Assertions.assertThat;
/**
* A test fixture with a test sub-class of AbstractMappingContentNegotiationStrategy.
* A test fixture with a test subclass of AbstractMappingContentNegotiationStrategy.
*
* @author Rossen Stoyanchev
* @since 3.2