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

Modernize code for diamond, isEmpty & pattern matching

Browse Source
This commit is contained in:
Tran Ngoc Nhan
2024-09-24 01:42:38 +07:00
committed by GitHub
parent 40faaa0c15
commit fc377126de
107 changed files with 550 additions and 454 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
spring-integration-webflux/src/main/java/org/springframework/integration/webflux/config/WebFluxIntegrationConfigurationInitializer.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2017-2023 the original author or authors.
* Copyright 2017-2024 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -37,6 +37,7 @@ import org.springframework.integration.webflux.support.WebFluxContextUtils;
*
* @author Artem Bilan
* @author Chris Bono
* @author Ngoc Nhan
*
* @since 5.0
*/
@@ -46,8 +47,8 @@ public class WebFluxIntegrationConfigurationInitializer implements IntegrationCo
@Override
public void initialize(ConfigurableListableBeanFactory beanFactory) throws BeansException {
if (beanFactory instanceof BeanDefinitionRegistry) {
registerReactiveRequestMappingHandlerMappingIfNecessary((BeanDefinitionRegistry) beanFactory);
if (beanFactory instanceof BeanDefinitionRegistry beanDefinitionRegistry) {
registerReactiveRequestMappingHandlerMappingIfNecessary(beanDefinitionRegistry);
}
else {
LOGGER.warn("'IntegrationRequestMappingHandlerMapping' isn't registered because 'beanFactory'" +

5
spring-integration-webflux/src/main/java/org/springframework/integration/webflux/inbound/WebFluxInboundEndpoint.java
View File

@@ -73,6 +73,7 @@ import org.springframework.web.server.WebHandler;
*
* @author Artem Bilan
* @author Gary Russell
* @author Ngoc Nhan
*
* @since 5.0
*
@@ -362,8 +363,8 @@ public class WebFluxInboundEndpoint extends BaseHttpInboundEndpoint implements W
responseContent = replyMessage.getPayload();
}
if (responseContent instanceof HttpStatus) {
response.setStatusCode((HttpStatus) responseContent);
if (responseContent instanceof HttpStatus httpStatus) {
response.setStatusCode(httpStatus);
return response.setComplete();
}
else {

5
spring-integration-webflux/src/main/java/org/springframework/integration/webflux/inbound/WebFluxIntegrationRequestMappingHandlerMapping.java
View File

@@ -76,6 +76,7 @@ import org.springframework.web.server.WebHandler;
*
* @author Artem Bilan
* @author Gary Russell
* @author Ngoc Nhan
*
* @since 5.0
*
@@ -118,8 +119,8 @@ public class WebFluxIntegrationRequestMappingHandlerMapping extends RequestMappi
@Override
protected void detectHandlerMethods(Object handler) {
if (handler instanceof String) {
handler = getApplicationContext().getBean((String) handler); // NOSONAR never null
if (handler instanceof String string) {
handler = getApplicationContext().getBean(string); // NOSONAR never null
}
RequestMappingInfo mapping = getMappingForEndpoint((WebFluxInboundEndpoint) handler);
if (mapping != null) {

29
spring-integration-webflux/src/main/java/org/springframework/integration/webflux/outbound/WebFluxRequestExecutingMessageHandler.java
View File

@@ -61,6 +61,7 @@ import org.springframework.web.util.DefaultUriBuilderFactory;
* @author Gary Russell
* @author David Graff
* @author Jatin Saxena
* @author Ngoc Nhan
*
* @since 5.0
*
@@ -249,8 +250,8 @@ public class WebFluxRequestExecutingMessageHandler extends AbstractHttpRequestEx
WebClient.RequestBodyUriSpec requestBodyUriSpec = this.webClient.method(httpMethod);
WebClient.RequestBodySpec requestSpec;
if (uri instanceof URI) {
requestSpec = requestBodyUriSpec.uri((URI) uri);
if (uri instanceof URI castUri) {
requestSpec = requestBodyUriSpec.uri(castUri);
}
else {
requestSpec = requestBodyUriSpec.uri((String) uri, uriVariables);
@@ -287,14 +288,14 @@ public class WebFluxRequestExecutingMessageHandler extends AbstractHttpRequestEx
}
BodyInserter<?, ? super ClientHttpRequest> inserter;
if (requestBody instanceof Resource) {
inserter = BodyInserters.fromResource((Resource) requestBody);
if (requestBody instanceof Resource resource) {
inserter = BodyInserters.fromResource(resource);
}
else if (requestBody instanceof Publisher<?>) {
inserter = buildBodyInserterForPublisher(requestMessage, (Publisher<?>) requestBody);
else if (requestBody instanceof Publisher<?> publisher) {
inserter = buildBodyInserterForPublisher(requestMessage, publisher);
}
else if (requestBody instanceof MultiValueMap<?, ?>) {
inserter = buildBodyInserterForMultiValueMap((MultiValueMap<?, ?>) requestBody,
else if (requestBody instanceof MultiValueMap<?, ?> multiValueMap) {
inserter = buildBodyInserterForMultiValueMap(multiValueMap,
httpRequest.getHeaders().getContentType());
}
else {
@@ -350,8 +351,8 @@ public class WebFluxRequestExecutingMessageHandler extends AbstractHttpRequestEx
private BodyExtractor<Flux<Object>, ? super ClientHttpResponse> createBodyExtractor(Object expectedResponseType) {
if (expectedResponseType != null) {
if (this.replyPayloadToFlux) {
if (expectedResponseType instanceof ParameterizedTypeReference) {
return BodyExtractors.toFlux((ParameterizedTypeReference) expectedResponseType);
if (expectedResponseType instanceof ParameterizedTypeReference parameterizedTypeReference) {
return BodyExtractors.toFlux(parameterizedTypeReference);
}
else {
return BodyExtractors.toFlux((Class) expectedResponseType);
@@ -359,8 +360,8 @@ public class WebFluxRequestExecutingMessageHandler extends AbstractHttpRequestEx
}
else {
BodyExtractor<? extends Mono<?>, ReactiveHttpInputMessage> monoExtractor;
if (expectedResponseType instanceof ParameterizedTypeReference<?>) {
monoExtractor = BodyExtractors.toMono((ParameterizedTypeReference) expectedResponseType);
if (expectedResponseType instanceof ParameterizedTypeReference<?> parameterizedTypeReference) {
monoExtractor = BodyExtractors.toMono(parameterizedTypeReference);
}
else {
monoExtractor = BodyExtractors.toMono((Class) expectedResponseType);
@@ -371,8 +372,8 @@ public class WebFluxRequestExecutingMessageHandler extends AbstractHttpRequestEx
else if (this.bodyExtractor != null) {
return (inputMessage, context) -> {
Object body = this.bodyExtractor.extract(inputMessage, context);
if (body instanceof Publisher) {
return Flux.from((Publisher) body);
if (body instanceof Publisher publisher) {
return Flux.from(publisher);
}
return Flux.just(body);
};