Skip to content

Commit e0aed09

Browse files
committed
Fixing env from ApplicationConfiguration
LMCROSSITXSADEPLOY-3413
1 parent 0a19165 commit e0aed09

File tree

2 files changed

+19
-0
lines changed

2 files changed

+19
-0
lines changed

multiapps-controller-core/src/main/java/org/cloudfoundry/multiapps/controller/core/Messages.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,7 @@ public final class Messages {
149149
public static final String GLOBAL_CONFIG_SPACE = "Global config space: {0}";
150150
public static final String OBJECT_STORE_CLIENT_TYPE = "Object store client type: {0}";
151151
public static final String APPLICATION_GUID = "Application GUID: {0}";
152+
public static final String USE_LEGACY_ROUTE_WARNING = "Legacy route warning enablement: {0}";
152153
public static final String APPLICATION_INSTANCE_INDEX = "Application instance index: {0}";
153154
public static final String AUDIT_LOG_CLIENT_CORE_THREADS = "Audit log client core threads: {0}";
154155
public static final String AUDIT_LOG_CLIENT_MAX_THREADS = "Audit log client max threads: {0}";

multiapps-controller-core/src/main/java/org/cloudfoundry/multiapps/controller/core/util/ApplicationConfiguration.java

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import java.util.Set;
1010
import java.util.concurrent.TimeUnit;
1111
import java.util.stream.Collectors;
12+
1213
import jakarta.inject.Inject;
1314
import jakarta.inject.Named;
1415
import org.apache.commons.collections4.CollectionUtils;
@@ -26,6 +27,7 @@
2627
import org.slf4j.LoggerFactory;
2728
import org.springframework.context.annotation.Lazy;
2829
import org.springframework.scheduling.support.CronExpression;
30+
2931
import static java.text.MessageFormat.format;
3032

3133
@Named
@@ -99,6 +101,7 @@ public class ApplicationConfiguration {
99101
static final String CFG_THREADS_FOR_FILE_UPLOAD_TO_CONTROLLER = "THREADS_FOR_FILE_UPLOAD_TO_CONTROLLER";
100102
static final String CFG_THREADS_FOR_FILE_STORAGE_UPLOAD = "THREADS_FOR_FILE_STORAGE_UPLOAD";
101103
static final String CFG_IS_HEALTH_CHECK_ENABLED = "IS_HEALTH_CHECK_ENABLED";
104+
static final String USE_LEGACY_ROUTE_WARNING = "USE_LEGACY_ROUTE_WARNING";
102105

103106
private static final List<String> VCAP_APPLICATION_URIS_KEYS = List.of("full_application_uris", "application_uris", "uris");
104107

@@ -158,6 +161,7 @@ public class ApplicationConfiguration {
158161
public static final int DEFAULT_THREADS_FOR_FILE_STORAGE_UPLOAD = 7;
159162
public static final boolean DEFAULT_IS_HEALTH_CHECK_ENABLED = false;
160163
public static final Boolean DEFAULT_IS_READINESS_HEALTH_CHECK_ENABLED = Boolean.FALSE;
164+
public static final Boolean DEFAULT_USE_LEGACY_ROUTE_WARNING = false;
161165

162166
protected final Environment environment;
163167

@@ -218,6 +222,7 @@ public class ApplicationConfiguration {
218222
private Boolean isHealthCheckEnabled;
219223
private Set<String> objectStoreRegions;
220224
private Boolean isReadinessHealthCheckEnabled;
225+
private Boolean useLegacyRouteWarning;
221226

222227
public ApplicationConfiguration() {
223228
this(new Environment());
@@ -500,6 +505,13 @@ public String getObjectStoreClientType() {
500505
return objectStoreClientType;
501506
}
502507

508+
public Boolean getLegacyRouteWarningEnablement() {
509+
if (useLegacyRouteWarning == null) {
510+
useLegacyRouteWarning = getLegacyRouteWarningEnablementFromEnvironment();
511+
}
512+
return useLegacyRouteWarning;
513+
}
514+
503515
public HealthCheckConfiguration getHealthCheckConfiguration() {
504516
if (healthCheckConfiguration == null) {
505517
healthCheckConfiguration = getHealthCheckConfigurationFromEnvironment();
@@ -916,6 +928,12 @@ private String getObjectStoreClientTypeFromEnvironment() {
916928
return value;
917929
}
918930

931+
private Boolean getLegacyRouteWarningEnablementFromEnvironment() {
932+
Boolean value = environment.getBoolean(USE_LEGACY_ROUTE_WARNING, DEFAULT_USE_LEGACY_ROUTE_WARNING);
933+
logEnvironmentVariable(USE_LEGACY_ROUTE_WARNING, Messages.USE_LEGACY_ROUTE_WARNING, value);
934+
return value;
935+
}
936+
919937
private HealthCheckConfiguration getHealthCheckConfigurationFromEnvironment() {
920938
HealthCheckConfiguration healthCheckConfigurationFromEnvironment = ImmutableHealthCheckConfiguration.builder()
921939
.spaceId(

0 commit comments

Comments
 (0)