agturley commented on code in PR #11299:
URL: https://github.com/apache/nifi/pull/11299#discussion_r3336173386
##########
nifi-extension-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/src/main/java/org/apache/nifi/processors/elasticsearch/PutElasticsearchJson.java:
##########
@@ -931,6 +1131,41 @@ private String resolveId(final Map<String, Object>
contentMap, final String idAt
return StringUtils.isNotBlank(flowFileIdAttribute) ?
flowFileIdAttribute : null;
}
+ /**
+ * Extracts the index name from a pre-parsed {@link JsonNode}.
+ * Used for JSON Array Index/Create operations where the node is already
available.
+ * Falls back to {@code fallbackIndex} when the field is absent or blank.
+ */
+ private String extractIndex(final JsonNode node, final String indexField,
final String fallbackIndex) {
+ if (StringUtils.isBlank(indexField)) {
+ return fallbackIndex;
+ }
+ final JsonNode indexNode = node.get(indexField);
+ if (indexNode != null && !indexNode.isNull()) {
+ final String value = indexNode.asText();
+ return StringUtils.isNotBlank(value) ? value : fallbackIndex;
+ }
+ return fallbackIndex;
+ }
+
+ /**
+ * Resolves the index name from an already-parsed content Map.
+ * Used for Update/Delete/Upsert operations and suppression-enabled
Index/Create paths
+ * where the Map is already available. Falls back to {@code fallbackIndex}
when the
+ * field is absent or blank.
+ */
+ private String resolveIndex(final Map<String, Object> contentMap, final
String indexField, final String fallbackIndex) {
+ if (StringUtils.isBlank(indexField)) {
+ return fallbackIndex;
+ }
+ final Object indexObj = contentMap.get(indexField);
+ if (indexObj != null) {
+ final String value = indexObj.toString();
Review Comment:
They match for normal strings but I found an actual bug while looking - if
the field value is null, the NDJSON path was using the literal string "null" as
the index, while the other two paths fell back correctly. Pulled all the
id/index extraction through a couple of shared helpers so they behave the same:
scalars use their text value, null/objects/arrays fall back. Added a couple
tests for a numeric value and a null value to cover it.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
