Skip to content

Commit 996ab88

Browse files
spencergibbspencergibb
committed
Formatting
See gh-2658
1 parent c278a43 commit 996ab88

File tree

6 files changed

+116
-109
lines changed

6 files changed

+116
-109
lines changed

‎spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/filter/headers/ForwardedHeadersFilter.java

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,14 @@ static Forwarded parse(String value) {
103103
return result;
104104
}
105105

106+
public boolean isByEnabled() {
107+
return byEnabled;
108+
}
109+
110+
public void setByEnabled(boolean byEnabled) {
111+
this.byEnabled = byEnabled;
112+
}
113+
106114
@Override
107115
public int getOrder() {
108116
return 0;
@@ -139,7 +147,8 @@ public HttpHeaders filter(HttpHeaders input, ServerWebExchange exchange) {
139147
String forValue;
140148
if (remoteAddress.isUnresolved()) {
141149
forValue = remoteAddress.getHostName();
142-
} else {
150+
}
151+
else {
143152
InetAddress address = remoteAddress.getAddress();
144153
forValue = remoteAddress.getAddress().getHostAddress();
145154
if (address instanceof Inet6Address) {
@@ -165,7 +174,8 @@ public HttpHeaders filter(HttpHeaders input, ServerWebExchange exchange) {
165174
private void addForwardedByHeader(Forwarded forwarded) {
166175
try {
167176
addForwardedBy(forwarded, InetAddress.getLocalHost());
168-
} catch (UnknownHostException e) {
177+
}
178+
catch (UnknownHostException e) {
169179
this.logger.warn("Can not resolve host address, skipping Forwarded 'by' header", e);
170180
}
171181
}
@@ -237,12 +247,4 @@ public String toHeaderValue() {
237247

238248
}
239249

240-
public boolean isByEnabled() {
241-
return byEnabled;
242-
}
243-
244-
public void setByEnabled(boolean byEnabled) {
245-
this.byEnabled = byEnabled;
246-
}
247-
248250
}

‎spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/filter/factory/SpringCloudCircuitBreakerFilterFactoryTests.java

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -246,9 +246,15 @@ public void filterStatusCodeResumeWithoutError() {
246246

247247
@Test
248248
public void filterPostFallback() {
249-
testClient.post().uri("/post").body(BodyInserters.fromValue("hello"))
250-
.header("Host", "www.circuitbreakerfallbackpost.org").exchange().expectStatus()
251-
.isOk().expectBody().json("{\"body\":\"hello\"}");
249+
testClient.post()
250+
.uri("/post")
251+
.body(BodyInserters.fromValue("hello"))
252+
.header("Host", "www.circuitbreakerfallbackpost.org")
253+
.exchange()
254+
.expectStatus()
255+
.isOk()
256+
.expectBody()
257+
.json("{\"body\":\"hello\"}");
252258
}
253259

254260
}

‎spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/filter/headers/ForwardedHeadersFilterTests.java

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,6 @@
1616

1717
package org.springframework.cloud.gateway.filter.headers;
1818

19-
import static org.assertj.core.api.Assertions.assertThat;
20-
import static org.springframework.cloud.gateway.filter.headers.ForwardedHeadersFilter.FORWARDED_HEADER;
21-
2219
import java.net.InetAddress;
2320
import java.net.InetSocketAddress;
2421
import java.net.UnknownHostException;
@@ -37,6 +34,9 @@
3734
import org.springframework.mock.web.server.MockServerWebExchange;
3835
import org.springframework.util.StringUtils;
3936

37+
import static org.assertj.core.api.Assertions.assertThat;
38+
import static org.springframework.cloud.gateway.filter.headers.ForwardedHeadersFilter.FORWARDED_HEADER;
39+
4040
/**
4141
* @author Spencer Gibb
4242
*/
@@ -224,8 +224,8 @@ public void forwardedByForIpv6AddressIsAdded() throws UnknownHostException {
224224

225225
forwardedHeadersFilter.addForwardedBy(forwarded, ipv6Address);
226226

227-
Assertions.assertThat(forwarded.getValues()).containsEntry("by",
228-
"\"[abc4:babf:955f:1724:11bc:153:275c:d36e]\"");
227+
Assertions.assertThat(forwarded.getValues())
228+
.containsEntry("by", "\"[abc4:babf:955f:1724:11bc:153:275c:d36e]\"");
229229

230230
}
231231

@@ -240,4 +240,5 @@ public void forwardedByIsNotAddedIfFeatureIsDisabled() throws UnknownHostExcepti
240240

241241
Assertions.assertThat(forwarded.getValues()).containsEntry("by", "216.103.69.111");
242242
}
243+
243244
}

‎spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/filter/headers/XForwardedHeadersFilterTests.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,6 @@
1616

1717
package org.springframework.cloud.gateway.filter.headers;
1818

19-
import static org.assertj.core.api.Assertions.assertThat;
20-
import static org.springframework.cloud.gateway.filter.headers.XForwardedHeadersFilter.X_FORWARDED_FOR_HEADER;
21-
import static org.springframework.cloud.gateway.filter.headers.XForwardedHeadersFilter.X_FORWARDED_HOST_HEADER;
22-
import static org.springframework.cloud.gateway.filter.headers.XForwardedHeadersFilter.X_FORWARDED_PORT_HEADER;
23-
import static org.springframework.cloud.gateway.filter.headers.XForwardedHeadersFilter.X_FORWARDED_PREFIX_HEADER;
24-
import static org.springframework.cloud.gateway.filter.headers.XForwardedHeadersFilter.X_FORWARDED_PROTO_HEADER;
25-
import static org.springframework.cloud.gateway.support.ServerWebExchangeUtils.GATEWAY_ORIGINAL_REQUEST_URL_ATTR;
26-
import static org.springframework.cloud.gateway.support.ServerWebExchangeUtils.GATEWAY_REQUEST_URL_ATTR;
27-
2819
import java.net.InetAddress;
2920
import java.net.InetSocketAddress;
3021
import java.net.URI;
@@ -38,6 +29,15 @@
3829
import org.springframework.web.server.ServerWebExchange;
3930
import org.springframework.web.util.UriComponentsBuilder;
4031

32+
import static org.assertj.core.api.Assertions.assertThat;
33+
import static org.springframework.cloud.gateway.filter.headers.XForwardedHeadersFilter.X_FORWARDED_FOR_HEADER;
34+
import static org.springframework.cloud.gateway.filter.headers.XForwardedHeadersFilter.X_FORWARDED_HOST_HEADER;
35+
import static org.springframework.cloud.gateway.filter.headers.XForwardedHeadersFilter.X_FORWARDED_PORT_HEADER;
36+
import static org.springframework.cloud.gateway.filter.headers.XForwardedHeadersFilter.X_FORWARDED_PREFIX_HEADER;
37+
import static org.springframework.cloud.gateway.filter.headers.XForwardedHeadersFilter.X_FORWARDED_PROTO_HEADER;
38+
import static org.springframework.cloud.gateway.support.ServerWebExchangeUtils.GATEWAY_ORIGINAL_REQUEST_URL_ATTR;
39+
import static org.springframework.cloud.gateway.support.ServerWebExchangeUtils.GATEWAY_REQUEST_URL_ATTR;
40+
4141
/**
4242
* @author Spencer Gibb
4343
*/

‎spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/test/GatewayIntegrationTests.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,6 @@
1616

1717
package org.springframework.cloud.gateway.test;
1818

19-
import static org.assertj.core.api.Assertions.assertThat;
20-
import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;
21-
import static org.springframework.cloud.gateway.test.TestUtils.getMap;
22-
2319
import java.util.ArrayList;
2420
import java.util.List;
2521
import java.util.Map;
@@ -62,7 +58,9 @@
6258
import org.springframework.web.bind.annotation.RestController;
6359
import org.springframework.web.server.ServerWebExchange;
6460

65-
import reactor.core.publisher.Mono;
61+
import static org.assertj.core.api.Assertions.assertThat;
62+
import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;
63+
import static org.springframework.cloud.gateway.test.TestUtils.getMap;
6664

6765
@SpringBootTest(webEnvironment = RANDOM_PORT)
6866
@DirtiesContext

‎spring-cloud-gateway-server/src/test/kotlin/org/springframework/cloud/gateway/route/builder/RouteDslTests.kt

Lines changed: 77 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -32,91 +32,91 @@ import java.net.URI
3232
@SpringBootTest(classes = [Config::class])
3333
class RouteDslTests {
3434

35-
@Autowired
36-
lateinit var builder: RouteLocatorBuilder
35+
@Autowired
36+
lateinit var builder: RouteLocatorBuilder
3737

38-
@Test
39-
fun sampleRouteDsl() {
40-
val routeLocator = builder.routes {
41-
route(id = "test") {
42-
host("**.abc.org") and path("/image/png")
43-
filters {
44-
addResponseHeader("X-TestHeader", "foobar")
45-
}
46-
uri("http://httpbin.org:80")
47-
}
38+
@Test
39+
fun sampleRouteDsl() {
40+
val routeLocator = builder.routes {
41+
route(id = "test") {
42+
host("**.abc.org") and path("/image/png")
43+
filters {
44+
addResponseHeader("X-TestHeader", "foobar")
45+
}
46+
uri("http://httpbin.org:80")
47+
}
4848

49-
route(id = "test2") {
50-
path("/image/webp") or path("/image/anotherone")
51-
filters {
52-
addResponseHeader("X-AnotherHeader", "baz")
53-
addResponseHeader("X-AnotherHeader-2", "baz-2")
54-
}
55-
uri("https://httpbin.org:443")
56-
}
57-
}
49+
route(id = "test2") {
50+
path("/image/webp") or path("/image/anotherone")
51+
filters {
52+
addResponseHeader("X-AnotherHeader", "baz")
53+
addResponseHeader("X-AnotherHeader-2", "baz-2")
54+
}
55+
uri("https://httpbin.org:443")
56+
}
57+
}
5858

59-
StepVerifier
60-
.create(routeLocator.routes)
61-
.expectNextMatches({
62-
it.id == "test" && it.filters.size == 1 && it.uri == URI.create("http://httpbin.org:80")
63-
})
64-
.expectNextMatches({
65-
it.id == "test2" && it.filters.size == 2 && it.uri == URI.create("https://httpbin.org:443")
66-
})
67-
.expectComplete()
68-
.verify()
59+
StepVerifier
60+
.create(routeLocator.routes)
61+
.expectNextMatches({
62+
it.id == "test" && it.filters.size == 1 && it.uri == URI.create("http://httpbin.org:80")
63+
})
64+
.expectNextMatches({
65+
it.id == "test2" && it.filters.size == 2 && it.uri == URI.create("https://httpbin.org:443")
66+
})
67+
.expectComplete()
68+
.verify()
6969

70-
val sampleExchange: ServerWebExchange = MockServerWebExchange.from(MockServerHttpRequest.get("/image/webp")
71-
.header("Host", "test.abc.org").build())
70+
val sampleExchange: ServerWebExchange = MockServerWebExchange.from(MockServerHttpRequest.get("/image/webp")
71+
.header("Host", "test.abc.org").build())
7272

73-
val filteredRoutes = routeLocator.routes.filter({
74-
sampleExchange.attributes.put(ServerWebExchangeUtils.GATEWAY_PREDICATE_ROUTE_ATTR, it.id)
75-
it.predicate.apply(sampleExchange).toMono().block()
76-
})
73+
val filteredRoutes = routeLocator.routes.filter({
74+
sampleExchange.attributes.put(ServerWebExchangeUtils.GATEWAY_PREDICATE_ROUTE_ATTR, it.id)
75+
it.predicate.apply(sampleExchange).toMono().block()
76+
})
7777

78-
StepVerifier.create(filteredRoutes)
79-
.expectNextMatches({
80-
it.id == "test2" && it.filters.size == 2 && it.uri == URI.create("https://httpbin.org:443")
81-
})
82-
.expectComplete()
83-
.verify()
84-
}
78+
StepVerifier.create(filteredRoutes)
79+
.expectNextMatches({
80+
it.id == "test2" && it.filters.size == 2 && it.uri == URI.create("https://httpbin.org:443")
81+
})
82+
.expectComplete()
83+
.verify()
84+
}
8585

86-
@Test
87-
fun dslWithFunctionParameters() {
88-
val routerLocator = builder.routes {
89-
route(id = "test1", order = 10, uri = "http://httpbin.org") {
90-
host("**.abc.org")
91-
}
92-
route(id = "test2", order = 10, uri = "http://someurl") {
93-
host("**.abc.org")
94-
uri("http://override-url")
95-
}
96-
}
86+
@Test
87+
fun dslWithFunctionParameters() {
88+
val routerLocator = builder.routes {
89+
route(id = "test1", order = 10, uri = "http://httpbin.org") {
90+
host("**.abc.org")
91+
}
92+
route(id = "test2", order = 10, uri = "http://someurl") {
93+
host("**.abc.org")
94+
uri("http://override-url")
95+
}
96+
}
9797

98-
StepVerifier.create(routerLocator.routes)
99-
.expectNextMatches({
100-
it.id == "test1" &&
101-
it.uri == URI.create("http://httpbin.org:80") &&
102-
it.order == 10 &&
103-
it.predicate.apply(MockServerWebExchange
104-
.from(MockServerHttpRequest
105-
.get("/someuri").header("Host", "test.abc.org")))
106-
.toMono().block()
107-
})
108-
.expectNextMatches({
109-
it.id == "test2" &&
110-
it.uri == URI.create("http://override-url:80") &&
111-
it.order == 10 &&
112-
it.predicate.apply(MockServerWebExchange
113-
.from(MockServerHttpRequest
114-
.get("/someuri").header("Host", "test.abc.org")))
115-
.toMono().block()
116-
})
117-
.expectComplete()
118-
.verify()
119-
}
98+
StepVerifier.create(routerLocator.routes)
99+
.expectNextMatches({
100+
it.id == "test1" &&
101+
it.uri == URI.create("http://httpbin.org:80") &&
102+
it.order == 10 &&
103+
it.predicate.apply(MockServerWebExchange
104+
.from(MockServerHttpRequest
105+
.get("/someuri").header("Host", "test.abc.org")))
106+
.toMono().block()
107+
})
108+
.expectNextMatches({
109+
it.id == "test2" &&
110+
it.uri == URI.create("http://override-url:80") &&
111+
it.order == 10 &&
112+
it.predicate.apply(MockServerWebExchange
113+
.from(MockServerHttpRequest
114+
.get("/someuri").header("Host", "test.abc.org")))
115+
.toMono().block()
116+
})
117+
.expectComplete()
118+
.verify()
119+
}
120120
}
121121

122122
@Configuration(proxyBeanMethods = false)

0 commit comments

Comments
 (0)