Browse Source

Spring cleaning: use method references

pull/32412/head
Sam Brannen 2 years ago
parent
commit
4bd1485ce4
  1. 3
      spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/target/AbstractBeanFactoryBasedTargetSourceCreator.java
  2. 3
      spring-context/src/main/java/org/springframework/scripting/support/ScriptFactoryPostProcessor.java
  3. 2
      spring-context/src/main/java/org/springframework/validation/method/MethodValidationResult.java
  4. 2
      spring-core/src/main/java/org/springframework/util/PlaceholderParser.java
  5. 4
      spring-test/src/main/java/org/springframework/test/web/reactive/server/JsonEncoderDecoder.java
  6. 2
      spring-test/src/test/java/org/springframework/test/web/reactive/server/samples/ExchangeMutatorTests.java
  7. 3
      spring-web/src/main/java/org/springframework/http/codec/multipart/PartEventHttpMessageReader.java
  8. 12
      spring-web/src/test/java/org/springframework/http/codec/support/CodecConfigurerTests.java
  9. 2
      spring-webflux/src/test/java/org/springframework/web/reactive/socket/WebSocketIntegrationTests.java
  10. 2
      spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupportTests.java

3
spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/target/AbstractBeanFactoryBasedTargetSourceCreator.java

@ -151,8 +151,7 @@ public abstract class AbstractBeanFactoryBasedTargetSourceCreator @@ -151,8 +151,7 @@ public abstract class AbstractBeanFactoryBasedTargetSourceCreator
// Filter out BeanPostProcessors that are part of the AOP infrastructure,
// since those are only meant to apply to beans defined in the original factory.
internalBeanFactory.getBeanPostProcessors().removeIf(beanPostProcessor ->
beanPostProcessor instanceof AopInfrastructureBean);
internalBeanFactory.getBeanPostProcessors().removeIf(AopInfrastructureBean.class::isInstance);
return internalBeanFactory;
}

3
spring-context/src/main/java/org/springframework/scripting/support/ScriptFactoryPostProcessor.java

@ -233,8 +233,7 @@ public class ScriptFactoryPostProcessor implements SmartInstantiationAwareBeanPo @@ -233,8 +233,7 @@ public class ScriptFactoryPostProcessor implements SmartInstantiationAwareBeanPo
// Filter out BeanPostProcessors that are part of the AOP infrastructure,
// since those are only meant to apply to beans defined in the original factory.
this.scriptBeanFactory.getBeanPostProcessors().removeIf(beanPostProcessor ->
beanPostProcessor instanceof AopInfrastructureBean);
this.scriptBeanFactory.getBeanPostProcessors().removeIf(AopInfrastructureBean.class::isInstance);
}
@Override

2
spring-context/src/main/java/org/springframework/validation/method/MethodValidationResult.java

@ -98,7 +98,7 @@ public interface MethodValidationResult { @@ -98,7 +98,7 @@ public interface MethodValidationResult {
*/
default List<ParameterErrors> getBeanResults() {
return getAllValidationResults().stream()
.filter(result -> result instanceof ParameterErrors)
.filter(ParameterErrors.class::isInstance)
.map(result -> (ParameterErrors) result)
.toList();
}

2
spring-core/src/main/java/org/springframework/util/PlaceholderParser.java

@ -469,7 +469,7 @@ final class PlaceholderParser { @@ -469,7 +469,7 @@ final class PlaceholderParser {
}
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) {

4
spring-test/src/main/java/org/springframework/test/web/reactive/server/JsonEncoderDecoder.java

@ -76,7 +76,7 @@ record JsonEncoderDecoder(Encoder<?> encoder, Decoder<?> decoder) { @@ -76,7 +76,7 @@ record JsonEncoderDecoder(Encoder<?> encoder, Decoder<?> decoder) {
@Nullable
private static Encoder<?> findJsonEncoder(Collection<HttpMessageWriter<?>> writers) {
return findJsonEncoder(writers.stream()
.filter(writer -> writer instanceof EncoderHttpMessageWriter)
.filter(EncoderHttpMessageWriter.class::isInstance)
.map(writer -> ((EncoderHttpMessageWriter<?>) writer).getEncoder()));
}
@ -97,7 +97,7 @@ record JsonEncoderDecoder(Encoder<?> encoder, Decoder<?> decoder) { @@ -97,7 +97,7 @@ record JsonEncoderDecoder(Encoder<?> encoder, Decoder<?> decoder) {
@Nullable
private static Decoder<?> findJsonDecoder(Collection<HttpMessageReader<?>> readers) {
return findJsonDecoder(readers.stream()
.filter(reader -> reader instanceof DecoderHttpMessageReader)
.filter(DecoderHttpMessageReader.class::isInstance)
.map(reader -> ((DecoderHttpMessageReader<?>) reader).getDecoder()));
}

2
spring-test/src/test/java/org/springframework/test/web/reactive/server/samples/ExchangeMutatorTests.java

@ -114,7 +114,7 @@ class ExchangeMutatorTests { @@ -114,7 +114,7 @@ class ExchangeMutatorTests {
Assert.notNull(httpHandlerBuilder, "Not a mock server");
httpHandlerBuilder.filters(filters -> {
filters.removeIf(filter -> filter instanceof IdentityFilter);
filters.removeIf(IdentityFilter.class::isInstance);
filters.add(0, this.filter);
});
}

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

@ -38,6 +38,7 @@ import org.springframework.http.MediaType; @@ -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 @@ -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

@ -385,12 +385,12 @@ class CodecConfigurerTests { @@ -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 { @@ -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 { @@ -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 { @@ -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()

2
spring-webflux/src/test/java/org/springframework/web/reactive/socket/WebSocketIntegrationTests.java

@ -69,7 +69,7 @@ class WebSocketIntegrationTests extends AbstractReactiveWebSocketIntegrationTest @@ -69,7 +69,7 @@ class WebSocketIntegrationTests extends AbstractReactiveWebSocketIntegrationTest
if (server instanceof TomcatHttpServer) {
Mono.fromRunnable(this::testEcho)
.retryWhen(Retry.max(3).filter(ex -> ex instanceof IllegalStateException))
.retryWhen(Retry.max(3).filter(IllegalStateException.class::isInstance))
.block();
}
else {

2
spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupportTests.java

@ -175,7 +175,7 @@ class WebMvcConfigurationSupportTests { @@ -175,7 +175,7 @@ class WebMvcConfigurationSupportTests {
List<HttpMessageConverter<?>> converters = adapter.getMessageConverters();
assertThat(converters).hasSizeGreaterThanOrEqualTo(14);
converters.stream()
.filter(converter -> converter instanceof AbstractJackson2HttpMessageConverter)
.filter(AbstractJackson2HttpMessageConverter.class::isInstance)
.forEach(converter -> {
ObjectMapper mapper = ((AbstractJackson2HttpMessageConverter) converter).getObjectMapper();
assertThat(mapper.getDeserializationConfig().isEnabled(DEFAULT_VIEW_INCLUSION)).isFalse();

Loading…
Cancel
Save