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

formatting

Browse Source
This commit is contained in:
Spencer Gibb
2019-07-23 16:35:40 -04:00
parent 9cbe105ff1
commit 0501c7a1c8
3 changed files with 26 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/config/HttpClientProperties.java
View File

@@ -424,20 +424,21 @@ public class HttpClientProperties {
public KeyStore createKeyStore() {
try {
KeyStore store = ssl.getKeyStoreProvider() != null ? KeyStore.getInstance(ssl.getKeyStoreType(),
ssl.getKeyStoreProvider())
: KeyStore.getInstance(ssl.getKeyStoreType());
try {
URL url = ResourceUtils.getURL(ssl.getKeyStore());
store.load(url.openStream(), ssl.getKeyStorePassword() != null
? ssl.getKeyStorePassword().toCharArray() : null);
}
catch (Exception e) {
throw new WebServerException(
"Could not load key store ' " + ssl.getKeyStore() + "'", e);
}
KeyStore store = ssl.getKeyStoreProvider() != null
? KeyStore.getInstance(ssl.getKeyStoreType(),
ssl.getKeyStoreProvider())
: KeyStore.getInstance(ssl.getKeyStoreType());
try {
URL url = ResourceUtils.getURL(ssl.getKeyStore());
store.load(url.openStream(), ssl.getKeyStorePassword() != null
? ssl.getKeyStorePassword().toCharArray() : null);
}
catch (Exception e) {
throw new WebServerException(
"Could not load key store ' " + ssl.getKeyStore() + "'", e);
}
return store;
return store;
}
catch (KeyStoreException | NoSuchProviderException e) {
throw new WebServerException(

13
spring-cloud-gateway-core/src/main/java/org/springframework/cloud/gateway/filter/WebClientWriteResponseFilter.java
View File

@@ -49,18 +49,20 @@ public class WebClientWriteResponseFilter implements GlobalFilter, Ordered {
public Mono<Void> filter(ServerWebExchange exchange, GatewayFilterChain chain) {
// NOTICE: nothing in "pre" filter stage as CLIENT_RESPONSE_ATTR is not added
// until the WebHandler is run
return chain.filter(exchange)
.doOnError(throwable -> cleanup(exchange))
return chain.filter(exchange).doOnError(throwable -> cleanup(exchange))
.then(Mono.defer(() -> {
ClientResponse clientResponse = exchange.getAttribute(CLIENT_RESPONSE_ATTR);
ClientResponse clientResponse = exchange
.getAttribute(CLIENT_RESPONSE_ATTR);
if (clientResponse == null) {
return Mono.empty();
}
log.trace("WebClientWriteResponseFilter start");
ServerHttpResponse response = exchange.getResponse();
return response.writeWith(clientResponse.body(BodyExtractors.toDataBuffers()))
//.log("webClient response")
return response
.writeWith(
clientResponse.body(BodyExtractors.toDataBuffers()))
// .log("webClient response")
.doOnCancel(() -> cleanup(exchange));
}));
}
@@ -71,4 +73,5 @@ public class WebClientWriteResponseFilter implements GlobalFilter, Ordered {
clientResponse.bodyToMono(Void.class).subscribe();
}
}
}

6
spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/actuate/GatewayControllerEndpointTests.java
View File

@@ -39,8 +39,10 @@ import static org.assertj.core.api.Assertions.assertThat;
import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;
@RunWith(SpringRunner.class)
@SpringBootTest(properties = { "management.endpoints.web.exposure.include=*",
"spring.cloud.gateway.actuator.verbose.enabled=true" }, webEnvironment = RANDOM_PORT)
@SpringBootTest(
properties = { "management.endpoints.web.exposure.include=*",
"spring.cloud.gateway.actuator.verbose.enabled=true" },
webEnvironment = RANDOM_PORT)
public class GatewayControllerEndpointTests {
@Autowired