Github user mattyb149 commented on a diff in the pull request:
https://github.com/apache/nifi/pull/2861#discussion_r209664984
--- Diff:
nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/src/main/java/org/apache/nifi/processors/elasticsearch/PutElasticsearchJson.java
---
@@ -0,0 +1,321 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.nifi.processors.elasticsearch;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.jayway.jsonpath.JsonPath;
+import org.apache.nifi.annotation.behavior.InputRequirement;
+import org.apache.nifi.annotation.documentation.CapabilityDescription;
+import org.apache.nifi.annotation.documentation.Tags;
+import org.apache.nifi.annotation.lifecycle.OnScheduled;
+import org.apache.nifi.components.PropertyDescriptor;
+import org.apache.nifi.components.ValidationContext;
+import org.apache.nifi.components.ValidationResult;
+import org.apache.nifi.components.Validator;
+import org.apache.nifi.elasticsearch.ElasticSearchClientService;
+import org.apache.nifi.elasticsearch.ElasticSearchError;
+import org.apache.nifi.elasticsearch.IndexOperationRequest;
+import org.apache.nifi.expression.ExpressionLanguageScope;
+import org.apache.nifi.flowfile.FlowFile;
+import org.apache.nifi.processor.AbstractProcessor;
+import org.apache.nifi.processor.ProcessContext;
+import org.apache.nifi.processor.ProcessSession;
+import org.apache.nifi.processor.Relationship;
+import org.apache.nifi.processor.exception.ProcessException;
+import org.apache.nifi.processor.util.StandardValidators;
+import
org.apache.nifi.processors.elasticsearch.put.FlowFileJsonDescription;
+import org.apache.nifi.processors.elasticsearch.put.JsonProcessingError;
+import org.apache.nifi.util.StringUtils;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+@InputRequirement(InputRequirement.Requirement.INPUT_REQUIRED)
+@Tags({"json", "elasticsearch", "5x", "6x", "put", "index"})
+@CapabilityDescription("This processor puts user-supplied JSON into
ElasticSearch. It does not require a schema.")
+public class PutElasticsearchJson extends AbstractProcessor implements
ElasticSearchRestProcessor {
+
+ static final PropertyDescriptor ID_ATTRIBUTE = new
PropertyDescriptor.Builder()
+ .name("put-es-json-id-attribute")
+ .displayName("ID Attribute")
+ .description("The attribute to use for setting the document ID in
ElasticSearch. If the payload is an array, " +
+ "and this option is used for getting the ID, an exception
will be raised.")
+ .required(false)
+
.expressionLanguageSupported(ExpressionLanguageScope.FLOWFILE_ATTRIBUTES)
+ .addValidator(Validator.VALID)
+ .build();
+ static final PropertyDescriptor ID_JSON_PATH = new
PropertyDescriptor.Builder()
+ .name("put-es-json-id-json-path")
+ .displayName("ID JSONPath")
+ .description("If set, the document ID will be pulled from each
json block using this JSONPath operation.")
+ .required(false)
+
.expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY)
+ .addValidator(Validator.VALID)
+ .build();
+ static final PropertyDescriptor INDEX_JSON_PATH = new
PropertyDescriptor.Builder()
+ .name("put-es-json-index-json-path")
+ .displayName("Index JSONPath")
+ .description("If set, the document's target index will be pulled
from each json block using this JSONPath operation. " +
+ "If it is left blank or fails to evaluate to a valid
value, the index property's valuable will be used instead. ")
+ .required(false)
+
.expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY)
+ .addValidator(Validator.VALID)
+ .build();
+ static final PropertyDescriptor TYPE_JSON_PATH = new
PropertyDescriptor.Builder()
+ .name("put-es-json-type-json-path")
+ .displayName("Type JSONPath")
+ .description("If set, the document's target type will be pulled
from each json block using this JSONPath operation. " +
+ "If it is left blank or fails to evaluate to a valid
value, the type property's valuable will be used instead. ")
+ .required(false)
+
.expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY)
+ .addValidator(Validator.VALID)
+ .build();
+ static final PropertyDescriptor BATCH_SIZE = new
PropertyDescriptor.Builder()
+ .name("put-es-json-batch-size")
+ .displayName("Batch Size")
+ .description("The number of flowfiles to fetch per batch. Be very
careful about setting this value high if" +
+ "JSON arrays could be sent in the flowfiles.")
+ .required(true)
+ .defaultValue("50")
+
.expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY)
+ .addValidator(StandardValidators.POSITIVE_INTEGER_VALIDATOR)
+ .build();
+
+ private ObjectMapper mapper = new ObjectMapper();
+ private ElasticSearchClientService clientService;
+
+ @Override
+ public Set<Relationship> getRelationships() {
+ return new HashSet<Relationship>(){{
+ add(REL_SUCCESS);
+ add(REL_FAILURE);
+ add(REL_RETRY);
+ }};
+ }
+
+ @Override
+ public final List<PropertyDescriptor>
getSupportedPropertyDescriptors() {
+ List<PropertyDescriptor> _temp = new ArrayList<>();
+ _temp.add(INDEX);
+ _temp.add(TYPE);
+ _temp.add(CLIENT_SERVICE);
+ _temp.add(ID_ATTRIBUTE);
+ _temp.add(ID_JSON_PATH);
+ _temp.add(INDEX_JSON_PATH);
+ _temp.add(TYPE_JSON_PATH);
+ _temp.add(BATCH_SIZE);
+
+ return Collections.unmodifiableList(_temp);
+ }
+
+ @Override
+ protected Collection<ValidationResult>
customValidate(ValidationContext validationContext) {
+ List<ValidationResult> retVal = new ArrayList<>();
+ boolean attrIsSet =
validationContext.getProperty(ID_ATTRIBUTE).isSet();
+ boolean jpIsSet =
validationContext.getProperty(ID_JSON_PATH).isSet();
+
+ if (attrIsSet && jpIsSet) {
--- End diff --
We should probably have checks here for the INDEX and TYPE stuff too? Also
the documentation for at least the JSONPath properties should be updated to
include the fact that they can't be set at the same time as the originals. You
could even add that doc to the "originals" by adding your own properties like
`MY_INDEX = new
PropertyDescriptor.Builder().from(INDEX).description(<paste_old_desc_here> + ".
Cannot be set at the same time as Index JSON Path").build()`. Then you wouldn't
add the base class's version, you'd build off them and add the altered ones.
---
