Skip to content

Tweak recordPath code, add test case #387

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 5 commits into from
Sep 3, 2021
Merged

Tweak recordPath code, add test case #387

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7b47a1c
Add test case for recordPath with root JSON array (#382)
fsteeg Sep 3, 2021
b4e056b
Avoid wrapping single record in list (#382)
fsteeg Sep 3, 2021
7b978b6
Avoid unnecessary List creation (#382)
fsteeg Sep 3, 2021
88d941f
Add test case for unsupported root array without recordPath (#382)
fsteeg Sep 3, 2021
5ffe4b5
Remove unused import (#382)
fsteeg Sep 3, 2021
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
36 changes: 21 additions & 15 deletions metafacture-json/src/main/java/org/metafacture/json/JsonDecoder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
import java.io.IOException;
import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;
import java.util.stream.Stream;

/**
* Decodes a record in JSON format.
Expand Down Expand Up @@ -132,21 +132,27 @@ public void resetRecordCount() {
@Override
public void process(final String json) {
assert !isClosed();
final List<String> records = recordPath.isEmpty() ? Arrays.asList(json)
: matches(JsonPath.read(json, recordPath));
records.forEach(record -> {
createParser(record);
try {
decode();
} catch (final IOException e) {
throw new MetafactureException(e);
} finally {
closeParser();
}
});
if (recordPath.isEmpty()) {
processRecord(json);
} else {
matches(JsonPath.read(json, recordPath)).forEach(record -> {
processRecord(record);
});
}
}

private void processRecord(String record) {
createParser(record);
try {
decode();
} catch (final IOException e) {
throw new MetafactureException(e);
} finally {
closeParser();
}
}

private List<String> matches(Object obj) {
private Stream<String> matches(Object obj) {
final List<?> records = (obj instanceof List<?>) ? ((List<?>) obj) : Arrays.asList(obj);
return records.stream().map(doc -> {
try {
Expand All @@ -155,7 +161,7 @@ private List<String> matches(Object obj) {
e.printStackTrace();
return doc.toString();
}
}).collect(Collectors.toList());
});
}

@Override
Expand Down
25 changes: 24 additions & 1 deletion metafacture-json/src/test/java/org/metafacture/json/JsonDecoderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ public void testShouldProcessConcatenatedRecords() {
}

@Test
public void testShouldProcessRecordsInArray() {
public void testShouldProcessRecordsInArrayField() {
jsonDecoder.setRecordPath("$.data");
jsonDecoder.process(
"{\"data\":[" + "{\"lit\": \"record 1\"}," +
Expand All @@ -167,6 +167,29 @@ public void testShouldProcessRecordsInArray() {
ordered.verify(receiver).endRecord();
}

@Test
public void testShouldProcessRecordsInArrayRoot() {
jsonDecoder.setRecordPath("$");
jsonDecoder.process(
"[" + "{\"lit\": \"record 1\"}," +
"{\"lit\": \"record 2\"}" + "]");

final InOrder ordered = inOrder(receiver);
ordered.verify(receiver).startRecord("1");
ordered.verify(receiver).literal("lit", "record 1");
ordered.verify(receiver).endRecord();
ordered.verify(receiver).startRecord("2");
ordered.verify(receiver).literal("lit", "record 2");
ordered.verify(receiver).endRecord();
}

@Test(expected=MetafactureException.class)
public void testRootArrayNoRecordPath() {
jsonDecoder.process(
"[" + "{\"lit\": \"record 1\"}," +
"{\"lit\": \"record 2\"}" + "]");
}

@Test
public void testShouldProcessMultipleRecords() {
jsonDecoder.process("{\"lit\": \"record 1\"}");
Expand Down