Skip to content

NIFI-10106 Avoid NPE in LookupRecord.createLookupCoordinates #6111

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
markap14 merged 1 commit into from
Jun 21, 2022
Merged

NIFI-10106 Avoid NPE in LookupRecord.createLookupCoordinates #6111

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
13 changes: 12 additions & 1 deletion ...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 @@ -682,7 +682,18 @@ private Map<String, Object> createLookupCoordinates(final Record record, final L
}

final FieldValue fieldValue = lookupFieldValues.get(0);
final Object coordinateValue = DataTypeUtils.convertType(fieldValue.getValue(), fieldValue.getField().getDataType(), null, null, null, fieldValue.getField().getFieldName());
final Object coordinateValue = DataTypeUtils.convertType(
fieldValue.getValue(),
Optional.ofNullable(fieldValue.getField())
.map(RecordField::getDataType)
.orElse(DataTypeUtils.inferDataType(fieldValue.getValue(), RecordFieldType.STRING.getDataType())),
null,
null,
null,
Optional.ofNullable(fieldValue.getField())
.map(RecordField::getFieldName)
.orElse(coordinateKey)
);
lookupCoordinates.put(coordinateKey, coordinateValue);
}

Expand Down
13 changes: 13 additions & 0 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 @@ -569,6 +569,19 @@ public void testLookupArrayKeyNotInLRS() throws InitializationException, IOExcep
out.assertContentEquals(new File("src/test/resources/TestLookupRecord/lookup-array-output-unmatched.json").toPath());
}


@Test
public void testLiteralCoordinate() {
lookupService.addValue("lookupKey", "lookupValue");

runner.setProperty("lookup", "toString('lookupKey', 'UTF-8')");

runner.enqueue("");
runner.run();

runner.assertAllFlowFilesTransferred(LookupRecord.REL_MATCHED, 1);
}

private static class MapLookup extends AbstractControllerService implements StringLookupService {
protected final Map<String, String> values = new HashMap<>();
private Map<String, Object> expectedContext;
Expand Down