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

Spring cleaning: use method references

Browse Source
This commit is contained in:
Sam Brannen
2024-02-23 11:53:15 +01:00
parent 4339c8eac2
commit 4bd1485ce4
10 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spring-web/src/main/java/org/springframework/http/codec/multipart/PartEventHttpMessageReader.java
View File

@@ -38,6 +38,7 @@ import org.springframework.http.MediaType;
import org.springframework.http.ReactiveHttpInputMessage;
import org.springframework.http.codec.HttpMessageReader;
import org.springframework.http.codec.LoggingCodecSupport;
import org.springframework.http.codec.multipart.MultipartParser.HeadersToken;
import org.springframework.lang.Nullable;
import org.springframework.util.Assert;
@@ -154,7 +155,7 @@ public class PartEventHttpMessageReader extends LoggingCodecSupport implements H
AtomicInteger partCount = new AtomicInteger();
return allPartsTokens
.windowUntil(t -> t instanceof MultipartParser.HeadersToken, true)
.windowUntil(HeadersToken.class::isInstance, true)
.concatMap(partTokens -> partTokens
.switchOnFirst((signal, flux) -> {
if (!signal.hasValue()) {

12
spring-web/src/test/java/org/springframework/http/codec/support/CodecConfigurerTests.java
View File

@@ -385,12 +385,12 @@ class CodecConfigurerTests {
// Clone has the customized the customizations
List<Decoder<?>> decoders = clone.getReaders().stream()
.filter(reader -> reader instanceof DecoderHttpMessageReader)
.filter(DecoderHttpMessageReader.class::isInstance)
.map(reader -> ((DecoderHttpMessageReader<?>) reader).getDecoder())
.collect(Collectors.toList());
List<Encoder<?>> encoders = clone.getWriters().stream()
.filter(writer -> writer instanceof EncoderHttpMessageWriter)
.filter(EncoderHttpMessageWriter.class::isInstance)
.map(reader -> ((EncoderHttpMessageWriter<?>) reader).getEncoder())
.collect(Collectors.toList());
@@ -400,12 +400,12 @@ class CodecConfigurerTests {
// Original does not have the customizations
decoders = this.configurer.getReaders().stream()
.filter(reader -> reader instanceof DecoderHttpMessageReader)
.filter(DecoderHttpMessageReader.class::isInstance)
.map(reader -> ((DecoderHttpMessageReader<?>) reader).getDecoder())
.collect(Collectors.toList());
encoders = this.configurer.getWriters().stream()
.filter(writer -> writer instanceof EncoderHttpMessageWriter)
.filter(EncoderHttpMessageWriter.class::isInstance)
.map(reader -> ((EncoderHttpMessageWriter<?>) reader).getEncoder())
.collect(Collectors.toList());
@@ -454,7 +454,7 @@ class CodecConfigurerTests {
private void assertDecoderInstance(Decoder<?> decoder) {
assertThat(this.configurer.getReaders().stream()
.filter(writer -> writer instanceof DecoderHttpMessageReader)
.filter(DecoderHttpMessageReader.class::isInstance)
.map(writer -> ((DecoderHttpMessageReader<?>) writer).getDecoder())
.filter(e -> decoder.getClass().equals(e.getClass()))
.findFirst()
@@ -463,7 +463,7 @@ class CodecConfigurerTests {
private void assertEncoderInstance(Encoder<?> encoder) {
assertThat(this.configurer.getWriters().stream()
.filter(writer -> writer instanceof EncoderHttpMessageWriter)
.filter(EncoderHttpMessageWriter.class::isInstance)
.map(writer -> ((EncoderHttpMessageWriter<?>) writer).getEncoder())
.filter(e -> encoder.getClass().equals(e.getClass()))
.findFirst()