Skip to content

fix: make Configuration load via TCCL and honor system properties; en… #53

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
tcheeric merged 1 commit into from
Sep 13, 2025
Merged

fix: make Configuration load via TCCL and honor system properties; en… #53

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
14 changes: 10 additions & 4 deletions phoenixd-base/src/main/java/xyz/tcheeric/phoenixd/common/rest/util/Configuration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@

private String resolve(@NonNull String key) {
String env = envValue(key);
if (env != null) {
return env;
}
if (env != null) return env;
String sys = System.getProperty(prefix + "." + key);
if (sys != null && !sys.isEmpty()) return sys;
return properties.getProperty(prefix + "." + key);
}

Expand All @@ -51,7 +51,13 @@
public Configuration(@NonNull String prefix) {
this.prefix = prefix;
this.properties = new Properties();
URL resource = getClass().getResource("/app.properties");
// Try thread context classloader first (works well in app servers and Spring Boot)
ClassLoader tccl = Thread.currentThread().getContextClassLoader();
URL resource = (tccl != null) ? tccl.getResource("app.properties") : null;
if (resource == null) {
// Fallback to this class' loader
resource = getClass().getResource("/app.properties");
}
if (resource != null) {
try (InputStream in = resource.openStream()) {
if (in != null) {
Expand Down Expand Up @@ -109,7 +115,7 @@

public boolean getBoolean(@NonNull String key) {
String value = resolve(key);
return value != null ? Boolean.parseBoolean(value) : false;

Check warning on line 118 in phoenixd-base/src/main/java/xyz/tcheeric/phoenixd/common/rest/util/Configuration.java

View workflow job for this annotation

GitHub Actions / Qodana Community for JVM

Simplifiable conditional expression 

`value != null ? Boolean.parseBoolean(value) : false` can be simplified to 'value != null \&\& Boolean.parseBoolean(value)'
}

public String get(@NonNull String key, @NonNull String defaultValue) {
Expand Down
Loading