http://git-wip-us.apache.org/repos/asf/nifi/blob/4c787799/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/main/java/org/apache/nifi/processors/elasticsearch/AbstractElasticsearchProcessor.java
----------------------------------------------------------------------
diff --git 
a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/main/java/org/apache/nifi/processors/elasticsearch/AbstractElasticsearchProcessor.java
 
b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/main/java/org/apache/nifi/processors/elasticsearch/AbstractElasticsearchProcessor.java
index 0453785..feac3c4 100644
--- 
a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/main/java/org/apache/nifi/processors/elasticsearch/AbstractElasticsearchProcessor.java
+++ 
b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/main/java/org/apache/nifi/processors/elasticsearch/AbstractElasticsearchProcessor.java
@@ -19,6 +19,7 @@ package org.apache.nifi.processors.elasticsearch;
 import org.apache.nifi.components.PropertyDescriptor;
 import org.apache.nifi.components.ValidationContext;
 import org.apache.nifi.components.ValidationResult;
+import org.apache.nifi.expression.ExpressionLanguageScope;
 import org.apache.nifi.processor.AbstractProcessor;
 import org.apache.nifi.processor.ProcessContext;
 import org.apache.nifi.processor.exception.ProcessException;
@@ -49,7 +50,7 @@ public abstract class AbstractElasticsearchProcessor extends 
AbstractProcessor {
             .required(true)
             .defaultValue("UTF-8")
             .addValidator(StandardValidators.CHARACTER_SET_VALIDATOR)
-            .expressionLanguageSupported(true)
+            
.expressionLanguageSupported(ExpressionLanguageScope.FLOWFILE_ATTRIBUTES)
             .build();
 
     public static final PropertyDescriptor USERNAME = new 
PropertyDescriptor.Builder()
@@ -57,7 +58,7 @@ public abstract class AbstractElasticsearchProcessor extends 
AbstractProcessor {
             .description("Username to access the Elasticsearch cluster")
             .required(false)
             .addValidator(StandardValidators.NON_EMPTY_VALIDATOR)
-            .expressionLanguageSupported(true)
+            
.expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY)
             .build();
 
     public static final PropertyDescriptor PASSWORD = new 
PropertyDescriptor.Builder()
@@ -66,7 +67,7 @@ public abstract class AbstractElasticsearchProcessor extends 
AbstractProcessor {
             .required(false)
             .sensitive(true)
             .addValidator(StandardValidators.NON_EMPTY_VALIDATOR)
-            .expressionLanguageSupported(true)
+            
.expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY)
             .build();
 
     protected abstract void createElasticsearchClient(ProcessContext context) 
throws ProcessException;

http://git-wip-us.apache.org/repos/asf/nifi/blob/4c787799/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/main/java/org/apache/nifi/processors/elasticsearch/AbstractElasticsearchTransportClientProcessor.java
----------------------------------------------------------------------
diff --git 
a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/main/java/org/apache/nifi/processors/elasticsearch/AbstractElasticsearchTransportClientProcessor.java
 
b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/main/java/org/apache/nifi/processors/elasticsearch/AbstractElasticsearchTransportClientProcessor.java
index b260768..c6f42a9 100644
--- 
a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/main/java/org/apache/nifi/processors/elasticsearch/AbstractElasticsearchTransportClientProcessor.java
+++ 
b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/main/java/org/apache/nifi/processors/elasticsearch/AbstractElasticsearchTransportClientProcessor.java
@@ -17,6 +17,7 @@
 package org.apache.nifi.processors.elasticsearch;
 
 import org.apache.nifi.components.PropertyDescriptor;
+import org.apache.nifi.expression.ExpressionLanguageScope;
 import org.apache.nifi.logging.ComponentLog;
 import org.apache.nifi.processor.ProcessContext;
 import org.apache.nifi.processor.exception.ProcessException;
@@ -49,7 +50,7 @@ public abstract class 
AbstractElasticsearchTransportClientProcessor extends Abst
             .required(true)
             .addValidator(StandardValidators.NON_EMPTY_VALIDATOR)
             .defaultValue("elasticsearch")
-            .expressionLanguageSupported(true)
+            
.expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY)
             .build();
 
     protected static final PropertyDescriptor HOSTS = new 
PropertyDescriptor.Builder()
@@ -58,9 +59,8 @@ public abstract class 
AbstractElasticsearchTransportClientProcessor extends Abst
                     + "host1:port,host2:port,....  For example 
testcluster:9300. This processor uses the Transport Client to "
                     + "connect to hosts. The default transport client port is 
9300.")
             .required(true)
-            .expressionLanguageSupported(false)
             .addValidator(StandardValidators.HOSTNAME_PORT_LIST_VALIDATOR)
-            .expressionLanguageSupported(true)
+            
.expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY)
             .build();
 
     public static final PropertyDescriptor PROP_SHIELD_LOCATION = new 
PropertyDescriptor.Builder()
@@ -71,7 +71,7 @@ public abstract class 
AbstractElasticsearchTransportClientProcessor extends Abst
                     + "lib/ directory, doing so will prevent the Shield plugin 
from being loaded.")
             .required(false)
             .addValidator(StandardValidators.FILE_EXISTS_VALIDATOR)
-            .expressionLanguageSupported(true)
+            
.expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY)
             .build();
 
     protected static final PropertyDescriptor PING_TIMEOUT = new 
PropertyDescriptor.Builder()
@@ -81,7 +81,7 @@ public abstract class 
AbstractElasticsearchTransportClientProcessor extends Abst
             .required(true)
             .defaultValue("5s")
             .addValidator(StandardValidators.TIME_PERIOD_VALIDATOR)
-            .expressionLanguageSupported(true)
+            
.expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY)
             .build();
 
     protected static final PropertyDescriptor SAMPLER_INTERVAL = new 
PropertyDescriptor.Builder()
@@ -91,7 +91,7 @@ public abstract class 
AbstractElasticsearchTransportClientProcessor extends Abst
             .required(true)
             .defaultValue("5s")
             .addValidator(StandardValidators.TIME_PERIOD_VALIDATOR)
-            .expressionLanguageSupported(true)
+            
.expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY)
             .build();
 
     protected AtomicReference<Client> esClient = new AtomicReference<>();

http://git-wip-us.apache.org/repos/asf/nifi/blob/4c787799/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/main/java/org/apache/nifi/processors/elasticsearch/FetchElasticsearch.java
----------------------------------------------------------------------
diff --git 
a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/main/java/org/apache/nifi/processors/elasticsearch/FetchElasticsearch.java
 
b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/main/java/org/apache/nifi/processors/elasticsearch/FetchElasticsearch.java
index 9edd3f9..9d7a402 100644
--- 
a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/main/java/org/apache/nifi/processors/elasticsearch/FetchElasticsearch.java
+++ 
b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/main/java/org/apache/nifi/processors/elasticsearch/FetchElasticsearch.java
@@ -26,6 +26,7 @@ import org.apache.nifi.annotation.documentation.Tags;
 import org.apache.nifi.annotation.lifecycle.OnScheduled;
 import org.apache.nifi.annotation.lifecycle.OnStopped;
 import org.apache.nifi.components.PropertyDescriptor;
+import org.apache.nifi.expression.ExpressionLanguageScope;
 import org.apache.nifi.flowfile.FlowFile;
 import org.apache.nifi.logging.ComponentLog;
 import org.apache.nifi.processor.ProcessContext;
@@ -85,7 +86,7 @@ public class FetchElasticsearch extends 
AbstractElasticsearchTransportClientProc
             .name("Document Identifier")
             .description("The identifier for the document to be fetched")
             .required(true)
-            .expressionLanguageSupported(true)
+            
.expressionLanguageSupported(ExpressionLanguageScope.FLOWFILE_ATTRIBUTES)
             .addValidator(StandardValidators.NON_EMPTY_VALIDATOR)
             .build();
 
@@ -93,7 +94,7 @@ public class FetchElasticsearch extends 
AbstractElasticsearchTransportClientProc
             .name("Index")
             .description("The name of the index to read from")
             .required(true)
-            .expressionLanguageSupported(true)
+            
.expressionLanguageSupported(ExpressionLanguageScope.FLOWFILE_ATTRIBUTES)
             .addValidator(StandardValidators.NON_EMPTY_VALIDATOR)
             .build();
 
@@ -101,7 +102,7 @@ public class FetchElasticsearch extends 
AbstractElasticsearchTransportClientProc
             .name("Type")
             .description("The type of this document (used by Elasticsearch for 
indexing and searching)")
             .required(true)
-            .expressionLanguageSupported(true)
+            
.expressionLanguageSupported(ExpressionLanguageScope.FLOWFILE_ATTRIBUTES)
             .addValidator(StandardValidators.NON_EMPTY_VALIDATOR)
             .build();
 

http://git-wip-us.apache.org/repos/asf/nifi/blob/4c787799/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/main/java/org/apache/nifi/processors/elasticsearch/FetchElasticsearchHttp.java
----------------------------------------------------------------------
diff --git 
a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/main/java/org/apache/nifi/processors/elasticsearch/FetchElasticsearchHttp.java
 
b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/main/java/org/apache/nifi/processors/elasticsearch/FetchElasticsearchHttp.java
index 63163e4..2c692df 100644
--- 
a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/main/java/org/apache/nifi/processors/elasticsearch/FetchElasticsearchHttp.java
+++ 
b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/main/java/org/apache/nifi/processors/elasticsearch/FetchElasticsearchHttp.java
@@ -32,6 +32,7 @@ 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.expression.ExpressionLanguageScope;
 import org.apache.nifi.flowfile.FlowFile;
 import org.apache.nifi.logging.ComponentLog;
 import org.apache.nifi.processor.ProcessContext;
@@ -70,7 +71,7 @@ import java.util.stream.Stream;
 @DynamicProperty(
         name = "A URL query parameter",
         value = "The value to set it to",
-        supportsExpressionLanguage = true,
+        expressionLanguageScope = ExpressionLanguageScope.VARIABLE_REGISTRY,
         description = "Adds the specified property name/value as a query 
parameter in the Elasticsearch URL used for processing")
 public class FetchElasticsearchHttp extends AbstractElasticsearchHttpProcessor 
{
 
@@ -102,7 +103,7 @@ public class FetchElasticsearchHttp extends 
AbstractElasticsearchHttpProcessor {
             .displayName("Document Identifier")
             .description("The identifier of the document to be fetched")
             .required(true)
-            .expressionLanguageSupported(true)
+            
.expressionLanguageSupported(ExpressionLanguageScope.FLOWFILE_ATTRIBUTES)
             .addValidator(StandardValidators.NON_EMPTY_VALIDATOR)
             .build();
 
@@ -111,7 +112,7 @@ public class FetchElasticsearchHttp extends 
AbstractElasticsearchHttpProcessor {
             .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();
 
@@ -121,7 +122,7 @@ public class FetchElasticsearchHttp extends 
AbstractElasticsearchHttpProcessor {
             .description("The (optional) type of this document, used by 
Elasticsearch for indexing and searching. If the property is empty, "
                     + "the first document matching the identifier across all 
types will be retrieved.")
             .required(false)
-            .expressionLanguageSupported(true)
+            
.expressionLanguageSupported(ExpressionLanguageScope.FLOWFILE_ATTRIBUTES)
             .addValidator(StandardValidators.NON_EMPTY_VALIDATOR)
             .build();
 
@@ -131,7 +132,7 @@ public class FetchElasticsearchHttp extends 
AbstractElasticsearchHttpProcessor {
             .description("A comma-separated list of fields to retrieve from 
the document. If the Fields property is left blank, "
                     + "then the entire document's source will be retrieved.")
             .required(false)
-            .expressionLanguageSupported(true)
+            
.expressionLanguageSupported(ExpressionLanguageScope.FLOWFILE_ATTRIBUTES)
             .addValidator(StandardValidators.NON_EMPTY_VALIDATOR)
             .build();
 

http://git-wip-us.apache.org/repos/asf/nifi/blob/4c787799/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/main/java/org/apache/nifi/processors/elasticsearch/PutElasticsearch.java
----------------------------------------------------------------------
diff --git 
a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/main/java/org/apache/nifi/processors/elasticsearch/PutElasticsearch.java
 
b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/main/java/org/apache/nifi/processors/elasticsearch/PutElasticsearch.java
index 31af3db..f5082ea 100644
--- 
a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/main/java/org/apache/nifi/processors/elasticsearch/PutElasticsearch.java
+++ 
b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/main/java/org/apache/nifi/processors/elasticsearch/PutElasticsearch.java
@@ -28,6 +28,7 @@ import org.apache.nifi.annotation.lifecycle.OnScheduled;
 import org.apache.nifi.annotation.lifecycle.OnStopped;
 import org.apache.nifi.components.PropertyDescriptor;
 import org.apache.nifi.expression.AttributeExpression;
+import org.apache.nifi.expression.ExpressionLanguageScope;
 import org.apache.nifi.flowfile.FlowFile;
 import org.apache.nifi.logging.ComponentLog;
 import org.apache.nifi.processor.ProcessContext;
@@ -81,7 +82,7 @@ public class PutElasticsearch extends 
AbstractElasticsearchTransportClientProces
             .name("Identifier Attribute")
             .description("The name of the attribute containing the identifier 
for each FlowFile")
             .required(true)
-            .expressionLanguageSupported(false)
+            .expressionLanguageSupported(ExpressionLanguageScope.NONE)
             .addValidator(StandardValidators.ATTRIBUTE_KEY_VALIDATOR)
             .build();
 
@@ -89,7 +90,7 @@ public class PutElasticsearch extends 
AbstractElasticsearchTransportClientProces
             .name("Index")
             .description("The name of the index to insert into")
             .required(true)
-            .expressionLanguageSupported(true)
+            
.expressionLanguageSupported(ExpressionLanguageScope.FLOWFILE_ATTRIBUTES)
             
.addValidator(StandardValidators.createAttributeExpressionLanguageValidator(
                     AttributeExpression.ResultType.STRING, true))
             .build();
@@ -98,7 +99,7 @@ public class PutElasticsearch extends 
AbstractElasticsearchTransportClientProces
             .name("Type")
             .description("The type of this document (used by Elasticsearch for 
indexing and searching)")
             .required(true)
-            .expressionLanguageSupported(true)
+            
.expressionLanguageSupported(ExpressionLanguageScope.FLOWFILE_ATTRIBUTES)
             .addValidator(StandardValidators.NON_EMPTY_EL_VALIDATOR)
             .build();
 
@@ -106,7 +107,7 @@ public class PutElasticsearch extends 
AbstractElasticsearchTransportClientProces
             .name("Index Operation")
             .description("The type of the operation used to index (index, 
update, upsert)")
             .required(true)
-            .expressionLanguageSupported(true)
+            
.expressionLanguageSupported(ExpressionLanguageScope.FLOWFILE_ATTRIBUTES)
             .addValidator(StandardValidators.NON_EMPTY_EL_VALIDATOR)
             .defaultValue("index")
             .build();
@@ -117,7 +118,7 @@ public class PutElasticsearch extends 
AbstractElasticsearchTransportClientProces
             .required(true)
             .addValidator(StandardValidators.POSITIVE_INTEGER_VALIDATOR)
             .defaultValue("100")
-            .expressionLanguageSupported(true)
+            
.expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY)
             .build();
 
     private static final Set<Relationship> relationships;

http://git-wip-us.apache.org/repos/asf/nifi/blob/4c787799/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/main/java/org/apache/nifi/processors/elasticsearch/PutElasticsearchHttp.java
----------------------------------------------------------------------
diff --git 
a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/main/java/org/apache/nifi/processors/elasticsearch/PutElasticsearchHttp.java
 
b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/main/java/org/apache/nifi/processors/elasticsearch/PutElasticsearchHttp.java
index 9102bfb..caf1e01 100644
--- 
a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/main/java/org/apache/nifi/processors/elasticsearch/PutElasticsearchHttp.java
+++ 
b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/main/java/org/apache/nifi/processors/elasticsearch/PutElasticsearchHttp.java
@@ -38,6 +38,7 @@ import org.apache.nifi.components.PropertyDescriptor;
 import org.apache.nifi.components.ValidationContext;
 import org.apache.nifi.components.ValidationResult;
 import org.apache.nifi.expression.AttributeExpression;
+import org.apache.nifi.expression.ExpressionLanguageScope;
 import org.apache.nifi.flowfile.FlowFile;
 import org.apache.nifi.logging.ComponentLog;
 import org.apache.nifi.processor.ProcessContext;
@@ -72,7 +73,7 @@ import static 
org.apache.commons.lang3.StringUtils.trimToEmpty;
 @DynamicProperty(
         name = "A URL query parameter",
         value = "The value to set it to",
-        supportsExpressionLanguage = true,
+        expressionLanguageScope = ExpressionLanguageScope.VARIABLE_REGISTRY,
         description = "Adds the specified property name/value as a query 
parameter in the Elasticsearch URL used for processing")
 @SystemResourceConsideration(resource = SystemResource.MEMORY)
 public class PutElasticsearchHttp extends AbstractElasticsearchHttpProcessor {
@@ -94,7 +95,7 @@ public class PutElasticsearchHttp extends 
AbstractElasticsearchHttpProcessor {
                     + "this property may be left empty or evaluate to an empty 
value, in which case the document's identifier will be "
                     + "auto-generated by Elasticsearch. For all other Index 
Operations, the attribute must evaluate to a non-empty value.")
             .required(false)
-            .expressionLanguageSupported(false)
+            .expressionLanguageSupported(ExpressionLanguageScope.NONE)
             .addValidator(StandardValidators.ATTRIBUTE_KEY_VALIDATOR)
             .build();
 
@@ -103,7 +104,7 @@ public class PutElasticsearchHttp extends 
AbstractElasticsearchHttpProcessor {
             .displayName("Index")
             .description("The name of the index to insert into")
             .required(true)
-            .expressionLanguageSupported(true)
+            
.expressionLanguageSupported(ExpressionLanguageScope.FLOWFILE_ATTRIBUTES)
             
.addValidator(StandardValidators.createAttributeExpressionLanguageValidator(
                     AttributeExpression.ResultType.STRING, true))
             .build();
@@ -113,7 +114,7 @@ public class PutElasticsearchHttp extends 
AbstractElasticsearchHttpProcessor {
             .displayName("Type")
             .description("The type of this document (used by Elasticsearch for 
indexing and searching)")
             .required(true)
-            .expressionLanguageSupported(true)
+            
.expressionLanguageSupported(ExpressionLanguageScope.FLOWFILE_ATTRIBUTES)
             .addValidator(StandardValidators.NON_EMPTY_EL_VALIDATOR)
             .build();
 
@@ -122,7 +123,7 @@ public class PutElasticsearchHttp extends 
AbstractElasticsearchHttpProcessor {
             .displayName("Index Operation")
             .description("The type of the operation used to index (index, 
update, upsert, delete)")
             .required(true)
-            .expressionLanguageSupported(true)
+            
.expressionLanguageSupported(ExpressionLanguageScope.FLOWFILE_ATTRIBUTES)
             .addValidator(StandardValidators.NON_EMPTY_EL_VALIDATOR)
             .defaultValue("index")
             .build();
@@ -136,7 +137,7 @@ public class PutElasticsearchHttp extends 
AbstractElasticsearchHttpProcessor {
             .required(true)
             .addValidator(StandardValidators.POSITIVE_INTEGER_VALIDATOR)
             .defaultValue("100")
-            .expressionLanguageSupported(true)
+            
.expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY)
             .build();
 
     private static final Set<Relationship> relationships;

http://git-wip-us.apache.org/repos/asf/nifi/blob/4c787799/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/main/java/org/apache/nifi/processors/elasticsearch/PutElasticsearchHttpRecord.java
----------------------------------------------------------------------
diff --git 
a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/main/java/org/apache/nifi/processors/elasticsearch/PutElasticsearchHttpRecord.java
 
b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/main/java/org/apache/nifi/processors/elasticsearch/PutElasticsearchHttpRecord.java
index ae98d52..9ea22bc 100644
--- 
a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/main/java/org/apache/nifi/processors/elasticsearch/PutElasticsearchHttpRecord.java
+++ 
b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/main/java/org/apache/nifi/processors/elasticsearch/PutElasticsearchHttpRecord.java
@@ -37,6 +37,7 @@ import org.apache.nifi.components.PropertyDescriptor;
 import org.apache.nifi.components.ValidationContext;
 import org.apache.nifi.components.ValidationResult;
 import org.apache.nifi.expression.AttributeExpression;
+import org.apache.nifi.expression.ExpressionLanguageScope;
 import org.apache.nifi.flowfile.FlowFile;
 import org.apache.nifi.logging.ComponentLog;
 import org.apache.nifi.processor.ProcessContext;
@@ -92,7 +93,7 @@ import static 
org.apache.commons.lang3.StringUtils.trimToEmpty;
 @DynamicProperty(
         name = "A URL query parameter",
         value = "The value to set it to",
-        supportsExpressionLanguage = true,
+        expressionLanguageScope = ExpressionLanguageScope.VARIABLE_REGISTRY,
         description = "Adds the specified property name/value as a query 
parameter in the Elasticsearch URL used for processing")
 public class PutElasticsearchHttpRecord extends 
AbstractElasticsearchHttpProcessor {
 
@@ -122,7 +123,7 @@ public class PutElasticsearchHttpRecord extends 
AbstractElasticsearchHttpProcess
                     + "auto-generated by Elasticsearch. For all other Index 
Operations, the field's value must be non-empty.")
             .required(false)
             .addValidator(new RecordPathValidator())
-            .expressionLanguageSupported(true)
+            
.expressionLanguageSupported(ExpressionLanguageScope.FLOWFILE_ATTRIBUTES)
             .build();
 
     static final PropertyDescriptor INDEX = new PropertyDescriptor.Builder()
@@ -130,7 +131,7 @@ public class PutElasticsearchHttpRecord extends 
AbstractElasticsearchHttpProcess
             .displayName("Index")
             .description("The name of the index to insert into")
             .required(true)
-            .expressionLanguageSupported(true)
+            
.expressionLanguageSupported(ExpressionLanguageScope.FLOWFILE_ATTRIBUTES)
             
.addValidator(StandardValidators.createAttributeExpressionLanguageValidator(
                     AttributeExpression.ResultType.STRING, true))
             .build();
@@ -140,7 +141,7 @@ public class PutElasticsearchHttpRecord extends 
AbstractElasticsearchHttpProcess
             .displayName("Type")
             .description("The type of this document (used by Elasticsearch for 
indexing and searching)")
             .required(true)
-            .expressionLanguageSupported(true)
+            
.expressionLanguageSupported(ExpressionLanguageScope.FLOWFILE_ATTRIBUTES)
             .addValidator(StandardValidators.NON_EMPTY_EL_VALIDATOR)
             .build();
 
@@ -149,7 +150,7 @@ public class PutElasticsearchHttpRecord extends 
AbstractElasticsearchHttpProcess
             .displayName("Index Operation")
             .description("The type of the operation used to index (index, 
update, upsert, delete)")
             .required(true)
-            .expressionLanguageSupported(true)
+            
.expressionLanguageSupported(ExpressionLanguageScope.FLOWFILE_ATTRIBUTES)
             .addValidator(StandardValidators.NON_EMPTY_EL_VALIDATOR)
             .defaultValue("index")
             .build();

http://git-wip-us.apache.org/repos/asf/nifi/blob/4c787799/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/main/java/org/apache/nifi/processors/elasticsearch/QueryElasticsearchHttp.java
----------------------------------------------------------------------
diff --git 
a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/main/java/org/apache/nifi/processors/elasticsearch/QueryElasticsearchHttp.java
 
b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/main/java/org/apache/nifi/processors/elasticsearch/QueryElasticsearchHttp.java
index 4b7312f..0f6ec46 100644
--- 
a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/main/java/org/apache/nifi/processors/elasticsearch/QueryElasticsearchHttp.java
+++ 
b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/main/java/org/apache/nifi/processors/elasticsearch/QueryElasticsearchHttp.java
@@ -32,6 +32,7 @@ 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.expression.ExpressionLanguageScope;
 import org.apache.nifi.flowfile.FlowFile;
 import org.apache.nifi.logging.ComponentLog;
 import org.apache.nifi.processor.ProcessContext;
@@ -76,7 +77,7 @@ import java.util.stream.Stream;
 @DynamicProperty(
         name = "A URL query parameter",
         value = "The value to set it to",
-        supportsExpressionLanguage = true,
+        expressionLanguageScope = ExpressionLanguageScope.VARIABLE_REGISTRY,
         description = "Adds the specified property name/value as a query 
parameter in the Elasticsearch URL used for processing")
 public class QueryElasticsearchHttp extends AbstractElasticsearchHttpProcessor 
{
 
@@ -107,16 +108,22 @@ public class QueryElasticsearchHttp extends 
AbstractElasticsearchHttpProcessor {
             .build();
 
     public static final PropertyDescriptor QUERY = new 
PropertyDescriptor.Builder()
-            .name("query-es-query").displayName("Query")
-            .description("The Lucene-style query to run against ElasticSearch 
(e.g., genre:blues AND -artist:muddy)").required(true)
-            
.expressionLanguageSupported(true).addValidator(StandardValidators.NON_EMPTY_VALIDATOR)
+            .name("query-es-query")
+            .displayName("Query")
+            .description("The Lucene-style query to run against ElasticSearch 
(e.g., genre:blues AND -artist:muddy)")
+            .required(true)
+            
.expressionLanguageSupported(ExpressionLanguageScope.FLOWFILE_ATTRIBUTES)
+            .addValidator(StandardValidators.NON_EMPTY_VALIDATOR)
             .build();
 
     public static final PropertyDescriptor INDEX = new 
PropertyDescriptor.Builder()
-            .name("query-es-index").displayName("Index")
+            .name("query-es-index")
+            .displayName("Index")
             .description("The name of the index to read from. If the property 
is set "
-                            + "to _all, the query will match across all 
indexes.").required(true)
-            
.expressionLanguageSupported(true).addValidator(StandardValidators.NON_EMPTY_VALIDATOR)
+                            + "to _all, the query will match across all 
indexes.")
+            .required(true)
+            
.expressionLanguageSupported(ExpressionLanguageScope.FLOWFILE_ATTRIBUTES)
+            .addValidator(StandardValidators.NON_EMPTY_VALIDATOR)
             .build();
 
     public static final PropertyDescriptor TYPE = new 
PropertyDescriptor.Builder()
@@ -126,7 +133,7 @@ public class QueryElasticsearchHttp extends 
AbstractElasticsearchHttpProcessor {
                     "The (optional) type of this query, used by Elasticsearch 
for indexing and searching. If the property is empty, "
                             + "the the query will match across all types.")
             .required(false)
-            .expressionLanguageSupported(true)
+            
.expressionLanguageSupported(ExpressionLanguageScope.FLOWFILE_ATTRIBUTES)
             .addValidator(StandardValidators.NON_EMPTY_VALIDATOR)
             .build();
 
@@ -137,7 +144,7 @@ public class QueryElasticsearchHttp extends 
AbstractElasticsearchHttpProcessor {
                     "A comma-separated list of fields to retrieve from the 
document. If the Fields property is left blank, "
                             + "then the entire document's source will be 
retrieved.")
             .required(false)
-            .expressionLanguageSupported(true)
+            
.expressionLanguageSupported(ExpressionLanguageScope.FLOWFILE_ATTRIBUTES)
             .addValidator(StandardValidators.NON_EMPTY_VALIDATOR)
             .build();
 
@@ -147,20 +154,29 @@ public class QueryElasticsearchHttp extends 
AbstractElasticsearchHttpProcessor {
             .description(
                     "A sort parameter (e.g., timestamp:asc). If the Sort 
property is left blank, "
                             + "then the results will be retrieved in document 
order.")
-            .required(false).expressionLanguageSupported(true)
-            .addValidator(StandardValidators.NON_EMPTY_VALIDATOR).build();
+            .required(false)
+            
.expressionLanguageSupported(ExpressionLanguageScope.FLOWFILE_ATTRIBUTES)
+            .addValidator(StandardValidators.NON_EMPTY_VALIDATOR)
+            .build();
 
     public static final PropertyDescriptor PAGE_SIZE = new 
PropertyDescriptor.Builder()
-            .name("query-es-size").displayName("Page Size").defaultValue("20")
+            .name("query-es-size")
+            .displayName("Page Size")
+            .defaultValue("20")
             .description("Determines how many documents to return per page 
during scrolling.")
-            .required(true).expressionLanguageSupported(true)
-            
.addValidator(StandardValidators.POSITIVE_INTEGER_VALIDATOR).build();
+            .required(true)
+            
.expressionLanguageSupported(ExpressionLanguageScope.FLOWFILE_ATTRIBUTES)
+            .addValidator(StandardValidators.POSITIVE_INTEGER_VALIDATOR)
+            .build();
 
     public static final PropertyDescriptor LIMIT = new 
PropertyDescriptor.Builder()
-            .name("query-es-limit").displayName("Limit")
+            .name("query-es-limit")
+            .displayName("Limit")
             .description("If set, limits the number of results that will be 
returned.")
-            .required(false).expressionLanguageSupported(true)
-            
.addValidator(StandardValidators.POSITIVE_INTEGER_VALIDATOR).build();
+            .required(false)
+            
.expressionLanguageSupported(ExpressionLanguageScope.FLOWFILE_ATTRIBUTES)
+            .addValidator(StandardValidators.POSITIVE_INTEGER_VALIDATOR)
+            .build();
 
     public static final PropertyDescriptor TARGET = new 
PropertyDescriptor.Builder()
             .name("query-es-target")
@@ -170,10 +186,12 @@ public class QueryElasticsearchHttp extends 
AbstractElasticsearchHttpProcessor {
                             + "response will be written as the content of the 
flow file.  In the case of 'Flow file attributes', "
                             + "the original flow file (if applicable) will be 
cloned for each result, and all return fields will be placed "
                             + "in a flow file attribute of the same name, but 
prefixed by 'es.result.'")
-            .required(true).expressionLanguageSupported(false)
+            .required(true)
+            .expressionLanguageSupported(ExpressionLanguageScope.NONE)
             .defaultValue(TARGET_FLOW_FILE_CONTENT)
             .allowableValues(TARGET_FLOW_FILE_CONTENT, 
TARGET_FLOW_FILE_ATTRIBUTES)
-            .addValidator(StandardValidators.NON_EMPTY_VALIDATOR).build();
+            .addValidator(StandardValidators.NON_EMPTY_VALIDATOR)
+            .build();
 
     private static final Set<Relationship> relationships;
     private static final List<PropertyDescriptor> propertyDescriptors;

http://git-wip-us.apache.org/repos/asf/nifi/blob/4c787799/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/main/java/org/apache/nifi/processors/elasticsearch/ScrollElasticsearchHttp.java
----------------------------------------------------------------------
diff --git 
a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/main/java/org/apache/nifi/processors/elasticsearch/ScrollElasticsearchHttp.java
 
b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/main/java/org/apache/nifi/processors/elasticsearch/ScrollElasticsearchHttp.java
index d49e71f..f6f351a 100644
--- 
a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/main/java/org/apache/nifi/processors/elasticsearch/ScrollElasticsearchHttp.java
+++ 
b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/main/java/org/apache/nifi/processors/elasticsearch/ScrollElasticsearchHttp.java
@@ -36,6 +36,7 @@ import org.apache.nifi.components.PropertyDescriptor;
 import org.apache.nifi.components.state.Scope;
 import org.apache.nifi.components.state.StateManager;
 import org.apache.nifi.components.state.StateMap;
+import org.apache.nifi.expression.ExpressionLanguageScope;
 import org.apache.nifi.flowfile.FlowFile;
 import org.apache.nifi.logging.ComponentLog;
 import org.apache.nifi.processor.ProcessContext;
@@ -76,7 +77,7 @@ import java.util.stream.Stream;
 @DynamicProperty(
         name = "A URL query parameter",
         value = "The value to set it to",
-        supportsExpressionLanguage = true,
+        expressionLanguageScope = ExpressionLanguageScope.VARIABLE_REGISTRY,
         description = "Adds the specified property name/value as a query 
parameter in the Elasticsearch URL used for processing")
 @Stateful(description = "After each successful scroll page, the latest 
scroll_id is persisted in scrollId as input for the next scroll call.  "
         + "Once the entire query is complete, finishedQuery state will be set 
to true, and the processor will not execute unless this is cleared.", scopes = 
{ Scope.LOCAL })
@@ -100,9 +101,12 @@ public class ScrollElasticsearchHttp extends 
AbstractElasticsearchHttpProcessor
                             + "flow files will be routed to failure.").build();
 
     public static final PropertyDescriptor QUERY = new 
PropertyDescriptor.Builder()
-            .name("scroll-es-query").displayName("Query")
-            .description("The Lucene-style query to run against ElasticSearch 
(e.g., genre:blues AND -artist:muddy)").required(true)
-            
.expressionLanguageSupported(true).addValidator(StandardValidators.NON_EMPTY_VALIDATOR)
+            .name("scroll-es-query")
+            .displayName("Query")
+            .description("The Lucene-style query to run against ElasticSearch 
(e.g., genre:blues AND -artist:muddy)")
+            .required(true)
+            
.expressionLanguageSupported(ExpressionLanguageScope.FLOWFILE_ATTRIBUTES)
+            .addValidator(StandardValidators.NON_EMPTY_VALIDATOR)
             .build();
 
     public static final PropertyDescriptor SCROLL_DURATION = new 
PropertyDescriptor.Builder()
@@ -111,7 +115,7 @@ public class ScrollElasticsearchHttp extends 
AbstractElasticsearchHttpProcessor
             .description("The scroll duration is how long each search context 
is kept in memory.")
             .defaultValue("1m")
             .required(true)
-            .expressionLanguageSupported(true)
+            
.expressionLanguageSupported(ExpressionLanguageScope.FLOWFILE_ATTRIBUTES)
             .addValidator(
                     
StandardValidators.createRegexMatchingValidator(Pattern.compile("[0-9]+(m|h)")))
             .build();
@@ -122,7 +126,7 @@ public class ScrollElasticsearchHttp extends 
AbstractElasticsearchHttpProcessor
             .description("The name of the index to read from. If the property 
is set "
                             + "to _all, the query will match across all 
indexes.")
             .required(true)
-            .expressionLanguageSupported(true)
+            
.expressionLanguageSupported(ExpressionLanguageScope.FLOWFILE_ATTRIBUTES)
             .addValidator(StandardValidators.NON_EMPTY_VALIDATOR)
             .build();
 
@@ -134,7 +138,8 @@ public class ScrollElasticsearchHttp extends 
AbstractElasticsearchHttpProcessor
                     + "the the query will match across all types.")
             .addValidator(StandardValidators.NON_EMPTY_VALIDATOR)
             .required(false)
-            .expressionLanguageSupported(true).build();
+            
.expressionLanguageSupported(ExpressionLanguageScope.FLOWFILE_ATTRIBUTES)
+            .build();
 
     public static final PropertyDescriptor FIELDS = new 
PropertyDescriptor.Builder()
             .name("scroll-es-fields")
@@ -142,8 +147,10 @@ public class ScrollElasticsearchHttp extends 
AbstractElasticsearchHttpProcessor
             .description(
                     "A comma-separated list of fields to retrieve from the 
document. If the Fields property is left blank, "
                             + "then the entire document's source will be 
retrieved.")
-            .required(false).expressionLanguageSupported(true)
-            .addValidator(StandardValidators.NON_EMPTY_VALIDATOR).build();
+            .required(false)
+            
.expressionLanguageSupported(ExpressionLanguageScope.FLOWFILE_ATTRIBUTES)
+            .addValidator(StandardValidators.NON_EMPTY_VALIDATOR)
+            .build();
 
     public static final PropertyDescriptor SORT = new 
PropertyDescriptor.Builder()
             .name("scroll-es-sort")
@@ -151,14 +158,20 @@ public class ScrollElasticsearchHttp extends 
AbstractElasticsearchHttpProcessor
             .description(
                     "A sort parameter (e.g., timestamp:asc). If the Sort 
property is left blank, "
                             + "then the results will be retrieved in document 
order.")
-            .required(false).expressionLanguageSupported(true)
-            .addValidator(StandardValidators.NON_EMPTY_VALIDATOR).build();
+            .required(false)
+            
.expressionLanguageSupported(ExpressionLanguageScope.FLOWFILE_ATTRIBUTES)
+            .addValidator(StandardValidators.NON_EMPTY_VALIDATOR)
+            .build();
 
     public static final PropertyDescriptor PAGE_SIZE = new 
PropertyDescriptor.Builder()
-            .name("scroll-es-size").displayName("Page Size").defaultValue("20")
+            .name("scroll-es-size")
+            .displayName("Page Size")
+            .defaultValue("20")
             .description("Determines how many documents to return per page 
during scrolling.")
-            .required(true).expressionLanguageSupported(true)
-            
.addValidator(StandardValidators.POSITIVE_INTEGER_VALIDATOR).build();
+            .required(true)
+            
.expressionLanguageSupported(ExpressionLanguageScope.FLOWFILE_ATTRIBUTES)
+            .addValidator(StandardValidators.POSITIVE_INTEGER_VALIDATOR)
+            .build();
 
     private static final Set<Relationship> relationships;
     private static final List<PropertyDescriptor> propertyDescriptors;

http://git-wip-us.apache.org/repos/asf/nifi/blob/4c787799/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/test/java/org/apache/nifi/processors/elasticsearch/ITQueryElasticsearchHttp.java
----------------------------------------------------------------------
diff --git 
a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/test/java/org/apache/nifi/processors/elasticsearch/ITQueryElasticsearchHttp.java
 
b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/test/java/org/apache/nifi/processors/elasticsearch/ITQueryElasticsearchHttp.java
index 15f2707..f60e2f9 100644
--- 
a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/test/java/org/apache/nifi/processors/elasticsearch/ITQueryElasticsearchHttp.java
+++ 
b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/test/java/org/apache/nifi/processors/elasticsearch/ITQueryElasticsearchHttp.java
@@ -40,7 +40,6 @@ public class ITQueryElasticsearchHttp {
     @Test
     public void testFetchElasticsearchOnTrigger() throws IOException {
         runner = TestRunners.newTestRunner(QueryElasticsearchHttp.class); // 
all docs are found
-        runner.setValidateExpressionUsage(true);
         runner.setProperty(AbstractElasticsearchHttpProcessor.ES_URL,
                 "http://localhost.internal:9200";);
 
@@ -67,7 +66,6 @@ public class ITQueryElasticsearchHttp {
     @Test
     public void testFetchElasticsearchOnTrigger_IncomingFile() throws 
IOException {
         runner = TestRunners.newTestRunner(QueryElasticsearchHttp.class); // 
all docs are found
-        runner.setValidateExpressionUsage(true);
         runner.setProperty(AbstractElasticsearchHttpProcessor.ES_URL,
                 "http://localhost.internal:9200";);
 

http://git-wip-us.apache.org/repos/asf/nifi/blob/4c787799/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/test/java/org/apache/nifi/processors/elasticsearch/ITScrollElasticsearchHttp.java
----------------------------------------------------------------------
diff --git 
a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/test/java/org/apache/nifi/processors/elasticsearch/ITScrollElasticsearchHttp.java
 
b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/test/java/org/apache/nifi/processors/elasticsearch/ITScrollElasticsearchHttp.java
index aa2a1e0..57ee242 100644
--- 
a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/test/java/org/apache/nifi/processors/elasticsearch/ITScrollElasticsearchHttp.java
+++ 
b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/test/java/org/apache/nifi/processors/elasticsearch/ITScrollElasticsearchHttp.java
@@ -38,7 +38,6 @@ public class ITScrollElasticsearchHttp {
     @Test
     public void testFetchElasticsearchOnTrigger() throws IOException {
         runner = TestRunners.newTestRunner(ScrollElasticsearchHttp.class); // 
all docs are found
-        runner.setValidateExpressionUsage(true);
         runner.setProperty(AbstractElasticsearchHttpProcessor.ES_URL,
                 "http://ip-172-31-49-152.ec2.internal:9200";);
 

http://git-wip-us.apache.org/repos/asf/nifi/blob/4c787799/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/test/java/org/apache/nifi/processors/elasticsearch/TestFetchElasticsearch.java
----------------------------------------------------------------------
diff --git 
a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/test/java/org/apache/nifi/processors/elasticsearch/TestFetchElasticsearch.java
 
b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/test/java/org/apache/nifi/processors/elasticsearch/TestFetchElasticsearch.java
index b36b296..961c181 100644
--- 
a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/test/java/org/apache/nifi/processors/elasticsearch/TestFetchElasticsearch.java
+++ 
b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/test/java/org/apache/nifi/processors/elasticsearch/TestFetchElasticsearch.java
@@ -16,6 +16,23 @@
  */
 package org.apache.nifi.processors.elasticsearch;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.fail;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.doThrow;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.MalformedURLException;
+import java.util.HashMap;
+import java.util.concurrent.ExecutionException;
+
 import org.apache.nifi.processor.ProcessContext;
 import org.apache.nifi.processor.exception.ProcessException;
 import org.apache.nifi.provenance.ProvenanceEventType;
@@ -44,23 +61,6 @@ import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
 
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.MalformedURLException;
-import java.util.HashMap;
-import java.util.concurrent.ExecutionException;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.fail;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.doThrow;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.when;
-
 public class TestFetchElasticsearch {
 
     private InputStream docExample;
@@ -81,7 +81,6 @@ public class TestFetchElasticsearch {
     @Test
     public void testFetchElasticsearchOnTrigger() throws IOException {
         runner = TestRunners.newTestRunner(new 
FetchElasticsearchTestProcessor(true)); // all docs are found
-        runner.setValidateExpressionUsage(true);
         
runner.setProperty(AbstractElasticsearchTransportClientProcessor.CLUSTER_NAME, 
"elasticsearch");
         
runner.setProperty(AbstractElasticsearchTransportClientProcessor.HOSTS, 
"127.0.0.1:9300");
         
runner.setProperty(AbstractElasticsearchTransportClientProcessor.PING_TIMEOUT, 
"5s");
@@ -110,7 +109,6 @@ public class TestFetchElasticsearch {
     @Test
     public void testFetchElasticsearchOnTriggerEL() throws IOException {
         runner = TestRunners.newTestRunner(new 
FetchElasticsearchTestProcessor(true)); // all docs are found
-        runner.setValidateExpressionUsage(true);
         
runner.setProperty(AbstractElasticsearchTransportClientProcessor.CLUSTER_NAME, 
"${cluster.name}");
         
runner.setProperty(AbstractElasticsearchTransportClientProcessor.HOSTS, 
"${hosts}");
         
runner.setProperty(AbstractElasticsearchTransportClientProcessor.PING_TIMEOUT, 
"${ping.timeout}");
@@ -147,7 +145,6 @@ public class TestFetchElasticsearch {
         
runner.setProperty(AbstractElasticsearchTransportClientProcessor.SAMPLER_INTERVAL,
 "5s");
         runner.setProperty(FetchElasticsearch.INDEX, "doc");
         runner.setProperty(FetchElasticsearch.TYPE, "status");
-        runner.setValidateExpressionUsage(true);
         runner.setProperty(FetchElasticsearch.DOC_ID, "${doc_id}");
 
         runner.enqueue(docExample, new HashMap<String, String>() {{
@@ -171,7 +168,6 @@ public class TestFetchElasticsearch {
         
runner.setProperty(AbstractElasticsearchTransportClientProcessor.SAMPLER_INTERVAL,
 "5s");
         runner.setProperty(FetchElasticsearch.INDEX, "doc");
         runner.setProperty(FetchElasticsearch.TYPE, "status");
-        runner.setValidateExpressionUsage(true);
         runner.setProperty(FetchElasticsearch.DOC_ID, "${doc_id}");
 
         runner.assertNotValid();
@@ -187,7 +183,6 @@ public class TestFetchElasticsearch {
         
runner.setProperty(AbstractElasticsearchTransportClientProcessor.SAMPLER_INTERVAL,
 "5s");
         runner.setProperty(FetchElasticsearch.INDEX, "doc");
         runner.setProperty(FetchElasticsearch.TYPE, "status");
-        runner.setValidateExpressionUsage(true);
         runner.setProperty(FetchElasticsearch.DOC_ID, "${doc_id}");
 
         // No Node Available exception
@@ -272,7 +267,6 @@ public class TestFetchElasticsearch {
         
runner.setProperty(AbstractElasticsearchTransportClientProcessor.SAMPLER_INTERVAL,
 "5s");
         runner.setProperty(FetchElasticsearch.INDEX, "doc");
         runner.setProperty(FetchElasticsearch.TYPE, "status");
-        runner.setValidateExpressionUsage(true);
         runner.setProperty(FetchElasticsearch.DOC_ID, "${doc_id}");
 
         // Allow time for the controller service to fully initialize
@@ -380,7 +374,6 @@ public class TestFetchElasticsearch {
         System.out.println("Starting test " + new Object() {
         }.getClass().getEnclosingMethod().getName());
         final TestRunner runner = TestRunners.newTestRunner(new 
FetchElasticsearch());
-        runner.setValidateExpressionUsage(true);
 
         //Local Cluster - Mac pulled from brew
         
runner.setProperty(AbstractElasticsearchTransportClientProcessor.CLUSTER_NAME, 
"elasticsearch_brew");
@@ -411,7 +404,6 @@ public class TestFetchElasticsearch {
         System.out.println("Starting test " + new Object() {
         }.getClass().getEnclosingMethod().getName());
         final TestRunner runner = TestRunners.newTestRunner(new 
FetchElasticsearch());
-        runner.setValidateExpressionUsage(true);
 
         //Local Cluster - Mac pulled from brew
         
runner.setProperty(AbstractElasticsearchTransportClientProcessor.CLUSTER_NAME, 
"elasticsearch_brew");

http://git-wip-us.apache.org/repos/asf/nifi/blob/4c787799/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/test/java/org/apache/nifi/processors/elasticsearch/TestFetchElasticsearchHttp.java
----------------------------------------------------------------------
diff --git 
a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/test/java/org/apache/nifi/processors/elasticsearch/TestFetchElasticsearchHttp.java
 
b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/test/java/org/apache/nifi/processors/elasticsearch/TestFetchElasticsearchHttp.java
index de56b49..bef54d4 100644
--- 
a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/test/java/org/apache/nifi/processors/elasticsearch/TestFetchElasticsearchHttp.java
+++ 
b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/test/java/org/apache/nifi/processors/elasticsearch/TestFetchElasticsearchHttp.java
@@ -16,14 +16,18 @@
  */
 package org.apache.nifi.processors.elasticsearch;
 
-import okhttp3.Call;
-import okhttp3.MediaType;
-import okhttp3.OkHttpClient;
-import okhttp3.Protocol;
-import okhttp3.Request;
-import okhttp3.RequestBody;
-import okhttp3.Response;
-import okhttp3.ResponseBody;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.util.HashMap;
+
 import org.apache.nifi.processor.ProcessContext;
 import org.apache.nifi.processor.exception.ProcessException;
 import org.apache.nifi.ssl.SSLContextService;
@@ -37,17 +41,14 @@ import org.junit.Test;
 import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
 
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import java.util.HashMap;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import okhttp3.Call;
+import okhttp3.MediaType;
+import okhttp3.OkHttpClient;
+import okhttp3.Protocol;
+import okhttp3.Request;
+import okhttp3.RequestBody;
+import okhttp3.Response;
+import okhttp3.ResponseBody;
 
 public class TestFetchElasticsearchHttp {
 
@@ -68,7 +69,6 @@ public class TestFetchElasticsearchHttp {
     @Test
     public void testFetchElasticsearchOnTriggerEL() throws IOException {
         runner = TestRunners.newTestRunner(new 
FetchElasticsearchHttpTestProcessor(true)); // all docs are found
-        runner.setValidateExpressionUsage(true);
         runner.setProperty(AbstractElasticsearchHttpProcessor.ES_URL, 
"${es.url}");
 
         runner.setProperty(FetchElasticsearchHttp.INDEX, "doc");
@@ -97,7 +97,6 @@ public class TestFetchElasticsearchHttp {
     @Test
     public void testFetchElasticsearchOnTrigger() throws IOException {
         runner = TestRunners.newTestRunner(new 
FetchElasticsearchHttpTestProcessor(true)); // all docs are found
-        runner.setValidateExpressionUsage(true);
         runner.setProperty(AbstractElasticsearchHttpProcessor.ES_URL, 
"http://127.0.0.1:9200";);
 
         runner.setProperty(FetchElasticsearchHttp.INDEX, "doc");
@@ -124,7 +123,6 @@ public class TestFetchElasticsearchHttp {
         final String DOC_ID = "28039652140";
         FetchElasticsearchHttpTestProcessor processor = new 
FetchElasticsearchHttpTestProcessor(true);
         runner = TestRunners.newTestRunner(processor); // all docs are found
-        runner.setValidateExpressionUsage(true);
         runner.setProperty(AbstractElasticsearchHttpProcessor.ES_URL, ES_URL);
 
         runner.setProperty(FetchElasticsearchHttp.INDEX, "doc");
@@ -149,7 +147,6 @@ public class TestFetchElasticsearchHttp {
     @Test
     public void testFetchElasticsearchOnTriggerWithFields() throws IOException 
{
         runner = TestRunners.newTestRunner(new 
FetchElasticsearchHttpTestProcessor(true)); // all docs are found
-        runner.setValidateExpressionUsage(true);
         runner.setProperty(AbstractElasticsearchHttpProcessor.ES_URL, 
"http://127.0.0.1:9200";);
 
         runner.setProperty(FetchElasticsearchHttp.INDEX, "doc");
@@ -177,7 +174,6 @@ public class TestFetchElasticsearchHttp {
         runner = TestRunners.newTestRunner(new 
FetchElasticsearchHttpTestProcessor(false)); // simulate doc not found
         runner.setProperty(AbstractElasticsearchHttpProcessor.ES_URL, 
"http://127.0.0.1:9200";);
         runner.setProperty(FetchElasticsearchHttp.INDEX, "doc");
-        runner.setValidateExpressionUsage(true);
         runner.setProperty(FetchElasticsearchHttp.DOC_ID, "${doc_id}");
 
         runner.setIncomingConnection(true);
@@ -201,7 +197,6 @@ public class TestFetchElasticsearchHttp {
         runner.setProperty(AbstractElasticsearchHttpProcessor.ES_URL, 
"http://127.0.0.1:9200";);
         runner.setProperty(FetchElasticsearchHttp.INDEX, "doc");
         runner.setProperty(FetchElasticsearchHttp.TYPE, "status");
-        runner.setValidateExpressionUsage(true);
         runner.setProperty(FetchElasticsearchHttp.DOC_ID, "${doc_id}");
 
         runner.enqueue(docExample, new HashMap<String, String>() {{
@@ -224,7 +219,6 @@ public class TestFetchElasticsearchHttp {
         runner.setProperty(AbstractElasticsearchHttpProcessor.ES_URL, 
"http://127.0.0.1:9200";);
         runner.setProperty(FetchElasticsearchHttp.INDEX, "doc");
         runner.setProperty(FetchElasticsearchHttp.TYPE, "status");
-        runner.setValidateExpressionUsage(true);
         runner.setProperty(FetchElasticsearchHttp.DOC_ID, "${doc_id}");
 
         runner.enqueue(docExample, new HashMap<String, String>() {{
@@ -247,7 +241,6 @@ public class TestFetchElasticsearchHttp {
         runner.setProperty(AbstractElasticsearchHttpProcessor.ES_URL, 
"http://127.0.0.1:9200";);
         runner.setProperty(FetchElasticsearchHttp.INDEX, "doc");
         runner.setProperty(FetchElasticsearchHttp.TYPE, "status");
-        runner.setValidateExpressionUsage(true);
         runner.setProperty(FetchElasticsearchHttp.DOC_ID, "${doc_id}");
 
         runner.setIncomingConnection(false);
@@ -264,7 +257,6 @@ public class TestFetchElasticsearchHttp {
         runner.setProperty(AbstractElasticsearchHttpProcessor.ES_URL, 
"127.0.0.1:9200");
         runner.setProperty(FetchElasticsearchHttp.INDEX, "doc");
         runner.setProperty(FetchElasticsearchHttp.TYPE, "status");
-        runner.setValidateExpressionUsage(true);
         runner.setProperty(FetchElasticsearchHttp.DOC_ID, "${doc_id}");
 
         runner.assertNotValid();
@@ -281,7 +273,6 @@ public class TestFetchElasticsearchHttp {
         runner.setProperty(FetchElasticsearchHttp.PROP_SSL_CONTEXT_SERVICE, 
"ssl-context");
         runner.setProperty(AbstractElasticsearchHttpProcessor.ES_URL, 
"http://127.0.0.1:9200";);
         runner.setProperty(FetchElasticsearchHttp.INDEX, "doc");
-        runner.setValidateExpressionUsage(true);
         runner.setProperty(FetchElasticsearchHttp.DOC_ID, "${doc_id}");
 
         // Allow time for the controller service to fully initialize
@@ -299,7 +290,6 @@ public class TestFetchElasticsearchHttp {
         FetchElasticsearchHttpTestProcessor p = new 
FetchElasticsearchHttpTestProcessor(true); // all docs are found
         
p.setExpectedUrl("http://127.0.0.1:9200/doc/status/28039652140?_source_include=id&myparam=myvalue";);
         runner = TestRunners.newTestRunner(p);
-        runner.setValidateExpressionUsage(true);
         runner.setProperty(AbstractElasticsearchHttpProcessor.ES_URL, 
"http://127.0.0.1:9200";);
 
         runner.setProperty(FetchElasticsearchHttp.INDEX, "doc");
@@ -391,6 +381,7 @@ public class TestFetchElasticsearchHttp {
             return url;
         }
 
+        @Override
         protected OkHttpClient getClient() {
             return client;
         }
@@ -413,7 +404,6 @@ public class TestFetchElasticsearchHttp {
         System.out.println("Starting test " + new Object() {
         }.getClass().getEnclosingMethod().getName());
         final TestRunner runner = TestRunners.newTestRunner(new 
FetchElasticsearchHttp());
-        runner.setValidateExpressionUsage(true);
 
         //Local Cluster - Mac pulled from brew
         runner.setProperty(AbstractElasticsearchHttpProcessor.ES_URL, 
"http://127.0.0.1:9200";);
@@ -437,7 +427,6 @@ public class TestFetchElasticsearchHttp {
         System.out.println("Starting test " + new Object() {
         }.getClass().getEnclosingMethod().getName());
         final TestRunner runner = TestRunners.newTestRunner(new 
FetchElasticsearchHttp());
-        runner.setValidateExpressionUsage(true);
 
         //Local Cluster - Mac pulled from brew
         runner.setProperty(AbstractElasticsearchHttpProcessor.ES_URL, 
"http://127.0.0.1:9200";);

http://git-wip-us.apache.org/repos/asf/nifi/blob/4c787799/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/test/java/org/apache/nifi/processors/elasticsearch/TestPutElasticsearch.java
----------------------------------------------------------------------
diff --git 
a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/test/java/org/apache/nifi/processors/elasticsearch/TestPutElasticsearch.java
 
b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/test/java/org/apache/nifi/processors/elasticsearch/TestPutElasticsearch.java
index 306f513..3fe6764 100644
--- 
a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/test/java/org/apache/nifi/processors/elasticsearch/TestPutElasticsearch.java
+++ 
b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/test/java/org/apache/nifi/processors/elasticsearch/TestPutElasticsearch.java
@@ -16,6 +16,21 @@
  */
 package org.apache.nifi.processors.elasticsearch;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.doThrow;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.HashMap;
+import java.util.concurrent.ExecutionException;
+
 import org.apache.nifi.processor.ProcessContext;
 import org.apache.nifi.processor.exception.ProcessException;
 import org.apache.nifi.provenance.ProvenanceEventType;
@@ -45,22 +60,6 @@ import org.junit.Test;
 import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
 
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.HashMap;
-import java.util.concurrent.ExecutionException;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.doThrow;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.when;
-
 public class TestPutElasticsearch {
 
     private InputStream docExample;
@@ -80,7 +79,6 @@ public class TestPutElasticsearch {
     @Test
     public void testPutElasticSearchOnTrigger() throws IOException {
         runner = TestRunners.newTestRunner(new 
PutElasticsearchTestProcessor(false)); // no failures
-        runner.setValidateExpressionUsage(true);
         
runner.setProperty(AbstractElasticsearchTransportClientProcessor.CLUSTER_NAME, 
"elasticsearch");
         
runner.setProperty(AbstractElasticsearchTransportClientProcessor.HOSTS, 
"127.0.0.1:9300");
         
runner.setProperty(AbstractElasticsearchTransportClientProcessor.PING_TIMEOUT, 
"5s");
@@ -110,7 +108,6 @@ public class TestPutElasticsearch {
     @Test
     public void testPutElasticSearchOnTriggerEL() throws IOException {
         runner = TestRunners.newTestRunner(new 
PutElasticsearchTestProcessor(false)); // no failures
-        runner.setValidateExpressionUsage(true);
         
runner.setProperty(AbstractElasticsearchTransportClientProcessor.CLUSTER_NAME, 
"${cluster.name}");
         
runner.setProperty(AbstractElasticsearchTransportClientProcessor.HOSTS, 
"${hosts}");
         
runner.setProperty(AbstractElasticsearchTransportClientProcessor.PING_TIMEOUT, 
"${ping.timeout}");
@@ -143,7 +140,6 @@ public class TestPutElasticsearch {
     @Test
     public void testPutElasticSearchOnTriggerWithFailures() throws IOException 
{
         runner = TestRunners.newTestRunner(new 
PutElasticsearchTestProcessor(true)); // simulate failures
-        runner.setValidateExpressionUsage(false);
         
runner.setProperty(AbstractElasticsearchTransportClientProcessor.CLUSTER_NAME, 
"elasticsearch");
         
runner.setProperty(AbstractElasticsearchTransportClientProcessor.HOSTS, 
"127.0.0.1:9300");
         
runner.setProperty(AbstractElasticsearchTransportClientProcessor.PING_TIMEOUT, 
"5s");
@@ -178,7 +174,6 @@ public class TestPutElasticsearch {
         
runner.setProperty(AbstractElasticsearchTransportClientProcessor.SAMPLER_INTERVAL,
 "5s");
         runner.setProperty(PutElasticsearch.INDEX, "doc");
         runner.setProperty(PutElasticsearch.TYPE, "status");
-        runner.setValidateExpressionUsage(true);
         runner.setProperty(PutElasticsearch.ID_ATTRIBUTE, "doc_id");
 
         // No Node Available exception
@@ -235,7 +230,6 @@ public class TestPutElasticsearch {
     @Test
     public void testPutElasticsearchOnTriggerWithNoIdAttribute() throws 
IOException {
         runner = TestRunners.newTestRunner(new 
PutElasticsearchTestProcessor(true)); // simulate failures
-        runner.setValidateExpressionUsage(false);
         
runner.setProperty(AbstractElasticsearchTransportClientProcessor.CLUSTER_NAME, 
"elasticsearch");
         
runner.setProperty(AbstractElasticsearchTransportClientProcessor.HOSTS, 
"127.0.0.1:9300");
         
runner.setProperty(AbstractElasticsearchTransportClientProcessor.PING_TIMEOUT, 
"5s");
@@ -256,7 +250,6 @@ public class TestPutElasticsearch {
     @Test
     public void testPutElasticsearchOnTriggerWithIndexFromAttribute() throws 
IOException {
         runner = TestRunners.newTestRunner(new 
PutElasticsearchTestProcessor(false));
-        runner.setValidateExpressionUsage(false);
         
runner.setProperty(AbstractElasticsearchTransportClientProcessor.CLUSTER_NAME, 
"elasticsearch");
         
runner.setProperty(AbstractElasticsearchTransportClientProcessor.HOSTS, 
"127.0.0.1:9300");
         
runner.setProperty(AbstractElasticsearchTransportClientProcessor.PING_TIMEOUT, 
"5s");
@@ -293,7 +286,6 @@ public class TestPutElasticsearch {
     @Test
     public void testPutElasticSearchOnTriggerWithInvalidIndexOp() throws 
IOException {
         runner = TestRunners.newTestRunner(new 
PutElasticsearchTestProcessor(false)); // no failures
-        runner.setValidateExpressionUsage(true);
         
runner.setProperty(AbstractElasticsearchTransportClientProcessor.CLUSTER_NAME, 
"elasticsearch");
         
runner.setProperty(AbstractElasticsearchTransportClientProcessor.HOSTS, 
"127.0.0.1:9300");
         
runner.setProperty(AbstractElasticsearchTransportClientProcessor.PING_TIMEOUT, 
"5s");
@@ -425,7 +417,6 @@ public class TestPutElasticsearch {
         System.out.println("Starting test " + new Object() {
         }.getClass().getEnclosingMethod().getName());
         final TestRunner runner = TestRunners.newTestRunner(new 
PutElasticsearch());
-        runner.setValidateExpressionUsage(false);
 
         //Local Cluster - Mac pulled from brew
         
runner.setProperty(AbstractElasticsearchTransportClientProcessor.CLUSTER_NAME, 
"elasticsearch_brew");
@@ -457,7 +448,6 @@ public class TestPutElasticsearch {
         System.out.println("Starting test " + new Object() {
         }.getClass().getEnclosingMethod().getName());
         final TestRunner runner = TestRunners.newTestRunner(new 
PutElasticsearch());
-        runner.setValidateExpressionUsage(false);
 
         //Local Cluster - Mac pulled from brew
         
runner.setProperty(AbstractElasticsearchTransportClientProcessor.CLUSTER_NAME, 
"elasticsearch_brew");

http://git-wip-us.apache.org/repos/asf/nifi/blob/4c787799/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/test/java/org/apache/nifi/processors/elasticsearch/TestPutElasticsearchHttp.java
----------------------------------------------------------------------
diff --git 
a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/test/java/org/apache/nifi/processors/elasticsearch/TestPutElasticsearchHttp.java
 
b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/test/java/org/apache/nifi/processors/elasticsearch/TestPutElasticsearchHttp.java
index 5ca3814..0d36edd 100644
--- 
a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/test/java/org/apache/nifi/processors/elasticsearch/TestPutElasticsearchHttp.java
+++ 
b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/test/java/org/apache/nifi/processors/elasticsearch/TestPutElasticsearchHttp.java
@@ -16,13 +16,17 @@
  */
 package org.apache.nifi.processors.elasticsearch;
 
-import okhttp3.Call;
-import okhttp3.MediaType;
-import okhttp3.OkHttpClient;
-import okhttp3.Protocol;
-import okhttp3.Request;
-import okhttp3.Response;
-import okhttp3.ResponseBody;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import java.io.IOException;
+import java.net.ConnectException;
+import java.nio.charset.StandardCharsets;
+import java.util.HashMap;
+
 import org.apache.commons.io.IOUtils;
 import org.apache.nifi.processor.ProcessContext;
 import org.apache.nifi.processor.exception.ProcessException;
@@ -36,16 +40,13 @@ import org.junit.Test;
 import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
 
-import java.io.IOException;
-import java.net.ConnectException;
-import java.nio.charset.StandardCharsets;
-import java.util.HashMap;
-
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import okhttp3.Call;
+import okhttp3.MediaType;
+import okhttp3.OkHttpClient;
+import okhttp3.Protocol;
+import okhttp3.Request;
+import okhttp3.Response;
+import okhttp3.ResponseBody;
 
 public class TestPutElasticsearchHttp {
 
@@ -66,7 +67,6 @@ public class TestPutElasticsearchHttp {
     @Test
     public void testPutElasticSearchOnTriggerIndex() throws IOException {
         runner = TestRunners.newTestRunner(new 
PutElasticsearchTestProcessor(false)); // no failures
-        runner.setValidateExpressionUsage(true);
         runner.setProperty(AbstractElasticsearchHttpProcessor.ES_URL, 
"http://127.0.0.1:9200";);
 
         runner.setProperty(PutElasticsearchHttp.INDEX, "doc");
@@ -88,7 +88,6 @@ public class TestPutElasticsearchHttp {
     @Test
     public void testPutElasticSearchOnTriggerUpdate() throws IOException {
         runner = TestRunners.newTestRunner(new 
PutElasticsearchTestProcessor(false)); // no failures
-        runner.setValidateExpressionUsage(true);
         runner.setProperty(AbstractElasticsearchHttpProcessor.ES_URL, 
"http://127.0.0.1:9200";);
 
         runner.setProperty(PutElasticsearchHttp.INDEX, "doc");
@@ -110,7 +109,6 @@ public class TestPutElasticsearchHttp {
     @Test
     public void testPutElasticSearchOnTriggerDelete() throws IOException {
         runner = TestRunners.newTestRunner(new 
PutElasticsearchTestProcessor(false)); // no failures
-        runner.setValidateExpressionUsage(true);
         runner.setProperty(AbstractElasticsearchHttpProcessor.ES_URL, 
"http://127.0.0.1:9200";);
 
         runner.setProperty(PutElasticsearchHttp.INDEX, "doc");
@@ -132,7 +130,6 @@ public class TestPutElasticsearchHttp {
     @Test
     public void testPutElasticSearchOnTriggerEL() throws IOException {
         runner = TestRunners.newTestRunner(new 
PutElasticsearchTestProcessor(false)); // no failures
-        runner.setValidateExpressionUsage(true);
         runner.setProperty(AbstractElasticsearchHttpProcessor.ES_URL, 
"${es.url}");
 
         runner.setProperty(PutElasticsearchHttp.INDEX, "doc");
@@ -159,7 +156,6 @@ public class TestPutElasticsearchHttp {
     @Test
     public void testPutElasticSearchOnTriggerBadIndexOp() throws IOException {
         runner = TestRunners.newTestRunner(new 
PutElasticsearchTestProcessor(false)); // no failures
-        runner.setValidateExpressionUsage(true);
         runner.setProperty(AbstractElasticsearchHttpProcessor.ES_URL, 
"http://127.0.0.1:9200";);
 
         runner.setProperty(PutElasticsearchHttp.INDEX, "doc");
@@ -181,7 +177,6 @@ public class TestPutElasticsearchHttp {
     @Test
     public void testPutElasticSearchInvalidConfig() throws IOException {
         runner = TestRunners.newTestRunner(new 
PutElasticsearchTestProcessor(false)); // no failures
-        runner.setValidateExpressionUsage(true);
         runner.setProperty(AbstractElasticsearchHttpProcessor.ES_URL, 
"http://127.0.0.1:9200";);
 
         runner.setProperty(PutElasticsearchHttp.INDEX, "doc");
@@ -202,7 +197,6 @@ public class TestPutElasticsearchHttp {
         PutElasticsearchTestProcessor processor = new 
PutElasticsearchTestProcessor(true);
         processor.setStatus(100, "Should fail");
         runner = TestRunners.newTestRunner(processor); // simulate failures
-        runner.setValidateExpressionUsage(false);
         runner.setProperty(AbstractElasticsearchHttpProcessor.ES_URL, 
"http://127.0.0.1:9200";);
         runner.setProperty(PutElasticsearchHttp.INDEX, "doc");
         runner.setProperty(PutElasticsearchHttp.TYPE, "status");
@@ -229,7 +223,6 @@ public class TestPutElasticsearchHttp {
         PutElasticsearchTestProcessor processor = new 
PutElasticsearchTestProcessor(true);
         processor.setStatus(-1, "Connection Exception");
         runner = TestRunners.newTestRunner(processor); // simulate failures
-        runner.setValidateExpressionUsage(false);
         runner.setProperty(AbstractElasticsearchHttpProcessor.ES_URL, 
"http://127.0.0.1:9200";);
         runner.setProperty(PutElasticsearchHttp.INDEX, "doc");
         runner.setProperty(PutElasticsearchHttp.TYPE, "status");
@@ -246,7 +239,6 @@ public class TestPutElasticsearchHttp {
     @Test
     public void testPutElasticsearchOnTriggerWithNoIdAttribute() throws 
IOException {
         runner = TestRunners.newTestRunner(new 
PutElasticsearchTestProcessor(true)); // simulate failures
-        runner.setValidateExpressionUsage(false);
         runner.setProperty(AbstractElasticsearchHttpProcessor.ES_URL, 
"http://127.0.0.1:9200";);
         runner.setProperty(PutElasticsearchHttp.INDEX, "doc");
         runner.setProperty(PutElasticsearchHttp.TYPE, "status");
@@ -266,7 +258,6 @@ public class TestPutElasticsearchHttp {
     @Test
     public void testPutElasticsearchOnTriggerWithIndexFromAttribute() throws 
IOException {
         runner = TestRunners.newTestRunner(new 
PutElasticsearchTestProcessor(false));
-        runner.setValidateExpressionUsage(false);
         runner.setProperty(AbstractElasticsearchHttpProcessor.ES_URL, 
"http://127.0.0.1:9200";);
         runner.setProperty(PutElasticsearchHttp.INDEX, "${i}");
         runner.setProperty(PutElasticsearchHttp.TYPE, "${type}");
@@ -300,7 +291,6 @@ public class TestPutElasticsearchHttp {
     @Test
     public void testPutElasticSearchOnTriggerWithInvalidIndexOp() throws 
IOException {
         runner = TestRunners.newTestRunner(new 
PutElasticsearchTestProcessor(false)); // no failures
-        runner.setValidateExpressionUsage(true);
         runner.setProperty(AbstractElasticsearchHttpProcessor.ES_URL, 
"http://127.0.0.1:9200";);
 
         runner.setProperty(PutElasticsearchHttp.INDEX, "doc");
@@ -330,7 +320,6 @@ public class TestPutElasticsearchHttp {
         p.setExpectedUrl("http://127.0.0.1:9200/_bulk?pipeline=my-pipeline";);
 
         runner = TestRunners.newTestRunner(p);
-        runner.setValidateExpressionUsage(true);
         runner.setProperty(AbstractElasticsearchHttpProcessor.ES_URL, 
"http://127.0.0.1:9200";);
         runner.setProperty(PutElasticsearchHttp.INDEX, "doc");
         runner.setProperty(PutElasticsearchHttp.TYPE, "status");
@@ -355,7 +344,6 @@ public class TestPutElasticsearchHttp {
         PutElasticsearchTestProcessor processor = new 
PutElasticsearchTestProcessor(true);
         processor.setResultField("not_found");
         runner = TestRunners.newTestRunner(processor); // simulate failures
-        runner.setValidateExpressionUsage(true);
         runner.setProperty(AbstractElasticsearchHttpProcessor.ES_URL, 
"http://127.0.0.1:9200";);
         runner.setProperty(PutElasticsearchHttp.INDEX_OP, "delete");
         runner.setProperty(PutElasticsearchHttp.INDEX, "doc");
@@ -447,6 +435,7 @@ public class TestPutElasticsearchHttp {
             });
         }
 
+        @Override
         protected OkHttpClient getClient() {
             return client;
         }
@@ -469,7 +458,6 @@ public class TestPutElasticsearchHttp {
         System.out.println("Starting test " + new Object() {
         }.getClass().getEnclosingMethod().getName());
         final TestRunner runner = TestRunners.newTestRunner(new 
PutElasticsearchHttp());
-        runner.setValidateExpressionUsage(false);
 
         runner.setProperty(AbstractElasticsearchHttpProcessor.ES_URL, 
"http://127.0.0.1:9200";);
         runner.setProperty(PutElasticsearchHttp.INDEX, "doc");
@@ -493,7 +481,6 @@ public class TestPutElasticsearchHttp {
         System.out.println("Starting test " + new Object() {
         }.getClass().getEnclosingMethod().getName());
         final TestRunner runner = TestRunners.newTestRunner(new 
PutElasticsearchHttp());
-        runner.setValidateExpressionUsage(false);
 
         runner.setProperty(AbstractElasticsearchHttpProcessor.ES_URL, 
"http://127.0.0.1:9200";);
         runner.setProperty(PutElasticsearchHttp.INDEX, "doc");

http://git-wip-us.apache.org/repos/asf/nifi/blob/4c787799/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/test/java/org/apache/nifi/processors/elasticsearch/TestPutElasticsearchHttpRecord.java
----------------------------------------------------------------------
diff --git 
a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/test/java/org/apache/nifi/processors/elasticsearch/TestPutElasticsearchHttpRecord.java
 
b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/test/java/org/apache/nifi/processors/elasticsearch/TestPutElasticsearchHttpRecord.java
index 75fb6ec..2816aa2 100644
--- 
a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/test/java/org/apache/nifi/processors/elasticsearch/TestPutElasticsearchHttpRecord.java
+++ 
b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/test/java/org/apache/nifi/processors/elasticsearch/TestPutElasticsearchHttpRecord.java
@@ -16,13 +16,18 @@
  */
 package org.apache.nifi.processors.elasticsearch;
 
-import okhttp3.Call;
-import okhttp3.MediaType;
-import okhttp3.OkHttpClient;
-import okhttp3.Protocol;
-import okhttp3.Request;
-import okhttp3.Response;
-import okhttp3.ResponseBody;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import java.io.IOException;
+import java.net.ConnectException;
+import java.util.HashMap;
+import java.util.List;
+
 import org.apache.nifi.processor.ProcessContext;
 import org.apache.nifi.processor.exception.ProcessException;
 import org.apache.nifi.provenance.ProvenanceEventRecord;
@@ -37,17 +42,13 @@ import org.junit.After;
 import org.junit.Ignore;
 import org.junit.Test;
 
-import java.io.IOException;
-import java.net.ConnectException;
-import java.util.HashMap;
-import java.util.List;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import okhttp3.Call;
+import okhttp3.MediaType;
+import okhttp3.OkHttpClient;
+import okhttp3.Protocol;
+import okhttp3.Request;
+import okhttp3.Response;
+import okhttp3.ResponseBody;
 
 public class TestPutElasticsearchHttpRecord {
 
@@ -62,7 +63,6 @@ public class TestPutElasticsearchHttpRecord {
     public void testPutElasticSearchOnTriggerIndex() throws IOException {
         runner = TestRunners.newTestRunner(new 
PutElasticsearchHttpRecordTestProcessor(false)); // no failures
         generateTestData();
-        runner.setValidateExpressionUsage(true);
         runner.setProperty(AbstractElasticsearchHttpProcessor.ES_URL, 
"http://127.0.0.1:9200";);
 
         runner.setProperty(PutElasticsearchHttpRecord.INDEX, "doc");
@@ -88,7 +88,6 @@ public class TestPutElasticsearchHttpRecord {
     public void testPutElasticSearchOnTriggerUpdate() throws IOException {
         runner = TestRunners.newTestRunner(new 
PutElasticsearchHttpRecordTestProcessor(false)); // no failures
         generateTestData();
-        runner.setValidateExpressionUsage(true);
         runner.setProperty(AbstractElasticsearchHttpProcessor.ES_URL, 
"http://127.0.0.1:9200";);
 
         runner.setProperty(PutElasticsearchHttpRecord.INDEX, "doc");
@@ -110,7 +109,6 @@ public class TestPutElasticsearchHttpRecord {
     public void testPutElasticSearchOnTriggerDelete() throws IOException {
         runner = TestRunners.newTestRunner(new 
PutElasticsearchHttpRecordTestProcessor(false)); // no failures
         generateTestData();
-        runner.setValidateExpressionUsage(true);
         runner.setProperty(AbstractElasticsearchHttpProcessor.ES_URL, 
"http://127.0.0.1:9200";);
 
         runner.setProperty(PutElasticsearchHttpRecord.INDEX, "doc");
@@ -132,7 +130,6 @@ public class TestPutElasticsearchHttpRecord {
     public void testPutElasticSearchOnTriggerEL() throws IOException {
         runner = TestRunners.newTestRunner(new 
PutElasticsearchHttpRecordTestProcessor(false)); // no failures
         generateTestData();
-        runner.setValidateExpressionUsage(true);
         runner.setProperty(AbstractElasticsearchHttpProcessor.ES_URL, 
"${es.url}");
 
         runner.setProperty(PutElasticsearchHttpRecord.INDEX, "doc");
@@ -159,7 +156,6 @@ public class TestPutElasticsearchHttpRecord {
     public void testPutElasticSearchOnTriggerBadIndexOp() throws IOException {
         runner = TestRunners.newTestRunner(new 
PutElasticsearchHttpRecordTestProcessor(false)); // no failures
         generateTestData();
-        runner.setValidateExpressionUsage(true);
         runner.setProperty(AbstractElasticsearchHttpProcessor.ES_URL, 
"http://127.0.0.1:9200";);
 
         runner.setProperty(PutElasticsearchHttpRecord.INDEX, "doc");
@@ -181,7 +177,6 @@ public class TestPutElasticsearchHttpRecord {
     public void testPutElasticSearchInvalidConfig() throws IOException {
         runner = TestRunners.newTestRunner(new 
PutElasticsearchHttpRecordTestProcessor(false)); // no failures
         generateTestData();
-        runner.setValidateExpressionUsage(true);
         runner.setProperty(AbstractElasticsearchHttpProcessor.ES_URL, 
"http://127.0.0.1:9200";);
 
         runner.setProperty(PutElasticsearchHttpRecord.INDEX, "doc");
@@ -276,7 +271,6 @@ public class TestPutElasticsearchHttpRecord {
     public void testPutElasticsearchOnTriggerWithIndexFromAttribute() throws 
IOException {
         runner = TestRunners.newTestRunner(new 
PutElasticsearchHttpRecordTestProcessor(false));
         generateTestData();
-        runner.setValidateExpressionUsage(false);
         runner.setProperty(AbstractElasticsearchHttpProcessor.ES_URL, 
"http://127.0.0.1:9200";);
         runner.setProperty(PutElasticsearchHttpRecord.INDEX, "${i}");
         runner.setProperty(PutElasticsearchHttpRecord.TYPE, "${type}");
@@ -310,7 +304,6 @@ public class TestPutElasticsearchHttpRecord {
     public void testPutElasticSearchOnTriggerWithInvalidIndexOp() throws 
IOException {
         runner = TestRunners.newTestRunner(new 
PutElasticsearchHttpRecordTestProcessor(false)); // no failures
         generateTestData();
-        runner.setValidateExpressionUsage(true);
         runner.setProperty(AbstractElasticsearchHttpProcessor.ES_URL, 
"http://127.0.0.1:9200";);
 
         runner.setProperty(PutElasticsearchHttpRecord.INDEX, "doc");
@@ -339,7 +332,6 @@ public class TestPutElasticsearchHttpRecord {
         p.setExpectedUrl("http://127.0.0.1:9200/_bulk?pipeline=my-pipeline";);
         runner = TestRunners.newTestRunner(p);
         generateTestData();
-        runner.setValidateExpressionUsage(true);
         runner.setProperty(AbstractElasticsearchHttpProcessor.ES_URL, 
"http://127.0.0.1:9200";);
 
         runner.setProperty(PutElasticsearchHttpRecord.INDEX, "doc");
@@ -427,6 +419,7 @@ public class TestPutElasticsearchHttpRecord {
             });
         }
 
+        @Override
         protected OkHttpClient getClient() {
             return client;
         }
@@ -449,7 +442,6 @@ public class TestPutElasticsearchHttpRecord {
         System.out.println("Starting test " + new Object() {
         }.getClass().getEnclosingMethod().getName());
         final TestRunner runner = TestRunners.newTestRunner(new 
PutElasticsearchHttpRecord());
-        runner.setValidateExpressionUsage(false);
 
         runner.setProperty(AbstractElasticsearchHttpProcessor.ES_URL, 
"http://127.0.0.1:9200";);
         runner.setProperty(PutElasticsearchHttpRecord.INDEX, "doc");
@@ -476,7 +468,6 @@ public class TestPutElasticsearchHttpRecord {
         System.out.println("Starting test " + new Object() {
         }.getClass().getEnclosingMethod().getName());
         final TestRunner runner = TestRunners.newTestRunner(new 
PutElasticsearchHttpRecord());
-        runner.setValidateExpressionUsage(false);
 
         runner.setProperty(AbstractElasticsearchHttpProcessor.ES_URL, 
"http://127.0.0.1:9200";);
         runner.setProperty(PutElasticsearchHttpRecord.INDEX, "doc");

Reply via email to