Skip to content

Avoid creating a copy of SystemProperties just to look for the config_ordinal #1300

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
radcortez merged 1 commit into from
Feb 1, 2025
Merged

Avoid creating a copy of SystemProperties just to look for the config_ordinal #1300

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
42 changes: 34 additions & 8 deletions implementation/src/main/java/io/smallrye/config/SysPropConfigSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
*/
package io.smallrye.config;

import static io.smallrye.config.common.utils.ConfigSourceUtil.CONFIG_ORDINAL_KEY;
import static io.smallrye.config.common.utils.ConfigSourceUtil.propertiesToMap;
import static java.security.AccessController.doPrivileged;
import static java.util.Collections.unmodifiableMap;
Expand All @@ -25,7 +26,6 @@
import java.util.Set;

import io.smallrye.config.common.AbstractConfigSource;
import io.smallrye.config.common.utils.ConfigSourceUtil;

/**
* @author <a href="http://jmesnil.net/">Jeff Mesnil</a> (c) 2017 Red Hat inc.
Expand All @@ -37,21 +37,51 @@ public class SysPropConfigSource extends AbstractConfigSource {
public static final int ORDINAL = 400;

public SysPropConfigSource() {
super(NAME, ConfigSourceUtil.getOrdinalFromMap(getSystemProperties(), ORDINAL));
super(NAME, getSystemOrdinal());
}

@Override
public Map<String, String> getProperties() {
return getSystemProperties();
if (System.getSecurityManager() == null) {
Comment thread
dmlloyd marked this conversation as resolved.
return unmodifiableMap(propertiesToMap(System.getProperties()));
} else {
return doPrivileged(new PrivilegedAction<Map<String, String>>() {
@Override
public Map<String, String> run() {
return unmodifiableMap(propertiesToMap(doPrivileged((PrivilegedAction<Properties>) System::getProperties)));
}
});
}
}

@Override
public Set<String> getPropertyNames() {
return getProperties().keySet();
if (System.getSecurityManager() == null) {
return System.getProperties().stringPropertyNames();
} else {
return doPrivileged(new PrivilegedAction<Set<String>>() {
@Override
public Set<String> run() {
return System.getProperties().stringPropertyNames();
}
});
}
}

@Override
public String getValue(String propertyName) {
return getSystemProperty(propertyName);
}

private static int getSystemOrdinal() {
String value = getSystemProperty(CONFIG_ORDINAL_KEY);
if (value != null) {
return Converters.INTEGER_CONVERTER.convert(value);
}
return ORDINAL;
}

private static String getSystemProperty(final String propertyName) {
if (System.getSecurityManager() == null) {
return System.getProperty(propertyName);
} else {
Expand All @@ -63,8 +93,4 @@ public String run() {
});
}
}

private static Map<String, String> getSystemProperties() {
return unmodifiableMap(propertiesToMap(doPrivileged((PrivilegedAction<Properties>) System::getProperties)));
}
}