Skip to content

Commit 2b56987

Browse files
committed
Remove unnecessary formatting changes.
Signed-off-by: Olga Maciaszek-Sharma <olga.maciaszek-sharma@broadcom.com>
1 parent e21dce1 commit 2b56987

File tree

1 file changed

+57
-57
lines changed

1 file changed

+57
-57
lines changed

spring-cloud-gateway-server-mvc/src/test/java/org/springframework/cloud/gateway/server/mvc/GatewayServerMvcAutoConfigurationTests.java

+57-57
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ public class GatewayServerMvcAutoConfigurationTests {
7777
fl1PiUDyPRIl2cnOJd+wCHKsyym/FL7yzk0OSEZ81I92LpGd/0b2Ld3m/bpe+C4Z
7878
ILzLXTnC6AhrLcDc9QN/EO+BiCL52n7EplNLtSn1LQ==
7979
-----END CERTIFICATE-----
80-
""";
80+
""";
8181

8282
private static final String key = """
8383
-----BEGIN PRIVATE KEY-----
@@ -113,44 +113,44 @@ public class GatewayServerMvcAutoConfigurationTests {
113113
@Test
114114
void filterEnabledPropertiesWork() {
115115
new ApplicationContextRunner()
116-
.withConfiguration(AutoConfigurations.of(FilterAutoConfiguration.class, PredicateAutoConfiguration.class,
117-
HandlerFunctionAutoConfiguration.class, GatewayServerMvcAutoConfiguration.class,
118-
HttpClientAutoConfiguration.class, RestTemplateAutoConfiguration.class,
119-
RestClientAutoConfiguration.class, SslAutoConfiguration.class))
120-
.withPropertyValues("spring.cloud.gateway.mvc.form-filter.enabled=false",
121-
"spring.cloud.gateway.mvc.forwarded-request-headers-filter.enabled=false",
122-
"spring.cloud.gateway.mvc.remove-content-length-request-headers-filter.enabled=false",
123-
"spring.cloud.gateway.mvc.remove-hop-by-hop-request-headers-filter.enabled=false",
124-
"spring.cloud.gateway.mvc.remove-hop-by-hop-response-headers-filter.enabled=false",
125-
"spring.cloud.gateway.mvc.remove-http2-status-response-headers-filter.enabled=false",
126-
"spring.cloud.gateway.mvc.transfer-encoding-normalization-request-headers-filter.enabled=false",
127-
"spring.cloud.gateway.mvc.weight-calculator-filter.enabled=false",
128-
"spring.cloud.gateway.mvc.x-forwarded-request-headers-filter.enabled=false")
129-
.run(context -> {
130-
assertThat(context).doesNotHaveBean(FormFilter.class);
131-
assertThat(context).doesNotHaveBean(ForwardedRequestHeadersFilter.class);
132-
assertThat(context).doesNotHaveBean(RemoveContentLengthRequestHeadersFilter.class);
133-
assertThat(context).doesNotHaveBean(RemoveHopByHopRequestHeadersFilter.class);
134-
assertThat(context).doesNotHaveBean(RemoveHopByHopResponseHeadersFilter.class);
135-
assertThat(context).doesNotHaveBean(RemoveHttp2StatusResponseHeadersFilter.class);
136-
assertThat(context).doesNotHaveBean(TransferEncodingNormalizationRequestHeadersFilter.class);
137-
assertThat(context).doesNotHaveBean(WeightCalculatorFilter.class);
138-
assertThat(context).doesNotHaveBean(XForwardedRequestHeadersFilter.class);
139-
});
116+
.withConfiguration(AutoConfigurations.of(FilterAutoConfiguration.class, PredicateAutoConfiguration.class,
117+
HandlerFunctionAutoConfiguration.class, GatewayServerMvcAutoConfiguration.class,
118+
HttpClientAutoConfiguration.class, RestTemplateAutoConfiguration.class,
119+
RestClientAutoConfiguration.class, SslAutoConfiguration.class))
120+
.withPropertyValues("spring.cloud.gateway.mvc.form-filter.enabled=false",
121+
"spring.cloud.gateway.mvc.forwarded-request-headers-filter.enabled=false",
122+
"spring.cloud.gateway.mvc.remove-content-length-request-headers-filter.enabled=false",
123+
"spring.cloud.gateway.mvc.remove-hop-by-hop-request-headers-filter.enabled=false",
124+
"spring.cloud.gateway.mvc.remove-hop-by-hop-response-headers-filter.enabled=false",
125+
"spring.cloud.gateway.mvc.remove-http2-status-response-headers-filter.enabled=false",
126+
"spring.cloud.gateway.mvc.transfer-encoding-normalization-request-headers-filter.enabled=false",
127+
"spring.cloud.gateway.mvc.weight-calculator-filter.enabled=false",
128+
"spring.cloud.gateway.mvc.x-forwarded-request-headers-filter.enabled=false")
129+
.run(context -> {
130+
assertThat(context).doesNotHaveBean(FormFilter.class);
131+
assertThat(context).doesNotHaveBean(ForwardedRequestHeadersFilter.class);
132+
assertThat(context).doesNotHaveBean(RemoveContentLengthRequestHeadersFilter.class);
133+
assertThat(context).doesNotHaveBean(RemoveHopByHopRequestHeadersFilter.class);
134+
assertThat(context).doesNotHaveBean(RemoveHopByHopResponseHeadersFilter.class);
135+
assertThat(context).doesNotHaveBean(RemoveHttp2StatusResponseHeadersFilter.class);
136+
assertThat(context).doesNotHaveBean(TransferEncodingNormalizationRequestHeadersFilter.class);
137+
assertThat(context).doesNotHaveBean(WeightCalculatorFilter.class);
138+
assertThat(context).doesNotHaveBean(XForwardedRequestHeadersFilter.class);
139+
});
140140
}
141141

142142
@DisabledForJreRange(min = JRE.JAVA_23)
143143
@Test
144144
void gatewayHttpClientPropertiesWork() {
145145
ConfigurableApplicationContext context = new SpringApplicationBuilder(TestConfig.class)
146-
.properties("spring.main.web-application-type=none",
147-
"spring.cloud.gateway.mvc.http-client.connect-timeout=1s",
148-
"spring.cloud.gateway.mvc.http-client.read-timeout=2s",
149-
"spring.cloud.gateway.mvc.http-client.ssl-bundle=mybundle",
150-
"spring.cloud.gateway.mvc.http-client.type=autodetect",
151-
"spring.ssl.bundle.pem.mybundle.keystore.certificate=" + cert,
152-
"spring.ssl.bundle.pem.mybundle.keystore.key=" + key)
153-
.run();
146+
.properties("spring.main.web-application-type=none",
147+
"spring.cloud.gateway.mvc.http-client.connect-timeout=1s",
148+
"spring.cloud.gateway.mvc.http-client.read-timeout=2s",
149+
"spring.cloud.gateway.mvc.http-client.ssl-bundle=mybundle",
150+
"spring.cloud.gateway.mvc.http-client.type=autodetect",
151+
"spring.ssl.bundle.pem.mybundle.keystore.certificate=" + cert,
152+
"spring.ssl.bundle.pem.mybundle.keystore.key=" + key)
153+
.run();
154154
ClientHttpRequestFactorySettings settings = context.getBean(ClientHttpRequestFactorySettings.class);
155155
HttpClientProperties properties = context.getBean(HttpClientProperties.class);
156156
assertThat(properties.getConnectTimeout()).hasSeconds(1);
@@ -166,35 +166,35 @@ void gatewayHttpClientPropertiesWork() {
166166
@Test
167167
void bootHttpClientPropertiesWork() {
168168
new ApplicationContextRunner()
169-
.withConfiguration(AutoConfigurations.of(FilterAutoConfiguration.class, PredicateAutoConfiguration.class,
170-
HandlerFunctionAutoConfiguration.class, GatewayServerMvcAutoConfiguration.class,
171-
HttpClientAutoConfiguration.class, RestTemplateAutoConfiguration.class,
172-
RestClientAutoConfiguration.class, SslAutoConfiguration.class))
173-
.withPropertyValues("spring.http.client.connect-timeout=1s", "spring.http.client.read-timeout=2s",
174-
"spring.http.client.ssl.bundle=mybundle",
175-
"spring.ssl.bundle.pem.mybundle.keystore.certificate=" + cert,
176-
"spring.ssl.bundle.pem.mybundle.keystore.key=" + key)
177-
.run(context -> {
178-
assertThat(context).hasSingleBean(ClientHttpRequestFactorySettings.class)
179-
.hasSingleBean(HttpClientProperties.class);
180-
HttpClientProperties httpClient = context.getBean(HttpClientProperties.class);
181-
assertThat(httpClient.getConnectTimeout()).hasSeconds(1);
182-
assertThat(httpClient.getReadTimeout()).hasSeconds(2);
183-
assertThat(httpClient.getSsl().getBundle()).isEqualTo("mybundle");
184-
assertThat(httpClient.getFactory()).isNull();
185-
ClientHttpRequestFactorySettings settings = context.getBean(ClientHttpRequestFactorySettings.class);
186-
assertThat(settings.readTimeout()).isEqualTo(Duration.ofSeconds(2));
187-
assertThat(settings.connectTimeout()).isEqualTo(Duration.ofSeconds(1));
188-
assertThat(settings.sslBundle()).isNotNull();
189-
// cant test redirects because EnvironmentPostProcessor is not run
190-
});
169+
.withConfiguration(AutoConfigurations.of(FilterAutoConfiguration.class, PredicateAutoConfiguration.class,
170+
HandlerFunctionAutoConfiguration.class, GatewayServerMvcAutoConfiguration.class,
171+
HttpClientAutoConfiguration.class, RestTemplateAutoConfiguration.class,
172+
RestClientAutoConfiguration.class, SslAutoConfiguration.class))
173+
.withPropertyValues("spring.http.client.connect-timeout=1s", "spring.http.client.read-timeout=2s",
174+
"spring.http.client.ssl.bundle=mybundle",
175+
"spring.ssl.bundle.pem.mybundle.keystore.certificate=" + cert,
176+
"spring.ssl.bundle.pem.mybundle.keystore.key=" + key)
177+
.run(context -> {
178+
assertThat(context).hasSingleBean(ClientHttpRequestFactorySettings.class)
179+
.hasSingleBean(HttpClientProperties.class);
180+
HttpClientProperties httpClient = context.getBean(HttpClientProperties.class);
181+
assertThat(httpClient.getConnectTimeout()).hasSeconds(1);
182+
assertThat(httpClient.getReadTimeout()).hasSeconds(2);
183+
assertThat(httpClient.getSsl().getBundle()).isEqualTo("mybundle");
184+
assertThat(httpClient.getFactory()).isNull();
185+
ClientHttpRequestFactorySettings settings = context.getBean(ClientHttpRequestFactorySettings.class);
186+
assertThat(settings.readTimeout()).isEqualTo(Duration.ofSeconds(2));
187+
assertThat(settings.connectTimeout()).isEqualTo(Duration.ofSeconds(1));
188+
assertThat(settings.sslBundle()).isNotNull();
189+
// cant test redirects because EnvironmentPostProcessor is not run
190+
});
191191
}
192192

193193
@Test
194194
void settingHttpClientFactoryWorks() {
195195
ConfigurableApplicationContext context = new SpringApplicationBuilder(TestConfig.class)
196-
.properties("spring.main.web-application-type=none", "spring.http.client.factory=simple")
197-
.run();
196+
.properties("spring.main.web-application-type=none", "spring.http.client.factory=simple")
197+
.run();
198198
ClientHttpRequestFactoryBuilder<?> builder = context.getBean(ClientHttpRequestFactoryBuilder.class);
199199
assertThat(builder).isInstanceOf(SimpleClientHttpRequestFactoryBuilder.class);
200200
}

0 commit comments

Comments
 (0)