SpringCloud/spring-cloud-commons
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Refactor.

Browse Source
This commit is contained in:
Olga MaciaszekSharma
2021-10-28 19:39:55 +02:00
parent e3fc8bd782
commit 7cb8c34978
7 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@@ -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

12
spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/blocking/XForwardedHeadersTransformer.java
View File

@@ -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;
}

2
spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/config/BlockingLoadBalancerClientAutoConfiguration.java
View File

@@ -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

8
spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/core/XForwardedHeadersTransformer.java
View File

@@ -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();

2
spring-cloud-loadbalancer/src/test/java/org/springframework/cloud/loadbalancer/blocking/XForwardedHeadersTransformerTests.java
View File

@@ -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);

2
spring-cloud-loadbalancer/src/test/java/org/springframework/cloud/loadbalancer/core/XForwardedHeadersTransformerTests.java
View File

@@ -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);