Spring cleaning: use method references
This commit is contained in:
parent
4339c8eac2
commit
4bd1485ce4
|
|
@ -151,8 +151,7 @@ public abstract class AbstractBeanFactoryBasedTargetSourceCreator
|
||||||
|
|
||||||
// Filter out BeanPostProcessors that are part of the AOP infrastructure,
|
// Filter out BeanPostProcessors that are part of the AOP infrastructure,
|
||||||
// since those are only meant to apply to beans defined in the original factory.
|
// since those are only meant to apply to beans defined in the original factory.
|
||||||
internalBeanFactory.getBeanPostProcessors().removeIf(beanPostProcessor ->
|
internalBeanFactory.getBeanPostProcessors().removeIf(AopInfrastructureBean.class::isInstance);
|
||||||
beanPostProcessor instanceof AopInfrastructureBean);
|
|
||||||
|
|
||||||
return internalBeanFactory;
|
return internalBeanFactory;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -233,8 +233,7 @@ public class ScriptFactoryPostProcessor implements SmartInstantiationAwareBeanPo
|
||||||
|
|
||||||
// Filter out BeanPostProcessors that are part of the AOP infrastructure,
|
// Filter out BeanPostProcessors that are part of the AOP infrastructure,
|
||||||
// since those are only meant to apply to beans defined in the original factory.
|
// since those are only meant to apply to beans defined in the original factory.
|
||||||
this.scriptBeanFactory.getBeanPostProcessors().removeIf(beanPostProcessor ->
|
this.scriptBeanFactory.getBeanPostProcessors().removeIf(AopInfrastructureBean.class::isInstance);
|
||||||
beanPostProcessor instanceof AopInfrastructureBean);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
||||||
|
|
@ -98,7 +98,7 @@ public interface MethodValidationResult {
|
||||||
*/
|
*/
|
||||||
default List<ParameterErrors> getBeanResults() {
|
default List<ParameterErrors> getBeanResults() {
|
||||||
return getAllValidationResults().stream()
|
return getAllValidationResults().stream()
|
||||||
.filter(result -> result instanceof ParameterErrors)
|
.filter(ParameterErrors.class::isInstance)
|
||||||
.map(result -> (ParameterErrors) result)
|
.map(result -> (ParameterErrors) result)
|
||||||
.toList();
|
.toList();
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -469,7 +469,7 @@ final class PlaceholderParser {
|
||||||
}
|
}
|
||||||
|
|
||||||
private boolean isTextOnly(List<Part> parts) {
|
private boolean isTextOnly(List<Part> parts) {
|
||||||
return parts.stream().allMatch(part -> part instanceof TextPart);
|
return parts.stream().allMatch(TextPart.class::isInstance);
|
||||||
}
|
}
|
||||||
|
|
||||||
private String toText(List<Part> parts) {
|
private String toText(List<Part> parts) {
|
||||||
|
|
|
||||||
|
|
@ -76,7 +76,7 @@ record JsonEncoderDecoder(Encoder<?> encoder, Decoder<?> decoder) {
|
||||||
@Nullable
|
@Nullable
|
||||||
private static Encoder<?> findJsonEncoder(Collection<HttpMessageWriter<?>> writers) {
|
private static Encoder<?> findJsonEncoder(Collection<HttpMessageWriter<?>> writers) {
|
||||||
return findJsonEncoder(writers.stream()
|
return findJsonEncoder(writers.stream()
|
||||||
.filter(writer -> writer instanceof EncoderHttpMessageWriter)
|
.filter(EncoderHttpMessageWriter.class::isInstance)
|
||||||
.map(writer -> ((EncoderHttpMessageWriter<?>) writer).getEncoder()));
|
.map(writer -> ((EncoderHttpMessageWriter<?>) writer).getEncoder()));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -97,7 +97,7 @@ record JsonEncoderDecoder(Encoder<?> encoder, Decoder<?> decoder) {
|
||||||
@Nullable
|
@Nullable
|
||||||
private static Decoder<?> findJsonDecoder(Collection<HttpMessageReader<?>> readers) {
|
private static Decoder<?> findJsonDecoder(Collection<HttpMessageReader<?>> readers) {
|
||||||
return findJsonDecoder(readers.stream()
|
return findJsonDecoder(readers.stream()
|
||||||
.filter(reader -> reader instanceof DecoderHttpMessageReader)
|
.filter(DecoderHttpMessageReader.class::isInstance)
|
||||||
.map(reader -> ((DecoderHttpMessageReader<?>) reader).getDecoder()));
|
.map(reader -> ((DecoderHttpMessageReader<?>) reader).getDecoder()));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -114,7 +114,7 @@ class ExchangeMutatorTests {
|
||||||
|
|
||||||
Assert.notNull(httpHandlerBuilder, "Not a mock server");
|
Assert.notNull(httpHandlerBuilder, "Not a mock server");
|
||||||
httpHandlerBuilder.filters(filters -> {
|
httpHandlerBuilder.filters(filters -> {
|
||||||
filters.removeIf(filter -> filter instanceof IdentityFilter);
|
filters.removeIf(IdentityFilter.class::isInstance);
|
||||||
filters.add(0, this.filter);
|
filters.add(0, this.filter);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -38,6 +38,7 @@ import org.springframework.http.MediaType;
|
||||||
import org.springframework.http.ReactiveHttpInputMessage;
|
import org.springframework.http.ReactiveHttpInputMessage;
|
||||||
import org.springframework.http.codec.HttpMessageReader;
|
import org.springframework.http.codec.HttpMessageReader;
|
||||||
import org.springframework.http.codec.LoggingCodecSupport;
|
import org.springframework.http.codec.LoggingCodecSupport;
|
||||||
|
import org.springframework.http.codec.multipart.MultipartParser.HeadersToken;
|
||||||
import org.springframework.lang.Nullable;
|
import org.springframework.lang.Nullable;
|
||||||
import org.springframework.util.Assert;
|
import org.springframework.util.Assert;
|
||||||
|
|
||||||
|
|
@ -154,7 +155,7 @@ public class PartEventHttpMessageReader extends LoggingCodecSupport implements H
|
||||||
|
|
||||||
AtomicInteger partCount = new AtomicInteger();
|
AtomicInteger partCount = new AtomicInteger();
|
||||||
return allPartsTokens
|
return allPartsTokens
|
||||||
.windowUntil(t -> t instanceof MultipartParser.HeadersToken, true)
|
.windowUntil(HeadersToken.class::isInstance, true)
|
||||||
.concatMap(partTokens -> partTokens
|
.concatMap(partTokens -> partTokens
|
||||||
.switchOnFirst((signal, flux) -> {
|
.switchOnFirst((signal, flux) -> {
|
||||||
if (!signal.hasValue()) {
|
if (!signal.hasValue()) {
|
||||||
|
|
|
||||||
|
|
@ -385,12 +385,12 @@ class CodecConfigurerTests {
|
||||||
// Clone has the customized the customizations
|
// Clone has the customized the customizations
|
||||||
|
|
||||||
List<Decoder<?>> decoders = clone.getReaders().stream()
|
List<Decoder<?>> decoders = clone.getReaders().stream()
|
||||||
.filter(reader -> reader instanceof DecoderHttpMessageReader)
|
.filter(DecoderHttpMessageReader.class::isInstance)
|
||||||
.map(reader -> ((DecoderHttpMessageReader<?>) reader).getDecoder())
|
.map(reader -> ((DecoderHttpMessageReader<?>) reader).getDecoder())
|
||||||
.collect(Collectors.toList());
|
.collect(Collectors.toList());
|
||||||
|
|
||||||
List<Encoder<?>> encoders = clone.getWriters().stream()
|
List<Encoder<?>> encoders = clone.getWriters().stream()
|
||||||
.filter(writer -> writer instanceof EncoderHttpMessageWriter)
|
.filter(EncoderHttpMessageWriter.class::isInstance)
|
||||||
.map(reader -> ((EncoderHttpMessageWriter<?>) reader).getEncoder())
|
.map(reader -> ((EncoderHttpMessageWriter<?>) reader).getEncoder())
|
||||||
.collect(Collectors.toList());
|
.collect(Collectors.toList());
|
||||||
|
|
||||||
|
|
@ -400,12 +400,12 @@ class CodecConfigurerTests {
|
||||||
// Original does not have the customizations
|
// Original does not have the customizations
|
||||||
|
|
||||||
decoders = this.configurer.getReaders().stream()
|
decoders = this.configurer.getReaders().stream()
|
||||||
.filter(reader -> reader instanceof DecoderHttpMessageReader)
|
.filter(DecoderHttpMessageReader.class::isInstance)
|
||||||
.map(reader -> ((DecoderHttpMessageReader<?>) reader).getDecoder())
|
.map(reader -> ((DecoderHttpMessageReader<?>) reader).getDecoder())
|
||||||
.collect(Collectors.toList());
|
.collect(Collectors.toList());
|
||||||
|
|
||||||
encoders = this.configurer.getWriters().stream()
|
encoders = this.configurer.getWriters().stream()
|
||||||
.filter(writer -> writer instanceof EncoderHttpMessageWriter)
|
.filter(EncoderHttpMessageWriter.class::isInstance)
|
||||||
.map(reader -> ((EncoderHttpMessageWriter<?>) reader).getEncoder())
|
.map(reader -> ((EncoderHttpMessageWriter<?>) reader).getEncoder())
|
||||||
.collect(Collectors.toList());
|
.collect(Collectors.toList());
|
||||||
|
|
||||||
|
|
@ -454,7 +454,7 @@ class CodecConfigurerTests {
|
||||||
|
|
||||||
private void assertDecoderInstance(Decoder<?> decoder) {
|
private void assertDecoderInstance(Decoder<?> decoder) {
|
||||||
assertThat(this.configurer.getReaders().stream()
|
assertThat(this.configurer.getReaders().stream()
|
||||||
.filter(writer -> writer instanceof DecoderHttpMessageReader)
|
.filter(DecoderHttpMessageReader.class::isInstance)
|
||||||
.map(writer -> ((DecoderHttpMessageReader<?>) writer).getDecoder())
|
.map(writer -> ((DecoderHttpMessageReader<?>) writer).getDecoder())
|
||||||
.filter(e -> decoder.getClass().equals(e.getClass()))
|
.filter(e -> decoder.getClass().equals(e.getClass()))
|
||||||
.findFirst()
|
.findFirst()
|
||||||
|
|
@ -463,7 +463,7 @@ class CodecConfigurerTests {
|
||||||
|
|
||||||
private void assertEncoderInstance(Encoder<?> encoder) {
|
private void assertEncoderInstance(Encoder<?> encoder) {
|
||||||
assertThat(this.configurer.getWriters().stream()
|
assertThat(this.configurer.getWriters().stream()
|
||||||
.filter(writer -> writer instanceof EncoderHttpMessageWriter)
|
.filter(EncoderHttpMessageWriter.class::isInstance)
|
||||||
.map(writer -> ((EncoderHttpMessageWriter<?>) writer).getEncoder())
|
.map(writer -> ((EncoderHttpMessageWriter<?>) writer).getEncoder())
|
||||||
.filter(e -> encoder.getClass().equals(e.getClass()))
|
.filter(e -> encoder.getClass().equals(e.getClass()))
|
||||||
.findFirst()
|
.findFirst()
|
||||||
|
|
|
||||||
|
|
@ -69,7 +69,7 @@ class WebSocketIntegrationTests extends AbstractReactiveWebSocketIntegrationTest
|
||||||
|
|
||||||
if (server instanceof TomcatHttpServer) {
|
if (server instanceof TomcatHttpServer) {
|
||||||
Mono.fromRunnable(this::testEcho)
|
Mono.fromRunnable(this::testEcho)
|
||||||
.retryWhen(Retry.max(3).filter(ex -> ex instanceof IllegalStateException))
|
.retryWhen(Retry.max(3).filter(IllegalStateException.class::isInstance))
|
||||||
.block();
|
.block();
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
|
|
|
||||||
|
|
@ -175,7 +175,7 @@ class WebMvcConfigurationSupportTests {
|
||||||
List<HttpMessageConverter<?>> converters = adapter.getMessageConverters();
|
List<HttpMessageConverter<?>> converters = adapter.getMessageConverters();
|
||||||
assertThat(converters).hasSizeGreaterThanOrEqualTo(14);
|
assertThat(converters).hasSizeGreaterThanOrEqualTo(14);
|
||||||
converters.stream()
|
converters.stream()
|
||||||
.filter(converter -> converter instanceof AbstractJackson2HttpMessageConverter)
|
.filter(AbstractJackson2HttpMessageConverter.class::isInstance)
|
||||||
.forEach(converter -> {
|
.forEach(converter -> {
|
||||||
ObjectMapper mapper = ((AbstractJackson2HttpMessageConverter) converter).getObjectMapper();
|
ObjectMapper mapper = ((AbstractJackson2HttpMessageConverter) converter).getObjectMapper();
|
||||||
assertThat(mapper.getDeserializationConfig().isEnabled(DEFAULT_VIEW_INCLUSION)).isFalse();
|
assertThat(mapper.getDeserializationConfig().isEnabled(DEFAULT_VIEW_INCLUSION)).isFalse();
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue