From 21b4625aa514d877a5eb1460b9311f3a33ce91fc Mon Sep 17 00:00:00 2001 From: spencergibb Date: Mon, 2 Nov 2020 14:52:38 -0500 Subject: [PATCH] formatting --- .../SecureHeadersGatewayFilterFactory.java | 15 ++++------- .../route/builder/GatewayFilterSpec.java | 6 ++--- ...eHeadersGatewayFilterFactoryUnitTests.java | 26 +++++++------------ 3 files changed, 16 insertions(+), 31 deletions(-) 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 c19edd7f..5d672c67 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 @@ -97,8 +97,7 @@ public class SecureHeadersGatewayFilterFactory } if (isEnabled(disabled, STRICT_TRANSPORT_SECURITY_HEADER)) { - headers.add(STRICT_TRANSPORT_SECURITY_HEADER, - config.getStrictTransportSecurity()); + headers.add(STRICT_TRANSPORT_SECURITY_HEADER, config.getStrictTransportSecurity()); } if (isEnabled(disabled, X_FRAME_OPTIONS_HEADER)) { @@ -106,8 +105,7 @@ public class SecureHeadersGatewayFilterFactory } if (isEnabled(disabled, X_CONTENT_TYPE_OPTIONS_HEADER)) { - headers.add(X_CONTENT_TYPE_OPTIONS_HEADER, - config.getContentTypeOptions()); + headers.add(X_CONTENT_TYPE_OPTIONS_HEADER, config.getContentTypeOptions()); } if (isEnabled(disabled, REFERRER_POLICY_HEADER)) { @@ -115,8 +113,7 @@ public class SecureHeadersGatewayFilterFactory } if (isEnabled(disabled, CONTENT_SECURITY_POLICY_HEADER)) { - headers.add(CONTENT_SECURITY_POLICY_HEADER, - config.getContentSecurityPolicy()); + headers.add(CONTENT_SECURITY_POLICY_HEADER, config.getContentSecurityPolicy()); } if (isEnabled(disabled, X_DOWNLOAD_OPTIONS_HEADER)) { @@ -124,8 +121,7 @@ public class SecureHeadersGatewayFilterFactory } if (isEnabled(disabled, X_PERMITTED_CROSS_DOMAIN_POLICIES_HEADER)) { - headers.add(X_PERMITTED_CROSS_DOMAIN_POLICIES_HEADER, - config.getPermittedCrossDomainPolicies()); + headers.add(X_PERMITTED_CROSS_DOMAIN_POLICIES_HEADER, config.getPermittedCrossDomainPolicies()); } return chain.filter(exchange); @@ -200,8 +196,7 @@ public class SecureHeadersGatewayFilterFactory } if (config.permittedCrossDomainPolicies == null) { - config.permittedCrossDomainPolicies = properties - .getPermittedCrossDomainPolicies(); + config.permittedCrossDomainPolicies = properties.getPermittedCrossDomainPolicies(); } return config; } diff --git a/spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/route/builder/GatewayFilterSpec.java b/spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/route/builder/GatewayFilterSpec.java index 7d107c8f..d99b96e2 100644 --- a/spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/route/builder/GatewayFilterSpec.java +++ b/spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/route/builder/GatewayFilterSpec.java @@ -535,10 +535,8 @@ public class GatewayFilterSpec extends UriSpec { * @param configConsumer self define headers * @return a {@link GatewayFilterSpec} that can be used to apply additional filters */ - public GatewayFilterSpec secureHeaders( - Consumer configConsumer) { - return filter( - getBean(SecureHeadersGatewayFilterFactory.class).apply(configConsumer)); + public GatewayFilterSpec secureHeaders(Consumer configConsumer) { + return filter(getBean(SecureHeadersGatewayFilterFactory.class).apply(configConsumer)); } /** diff --git a/spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/filter/factory/SecureHeadersGatewayFilterFactoryUnitTests.java b/spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/filter/factory/SecureHeadersGatewayFilterFactoryUnitTests.java index 5a4344c7..68ad726f 100644 --- a/spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/filter/factory/SecureHeadersGatewayFilterFactoryUnitTests.java +++ b/spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/filter/factory/SecureHeadersGatewayFilterFactoryUnitTests.java @@ -87,8 +87,7 @@ public class SecureHeadersGatewayFilterFactoryUnitTests { "x-content-type-options", "referrer-policy", "content-security-policy", "x-download-options", "x-permitted-cross-domain-policies")); - SecureHeadersGatewayFilterFactory filterFactory = new SecureHeadersGatewayFilterFactory( - properties); + SecureHeadersGatewayFilterFactory filterFactory = new SecureHeadersGatewayFilterFactory(properties); filter = filterFactory.apply(new Config()); filter.filter(exchange, filterChain); @@ -113,27 +112,21 @@ public class SecureHeadersGatewayFilterFactoryUnitTests { filter.filter(exchange, filterChain); ServerHttpResponse response = captor.getValue().getResponse(); - assertThat(response.getHeaders()).containsKeys(X_XSS_PROTECTION_HEADER, - STRICT_TRANSPORT_SECURITY_HEADER, X_FRAME_OPTIONS_HEADER, - X_CONTENT_TYPE_OPTIONS_HEADER, REFERRER_POLICY_HEADER, - CONTENT_SECURITY_POLICY_HEADER, X_DOWNLOAD_OPTIONS_HEADER, - X_PERMITTED_CROSS_DOMAIN_POLICIES_HEADER); + assertThat(response.getHeaders()).containsKeys(X_XSS_PROTECTION_HEADER, STRICT_TRANSPORT_SECURITY_HEADER, + X_FRAME_OPTIONS_HEADER, X_CONTENT_TYPE_OPTIONS_HEADER, REFERRER_POLICY_HEADER, + CONTENT_SECURITY_POLICY_HEADER, X_DOWNLOAD_OPTIONS_HEADER, X_PERMITTED_CROSS_DOMAIN_POLICIES_HEADER); - assertThat(response.getHeaders().get(STRICT_TRANSPORT_SECURITY_HEADER)) - .containsOnly("max-age=65535"); - assertThat(response.getHeaders().get(REFERRER_POLICY_HEADER)) - .containsOnly("referrer"); + assertThat(response.getHeaders().get(STRICT_TRANSPORT_SECURITY_HEADER)).containsOnly("max-age=65535"); + assertThat(response.getHeaders().get(REFERRER_POLICY_HEADER)).containsOnly("referrer"); assertThat(response.getHeaders().get(X_XSS_PROTECTION_HEADER)) .containsOnly(properties.getXssProtectionHeader()); - assertThat(response.getHeaders().get(X_FRAME_OPTIONS_HEADER)) - .containsOnly(properties.getFrameOptions()); + assertThat(response.getHeaders().get(X_FRAME_OPTIONS_HEADER)).containsOnly(properties.getFrameOptions()); assertThat(response.getHeaders().get(X_CONTENT_TYPE_OPTIONS_HEADER)) .containsOnly(properties.getContentTypeOptions()); assertThat(response.getHeaders().get(CONTENT_SECURITY_POLICY_HEADER)) .containsOnly(properties.getContentSecurityPolicy()); - assertThat(response.getHeaders().get(X_DOWNLOAD_OPTIONS_HEADER)) - .containsOnly(properties.getDownloadOptions()); + assertThat(response.getHeaders().get(X_DOWNLOAD_OPTIONS_HEADER)).containsOnly(properties.getDownloadOptions()); assertThat(response.getHeaders().get(X_PERMITTED_CROSS_DOMAIN_POLICIES_HEADER)) .containsOnly(properties.getPermittedCrossDomainPolicies()); @@ -141,8 +134,7 @@ public class SecureHeadersGatewayFilterFactoryUnitTests { @Test public void toStringFormat() { - GatewayFilter filter = new SecureHeadersGatewayFilterFactory( - new SecureHeadersProperties()).apply(new Config()); + GatewayFilter filter = new SecureHeadersGatewayFilterFactory(new SecureHeadersProperties()).apply(new Config()); Assertions.assertThat(filter.toString()).contains("SecureHeaders"); }