Browse Source

Refactor.

pull/1035/head
Olga MaciaszekSharma 3 years ago
parent
commit
7cb8c34978
  1. 2
      spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/LoadBalancerProperties.java
  2. 2
      spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/annotation/LoadBalancerClientConfiguration.java
  3. 12
      spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/blocking/XForwardedHeadersTransformer.java
  4. 2
      spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/config/BlockingLoadBalancerClientAutoConfiguration.java
  5. 8
      spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/core/XForwardedHeadersTransformer.java
  6. 2
      spring-cloud-loadbalancer/src/test/java/org/springframework/cloud/loadbalancer/blocking/XForwardedHeadersTransformerTests.java
  7. 2
      spring-cloud-loadbalancer/src/test/java/org/springframework/cloud/loadbalancer/core/XForwardedHeadersTransformerTests.java

2
spring-cloud-commons/src/main/java/org/springframework/cloud/client/loadbalancer/LoadBalancerProperties.java

@ -117,7 +117,7 @@ public class LoadBalancerProperties {
this.xForwarded = xForwarded; this.xForwarded = xForwarded;
} }
public XForwarded getxForwarded() { public XForwarded getXForwarded() {
return xForwarded; return xForwarded;
} }

2
spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/annotation/LoadBalancerClientConfiguration.java

@ -99,7 +99,7 @@ public class LoadBalancerClientConfiguration {
@ConditionalOnMissingBean @ConditionalOnMissingBean
@ConditionalOnProperty(value = "spring.cloud.loadbalancer.xForwarded.enabledXforwarded", havingValue = "true") @ConditionalOnProperty(value = "spring.cloud.loadbalancer.xForwarded.enabledXforwarded", havingValue = "true")
public XForwardedHeadersTransformer xForwarderHeadersTransformer(LoadBalancerProperties properties) { public XForwardedHeadersTransformer xForwarderHeadersTransformer(LoadBalancerProperties properties) {
return new XForwardedHeadersTransformer(properties.getxForwarded()); return new XForwardedHeadersTransformer(properties.getXForwarded());
} }
@Bean @Bean

12
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 { public class XForwardedHeadersTransformer implements LoadBalancerRequestTransformer {
private final LoadBalancerProperties.XForwarded XForwardedHeaders; private final LoadBalancerProperties.XForwarded xForwarded;
public XForwardedHeadersTransformer(LoadBalancerProperties.XForwarded XForwardedHeaders) { public XForwardedHeadersTransformer(LoadBalancerProperties.XForwarded xForwarded) {
this.XForwardedHeaders = XForwardedHeaders; this.xForwarded = xForwarded;
} }
@Override @Override
@ -42,12 +42,12 @@ public class XForwardedHeadersTransformer implements LoadBalancerRequestTransfor
if (instance == null) { if (instance == null) {
return request; return request;
} }
if (XForwardedHeaders.isEnabled()) { if (xForwarded.isEnabled()) {
HttpHeaders headers = request.getHeaders(); HttpHeaders headers = request.getHeaders();
String xForwardedHost = request.getURI().getHost(); 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-Host", xForwardedHost);
headers.add("X-Forwarded-Proto", xforwardedProto); headers.add("X-Forwarded-Proto", xForwardedProto);
} }
return request; return request;
} }

2
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") @ConditionalOnProperty(value = "spring.cloud.loadbalancer.xforwarded.enabledXforwarded", havingValue = "true")
@ConditionalOnMissingBean(XForwardedHeadersTransformer.class) @ConditionalOnMissingBean(XForwardedHeadersTransformer.class)
public XForwardedHeadersTransformer xForwarderHeadersTransformer(LoadBalancerProperties properties) { public XForwardedHeadersTransformer xForwarderHeadersTransformer(LoadBalancerProperties properties) {
return new XForwardedHeadersTransformer(properties.getxForwarded()); return new XForwardedHeadersTransformer(properties.getXForwarded());
} }
@Configuration @Configuration

8
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 { public class XForwardedHeadersTransformer implements LoadBalancerClientRequestTransformer {
private final LoadBalancerProperties.XForwarded XForwardedHeaders; private final LoadBalancerProperties.XForwarded xForwarded;
public XForwardedHeadersTransformer(LoadBalancerProperties.XForwarded XForwardedHeaders) { public XForwardedHeadersTransformer(LoadBalancerProperties.XForwarded xForwarded) {
this.XForwardedHeaders = XForwardedHeaders; this.xForwarded = xForwarded;
} }
@Override @Override
@ -42,7 +42,7 @@ public class XForwardedHeadersTransformer implements LoadBalancerClientRequestTr
if (instance == null) { if (instance == null) {
return request; return request;
} }
if (XForwardedHeaders.isEnabled()) { if (xForwarded.isEnabled()) {
HttpHeaders headers = request.headers(); HttpHeaders headers = request.headers();
String xForwardedHost = request.url().getHost(); String xForwardedHost = request.url().getHost();
String xForwardedProto = request.url().getScheme(); String xForwardedProto = request.url().getScheme();

2
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 { 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); private final ServiceInstance serviceInstance = new DefaultServiceInstance("test1", "test", "test.org", 8080, false);

2
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 { 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); private final ServiceInstance serviceInstance = new DefaultServiceInstance("test1", "test", "test.org", 8080, false);

Loading…
Cancel
Save