Apache
/
nifi
mirror of https://github.com/apache/nifi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

NIFI-5500 Adding support for array fields when outputting to attributes when using QueryElasticsearchHttp 

NIFI-5500 Optimised array-to-string conversion

This closes #2942

Signed-off-by: Mike Thomsen <mikerthomsen@gmail.com>
This commit is contained in:
Wietze 2018-08-08 17:17:47 +01:00 committed by Mike Thomsen
parent af6039a5b0
commit d59a07245f
4 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/main/java/org/apache/nifi/processors/elasticsearch/QueryElasticsearchHttp.java
View File

@ -432,7 +432,18 @@ public class QueryElasticsearchHttp extends AbstractElasticsearchHttpProcessor {
Map<String, String> attributes = new HashMap<>();
for(Iterator<Entry<String, JsonNode>> it = source.fields(); it.hasNext(); ) {
Entry<String, JsonNode> entry = it.next();
attributes.put(ATTRIBUTE_PREFIX + entry.getKey(), entry.getValue().asText());
String textValue = "";
if(entry.getValue().isArray()){
ArrayList<String> text_values = new ArrayList<String>();
for(Iterator<JsonNode> items = entry.getValue().iterator(); items.hasNext(); ) {
text_values.add(items.next().asText());
}
textValue = StringUtils.join(text_values, ',');
} else {
textValue = entry.getValue().asText();
}
attributes.put(ATTRIBUTE_PREFIX + entry.getKey(), textValue);
}
documentFlowFile = session.putAllAttributes(documentFlowFile, attributes);
}

1
nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/test/java/org/apache/nifi/processors/elasticsearch/TestQueryElasticsearchHttp.java
View File

@ -141,6 +141,7 @@ public class TestQueryElasticsearchHttp {
QueryElasticsearchHttp.REL_SUCCESS).get(0);
assertNotNull(out);
assertEquals("blah", new String(out.toByteArray()));
assertEquals("arrays,are,supported,too", out.getAttribute("es.result.tags"));
assertEquals("Twitter", out.getAttribute("es.result.source"));
}

10
nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/test/resources/query-page1.json
View File

@ -25,7 +25,8 @@
"transit_uri": "file://cluster2/data/outgoing/S3/abc-97b.zip",
"object_type": "Provenance Record",
"version": "ASVsZu_vShwtGCJpGOObmuSqUJRUC3L_",
"file_size": "3645525"
"file_size": "3645525",
"tags": ["arrays", "are", "supported", "too"]
},
"sort": [
1469198828102
@ -45,13 +46,14 @@
"transit_uri": "file://cluster2/data/outgoing/S3/abc-a78.zip",
"object_type": "Provenance Record",
"version": "SjJkrwnv6edIRqJChEYzrE7PeT1hzioz",
"file_size": "4480294"
"file_size": "4480294",
"tags": ["arrays", "are", "supported", "too"]
},
"sort": [
1469198828101
]
}
]
}
}
}

5
nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/test/resources/query-page2.json
View File

@ -25,7 +25,8 @@
"transit_uri": "file://cluster2/data/outgoing/S3/abc-42a.zip",
"object_type": "Provenance Record",
"version": "ArPsIlGBKqDvfL6qQZOVpmDwUEB.nynh",
"file_size": "18206872"
"file_size": "18206872",
"tags": ["arrays", "are", "supported", "too"]
},
"sort": [
1469198828101
@ -33,4 +34,4 @@
}
]
}
}
}