Skip to content

Fix config loading for hyphenated keys #4

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
Locon213 merged 1 commit into from
Aug 5, 2025
Merged

Fix config loading for hyphenated keys #4

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
29 changes: 27 additions & 2 deletions core/src/main/java/com/livemotdmanager/core/ConfigLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

import org.yaml.snakeyaml.LoaderOptions;
import org.yaml.snakeyaml.Yaml;
import org.yaml.snakeyaml.constructor.Constructor;
import org.yaml.snakeyaml.introspector.BeanAccess;
import org.yaml.snakeyaml.introspector.Property;
import org.yaml.snakeyaml.introspector.PropertyUtils;

import java.io.InputStream;
import java.io.InputStreamReader;
Expand All @@ -15,9 +19,30 @@ private ConfigLoader() {}

public static MotdConfig load(InputStream in) {
LoaderOptions options = new LoaderOptions();
Yaml yaml = new Yaml(options);
Constructor constructor = new Constructor(MotdConfig.class, options);
PropertyUtils utils = new PropertyUtils() {
@Override
public Property getProperty(Class<?> type, String name, BeanAccess bAccess) {
// convert kebab-case (update-interval-minutes) to camelCase
StringBuilder sb = new StringBuilder();
boolean upper = false;
for (char c : name.toCharArray()) {
if (c == '-') {
upper = true;
} else {
sb.append(upper ? Character.toUpperCase(c) : c);
upper = false;
}
}
return super.getProperty(type, sb.toString(), bAccess);
}
};
utils.setSkipMissingProperties(true);
constructor.setPropertyUtils(utils);
Yaml yaml = new Yaml(constructor);
yaml.setBeanAccess(BeanAccess.FIELD);
try (InputStreamReader reader = new InputStreamReader(in, StandardCharsets.UTF_8)) {
MotdConfig cfg = yaml.loadAs(reader, MotdConfig.class);
MotdConfig cfg = yaml.load(reader);
if (cfg == null) cfg = new MotdConfig();
return cfg;
} catch (Exception e) {
Expand Down
Loading