Skip to content

Escape feedback char in _else data. #344

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
merged 1 commit into from
Nov 26, 2020
Merged

Escape feedback char in _else data. #344

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
14 changes: 11 additions & 3 deletions metamorph/src/main/java/org/metafacture/metamorph/Metamorph.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,11 +338,11 @@ else if (fallbackReceiver != null) {
elseNestedEntityStarted = true;
}

send(currentLiteralName, value, fallbackReceiver);
send(escapeFeedbackChar(currentLiteralName), value, fallbackReceiver);
}
}
else {
send(path, value, fallbackReceiver);
send(escapeFeedbackChar(path), value, fallbackReceiver);
}
}
}
Expand All @@ -363,6 +363,14 @@ private void send(final String path, final String value, final List<NamedValueRe
}
}

private boolean startsWithFeedbackChar(final String name) {
return name.length() != 0 && name.charAt(0) == FEEDBACK_CHAR;
}

private String escapeFeedbackChar(final String name) {
return name == null ? null : (startsWithFeedbackChar(name) ? ESCAPE_CHAR : "") + name;
}

/**
* @param streamReceiver
* the outputHandler to set
Expand All @@ -388,7 +396,7 @@ public void receive(final String name, final String value, final NamedValueSourc
"encountered literal with name='null'. This indicates a bug in a function or a collector.");
}

if (name.length() != 0 && name.charAt(0) == FEEDBACK_CHAR) {
if (startsWithFeedbackChar(name)) {
dispatch(name, value, null, false);
return;
}
Expand Down
8 changes: 8 additions & 0 deletions metamorph/src/test/java/org/metafacture/metamorph/TestMetamorphBasics.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,25 +106,29 @@ private void testElseData(final String elseKeyword) {
"</rules>",
i -> {
i.startRecord("1");
i.literal("@id", "123");
i.literal("Shikotan", "Aekap");
i.startEntity("Germany");
i.literal("Langeoog", "Moin");
i.literal("Sylt", "Aloha");
i.literal("Borkum", "Tach");
i.endEntity();
i.startEntity("Germany");
i.literal("@foo", "bar");
i.literal("Baltrum", "Moin Moin");
i.endEntity();
i.endRecord();
},
o -> {
o.get().startRecord("1");
o.get().literal("@id", "123");
o.get().literal("Shikotan", "Aekap");
o.get().literal("Germany.Langeoog", "Moin");
o.get().startEntity("Germany");
o.get().literal("Hawaii", "Aloha");
o.get().literal("Germany.Borkum", "Tach");
o.get().endEntity();
o.get().literal("Germany.@foo", "bar");
o.get().literal("Germany.Baltrum", "Moin Moin");
o.get().endRecord();
}
Expand Down Expand Up @@ -223,8 +227,10 @@ public void shouldHandleUnmatchedLiteralsAndEntitiesInElseNestedSource() {
"</rules>",
i -> {
i.startRecord("1");
i.literal("@id", "123");
i.literal("Shikotan", "Aekap");
i.startEntity("Germany");
i.literal("@foo", "bar");
i.literal("Langeoog", "Moin");
i.literal("Baltrum", "Moin Moin");
i.endEntity();
Expand All @@ -235,8 +241,10 @@ public void shouldHandleUnmatchedLiteralsAndEntitiesInElseNestedSource() {
},
o -> {
o.get().startRecord("1");
o.get().literal("@id", "123");
o.get().literal("Shikotan", "Aekap");
o.get().startEntity("Germany");
o.get().literal("@foo", "bar");
o.get().literal("Langeoog", "Moin");
o.get().literal("Baltrum", "Moin Moin");
o.get().endEntity();
Expand Down