From 7cb8c34978582e85cb90c36f21f109332701eb01 Mon Sep 17 00:00:00 2001 From: Olga MaciaszekSharma Date: Thu, 28 Oct 2021 19:39:55 +0200 Subject: [PATCH] Refactor. --- .../client/loadbalancer/LoadBalancerProperties.java | 2 +- .../annotation/LoadBalancerClientConfiguration.java | 2 +- .../blocking/XForwardedHeadersTransformer.java | 12 ++++++------ .../BlockingLoadBalancerClientAutoConfiguration.java | 2 +- .../core/XForwardedHeadersTransformer.java | 8 ++++---- .../blocking/XForwardedHeadersTransformerTests.java | 2 +- .../core/XForwardedHeadersTransformerTests.java | 2 +- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/LoadBalancerProperties.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/LoadBalancerProperties.java index 04aa2ce9..aa2d6bf6 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/LoadBalancerProperties.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/LoadBalancerProperties.java @@ -117,7 +117,7 @@ public class LoadBalancerProperties { this.xForwarded = xForwarded; } - public XForwarded getxForwarded() { + public XForwarded getXForwarded() { return xForwarded; } diff --git a/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/annotation/LoadBalancerClientConfiguration.java b/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/annotation/LoadBalancerClientConfiguration.java index ac822695..9dae56f0 100644 --- a/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/annotation/LoadBalancerClientConfiguration.java +++ b/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/annotation/LoadBalancerClientConfiguration.java @@ -99,7 +99,7 @@ public class LoadBalancerClientConfiguration { @ConditionalOnMissingBean @ConditionalOnProperty(value = "spring.cloud.loadbalancer.xForwarded.enabledXforwarded", havingValue = "true") public XForwardedHeadersTransformer xForwarderHeadersTransformer(LoadBalancerProperties properties) { - return new XForwardedHeadersTransformer(properties.getxForwarded()); + return new XForwardedHeadersTransformer(properties.getXForwarded()); } @Bean diff --git a/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/blocking/XForwardedHeadersTransformer.java b/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/blocking/XForwardedHeadersTransformer.java index 8e5e25a7..398a652c 100644 --- a/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/blocking/XForwardedHeadersTransformer.java +++ b/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/blocking/XForwardedHeadersTransformer.java @@ -31,10 +31,10 @@ import org.springframework.http.HttpRequest; public class XForwardedHeadersTransformer implements LoadBalancerRequestTransformer { - private final LoadBalancerProperties.XForwarded XForwardedHeaders; + private final LoadBalancerProperties.XForwarded xForwarded; - public XForwardedHeadersTransformer(LoadBalancerProperties.XForwarded XForwardedHeaders) { - this.XForwardedHeaders = XForwardedHeaders; + public XForwardedHeadersTransformer(LoadBalancerProperties.XForwarded xForwarded) { + this.xForwarded = xForwarded; } @Override @@ -42,12 +42,12 @@ public class XForwardedHeadersTransformer implements LoadBalancerRequestTransfor if (instance == null) { return request; } - if (XForwardedHeaders.isEnabled()) { + if (xForwarded.isEnabled()) { HttpHeaders headers = request.getHeaders(); String xForwardedHost = request.getURI().getHost(); - String xforwardedProto = request.getURI().getScheme(); + String xForwardedProto = request.getURI().getScheme(); headers.add("X-Forwarded-Host", xForwardedHost); - headers.add("X-Forwarded-Proto", xforwardedProto); + headers.add("X-Forwarded-Proto", xForwardedProto); } return request; } diff --git a/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/config/BlockingLoadBalancerClientAutoConfiguration.java b/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/config/BlockingLoadBalancerClientAutoConfiguration.java index 52f5a0bf..1cdcbb17 100644 --- a/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/config/BlockingLoadBalancerClientAutoConfiguration.java +++ b/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/config/BlockingLoadBalancerClientAutoConfiguration.java @@ -77,7 +77,7 @@ public class BlockingLoadBalancerClientAutoConfiguration { @ConditionalOnProperty(value = "spring.cloud.loadbalancer.xforwarded.enabledXforwarded", havingValue = "true") @ConditionalOnMissingBean(XForwardedHeadersTransformer.class) public XForwardedHeadersTransformer xForwarderHeadersTransformer(LoadBalancerProperties properties) { - return new XForwardedHeadersTransformer(properties.getxForwarded()); + return new XForwardedHeadersTransformer(properties.getXForwarded()); } @Configuration diff --git a/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/core/XForwardedHeadersTransformer.java b/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/core/XForwardedHeadersTransformer.java index cf632098..c4432559 100644 --- a/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/core/XForwardedHeadersTransformer.java +++ b/spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/core/XForwardedHeadersTransformer.java @@ -31,10 +31,10 @@ import org.springframework.web.reactive.function.client.ClientRequest; public class XForwardedHeadersTransformer implements LoadBalancerClientRequestTransformer { - private final LoadBalancerProperties.XForwarded XForwardedHeaders; + private final LoadBalancerProperties.XForwarded xForwarded; - public XForwardedHeadersTransformer(LoadBalancerProperties.XForwarded XForwardedHeaders) { - this.XForwardedHeaders = XForwardedHeaders; + public XForwardedHeadersTransformer(LoadBalancerProperties.XForwarded xForwarded) { + this.xForwarded = xForwarded; } @Override @@ -42,7 +42,7 @@ public class XForwardedHeadersTransformer implements LoadBalancerClientRequestTr if (instance == null) { return request; } - if (XForwardedHeaders.isEnabled()) { + if (xForwarded.isEnabled()) { HttpHeaders headers = request.headers(); String xForwardedHost = request.url().getHost(); String xForwardedProto = request.url().getScheme(); diff --git a/spring-cloud-loadbalancer/src/test/java/org/springframework/cloud/loadbalancer/blocking/XForwardedHeadersTransformerTests.java b/spring-cloud-loadbalancer/src/test/java/org/springframework/cloud/loadbalancer/blocking/XForwardedHeadersTransformerTests.java index 9a751180..9b6addc2 100644 --- a/spring-cloud-loadbalancer/src/test/java/org/springframework/cloud/loadbalancer/blocking/XForwardedHeadersTransformerTests.java +++ b/spring-cloud-loadbalancer/src/test/java/org/springframework/cloud/loadbalancer/blocking/XForwardedHeadersTransformerTests.java @@ -40,7 +40,7 @@ import static org.mockito.Mockito.when; class XForwardedHeadersTransformerTests { - private final LoadBalancerProperties.XForwarded xForwarded = new LoadBalancerProperties().getxForwarded(); + private final LoadBalancerProperties.XForwarded xForwarded = new LoadBalancerProperties().getXForwarded(); private final ServiceInstance serviceInstance = new DefaultServiceInstance("test1", "test", "test.org", 8080, false); diff --git a/spring-cloud-loadbalancer/src/test/java/org/springframework/cloud/loadbalancer/core/XForwardedHeadersTransformerTests.java b/spring-cloud-loadbalancer/src/test/java/org/springframework/cloud/loadbalancer/core/XForwardedHeadersTransformerTests.java index d7aafb71..c5988183 100644 --- a/spring-cloud-loadbalancer/src/test/java/org/springframework/cloud/loadbalancer/core/XForwardedHeadersTransformerTests.java +++ b/spring-cloud-loadbalancer/src/test/java/org/springframework/cloud/loadbalancer/core/XForwardedHeadersTransformerTests.java @@ -41,7 +41,7 @@ import static org.mockito.Mockito.when; class XForwardedHeadersTransformerTests { - private final LoadBalancerProperties.XForwarded xForwarded = new LoadBalancerProperties().getxForwarded(); + private final LoadBalancerProperties.XForwarded xForwarded = new LoadBalancerProperties().getXForwarded(); private final ServiceInstance serviceInstance = new DefaultServiceInstance("test1", "test", "test.org", 8080, false);