Skip to content

Commit

Permalink
Merge branch 'v3.x.x' into reboot/fix-zaas-responses
Browse files Browse the repository at this point in the history
  • Loading branch information
pj892031 authored Nov 5, 2024
2 parents 147248d + bf1f2ed commit 9ec6eb2
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ services:
description: 'IBM z/OS Management Facility REST API service. Once configured you can access z/OSMF via the API gateway: https://${ZOWE_EXPLORER_HOST}:${GATEWAY_PORT}/ibmzosmf/api/v1/info'
catalogUiTileId: zosmf
instanceBaseUrls:
- %ZOSMF_SCHEME%://${ZOSMF_HOST}:${ZOSMF_PORT}/"
- %ZOSMF_SCHEME%://${ZOSMF_HOST}:${ZOSMF_PORT}/
homePageRelativeUrl: # Home page is at the same URL
routedServices:
- gatewayUrl: api/v1
Expand All @@ -20,7 +20,7 @@ services:
- apiId: ibm.zosmf
gatewayUrl: api/v1
documentationUrl: https://www.ibm.com/support/knowledgecenter/en/SSLTBW_2.4.0/com.ibm.zos.v2r4.izua700/IZUHPINFO_RESTServices.htm
swaggerUrl: %ZOSMF_SCHEME%://${ZOSMF_HOST}:${ZOSMF_PORT}/zosmf/api/docs"
swaggerUrl: %ZOSMF_SCHEME%://${ZOSMF_HOST}:${ZOSMF_PORT}/zosmf/api/docs
customMetadata:
apiml:
enableUrlEncodedCharacters: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import io.github.resilience4j.timelimiter.TimeLimiterConfig;
import io.netty.handler.ssl.SslContext;
import io.netty.handler.ssl.SslContextBuilder;
import io.netty.resolver.DefaultAddressResolverGroup;
import jakarta.annotation.PostConstruct;
import lombok.extern.slf4j.Slf4j;
import org.springframework.aop.support.AopUtils;
Expand Down Expand Up @@ -345,20 +346,26 @@ public HttpClientFactory gatewayHttpClientFactory(
return new HttpClientFactory(properties, serverProperties, sslConfigurer, customizers) {
@Override
protected HttpClient createInstance() {
return super.createInstance().secure(sslContextSpec -> sslContextSpec.sslContext(sslContext));
return super.createInstance()
.secure(sslContextSpec -> sslContextSpec.sslContext(sslContext))
.resolver(DefaultAddressResolverGroup.INSTANCE);
}
};
}

@Bean
@Primary
public WebClient webClient(HttpClient httpClient) {
return WebClient.builder().clientConnector(new ReactorClientHttpConnector(getHttpClient(httpClient, false))).build();
return WebClient.builder()
.clientConnector(new ReactorClientHttpConnector(getHttpClient(httpClient, false)))
.build();
}

@Bean
public WebClient webClientClientCert(HttpClient httpClient) {
return WebClient.builder().clientConnector(new ReactorClientHttpConnector(getHttpClient(httpClient, true))).build();
return WebClient.builder()
.clientConnector(new ReactorClientHttpConnector(getHttpClient(httpClient, true)))
.build();
}

@Bean
Expand Down

0 comments on commit 9ec6eb2

Please sign in to comment.