You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by pv...@apache.org on 2018/04/06 18:38:54 UTC
nifi git commit: NIFI-4149 - fixed contrib-check errors
Repository: nifi
Updated Branches:
refs/heads/master 644133dc3 -> 7cc77937d
NIFI-4149 - fixed contrib-check errors
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/7cc77937
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/7cc77937
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/7cc77937
Branch: refs/heads/master
Commit: 7cc77937d8636feb65d708d14c3b22a6c71a1ed7
Parents: 644133d
Author: Pierre Villard <pi...@gmail.com>
Authored: Fri Apr 6 20:38:04 2018 +0200
Committer: Pierre Villard <pi...@gmail.com>
Committed: Fri Apr 6 20:38:04 2018 +0200
----------------------------------------------------------------------
.../elasticsearch/JsonQueryElasticsearch.java | 13 +++++++------
.../processors/poi/ConvertExcelToCSVProcessor.java | 8 ++++----
2 files changed, 11 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi/blob/7cc77937/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/src/main/java/org/apache/nifi/processors/elasticsearch/JsonQueryElasticsearch.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/src/main/java/org/apache/nifi/processors/elasticsearch/JsonQueryElasticsearch.java b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/src/main/java/org/apache/nifi/processors/elasticsearch/JsonQueryElasticsearch.java
index 434f185..64be962 100644
--- a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/src/main/java/org/apache/nifi/processors/elasticsearch/JsonQueryElasticsearch.java
+++ b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/src/main/java/org/apache/nifi/processors/elasticsearch/JsonQueryElasticsearch.java
@@ -30,6 +30,7 @@ import org.apache.nifi.components.PropertyDescriptor;
import org.apache.nifi.components.Validator;
import org.apache.nifi.elasticsearch.ElasticSearchClientService;
import org.apache.nifi.elasticsearch.SearchResponse;
+import org.apache.nifi.expression.ExpressionLanguageScope;
import org.apache.nifi.flowfile.FlowFile;
import org.apache.nifi.flowfile.attributes.CoreAttributes;
import org.apache.nifi.processor.AbstractProcessor;
@@ -83,7 +84,7 @@ public class JsonQueryElasticsearch extends AbstractProcessor {
.displayName("Index")
.description("The name of the index to read from")
.required(true)
- .expressionLanguageSupported(true)
+ .expressionLanguageSupported(ExpressionLanguageScope.FLOWFILE_ATTRIBUTES)
.addValidator(StandardValidators.NON_EMPTY_VALIDATOR)
.build();
@@ -92,7 +93,7 @@ public class JsonQueryElasticsearch extends AbstractProcessor {
.displayName("Type")
.description("The type of this document (used by Elasticsearch for indexing and searching)")
.required(false)
- .expressionLanguageSupported(true)
+ .expressionLanguageSupported(ExpressionLanguageScope.FLOWFILE_ATTRIBUTES)
.addValidator(StandardValidators.NON_EMPTY_VALIDATOR)
.build();
@@ -108,14 +109,14 @@ public class JsonQueryElasticsearch extends AbstractProcessor {
"\t}\n" +
"}")
.required(false)
- .expressionLanguageSupported(true)
+ .expressionLanguageSupported(ExpressionLanguageScope.FLOWFILE_ATTRIBUTES)
.addValidator(StandardValidators.NON_EMPTY_VALIDATOR)
.build();
public static final PropertyDescriptor QUERY_ATTRIBUTE = new PropertyDescriptor.Builder()
.name("el-query-attribute")
.displayName("Query Attribute")
.description("If set, the executed query will be set on each result flowfile in the specified attribute.")
- .expressionLanguageSupported(true)
+ .expressionLanguageSupported(ExpressionLanguageScope.FLOWFILE_ATTRIBUTES)
.addValidator(Validator.VALID)
.required(false)
.build();
@@ -138,7 +139,7 @@ public class JsonQueryElasticsearch extends AbstractProcessor {
.allowableValues(SPLIT_UP_HITS_NO, SPLIT_UP_YES)
.defaultValue(SPLIT_UP_HITS_NO.getValue())
.required(true)
- .expressionLanguageSupported(false)
+ .expressionLanguageSupported(ExpressionLanguageScope.NONE)
.build();
public static final PropertyDescriptor SPLIT_UP_AGGREGATIONS = new PropertyDescriptor.Builder()
.name("el-rest-split-up-aggregations")
@@ -147,7 +148,7 @@ public class JsonQueryElasticsearch extends AbstractProcessor {
.allowableValues(SPLIT_UP_HITS_NO, SPLIT_UP_YES)
.defaultValue(SPLIT_UP_HITS_NO.getValue())
.required(true)
- .expressionLanguageSupported(false)
+ .expressionLanguageSupported(ExpressionLanguageScope.NONE)
.build();
public static final PropertyDescriptor CLIENT_SERVICE = new PropertyDescriptor.Builder()
http://git-wip-us.apache.org/repos/asf/nifi/blob/7cc77937/nifi-nar-bundles/nifi-poi-bundle/nifi-poi-processors/src/main/java/org/apache/nifi/processors/poi/ConvertExcelToCSVProcessor.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-poi-bundle/nifi-poi-processors/src/main/java/org/apache/nifi/processors/poi/ConvertExcelToCSVProcessor.java b/nifi-nar-bundles/nifi-poi-bundle/nifi-poi-processors/src/main/java/org/apache/nifi/processors/poi/ConvertExcelToCSVProcessor.java
index d88b256..7a762f4 100644
--- a/nifi-nar-bundles/nifi-poi-bundle/nifi-poi-processors/src/main/java/org/apache/nifi/processors/poi/ConvertExcelToCSVProcessor.java
+++ b/nifi-nar-bundles/nifi-poi-bundle/nifi-poi-processors/src/main/java/org/apache/nifi/processors/poi/ConvertExcelToCSVProcessor.java
@@ -97,7 +97,7 @@ public class ConvertExcelToCSVProcessor
" is left blank then all of the sheets will be extracted from the Excel document. The list of names is case in-sensitive. Any sheets not " +
"specified in this value will be ignored.")
.required(false)
- .expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY)
+ .expressionLanguageSupported(ExpressionLanguageScope.FLOWFILE_ATTRIBUTES)
.addValidator(StandardValidators.NON_EMPTY_VALIDATOR)
.build();
@@ -109,7 +109,7 @@ public class ConvertExcelToCSVProcessor
+ "Empty rows of data anywhere in the spreadsheet will always be skipped, no matter what this value is set to.")
.required(true)
.defaultValue("0")
- .expressionLanguageSupported(true)
+ .expressionLanguageSupported(ExpressionLanguageScope.FLOWFILE_ATTRIBUTES)
.addValidator(StandardValidators.NON_NEGATIVE_INTEGER_VALIDATOR)
.build();
@@ -119,7 +119,7 @@ public class ConvertExcelToCSVProcessor
.description("Comma delimited list of column numbers to skip. Use the columns number and not the letter designation. "
+ "Use this to skip over columns anywhere in your worksheet that you don't want extracted as part of the record.")
.required(false)
- .expressionLanguageSupported(true)
+ .expressionLanguageSupported(ExpressionLanguageScope.FLOWFILE_ATTRIBUTES)
.addValidator(StandardValidators.NON_EMPTY_VALIDATOR)
.build();
@@ -629,4 +629,4 @@ public class ConvertExcelToCSVProcessor
this.styles = styles;
}
}
-}
\ No newline at end of file
+}