From c7eed737150b68c3c7618b9285da67b562d7fea5 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Fri, 2 Jul 2021 02:30:45 +0000 Subject: [PATCH] Bumping versions --- .../cloud/gateway/config/GatewayRedisAutoConfiguration.java | 3 +-- .../filter/factory/SecureHeadersGatewayFilterFactory.java | 3 ++- .../gateway/config/GatewayRedisAutoConfigurationTests.java | 3 +-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/config/GatewayRedisAutoConfiguration.java b/spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/config/GatewayRedisAutoConfiguration.java index 3f930990..e8cd76c9 100644 --- a/spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/config/GatewayRedisAutoConfiguration.java +++ b/spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/config/GatewayRedisAutoConfiguration.java @@ -44,8 +44,7 @@ import org.springframework.web.reactive.DispatcherHandler; @AutoConfigureBefore(GatewayAutoConfiguration.class) @ConditionalOnBean(ReactiveRedisTemplate.class) @ConditionalOnClass({ RedisTemplate.class, DispatcherHandler.class }) -@ConditionalOnProperty(name = "spring.cloud.gateway.redis.enabled", - matchIfMissing = true) +@ConditionalOnProperty(name = "spring.cloud.gateway.redis.enabled", matchIfMissing = true) class GatewayRedisAutoConfiguration { @Bean diff --git a/spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/filter/factory/SecureHeadersGatewayFilterFactory.java b/spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/filter/factory/SecureHeadersGatewayFilterFactory.java index 702ef933..46d7e780 100644 --- a/spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/filter/factory/SecureHeadersGatewayFilterFactory.java +++ b/spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/filter/factory/SecureHeadersGatewayFilterFactory.java @@ -122,7 +122,8 @@ public class SecureHeadersGatewayFilterFactory } if (isEnabled(disabled, X_PERMITTED_CROSS_DOMAIN_POLICIES_HEADER)) { - headers.addIfAbsent(X_PERMITTED_CROSS_DOMAIN_POLICIES_HEADER, config.getPermittedCrossDomainPolicies()); + headers.addIfAbsent(X_PERMITTED_CROSS_DOMAIN_POLICIES_HEADER, + config.getPermittedCrossDomainPolicies()); } })); } diff --git a/spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/config/GatewayRedisAutoConfigurationTests.java b/spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/config/GatewayRedisAutoConfigurationTests.java index 1d05b49f..dd44f3f4 100644 --- a/spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/config/GatewayRedisAutoConfigurationTests.java +++ b/spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/config/GatewayRedisAutoConfigurationTests.java @@ -58,8 +58,7 @@ public class GatewayRedisAutoConfigurationTests { } @RunWith(SpringRunner.class) - @SpringBootTest(classes = Config.class, - properties = "spring.cloud.gateway.redis.enabled=false") + @SpringBootTest(classes = Config.class, properties = "spring.cloud.gateway.redis.enabled=false") public static class DisabledByProperty { @Autowired(required = false)