Skip to content

NIFI-9544 - LookupRecord - fixed behavior when no matching value in the LRS #5638

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

Closed
pvillard31 wants to merge 1 commit into from
Closed

NIFI-9544 - LookupRecord - fixed behavior when no matching value in the LRS #5638

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
2 changes: 2 additions & 0 deletions nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -624,7 +624,9 @@
<exclude>src/test/resources/TestValidateRecord/timestamp.avsc</exclude>
<exclude>src/test/resources/TestValidateRecord/timestamp.json</exclude>
<exclude>src/test/resources/TestLookupRecord/lookup-array-input.json</exclude>
<exclude>src/test/resources/TestLookupRecord/lookup-array-input-unmatched.json</exclude>
<exclude>src/test/resources/TestLookupRecord/lookup-array-output.json</exclude>
<exclude>src/test/resources/TestLookupRecord/lookup-array-output-unmatched.json</exclude>
<exclude>src/test/resources/TestValidateRecord/int-maps-schema.avsc</exclude>
<exclude>src/test/resources/TestValidateRecord/int-maps-data.json</exclude>
<exclude>src/test/resources/TestValidateRecord/array-and-map-with-null-element.avro</exclude>
Expand Down
13 changes: 8 additions & 5 deletions ...i-standard-processors/src/main/java/org/apache/nifi/processors/standard/LookupRecord.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,6 +309,7 @@ private Set<Relationship> doInPlaceReplacement(Record record, FlowFile flowFile,
final Map<String, RecordPath> recordPaths = flowFileContext.getKey();
final Map<String, Object> lookupCoordinates = new HashMap<>(recordPaths.size());
final String coordinateKey = lookupService.getRequiredKeys().iterator().next();
boolean hasUnmatchedValue = false;

for (final Map.Entry<String, RecordPath> entry : recordPaths.entrySet()) {
final RecordPath recordPath = entry.getValue();
Expand Down Expand Up @@ -338,20 +339,22 @@ private Set<Relationship> doInPlaceReplacement(Record record, FlowFile flowFile,
}

if (!lookupValueOption.isPresent()) {
final Set<Relationship> rels = routeToMatchedUnmatched ? UNMATCHED_COLLECTION : SUCCESS_COLLECTION;
return rels;
hasUnmatchedValue = true;
continue;
}

final Object lookupValue = lookupValueOption.get();

final DataType inferredDataType = DataTypeUtils.inferDataType(lookupValue, RecordFieldType.STRING.getDataType());
fieldValue.updateValue(lookupValue, inferredDataType);

}
}

final Set<Relationship> rels = routeToMatchedUnmatched ? MATCHED_COLLECTION : SUCCESS_COLLECTION;
return rels;
if (hasUnmatchedValue) {
return routeToMatchedUnmatched ? UNMATCHED_COLLECTION : SUCCESS_COLLECTION;
} else {
return routeToMatchedUnmatched ? MATCHED_COLLECTION : SUCCESS_COLLECTION;
}
}

private Set<Relationship> doResultPathReplacement(Record record, FlowFile flowFile, ProcessContext context, Tuple<Map<String, RecordPath>, RecordPath> flowFileContext) {
Expand Down
6 changes: 4 additions & 2 deletions ...andard-processors/src/test/java/org/apache/nifi/processors/standard/TestLookupRecord.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -539,14 +539,16 @@ public void testLookupArrayKeyNotInLRS() throws InitializationException, IOExcep
runner.setProperty("lookupFoo", "/foo/foo");

lookupService.addValue("FR", "France");
lookupService.addValue("CA", "Canada");
lookupService.addValue("fr", "French");
lookupService.addValue("badkey", "value");

runner.enqueue(new File("src/test/resources/TestLookupRecord/lookup-array-input.json").toPath());
runner.enqueue(new File("src/test/resources/TestLookupRecord/lookup-array-input-unmatched.json").toPath());
runner.run();

runner.assertAllFlowFilesTransferred(LookupRecord.REL_UNMATCHED);
final MockFlowFile out = runner.getFlowFilesForRelationship(LookupRecord.REL_UNMATCHED).get(0);
System.out.println(out.getContent());
out.assertContentEquals(new File("src/test/resources/TestLookupRecord/lookup-array-output-unmatched.json").toPath());
}

private static class MapLookup extends AbstractControllerService implements StringLookupService {
Expand Down
29 changes: 29 additions & 0 deletions ...standard-processors/src/test/resources/TestLookupRecord/lookup-array-input-unmatched.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
[
{
"foo" : {
"foo" : "key"
},
"locales": [
{
"language" : "en",
"region" : "CA"
}, {
"language" : "fr",
"region" : "FR"
}
]
}, {
"foo" : {
"foo" : "key"
},
"locales": [
{
"language" : "fr",
"region" : "CA"
}, {
"language" : "fr",
"region" : "FR"
}
]
}
]
1 change: 1 addition & 0 deletions ...tandard-processors/src/test/resources/TestLookupRecord/lookup-array-output-unmatched.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
[{"foo":{"foo":"key"},"locales":[{"language":"en","region":"CA"},{"language":"French","region":"France"}]},{"foo":{"foo":"key"},"locales":[{"language":"French","region":"CA"},{"language":"French","region":"France"}]}]