Skip to content

Ref #2062: Deal with Array in config env variable and system property #2176

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jbonofre merged 1 commit into from
Dec 3, 2025
Merged

Ref #2062: Deal with Array in config env variable and system property #2176

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 32 additions & 8 deletions config/core/src/main/java/org/apache/karaf/config/core/impl/KarafConfigurationPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,23 +33,47 @@ public void modifyConfiguration(ServiceReference<?> reference, Dictionary<String
final Object pid = properties.get(Constants.SERVICE_PID);
for (Enumeration<String> keys = properties.keys(); keys.hasMoreElements(); ) {
String key = keys.nextElement();

// looking for env variable and system property matching key (pid.key).toUpperCase().replace('.', '_').replace('-', '_').replace('~', '_')
String env = (pid + "." + key).toUpperCase().replaceAll("\\.", "_").replace("-", "_").replace("~", "_");
String sys = pid + "." + key;

if (System.getenv(env) != null) {
String value = InterpolationHelper.substVars(System.getenv(env), null,null, convertDictionaryToMap(properties));
if (properties.get(key) != null && (properties.get(key) instanceof Number)) {
properties.put(key, Integer.parseInt(value));

String value = System.getenv(env);

if (value.startsWith("[") && value.endsWith("]")) {
String[] values = value.substring(1, value.length() - 1).split(",");
values = Arrays.stream(values).<String>map(e -> InterpolationHelper.substVars(e, null,null, convertDictionaryToMap(properties))).toArray(String[]::new);
properties.put(key, values);
} else {
properties.put(key, value);
value = InterpolationHelper.substVars(value, null,null, convertDictionaryToMap(properties));
try {
int intValue = Integer.parseInt(value);
properties.put(key, intValue);
} catch (NumberFormatException e) {
properties.put(key, value);
}
}

} else if (System.getProperty(sys) != null) {
String value = InterpolationHelper.substVars(System.getProperty(sys), null, null, convertDictionaryToMap(properties));
if (properties.get(key) != null && (properties.get(key) instanceof Number)) {
properties.put(key, Integer.parseInt(value));

String value = System.getProperty(sys);

if (value.startsWith("[") && value.endsWith("]")) {
String[] values= value.substring(1, value.length() - 1).split(",");
values = Arrays.stream(values).<String>map(e -> InterpolationHelper.substVars(e, null,null, convertDictionaryToMap(properties))).toArray(String[]::new);
properties.put(key, values);
} else {
properties.put(key, value);
value = InterpolationHelper.substVars(value, null,null, convertDictionaryToMap(properties));
try {
int intValue = Integer.parseInt(value);
properties.put(key, intValue);
} catch (NumberFormatException e) {
properties.put(key, value);
}
}

}
}
}
Expand Down
Loading