Skip to content

Add default values handling into string substitutor #256

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

Open
groov1kk wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add default values handling into string substitutor #256

Show file tree
Hide file tree
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
7 changes: 4 additions & 3 deletions owner/src/main/java/org/aeonbits/owner/StrSubstitutor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,10 @@ String replace(String source) {
Matcher m = PATTERN.matcher(source);
StringBuffer sb = new StringBuffer();
while (m.find()) {
String var = m.group(1);
String value = values.getProperty(var);
String replacement = (value != null) ? replace(value) : "";
String[] var = m.group(1).split(":");
String value = values.getProperty(var[0]);
String replacement = (value != null) ? replace(value) :
var.length > 1 ? var[1] : ""; // Otherwise try to extract a default value
m.appendReplacement(sb, Matcher.quoteReplacement(replacement));
}
m.appendTail(sb);
Expand Down
20 changes: 20 additions & 0 deletions owner/src/test/java/org/aeonbits/owner/StrSubstitutorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,26 @@ public void shouldReplaceVariables() {
assertEquals("The quick brown fox jumped over the lazy dog.", resolvedString);
}

@Test
public void shouldApplyDefaultValues() {
Properties values = new Properties();
String templateString = "The ${animal:wolf} jumped over the ${target:sheep}.";
StrSubstitutor sub = new StrSubstitutor(values);
String resolvedString = sub.replace(templateString);
assertEquals("The wolf jumped over the sheep.", resolvedString);
}

@Test
public void shouldOverrideDefaultValues() {
Properties values = new Properties();
values.setProperty("animal", "quick brown fox");
values.setProperty("target", "lazy dog");
String templateString = "The ${animal:wolf} jumped over the ${target:sheep}.";
StrSubstitutor sub = new StrSubstitutor(values);
String resolvedString = sub.replace(templateString);
assertEquals("The quick brown fox jumped over the lazy dog.", resolvedString);
}

@Test
public void shouldReplaceVariablesHavingBackslashes() {
Properties values = new Properties();
Expand Down