Improved default config methods

This commit is contained in:
Auxilor
2023-04-26 14:44:13 +01:00
parent 80fa05da98
commit 7387fe2332

View File

@@ -279,7 +279,10 @@ public interface Config extends Cloneable, PlaceholderInjectable {
@NotNull
default String getFormattedString(@NotNull String path,
@NotNull PlaceholderContext context) {
return StringUtils.format(getString(path), context.withInjectableContext(this));
return Objects.requireNonNullElse(
getFormattedStringOrNull(path, context),
""
);
}
/**
@@ -419,9 +422,9 @@ public interface Config extends Cloneable, PlaceholderInjectable {
@NotNull
default List<String> getFormattedStrings(@NotNull String path,
@NotNull PlaceholderContext context) {
return StringUtils.formatList(
getStrings(path),
context.withInjectableContext(this)
return Objects.requireNonNullElse(
getFormattedStringsOrNull(path, context),
new ArrayList<>()
);
}