diff --git a/spring-integration-core/src/main/java/org/springframework/integration/codec/kryo/AbstractKryoRegistrar.java b/spring-integration-core/src/main/java/org/springframework/integration/codec/kryo/AbstractKryoRegistrar.java index 9e16c8d2c6..859f80ccfe 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/codec/kryo/AbstractKryoRegistrar.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/codec/kryo/AbstractKryoRegistrar.java @@ -1,5 +1,5 @@ /* - * Copyright 2015-2019 the original author or authors. + * Copyright 2015-2020 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. @@ -32,7 +32,7 @@ import com.esotericsoftware.kryo.Registration; */ public abstract class AbstractKryoRegistrar implements KryoRegistrar { - protected static final Kryo kryo = new Kryo(); // NOSONAR TODO uppercase in 5.2 + protected static final Kryo KRYO = new Kryo(); protected final Log log = LogFactory.getLog(getClass()); // NOSONAR property is final diff --git a/spring-integration-core/src/main/java/org/springframework/integration/codec/kryo/KryoClassListRegistrar.java b/spring-integration-core/src/main/java/org/springframework/integration/codec/kryo/KryoClassListRegistrar.java index a976824fd8..3ccb81c1ba 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/codec/kryo/KryoClassListRegistrar.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/codec/kryo/KryoClassListRegistrar.java @@ -68,7 +68,7 @@ public class KryoClassListRegistrar extends AbstractKryoRegistrar { if (!CollectionUtils.isEmpty(this.registeredClasses)) { for (int i = 0; i < this.registeredClasses.size(); i++) { registrations.add(new Registration(this.registeredClasses.get(i), - kryo.getSerializer(this.registeredClasses.get(i)), i + this.initialValue)); + KRYO.getSerializer(this.registeredClasses.get(i)), i + this.initialValue)); } } return registrations; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/codec/kryo/KryoClassMapRegistrar.java b/spring-integration-core/src/main/java/org/springframework/integration/codec/kryo/KryoClassMapRegistrar.java index 5768b5ea70..8152400221 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/codec/kryo/KryoClassMapRegistrar.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/codec/kryo/KryoClassMapRegistrar.java @@ -1,5 +1,5 @@ /* - * Copyright 2015-2019 the original author or authors. + * Copyright 2015-2020 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. @@ -46,7 +46,7 @@ public class KryoClassMapRegistrar extends AbstractKryoRegistrar { if (!CollectionUtils.isEmpty(this.registeredClasses)) { for (Map.Entry> entry : this.registeredClasses.entrySet()) { registrations.add( - new Registration(entry.getValue(), kryo.getSerializer(entry.getValue()), entry.getKey())); + new Registration(entry.getValue(), KRYO.getSerializer(entry.getValue()), entry.getKey())); } } return registrations; diff --git a/spring-integration-http/src/main/java/org/springframework/integration/http/config/HttpIntegrationConfigurationInitializer.java b/spring-integration-http/src/main/java/org/springframework/integration/http/config/HttpIntegrationConfigurationInitializer.java index 0c60d9c516..3c7d01990e 100644 --- a/spring-integration-http/src/main/java/org/springframework/integration/http/config/HttpIntegrationConfigurationInitializer.java +++ b/spring-integration-http/src/main/java/org/springframework/integration/http/config/HttpIntegrationConfigurationInitializer.java @@ -1,5 +1,5 @@ /* - * Copyright 2014-2019 the original author or authors. + * Copyright 2014-2020 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,7 +37,7 @@ import org.springframework.integration.http.inbound.IntegrationRequestMappingHan */ public class HttpIntegrationConfigurationInitializer implements IntegrationConfigurationInitializer { - private static final Log logger = LogFactory.getLog(HttpIntegrationConfigurationInitializer.class); + private static final Log LOGGER = LogFactory.getLog(HttpIntegrationConfigurationInitializer.class); @Override public void initialize(ConfigurableListableBeanFactory beanFactory) throws BeansException { @@ -45,7 +45,7 @@ public class HttpIntegrationConfigurationInitializer implements IntegrationConfi registerRequestMappingHandlerMappingIfNecessary((BeanDefinitionRegistry) beanFactory); } else { - logger.warn("'IntegrationRequestMappingHandlerMapping' isn't registered because 'beanFactory'" + + LOGGER.warn("'IntegrationRequestMappingHandlerMapping' isn't registered because 'beanFactory'" + " isn't an instance of `BeanDefinitionRegistry`."); } } diff --git a/spring-integration-http/src/main/java/org/springframework/integration/http/inbound/IntegrationRequestMappingHandlerMapping.java b/spring-integration-http/src/main/java/org/springframework/integration/http/inbound/IntegrationRequestMappingHandlerMapping.java index a495fb7718..b353e02069 100644 --- a/spring-integration-http/src/main/java/org/springframework/integration/http/inbound/IntegrationRequestMappingHandlerMapping.java +++ b/spring-integration-http/src/main/java/org/springframework/integration/http/inbound/IntegrationRequestMappingHandlerMapping.java @@ -172,45 +172,49 @@ public final class IntegrationRequestMappingHandlerMapping extends RequestMappin protected CorsConfiguration initCorsConfiguration(Object handler, Method method, RequestMappingInfo mappingInfo) { CrossOrigin crossOrigin = ((BaseHttpInboundEndpoint) handler).getCrossOrigin(); if (crossOrigin != null) { - CorsConfiguration config = new CorsConfiguration(); - for (RequestMethod requestMethod : crossOrigin.getMethod()) { - config.addAllowedMethod(requestMethod.name()); - } - config.setAllowedHeaders(Arrays.asList(crossOrigin.getAllowedHeaders())); - config.setExposedHeaders(Arrays.asList(crossOrigin.getExposedHeaders())); - Boolean allowCredentials = crossOrigin.getAllowCredentials(); - config.setAllowCredentials(allowCredentials); - List allowedOrigins = Arrays.asList(crossOrigin.getOrigin()); - if (Boolean.TRUE.equals(allowCredentials) - && CollectionUtils.contains(allowedOrigins.iterator(), CorsConfiguration.ALL)) { - config.setAllowedOriginPatterns(allowedOrigins); - } - else { - config.setAllowedOrigins(allowedOrigins); - } - - if (crossOrigin.getMaxAge() != -1) { - config.setMaxAge(crossOrigin.getMaxAge()); - } - if (CollectionUtils.isEmpty(config.getAllowedMethods())) { - for (RequestMethod allowedMethod : mappingInfo.getMethodsCondition().getMethods()) { - config.addAllowedMethod(allowedMethod.name()); - } - } - if (CollectionUtils.isEmpty(config.getAllowedHeaders())) { - for (NameValueExpression headerExpression : - mappingInfo.getHeadersCondition().getExpressions()) { - - if (!headerExpression.isNegated()) { - config.addAllowedHeader(headerExpression.getName()); - } - } - } - return config.applyPermitDefaultValues(); + return buildCorsConfiguration(crossOrigin, mappingInfo); } return null; } + private static CorsConfiguration buildCorsConfiguration(CrossOrigin crossOrigin, RequestMappingInfo mappingInfo) { + CorsConfiguration config = new CorsConfiguration(); + for (RequestMethod requestMethod : crossOrigin.getMethod()) { + config.addAllowedMethod(requestMethod.name()); + } + config.setAllowedHeaders(Arrays.asList(crossOrigin.getAllowedHeaders())); + config.setExposedHeaders(Arrays.asList(crossOrigin.getExposedHeaders())); + Boolean allowCredentials = crossOrigin.getAllowCredentials(); + config.setAllowCredentials(allowCredentials); + List allowedOrigins = Arrays.asList(crossOrigin.getOrigin()); + if (Boolean.TRUE.equals(allowCredentials) + && CollectionUtils.contains(allowedOrigins.iterator(), CorsConfiguration.ALL)) { + config.setAllowedOriginPatterns(allowedOrigins); + } + else { + config.setAllowedOrigins(allowedOrigins); + } + + if (crossOrigin.getMaxAge() != -1) { + config.setMaxAge(crossOrigin.getMaxAge()); + } + if (CollectionUtils.isEmpty(config.getAllowedMethods())) { + for (RequestMethod allowedMethod : mappingInfo.getMethodsCondition().getMethods()) { + config.addAllowedMethod(allowedMethod.name()); + } + } + if (CollectionUtils.isEmpty(config.getAllowedHeaders())) { + for (NameValueExpression headerExpression : + mappingInfo.getHeadersCondition().getExpressions()) { + + if (!headerExpression.isNegated()) { + config.addAllowedHeader(headerExpression.getName()); + } + } + } + return config.applyPermitDefaultValues(); + } + /** * Created a {@link RequestMappingInfo} from a * 'Spring Integration HTTP Inbound Endpoint' {@link RequestMapping}. diff --git a/spring-integration-webflux/src/main/java/org/springframework/integration/webflux/inbound/WebFluxIntegrationRequestMappingHandlerMapping.java b/spring-integration-webflux/src/main/java/org/springframework/integration/webflux/inbound/WebFluxIntegrationRequestMappingHandlerMapping.java index cba417e9e3..33b4853536 100644 --- a/spring-integration-webflux/src/main/java/org/springframework/integration/webflux/inbound/WebFluxIntegrationRequestMappingHandlerMapping.java +++ b/spring-integration-webflux/src/main/java/org/springframework/integration/webflux/inbound/WebFluxIntegrationRequestMappingHandlerMapping.java @@ -148,45 +148,50 @@ public class WebFluxIntegrationRequestMappingHandlerMapping extends RequestMappi protected CorsConfiguration initCorsConfiguration(Object handler, Method method, RequestMappingInfo mappingInfo) { CrossOrigin crossOrigin = ((BaseHttpInboundEndpoint) handler).getCrossOrigin(); if (crossOrigin != null) { - CorsConfiguration config = new CorsConfiguration(); - for (RequestMethod requestMethod : crossOrigin.getMethod()) { - config.addAllowedMethod(requestMethod.name()); - } - config.setAllowedHeaders(Arrays.asList(crossOrigin.getAllowedHeaders())); - config.setExposedHeaders(Arrays.asList(crossOrigin.getExposedHeaders())); - Boolean allowCredentials = crossOrigin.getAllowCredentials(); - config.setAllowCredentials(allowCredentials); - List allowedOrigins = Arrays.asList(crossOrigin.getOrigin()); - if (Boolean.TRUE.equals(allowCredentials) - && CollectionUtils.contains(allowedOrigins.iterator(), CorsConfiguration.ALL)) { - config.setAllowedOriginPatterns(allowedOrigins); - } - else { - config.setAllowedOrigins(allowedOrigins); - } - - if (crossOrigin.getMaxAge() != -1) { - config.setMaxAge(crossOrigin.getMaxAge()); - } - if (CollectionUtils.isEmpty(config.getAllowedMethods())) { - for (RequestMethod allowedMethod : mappingInfo.getMethodsCondition().getMethods()) { - config.addAllowedMethod(allowedMethod.name()); - } - } - if (CollectionUtils.isEmpty(config.getAllowedHeaders())) { - for (NameValueExpression headerExpression : - mappingInfo.getHeadersCondition().getExpressions()) { - - if (!headerExpression.isNegated()) { - config.addAllowedHeader(headerExpression.getName()); - } - } - } - return config.applyPermitDefaultValues(); + return buildCorsConfiguration(crossOrigin, mappingInfo); } return null; } + private static CorsConfiguration buildCorsConfiguration(CrossOrigin crossOrigin, RequestMappingInfo mappingInfo) { + CorsConfiguration config = new CorsConfiguration(); + for (RequestMethod requestMethod : crossOrigin.getMethod()) { + config.addAllowedMethod(requestMethod.name()); + } + config.setAllowedHeaders(Arrays.asList(crossOrigin.getAllowedHeaders())); + config.setExposedHeaders(Arrays.asList(crossOrigin.getExposedHeaders())); + Boolean allowCredentials = crossOrigin.getAllowCredentials(); + config.setAllowCredentials(allowCredentials); + List allowedOrigins = Arrays.asList(crossOrigin.getOrigin()); + if (Boolean.TRUE.equals(allowCredentials) + && CollectionUtils.contains(allowedOrigins.iterator(), CorsConfiguration.ALL)) { + config.setAllowedOriginPatterns(allowedOrigins); + } + else { + config.setAllowedOrigins(allowedOrigins); + } + + if (crossOrigin.getMaxAge() != -1) { + config.setMaxAge(crossOrigin.getMaxAge()); + } + if (CollectionUtils.isEmpty(config.getAllowedMethods())) { + for (RequestMethod allowedMethod : mappingInfo.getMethodsCondition().getMethods()) { + config.addAllowedMethod(allowedMethod.name()); + } + } + if (CollectionUtils.isEmpty(config.getAllowedHeaders())) { + for (NameValueExpression headerExpression : + mappingInfo.getHeadersCondition().getExpressions()) { + + if (!headerExpression.isNegated()) { + config.addAllowedHeader(headerExpression.getName()); + } + } + } + return config.applyPermitDefaultValues(); + } + + /** * {@link org.springframework.integration.http.inbound.HttpRequestHandlingEndpointSupport}s * may depend on auto-created {@code requestChannel}s, so MVC Handlers detection should be postponed