From c19e2c42d84feac353e4dc123d78faecb35c79d2 Mon Sep 17 00:00:00 2001 From: alexandr cumarav Date: Thu, 31 Aug 2023 16:15:59 +0200 Subject: [PATCH] GH2883 rename and inverse default value of feature flag Signed-off-by: alexandr cumarav --- .../apiml/cloudgatewayservice/scheduled/GatewayScanJob.java | 4 ++-- cloud-gateway-service/src/main/resources/application.yml | 2 +- cloud-gateway-service/src/test/resources/application.yml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cloud-gateway-service/src/main/java/org/zowe/apiml/cloudgatewayservice/scheduled/GatewayScanJob.java b/cloud-gateway-service/src/main/java/org/zowe/apiml/cloudgatewayservice/scheduled/GatewayScanJob.java index 9a9bda53c5..533dd76c5e 100644 --- a/cloud-gateway-service/src/main/java/org/zowe/apiml/cloudgatewayservice/scheduled/GatewayScanJob.java +++ b/cloud-gateway-service/src/main/java/org/zowe/apiml/cloudgatewayservice/scheduled/GatewayScanJob.java @@ -43,13 +43,13 @@ * maxSimultaneousRequests: - default value 20 * clientKeystore: - default value null * clientKeystorePassword: - default value null - * enableServiceRegistry: - default value false + * serviceRegistryEnabled: - default value false * */ @EnableScheduling @Slf4j @Component -@ConditionalOnExpression("${apiml.cloudGateway.enableServiceRegistry:false}") +@ConditionalOnExpression("${apiml.cloudGateway.serviceRegistryEnabled:false}") @RequiredArgsConstructor public class GatewayScanJob { public static final String GATEWAY_SERVICE_ID = "GATEWAY"; diff --git a/cloud-gateway-service/src/main/resources/application.yml b/cloud-gateway-service/src/main/resources/application.yml index 0c2f025a90..9dcb708a4b 100644 --- a/cloud-gateway-service/src/main/resources/application.yml +++ b/cloud-gateway-service/src/main/resources/application.yml @@ -22,7 +22,7 @@ apiml: ssl: nonStrictVerifySslCertificatesOfServices: true cloudGateway: - enableServiceRegistry: + serviceRegistryEnabled: false server: port: ${apiml.service.port} diff --git a/cloud-gateway-service/src/test/resources/application.yml b/cloud-gateway-service/src/test/resources/application.yml index 76776a792a..8e845ae3fa 100644 --- a/cloud-gateway-service/src/test/resources/application.yml +++ b/cloud-gateway-service/src/test/resources/application.yml @@ -13,7 +13,7 @@ apiml: corsEnabled: true ignoredHeadersWhenCorsEnabled: Access-Control-Request-Method,Access-Control-Request-Headers,Access-Control-Allow-Origin,Access-Control-Allow-Methods,Access-Control-Allow-Headers,Access-Control-Allow-Credentials,Origin cloudGateway: - enableServiceRegistry: false + serviceRegistryEnabled: false server: port: ${apiml.service.port} ssl: