NIFI-10106 Avoid NPE in LookupRecord.createLookupCoordinates (apache#…

…6111)
nexr · Jun 21, 2022 · c089965 · c089965
1 parent 5febd47
commit c089965
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 1 deletion.
diff --git a/...i-standard-processors/src/main/java/org/apache/nifi/processors/standard/LookupRecord.java b/...i-standard-processors/src/main/java/org/apache/nifi/processors/standard/LookupRecord.java
@@ -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);
             }
 

diff --git a/...andard-processors/src/test/java/org/apache/nifi/processors/standard/TestLookupRecord.java b/...andard-processors/src/test/java/org/apache/nifi/processors/standard/TestLookupRecord.java
@@ -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;