You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by ma...@apache.org on 2019/06/13 15:34:30 UTC
[nifi] 02/02: NIFI-6322: Renamed EvaluationContext to
EvaluatorState; added javadocs
This is an automated email from the ASF dual-hosted git repository.
markap14 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nifi.git
commit c456b30b9b75c6c6c48a57917196e32d8ab181e2
Author: Mark Payne <ma...@hotmail.com>
AuthorDate: Thu Jun 13 11:32:29 2019 -0400
NIFI-6322: Renamed EvaluationContext to EvaluatorState; added javadocs
---
.../nifi/attribute/expression/language/Query.java | 4 ++--
.../expression/language/StandardPreparedQuery.java | 4 ++--
.../language/compile/ExpressionCompiler.java | 4 ++--
.../language/evaluation/BooleanEvaluator.java | 2 +-
.../language/evaluation/DateEvaluator.java | 2 +-
.../language/evaluation/DecimalEvaluator.java | 2 +-
.../expression/language/evaluation/Evaluator.java | 4 ++--
.../{EvaluationContext.java => EvaluatorState.java} | 21 ++++++++++++++++++++-
.../language/evaluation/NumberEvaluator.java | 2 +-
.../language/evaluation/StringEvaluator.java | 2 +-
.../language/evaluation/WholeNumberEvaluator.java | 2 +-
.../evaluation/cast/BooleanCastEvaluator.java | 4 ++--
.../language/evaluation/cast/DateCastEvaluator.java | 4 ++--
.../evaluation/cast/DecimalCastEvaluator.java | 4 ++--
.../evaluation/cast/NumberCastEvaluator.java | 4 ++--
.../evaluation/cast/StringCastEvaluator.java | 4 ++--
.../evaluation/cast/WholeNumberCastEvaluator.java | 4 ++--
.../language/evaluation/functions/AndEvaluator.java | 4 ++--
.../evaluation/functions/AppendEvaluator.java | 4 ++--
.../evaluation/functions/Base64DecodeEvaluator.java | 4 ++--
.../evaluation/functions/Base64EncodeEvaluator.java | 4 ++--
.../functions/CharSequenceTranslatorEvaluator.java | 4 ++--
.../evaluation/functions/ContainsEvaluator.java | 4 ++--
.../evaluation/functions/DivideEvaluator.java | 4 ++--
.../evaluation/functions/EndsWithEvaluator.java | 4 ++--
.../evaluation/functions/EqualsEvaluator.java | 4 ++--
.../functions/EqualsIgnoreCaseEvaluator.java | 4 ++--
.../evaluation/functions/FindEvaluator.java | 6 +++---
.../evaluation/functions/FormatEvaluator.java | 4 ++--
.../evaluation/functions/FromRadixEvaluator.java | 4 ++--
.../functions/GetDelimitedFieldEvaluator.java | 4 ++--
.../functions/GetStateVariableEvaluator.java | 4 ++--
.../evaluation/functions/GreaterThanEvaluator.java | 4 ++--
.../functions/GreaterThanOrEqualEvaluator.java | 4 ++--
.../evaluation/functions/HostnameEvaluator.java | 4 ++--
.../language/evaluation/functions/IPEvaluator.java | 4 ++--
.../evaluation/functions/IfElseEvaluator.java | 4 ++--
.../language/evaluation/functions/InEvaluator.java | 4 ++--
.../evaluation/functions/IndexOfEvaluator.java | 4 ++--
.../evaluation/functions/IsEmptyEvaluator.java | 4 ++--
.../evaluation/functions/IsNullEvaluator.java | 4 ++--
.../evaluation/functions/JsonPathEvaluator.java | 6 +++---
.../evaluation/functions/LastIndexOfEvaluator.java | 4 ++--
.../evaluation/functions/LengthEvaluator.java | 4 ++--
.../evaluation/functions/LessThanEvaluator.java | 4 ++--
.../functions/LessThanOrEqualEvaluator.java | 4 ++--
.../evaluation/functions/MatchesEvaluator.java | 6 +++---
.../evaluation/functions/MathEvaluator.java | 4 ++--
.../evaluation/functions/MinusEvaluator.java | 4 ++--
.../language/evaluation/functions/ModEvaluator.java | 4 ++--
.../evaluation/functions/MultiplyEvaluator.java | 4 ++--
.../language/evaluation/functions/NotEvaluator.java | 4 ++--
.../evaluation/functions/NotNullEvaluator.java | 4 ++--
.../language/evaluation/functions/NowEvaluator.java | 4 ++--
.../evaluation/functions/NumberToDateEvaluator.java | 4 ++--
.../functions/OneUpSequenceEvaluator.java | 4 ++--
.../language/evaluation/functions/OrEvaluator.java | 4 ++--
.../evaluation/functions/PlusEvaluator.java | 4 ++--
.../evaluation/functions/PrependEvaluator.java | 4 ++--
.../functions/RandomNumberGeneratorEvaluator.java | 4 ++--
.../evaluation/functions/ReplaceAllEvaluator.java | 4 ++--
.../evaluation/functions/ReplaceEmptyEvaluator.java | 4 ++--
.../evaluation/functions/ReplaceEvaluator.java | 4 ++--
.../evaluation/functions/ReplaceFirstEvaluator.java | 4 ++--
.../evaluation/functions/ReplaceNullEvaluator.java | 4 ++--
.../evaluation/functions/StartsWithEvaluator.java | 4 ++--
.../evaluation/functions/StringToDateEvaluator.java | 4 ++--
.../functions/SubstringAfterEvaluator.java | 4 ++--
.../functions/SubstringAfterLastEvaluator.java | 4 ++--
.../functions/SubstringBeforeEvaluator.java | 4 ++--
.../functions/SubstringBeforeLastEvaluator.java | 4 ++--
.../evaluation/functions/SubstringEvaluator.java | 4 ++--
.../evaluation/functions/ThreadEvaluator.java | 4 ++--
.../evaluation/functions/ToLowerEvaluator.java | 4 ++--
.../evaluation/functions/ToRadixEvaluator.java | 4 ++--
.../evaluation/functions/ToStringEvaluator.java | 4 ++--
.../evaluation/functions/ToUpperEvaluator.java | 4 ++--
.../evaluation/functions/TrimEvaluator.java | 4 ++--
.../evaluation/functions/UrlDecodeEvaluator.java | 4 ++--
.../evaluation/functions/UrlEncodeEvaluator.java | 4 ++--
.../evaluation/functions/UuidEvaluator.java | 4 ++--
.../literals/BooleanLiteralEvaluator.java | 4 ++--
.../literals/DecimalLiteralEvaluator.java | 4 ++--
.../evaluation/literals/StringLiteralEvaluator.java | 4 ++--
.../evaluation/literals/ToLiteralEvaluator.java | 4 ++--
.../literals/WholeNumberLiteralEvaluator.java | 4 ++--
.../language/evaluation/reduce/CountEvaluator.java | 4 ++--
.../language/evaluation/reduce/JoinEvaluator.java | 4 ++--
.../selection/AllAttributesEvaluator.java | 6 +++---
.../evaluation/selection/AnyAttributeEvaluator.java | 6 +++---
.../evaluation/selection/AttributeEvaluator.java | 4 ++--
.../selection/DelineatedAttributeEvaluator.java | 6 +++---
.../evaluation/selection/MappingEvaluator.java | 6 +++---
.../selection/MultiMatchAttributeEvaluator.java | 6 +++---
.../selection/MultiNamedAttributeEvaluator.java | 6 +++---
95 files changed, 211 insertions(+), 192 deletions(-)
diff --git a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/Query.java b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/Query.java
index d4b0314..b7c5259 100644
--- a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/Query.java
+++ b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/Query.java
@@ -18,7 +18,7 @@ package org.apache.nifi.attribute.expression.language;
import org.antlr.runtime.tree.Tree;
import org.apache.nifi.attribute.expression.language.compile.ExpressionCompiler;
-import org.apache.nifi.attribute.expression.language.evaluation.EvaluationContext;
+import org.apache.nifi.attribute.expression.language.evaluation.EvaluatorState;
import org.apache.nifi.attribute.expression.language.evaluation.Evaluator;
import org.apache.nifi.attribute.expression.language.evaluation.QueryResult;
import org.apache.nifi.attribute.expression.language.evaluation.selection.AttributeEvaluator;
@@ -43,7 +43,7 @@ public class Query {
private final Tree tree;
private final Evaluator<?> evaluator;
private final AtomicBoolean evaluated = new AtomicBoolean(false);
- private final EvaluationContext context = new EvaluationContext();
+ private final EvaluatorState context = new EvaluatorState();
private Query(final String query, final Tree tree, final Evaluator<?> evaluator) {
this.query = query;
diff --git a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/StandardPreparedQuery.java b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/StandardPreparedQuery.java
index 8d00b59..b9fa720 100644
--- a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/StandardPreparedQuery.java
+++ b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/StandardPreparedQuery.java
@@ -16,7 +16,7 @@
*/
package org.apache.nifi.attribute.expression.language;
-import org.apache.nifi.attribute.expression.language.evaluation.EvaluationContext;
+import org.apache.nifi.attribute.expression.language.evaluation.EvaluatorState;
import org.apache.nifi.attribute.expression.language.evaluation.Evaluator;
import org.apache.nifi.attribute.expression.language.evaluation.literals.StringLiteralEvaluator;
import org.apache.nifi.attribute.expression.language.evaluation.selection.AllAttributesEvaluator;
@@ -100,7 +100,7 @@ public class StandardPreparedQuery implements PreparedQuery {
final Evaluator<String> nameEval = attributeEval.getNameEvaluator();
if (nameEval instanceof StringLiteralEvaluator) {
- final String referencedVar = nameEval.evaluate(Collections.emptyMap(), new EvaluationContext()).getValue();
+ final String referencedVar = nameEval.evaluate(Collections.emptyMap(), new EvaluatorState()).getValue();
variables.add(referencedVar);
}
} else if (evaluator instanceof AllAttributesEvaluator) {
diff --git a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/compile/ExpressionCompiler.java b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/compile/ExpressionCompiler.java
index 253d40d..749c3be 100644
--- a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/compile/ExpressionCompiler.java
+++ b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/compile/ExpressionCompiler.java
@@ -28,7 +28,7 @@ import org.apache.nifi.attribute.expression.language.antlr.AttributeExpressionLe
import org.apache.nifi.attribute.expression.language.antlr.AttributeExpressionParser;
import org.apache.nifi.attribute.expression.language.evaluation.BooleanEvaluator;
import org.apache.nifi.attribute.expression.language.evaluation.DateEvaluator;
-import org.apache.nifi.attribute.expression.language.evaluation.EvaluationContext;
+import org.apache.nifi.attribute.expression.language.evaluation.EvaluatorState;
import org.apache.nifi.attribute.expression.language.evaluation.Evaluator;
import org.apache.nifi.attribute.expression.language.evaluation.StringEvaluator;
import org.apache.nifi.attribute.expression.language.evaluation.cast.BooleanCastEvaluator;
@@ -948,7 +948,7 @@ public class ExpressionCompiler {
final List<String> attributeNames = new ArrayList<>();
for (int i = 1; i < tree.getChildCount(); i++) { // skip the first child because that's the name of the multi-attribute function
- attributeNames.add(newStringLiteralEvaluator(tree.getChild(i).getText()).evaluate(null, new EvaluationContext()).getValue());
+ attributeNames.add(newStringLiteralEvaluator(tree.getChild(i).getText()).evaluate(null, new EvaluatorState()).getValue());
}
switch (multiAttrType) {
diff --git a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/BooleanEvaluator.java b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/BooleanEvaluator.java
index 57cb61f..5e63d16 100644
--- a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/BooleanEvaluator.java
+++ b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/BooleanEvaluator.java
@@ -27,7 +27,7 @@ public abstract class BooleanEvaluator implements Evaluator<Boolean> {
}
@Override
- public int getEvaluationsRemaining(final EvaluationContext context) {
+ public int getEvaluationsRemaining(final EvaluatorState context) {
return 0;
}
diff --git a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/DateEvaluator.java b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/DateEvaluator.java
index dbf6023..352952e 100644
--- a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/DateEvaluator.java
+++ b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/DateEvaluator.java
@@ -29,7 +29,7 @@ public abstract class DateEvaluator implements Evaluator<Date> {
}
@Override
- public int getEvaluationsRemaining(final EvaluationContext context) {
+ public int getEvaluationsRemaining(final EvaluatorState context) {
return 0;
}
diff --git a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/DecimalEvaluator.java b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/DecimalEvaluator.java
index 33e919f..7602690 100644
--- a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/DecimalEvaluator.java
+++ b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/DecimalEvaluator.java
@@ -27,7 +27,7 @@ public abstract class DecimalEvaluator implements Evaluator<Double> {
}
@Override
- public int getEvaluationsRemaining(final EvaluationContext context) {
+ public int getEvaluationsRemaining(final EvaluatorState context) {
return 0;
}
diff --git a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/Evaluator.java b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/Evaluator.java
index 45252c5..499f93d 100644
--- a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/Evaluator.java
+++ b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/Evaluator.java
@@ -22,11 +22,11 @@ import org.apache.nifi.expression.AttributeExpression.ResultType;
public interface Evaluator<T> {
- QueryResult<T> evaluate(Map<String, String> attributes, EvaluationContext context);
+ QueryResult<T> evaluate(Map<String, String> attributes, EvaluatorState context);
ResultType getResultType();
- int getEvaluationsRemaining(EvaluationContext context);
+ int getEvaluationsRemaining(EvaluatorState context);
Evaluator<?> getSubjectEvaluator();
diff --git a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/EvaluationContext.java b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/EvaluatorState.java
similarity index 55%
rename from nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/EvaluationContext.java
rename to nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/EvaluatorState.java
index b40b6d2..56c11f7 100644
--- a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/EvaluationContext.java
+++ b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/EvaluatorState.java
@@ -19,14 +19,33 @@ package org.apache.nifi.attribute.expression.language.evaluation;
import java.util.HashMap;
import java.util.Map;
-public class EvaluationContext {
+/**
+ * A storage mechanism for {@link Evaluator}s to stash & retrieve state. While most Evaluators are stateless,
+ * some must maintain state, for instance to iterate over many Attributes. By stashing that state and retrieving
+ * it from this EvaluatorState instead of using member variables, Evaluators are able to be kept both threadsafe
+ * and in-and-of-themselves stateless, which means that new Evaluators need not be created for each iteration of
+ * the function.
+ */
+public class EvaluatorState {
private final Map<Evaluator<?>, Object> statePerEvaluator = new HashMap<>();
+ /**
+ * Fetches state for the given evaluator, casting it into the given type
+ * @param evaluator the Evaluator to retrieve state for
+ * @param clazz the Class to which the value should be cast
+ * @param <T> type Type of the value
+ * @return the state for the given Evaluator, or <code>null</code> if no state has been stored
+ */
public <T> T getState(Evaluator<?> evaluator, Class<T> clazz) {
return clazz.cast(statePerEvaluator.get(evaluator));
}
+ /**
+ * Updates state for the given Evaluator
+ * @param evaluator the Evaluator to store state for
+ * @param state the state to store
+ */
public void putState(Evaluator<?> evaluator, Object state) {
statePerEvaluator.put(evaluator, state);
}
diff --git a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/NumberEvaluator.java b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/NumberEvaluator.java
index 44bf3b5..99d054f 100644
--- a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/NumberEvaluator.java
+++ b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/NumberEvaluator.java
@@ -27,7 +27,7 @@ public abstract class NumberEvaluator implements Evaluator<Number> {
}
@Override
- public int getEvaluationsRemaining(final EvaluationContext context) {
+ public int getEvaluationsRemaining(final EvaluatorState context) {
return 0;
}
diff --git a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/StringEvaluator.java b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/StringEvaluator.java
index 3f91fb6..e3cdad4 100644
--- a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/StringEvaluator.java
+++ b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/StringEvaluator.java
@@ -27,7 +27,7 @@ public abstract class StringEvaluator implements Evaluator<String> {
}
@Override
- public int getEvaluationsRemaining(EvaluationContext context) {
+ public int getEvaluationsRemaining(EvaluatorState context) {
return 0;
}
diff --git a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/WholeNumberEvaluator.java b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/WholeNumberEvaluator.java
index e666c50..1389dbc 100644
--- a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/WholeNumberEvaluator.java
+++ b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/WholeNumberEvaluator.java
@@ -27,7 +27,7 @@ public abstract class WholeNumberEvaluator implements Evaluator<Long> {
}
@Override
- public int getEvaluationsRemaining(final EvaluationContext context) {
+ public int getEvaluationsRemaining(final EvaluatorState context) {
return 0;
}
diff --git a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/cast/BooleanCastEvaluator.java b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/cast/BooleanCastEvaluator.java
index b97f88e..7d0928c 100644
--- a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/cast/BooleanCastEvaluator.java
+++ b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/cast/BooleanCastEvaluator.java
@@ -20,7 +20,7 @@ import java.util.Map;
import org.apache.nifi.attribute.expression.language.evaluation.BooleanEvaluator;
import org.apache.nifi.attribute.expression.language.evaluation.BooleanQueryResult;
-import org.apache.nifi.attribute.expression.language.evaluation.EvaluationContext;
+import org.apache.nifi.attribute.expression.language.evaluation.EvaluatorState;
import org.apache.nifi.attribute.expression.language.evaluation.Evaluator;
import org.apache.nifi.attribute.expression.language.evaluation.QueryResult;
import org.apache.nifi.attribute.expression.language.evaluation.StringEvaluator;
@@ -34,7 +34,7 @@ public class BooleanCastEvaluator extends BooleanEvaluator {
}
@Override
- public QueryResult<Boolean> evaluate(final Map<String, String> attributes, final EvaluationContext context) {
+ public QueryResult<Boolean> evaluate(final Map<String, String> attributes, final EvaluatorState context) {
final QueryResult<String> result = subjectEvaluator.evaluate(attributes, context);
if (result.getValue() == null) {
return new BooleanQueryResult(null);
diff --git a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/cast/DateCastEvaluator.java b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/cast/DateCastEvaluator.java
index af584c0..33c82a1 100644
--- a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/cast/DateCastEvaluator.java
+++ b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/cast/DateCastEvaluator.java
@@ -26,7 +26,7 @@ import java.util.regex.Pattern;
import org.apache.nifi.attribute.expression.language.evaluation.DateEvaluator;
import org.apache.nifi.attribute.expression.language.evaluation.DateQueryResult;
-import org.apache.nifi.attribute.expression.language.evaluation.EvaluationContext;
+import org.apache.nifi.attribute.expression.language.evaluation.EvaluatorState;
import org.apache.nifi.attribute.expression.language.evaluation.Evaluator;
import org.apache.nifi.attribute.expression.language.evaluation.NumberQueryResult;
import org.apache.nifi.attribute.expression.language.evaluation.QueryResult;
@@ -57,7 +57,7 @@ public class DateCastEvaluator extends DateEvaluator {
}
@Override
- public QueryResult<Date> evaluate(final Map<String, String> attributes, final EvaluationContext context) {
+ public QueryResult<Date> evaluate(final Map<String, String> attributes, final EvaluatorState context) {
final QueryResult<?> result = subjectEvaluator.evaluate(attributes, context);
if (result.getValue() == null) {
return new DateQueryResult(null);
diff --git a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/cast/DecimalCastEvaluator.java b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/cast/DecimalCastEvaluator.java
index 61cc4fb..5cbfde2 100644
--- a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/cast/DecimalCastEvaluator.java
+++ b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/cast/DecimalCastEvaluator.java
@@ -19,7 +19,7 @@ package org.apache.nifi.attribute.expression.language.evaluation.cast;
import org.apache.nifi.attribute.expression.language.evaluation.DateQueryResult;
import org.apache.nifi.attribute.expression.language.evaluation.DecimalEvaluator;
import org.apache.nifi.attribute.expression.language.evaluation.DecimalQueryResult;
-import org.apache.nifi.attribute.expression.language.evaluation.EvaluationContext;
+import org.apache.nifi.attribute.expression.language.evaluation.EvaluatorState;
import org.apache.nifi.attribute.expression.language.evaluation.Evaluator;
import org.apache.nifi.attribute.expression.language.evaluation.NumberQueryResult;
import org.apache.nifi.attribute.expression.language.evaluation.QueryResult;
@@ -43,7 +43,7 @@ public class DecimalCastEvaluator extends DecimalEvaluator {
}
@Override
- public QueryResult<Double> evaluate(final Map<String, String> attributes, final EvaluationContext context) {
+ public QueryResult<Double> evaluate(final Map<String, String> attributes, final EvaluatorState context) {
final QueryResult<?> result = subjectEvaluator.evaluate(attributes, context);
if (result.getValue() == null) {
return new DecimalQueryResult(null);
diff --git a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/cast/NumberCastEvaluator.java b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/cast/NumberCastEvaluator.java
index be09c93..c9bda44 100644
--- a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/cast/NumberCastEvaluator.java
+++ b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/cast/NumberCastEvaluator.java
@@ -18,7 +18,7 @@ package org.apache.nifi.attribute.expression.language.evaluation.cast;
import org.apache.nifi.attribute.expression.language.evaluation.DateQueryResult;
import org.apache.nifi.attribute.expression.language.evaluation.DecimalQueryResult;
-import org.apache.nifi.attribute.expression.language.evaluation.EvaluationContext;
+import org.apache.nifi.attribute.expression.language.evaluation.EvaluatorState;
import org.apache.nifi.attribute.expression.language.evaluation.Evaluator;
import org.apache.nifi.attribute.expression.language.evaluation.NumberEvaluator;
import org.apache.nifi.attribute.expression.language.evaluation.NumberQueryResult;
@@ -43,7 +43,7 @@ public class NumberCastEvaluator extends NumberEvaluator {
}
@Override
- public QueryResult<Number> evaluate(final Map<String, String> attributes, final EvaluationContext context) {
+ public QueryResult<Number> evaluate(final Map<String, String> attributes, final EvaluatorState context) {
final QueryResult<?> result = subjectEvaluator.evaluate(attributes, context);
if (result.getValue() == null) {
return new NumberQueryResult(null);
diff --git a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/cast/StringCastEvaluator.java b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/cast/StringCastEvaluator.java
index 2555a41..37ff485 100644
--- a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/cast/StringCastEvaluator.java
+++ b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/cast/StringCastEvaluator.java
@@ -18,7 +18,7 @@ package org.apache.nifi.attribute.expression.language.evaluation.cast;
import java.util.Map;
-import org.apache.nifi.attribute.expression.language.evaluation.EvaluationContext;
+import org.apache.nifi.attribute.expression.language.evaluation.EvaluatorState;
import org.apache.nifi.attribute.expression.language.evaluation.Evaluator;
import org.apache.nifi.attribute.expression.language.evaluation.QueryResult;
import org.apache.nifi.attribute.expression.language.evaluation.StringEvaluator;
@@ -33,7 +33,7 @@ public class StringCastEvaluator extends StringEvaluator {
}
@Override
- public QueryResult<String> evaluate(final Map<String, String> attributes, final EvaluationContext context) {
+ public QueryResult<String> evaluate(final Map<String, String> attributes, final EvaluatorState context) {
final QueryResult<?> result = subjectEvaluator.evaluate(attributes, context);
if (result.getValue() == null) {
return new StringQueryResult(null);
diff --git a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/cast/WholeNumberCastEvaluator.java b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/cast/WholeNumberCastEvaluator.java
index 16bc33a..4dfefea 100644
--- a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/cast/WholeNumberCastEvaluator.java
+++ b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/cast/WholeNumberCastEvaluator.java
@@ -20,7 +20,7 @@ import java.util.Map;
import org.apache.nifi.attribute.expression.language.evaluation.DateQueryResult;
import org.apache.nifi.attribute.expression.language.evaluation.DecimalQueryResult;
-import org.apache.nifi.attribute.expression.language.evaluation.EvaluationContext;
+import org.apache.nifi.attribute.expression.language.evaluation.EvaluatorState;
import org.apache.nifi.attribute.expression.language.evaluation.Evaluator;
import org.apache.nifi.attribute.expression.language.evaluation.NumberQueryResult;
import org.apache.nifi.attribute.expression.language.evaluation.QueryResult;
@@ -43,7 +43,7 @@ public class WholeNumberCastEvaluator extends WholeNumberEvaluator {
}
@Override
- public QueryResult<Long> evaluate(final Map<String, String> attributes, final EvaluationContext context) {
+ public QueryResult<Long> evaluate(final Map<String, String> attributes, final EvaluatorState context) {
final QueryResult<?> result = subjectEvaluator.evaluate(attributes, context);
if (result.getValue() == null) {
return new WholeNumberQueryResult(null);
diff --git a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/AndEvaluator.java b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/AndEvaluator.java
index abdd496..db4f000 100644
--- a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/AndEvaluator.java
+++ b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/AndEvaluator.java
@@ -20,7 +20,7 @@ import java.util.Map;
import org.apache.nifi.attribute.expression.language.evaluation.BooleanEvaluator;
import org.apache.nifi.attribute.expression.language.evaluation.BooleanQueryResult;
-import org.apache.nifi.attribute.expression.language.evaluation.EvaluationContext;
+import org.apache.nifi.attribute.expression.language.evaluation.EvaluatorState;
import org.apache.nifi.attribute.expression.language.evaluation.Evaluator;
import org.apache.nifi.attribute.expression.language.evaluation.QueryResult;
@@ -35,7 +35,7 @@ public class AndEvaluator extends BooleanEvaluator {
}
@Override
- public QueryResult<Boolean> evaluate(final Map<String, String> attributes, final EvaluationContext context) {
+ public QueryResult<Boolean> evaluate(final Map<String, String> attributes, final EvaluatorState context) {
final QueryResult<Boolean> subjectValue = subjectEvaluator.evaluate(attributes, context);
if (subjectValue == null) {
return new BooleanQueryResult(null);
diff --git a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/AppendEvaluator.java b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/AppendEvaluator.java
index 8ee50a6..5541398 100644
--- a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/AppendEvaluator.java
+++ b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/AppendEvaluator.java
@@ -18,7 +18,7 @@ package org.apache.nifi.attribute.expression.language.evaluation.functions;
import java.util.Map;
-import org.apache.nifi.attribute.expression.language.evaluation.EvaluationContext;
+import org.apache.nifi.attribute.expression.language.evaluation.EvaluatorState;
import org.apache.nifi.attribute.expression.language.evaluation.Evaluator;
import org.apache.nifi.attribute.expression.language.evaluation.QueryResult;
import org.apache.nifi.attribute.expression.language.evaluation.StringEvaluator;
@@ -35,7 +35,7 @@ public class AppendEvaluator extends StringEvaluator {
}
@Override
- public QueryResult<String> evaluate(final Map<String, String> attributes, final EvaluationContext context) {
+ public QueryResult<String> evaluate(final Map<String, String> attributes, final EvaluatorState context) {
final String subjectValue = subject.evaluate(attributes, context).getValue();
final String appendValue = appendEvaluator.evaluate(attributes, context).getValue();
diff --git a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/Base64DecodeEvaluator.java b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/Base64DecodeEvaluator.java
index e599ef6..39147c2 100644
--- a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/Base64DecodeEvaluator.java
+++ b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/Base64DecodeEvaluator.java
@@ -20,7 +20,7 @@ import java.io.UnsupportedEncodingException;
import java.util.Base64;
import java.util.Map;
-import org.apache.nifi.attribute.expression.language.evaluation.EvaluationContext;
+import org.apache.nifi.attribute.expression.language.evaluation.EvaluatorState;
import org.apache.nifi.attribute.expression.language.evaluation.Evaluator;
import org.apache.nifi.attribute.expression.language.evaluation.QueryResult;
import org.apache.nifi.attribute.expression.language.evaluation.StringEvaluator;
@@ -35,7 +35,7 @@ public class Base64DecodeEvaluator extends StringEvaluator {
}
@Override
- public QueryResult<String> evaluate(final Map<String, String> attributes, final EvaluationContext context) {
+ public QueryResult<String> evaluate(final Map<String, String> attributes, final EvaluatorState context) {
final String subjectValue = subject.evaluate(attributes, context).getValue();
if (subjectValue == null) {
return new StringQueryResult(null);
diff --git a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/Base64EncodeEvaluator.java b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/Base64EncodeEvaluator.java
index c865c5d..7fef980 100644
--- a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/Base64EncodeEvaluator.java
+++ b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/Base64EncodeEvaluator.java
@@ -20,7 +20,7 @@ import java.io.UnsupportedEncodingException;
import java.util.Base64;
import java.util.Map;
-import org.apache.nifi.attribute.expression.language.evaluation.EvaluationContext;
+import org.apache.nifi.attribute.expression.language.evaluation.EvaluatorState;
import org.apache.nifi.attribute.expression.language.evaluation.Evaluator;
import org.apache.nifi.attribute.expression.language.evaluation.QueryResult;
import org.apache.nifi.attribute.expression.language.evaluation.StringEvaluator;
@@ -35,7 +35,7 @@ public class Base64EncodeEvaluator extends StringEvaluator {
}
@Override
- public QueryResult<String> evaluate(final Map<String, String> attributes, final EvaluationContext context) {
+ public QueryResult<String> evaluate(final Map<String, String> attributes, final EvaluatorState context) {
final String subjectValue = subject.evaluate(attributes, context).getValue();
if (subjectValue == null) {
return new StringQueryResult(null);
diff --git a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/CharSequenceTranslatorEvaluator.java b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/CharSequenceTranslatorEvaluator.java
index 5a57c67..fbd3e8a 100644
--- a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/CharSequenceTranslatorEvaluator.java
+++ b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/CharSequenceTranslatorEvaluator.java
@@ -20,7 +20,7 @@ import java.util.Map;
import org.apache.commons.text.StringEscapeUtils;
import org.apache.commons.text.translate.CharSequenceTranslator;
-import org.apache.nifi.attribute.expression.language.evaluation.EvaluationContext;
+import org.apache.nifi.attribute.expression.language.evaluation.EvaluatorState;
import org.apache.nifi.attribute.expression.language.evaluation.Evaluator;
import org.apache.nifi.attribute.expression.language.evaluation.QueryResult;
import org.apache.nifi.attribute.expression.language.evaluation.StringEvaluator;
@@ -76,7 +76,7 @@ public class CharSequenceTranslatorEvaluator extends StringEvaluator {
}
@Override
- public QueryResult<String> evaluate(final Map<String, String> attributes, final EvaluationContext context) {
+ public QueryResult<String> evaluate(final Map<String, String> attributes, final EvaluatorState context) {
final String subjectValue = subject.evaluate(attributes, context).getValue();
return new StringQueryResult(subjectValue == null ? "" : method.translate(subjectValue));
}
diff --git a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/ContainsEvaluator.java b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/ContainsEvaluator.java
index 78a0683..4de3dd4 100644
--- a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/ContainsEvaluator.java
+++ b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/ContainsEvaluator.java
@@ -20,7 +20,7 @@ import java.util.Map;
import org.apache.nifi.attribute.expression.language.evaluation.BooleanEvaluator;
import org.apache.nifi.attribute.expression.language.evaluation.BooleanQueryResult;
-import org.apache.nifi.attribute.expression.language.evaluation.EvaluationContext;
+import org.apache.nifi.attribute.expression.language.evaluation.EvaluatorState;
import org.apache.nifi.attribute.expression.language.evaluation.Evaluator;
import org.apache.nifi.attribute.expression.language.evaluation.QueryResult;
@@ -35,7 +35,7 @@ public class ContainsEvaluator extends BooleanEvaluator {
}
@Override
- public QueryResult<Boolean> evaluate(final Map<String, String> attributes, final EvaluationContext context) {
+ public QueryResult<Boolean> evaluate(final Map<String, String> attributes, final EvaluatorState context) {
final String subjectValue = subject.evaluate(attributes, context).getValue();
if (subjectValue == null) {
return new BooleanQueryResult(false);
diff --git a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/DivideEvaluator.java b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/DivideEvaluator.java
index 76f0e7f..396c30c 100644
--- a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/DivideEvaluator.java
+++ b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/DivideEvaluator.java
@@ -18,7 +18,7 @@ package org.apache.nifi.attribute.expression.language.evaluation.functions;
import java.util.Map;
-import org.apache.nifi.attribute.expression.language.evaluation.EvaluationContext;
+import org.apache.nifi.attribute.expression.language.evaluation.EvaluatorState;
import org.apache.nifi.attribute.expression.language.evaluation.Evaluator;
import org.apache.nifi.attribute.expression.language.evaluation.NumberEvaluator;
import org.apache.nifi.attribute.expression.language.evaluation.NumberQueryResult;
@@ -35,7 +35,7 @@ public class DivideEvaluator extends NumberEvaluator {
}
@Override
- public QueryResult<Number> evaluate(final Map<String, String> attributes, final EvaluationContext context) {
+ public QueryResult<Number> evaluate(final Map<String, String> attributes, final EvaluatorState context) {
final Number subjectValue = subject.evaluate(attributes, context).getValue();
if (subjectValue == null) {
return new NumberQueryResult(null);
diff --git a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/EndsWithEvaluator.java b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/EndsWithEvaluator.java
index db7b4d6..c40cb1d 100644
--- a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/EndsWithEvaluator.java
+++ b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/EndsWithEvaluator.java
@@ -20,7 +20,7 @@ import java.util.Map;
import org.apache.nifi.attribute.expression.language.evaluation.BooleanEvaluator;
import org.apache.nifi.attribute.expression.language.evaluation.BooleanQueryResult;
-import org.apache.nifi.attribute.expression.language.evaluation.EvaluationContext;
+import org.apache.nifi.attribute.expression.language.evaluation.EvaluatorState;
import org.apache.nifi.attribute.expression.language.evaluation.Evaluator;
import org.apache.nifi.attribute.expression.language.evaluation.QueryResult;
@@ -35,7 +35,7 @@ public class EndsWithEvaluator extends BooleanEvaluator {
}
@Override
- public QueryResult<Boolean> evaluate(final Map<String, String> attributes, final EvaluationContext context) {
+ public QueryResult<Boolean> evaluate(final Map<String, String> attributes, final EvaluatorState context) {
final String subjectValue = subject.evaluate(attributes, context).getValue();
if (subjectValue == null) {
return new BooleanQueryResult(false);
diff --git a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/EqualsEvaluator.java b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/EqualsEvaluator.java
index 78227b4..a00a96a 100644
--- a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/EqualsEvaluator.java
+++ b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/EqualsEvaluator.java
@@ -21,7 +21,7 @@ import java.util.Map;
import org.apache.nifi.attribute.expression.language.evaluation.BooleanEvaluator;
import org.apache.nifi.attribute.expression.language.evaluation.BooleanQueryResult;
-import org.apache.nifi.attribute.expression.language.evaluation.EvaluationContext;
+import org.apache.nifi.attribute.expression.language.evaluation.EvaluatorState;
import org.apache.nifi.attribute.expression.language.evaluation.Evaluator;
import org.apache.nifi.attribute.expression.language.evaluation.QueryResult;
import org.apache.nifi.expression.AttributeExpression.ResultType;
@@ -37,7 +37,7 @@ public class EqualsEvaluator extends BooleanEvaluator {
}
@Override
- public QueryResult<Boolean> evaluate(final Map<String, String> attributes, final EvaluationContext context) {
+ public QueryResult<Boolean> evaluate(final Map<String, String> attributes, final EvaluatorState context) {
final Object a = subject.evaluate(attributes, context).getValue();
if (a == null) {
return new BooleanQueryResult(false);
diff --git a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/EqualsIgnoreCaseEvaluator.java b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/EqualsIgnoreCaseEvaluator.java
index 6903c73..b2364dd 100644
--- a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/EqualsIgnoreCaseEvaluator.java
+++ b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/EqualsIgnoreCaseEvaluator.java
@@ -20,7 +20,7 @@ import java.util.Map;
import org.apache.nifi.attribute.expression.language.evaluation.BooleanEvaluator;
import org.apache.nifi.attribute.expression.language.evaluation.BooleanQueryResult;
-import org.apache.nifi.attribute.expression.language.evaluation.EvaluationContext;
+import org.apache.nifi.attribute.expression.language.evaluation.EvaluatorState;
import org.apache.nifi.attribute.expression.language.evaluation.Evaluator;
import org.apache.nifi.attribute.expression.language.evaluation.QueryResult;
@@ -35,7 +35,7 @@ public class EqualsIgnoreCaseEvaluator extends BooleanEvaluator {
}
@Override
- public QueryResult<Boolean> evaluate(final Map<String, String> attributes, final EvaluationContext context) {
+ public QueryResult<Boolean> evaluate(final Map<String, String> attributes, final EvaluatorState context) {
final Object a = subject.evaluate(attributes, context).getValue();
if (a == null) {
return new BooleanQueryResult(false);
diff --git a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/FindEvaluator.java b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/FindEvaluator.java
index 22deac9..7b10153 100644
--- a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/FindEvaluator.java
+++ b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/FindEvaluator.java
@@ -21,7 +21,7 @@ import java.util.regex.Pattern;
import org.apache.nifi.attribute.expression.language.evaluation.BooleanEvaluator;
import org.apache.nifi.attribute.expression.language.evaluation.BooleanQueryResult;
-import org.apache.nifi.attribute.expression.language.evaluation.EvaluationContext;
+import org.apache.nifi.attribute.expression.language.evaluation.EvaluatorState;
import org.apache.nifi.attribute.expression.language.evaluation.Evaluator;
import org.apache.nifi.attribute.expression.language.evaluation.QueryResult;
import org.apache.nifi.attribute.expression.language.evaluation.literals.StringLiteralEvaluator;
@@ -40,14 +40,14 @@ public class FindEvaluator extends BooleanEvaluator {
// if the search string is a literal, we don't need to evaluate it each time; we can just
// pre-compile it. Otherwise, it must be compiled every time.
if (search instanceof StringLiteralEvaluator) {
- this.compiledPattern = Pattern.compile(search.evaluate(null, new EvaluationContext()).getValue());
+ this.compiledPattern = Pattern.compile(search.evaluate(null, new EvaluatorState()).getValue());
} else {
this.compiledPattern = null;
}
}
@Override
- public QueryResult<Boolean> evaluate(final Map<String, String> attributes, final EvaluationContext context) {
+ public QueryResult<Boolean> evaluate(final Map<String, String> attributes, final EvaluatorState context) {
final String subjectValue = subject.evaluate(attributes, context).getValue();
if (subjectValue == null) {
return new BooleanQueryResult(false);
diff --git a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/FormatEvaluator.java b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/FormatEvaluator.java
index 78ae64d..53540bb 100644
--- a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/FormatEvaluator.java
+++ b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/FormatEvaluator.java
@@ -23,7 +23,7 @@ import java.util.Map;
import java.util.TimeZone;
import org.apache.nifi.attribute.expression.language.evaluation.DateEvaluator;
-import org.apache.nifi.attribute.expression.language.evaluation.EvaluationContext;
+import org.apache.nifi.attribute.expression.language.evaluation.EvaluatorState;
import org.apache.nifi.attribute.expression.language.evaluation.Evaluator;
import org.apache.nifi.attribute.expression.language.evaluation.QueryResult;
import org.apache.nifi.attribute.expression.language.evaluation.StringEvaluator;
@@ -42,7 +42,7 @@ public class FormatEvaluator extends StringEvaluator {
}
@Override
- public QueryResult<String> evaluate(final Map<String, String> attributes, final EvaluationContext context) {
+ public QueryResult<String> evaluate(final Map<String, String> attributes, final EvaluatorState context) {
final Date subjectValue = subject.evaluate(attributes, context).getValue();
if (subjectValue == null) {
return new StringQueryResult(null);
diff --git a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/FromRadixEvaluator.java b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/FromRadixEvaluator.java
index 5369379..2470b5b 100644
--- a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/FromRadixEvaluator.java
+++ b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/FromRadixEvaluator.java
@@ -18,7 +18,7 @@ package org.apache.nifi.attribute.expression.language.evaluation.functions;
import java.util.Map;
-import org.apache.nifi.attribute.expression.language.evaluation.EvaluationContext;
+import org.apache.nifi.attribute.expression.language.evaluation.EvaluatorState;
import org.apache.nifi.attribute.expression.language.evaluation.Evaluator;
import org.apache.nifi.attribute.expression.language.evaluation.QueryResult;
import org.apache.nifi.attribute.expression.language.evaluation.WholeNumberEvaluator;
@@ -35,7 +35,7 @@ public class FromRadixEvaluator extends WholeNumberEvaluator {
}
@Override
- public QueryResult<Long> evaluate(final Map<String, String> attributes, final EvaluationContext context) {
+ public QueryResult<Long> evaluate(final Map<String, String> attributes, final EvaluatorState context) {
final String result = numberEvaluator.evaluate(attributes, context).getValue();
if (result == null) {
return new WholeNumberQueryResult(null);
diff --git a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/GetDelimitedFieldEvaluator.java b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/GetDelimitedFieldEvaluator.java
index b287ece..cc715de 100644
--- a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/GetDelimitedFieldEvaluator.java
+++ b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/GetDelimitedFieldEvaluator.java
@@ -19,7 +19,7 @@ package org.apache.nifi.attribute.expression.language.evaluation.functions;
import java.util.Map;
-import org.apache.nifi.attribute.expression.language.evaluation.EvaluationContext;
+import org.apache.nifi.attribute.expression.language.evaluation.EvaluatorState;
import org.apache.nifi.attribute.expression.language.evaluation.Evaluator;
import org.apache.nifi.attribute.expression.language.evaluation.QueryResult;
import org.apache.nifi.attribute.expression.language.evaluation.StringEvaluator;
@@ -65,7 +65,7 @@ public class GetDelimitedFieldEvaluator extends StringEvaluator {
}
@Override
- public QueryResult<String> evaluate(final Map<String, String> attributes, final EvaluationContext context) {
+ public QueryResult<String> evaluate(final Map<String, String> attributes, final EvaluatorState context) {
final String subject = subjectEval.evaluate(attributes, context).getValue();
if (subject == null || subject.isEmpty()) {
return new StringQueryResult("");
diff --git a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/GetStateVariableEvaluator.java b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/GetStateVariableEvaluator.java
index 241c3a8..8bf7111 100644
--- a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/GetStateVariableEvaluator.java
+++ b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/GetStateVariableEvaluator.java
@@ -20,7 +20,7 @@ package org.apache.nifi.attribute.expression.language.evaluation.functions;
import java.util.Map;
import org.apache.nifi.attribute.expression.language.AttributesAndState;
-import org.apache.nifi.attribute.expression.language.evaluation.EvaluationContext;
+import org.apache.nifi.attribute.expression.language.evaluation.EvaluatorState;
import org.apache.nifi.attribute.expression.language.evaluation.Evaluator;
import org.apache.nifi.attribute.expression.language.evaluation.QueryResult;
import org.apache.nifi.attribute.expression.language.evaluation.StringEvaluator;
@@ -35,7 +35,7 @@ public class GetStateVariableEvaluator extends StringEvaluator {
}
@Override
- public QueryResult<String> evaluate(Map<String, String> attributes, final EvaluationContext context) {
+ public QueryResult<String> evaluate(Map<String, String> attributes, final EvaluatorState context) {
if (!(attributes instanceof AttributesAndState)){
return new StringQueryResult(null);
}
diff --git a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/GreaterThanEvaluator.java b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/GreaterThanEvaluator.java
index 1bbc7d4..51c14f1 100644
--- a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/GreaterThanEvaluator.java
+++ b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/GreaterThanEvaluator.java
@@ -20,7 +20,7 @@ import java.util.Map;
import org.apache.nifi.attribute.expression.language.evaluation.BooleanEvaluator;
import org.apache.nifi.attribute.expression.language.evaluation.BooleanQueryResult;
-import org.apache.nifi.attribute.expression.language.evaluation.EvaluationContext;
+import org.apache.nifi.attribute.expression.language.evaluation.EvaluatorState;
import org.apache.nifi.attribute.expression.language.evaluation.Evaluator;
import org.apache.nifi.attribute.expression.language.evaluation.QueryResult;
@@ -35,7 +35,7 @@ public class GreaterThanEvaluator extends BooleanEvaluator {
}
@Override
- public QueryResult<Boolean> evaluate(final Map<String, String> attributes, final EvaluationContext context) {
+ public QueryResult<Boolean> evaluate(final Map<String, String> attributes, final EvaluatorState context) {
final Number subjectValue = subject.evaluate(attributes, context).getValue();
if (subjectValue == null) {
return new BooleanQueryResult(false);
diff --git a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/GreaterThanOrEqualEvaluator.java b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/GreaterThanOrEqualEvaluator.java
index 2683566..fcb4db5 100644
--- a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/GreaterThanOrEqualEvaluator.java
+++ b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/GreaterThanOrEqualEvaluator.java
@@ -20,7 +20,7 @@ import java.util.Map;
import org.apache.nifi.attribute.expression.language.evaluation.BooleanEvaluator;
import org.apache.nifi.attribute.expression.language.evaluation.BooleanQueryResult;
-import org.apache.nifi.attribute.expression.language.evaluation.EvaluationContext;
+import org.apache.nifi.attribute.expression.language.evaluation.EvaluatorState;
import org.apache.nifi.attribute.expression.language.evaluation.Evaluator;
import org.apache.nifi.attribute.expression.language.evaluation.QueryResult;
@@ -35,7 +35,7 @@ public class GreaterThanOrEqualEvaluator extends BooleanEvaluator {
}
@Override
- public QueryResult<Boolean> evaluate(final Map<String, String> attributes, final EvaluationContext context) {
+ public QueryResult<Boolean> evaluate(final Map<String, String> attributes, final EvaluatorState context) {
final Number subjectValue = subject.evaluate(attributes, context).getValue();
if (subjectValue == null) {
return new BooleanQueryResult(false);
diff --git a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/HostnameEvaluator.java b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/HostnameEvaluator.java
index 4fb9913..c0c1e5a 100644
--- a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/HostnameEvaluator.java
+++ b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/HostnameEvaluator.java
@@ -20,7 +20,7 @@ import java.net.InetAddress;
import java.net.UnknownHostException;
import java.util.Map;
-import org.apache.nifi.attribute.expression.language.evaluation.EvaluationContext;
+import org.apache.nifi.attribute.expression.language.evaluation.EvaluatorState;
import org.apache.nifi.attribute.expression.language.evaluation.Evaluator;
import org.apache.nifi.attribute.expression.language.evaluation.QueryResult;
import org.apache.nifi.attribute.expression.language.evaluation.StringEvaluator;
@@ -47,7 +47,7 @@ public class HostnameEvaluator extends StringEvaluator {
}
@Override
- public QueryResult<String> evaluate(final Map<String, String> attributes, final EvaluationContext context) {
+ public QueryResult<String> evaluate(final Map<String, String> attributes, final EvaluatorState context) {
return hostname;
}
diff --git a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/IPEvaluator.java b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/IPEvaluator.java
index ac3cd44..dcde526 100644
--- a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/IPEvaluator.java
+++ b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/IPEvaluator.java
@@ -20,7 +20,7 @@ import java.net.InetAddress;
import java.net.UnknownHostException;
import java.util.Map;
-import org.apache.nifi.attribute.expression.language.evaluation.EvaluationContext;
+import org.apache.nifi.attribute.expression.language.evaluation.EvaluatorState;
import org.apache.nifi.attribute.expression.language.evaluation.Evaluator;
import org.apache.nifi.attribute.expression.language.evaluation.QueryResult;
import org.apache.nifi.attribute.expression.language.evaluation.StringEvaluator;
@@ -35,7 +35,7 @@ public class IPEvaluator extends StringEvaluator {
}
@Override
- public QueryResult<String> evaluate(final Map<String, String> attributes, final EvaluationContext context) {
+ public QueryResult<String> evaluate(final Map<String, String> attributes, final EvaluatorState context) {
return ipAddress;
}
diff --git a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/IfElseEvaluator.java b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/IfElseEvaluator.java
index ff68b15..b1e21a9 100644
--- a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/IfElseEvaluator.java
+++ b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/IfElseEvaluator.java
@@ -18,7 +18,7 @@ package org.apache.nifi.attribute.expression.language.evaluation.functions;
import java.util.Map;
-import org.apache.nifi.attribute.expression.language.evaluation.EvaluationContext;
+import org.apache.nifi.attribute.expression.language.evaluation.EvaluatorState;
import org.apache.nifi.attribute.expression.language.evaluation.Evaluator;
import org.apache.nifi.attribute.expression.language.evaluation.QueryResult;
import org.apache.nifi.attribute.expression.language.evaluation.StringEvaluator;
@@ -37,7 +37,7 @@ public class IfElseEvaluator extends StringEvaluator {
}
@Override
- public QueryResult<String> evaluate(final Map<String, String> attributes, final EvaluationContext context) {
+ public QueryResult<String> evaluate(final Map<String, String> attributes, final EvaluatorState context) {
final QueryResult<Boolean> subjectValue = subject.evaluate(attributes, context);
if (subjectValue == null) {
return new StringQueryResult(null);
diff --git a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/InEvaluator.java b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/InEvaluator.java
index 0b4e0ea..8fc81e4 100644
--- a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/InEvaluator.java
+++ b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/InEvaluator.java
@@ -21,7 +21,7 @@ import java.util.Map;
import org.apache.nifi.attribute.expression.language.evaluation.BooleanEvaluator;
import org.apache.nifi.attribute.expression.language.evaluation.BooleanQueryResult;
-import org.apache.nifi.attribute.expression.language.evaluation.EvaluationContext;
+import org.apache.nifi.attribute.expression.language.evaluation.EvaluatorState;
import org.apache.nifi.attribute.expression.language.evaluation.Evaluator;
import org.apache.nifi.attribute.expression.language.evaluation.QueryResult;
@@ -36,7 +36,7 @@ public class InEvaluator extends BooleanEvaluator {
}
@Override
- public QueryResult<Boolean> evaluate(final Map<String, String> attributes, final EvaluationContext context) {
+ public QueryResult<Boolean> evaluate(final Map<String, String> attributes, final EvaluatorState context) {
final String subjectValue = subject.evaluate(attributes, context).getValue();
if (subjectValue == null) {
return new BooleanQueryResult(false);
diff --git a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/IndexOfEvaluator.java b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/IndexOfEvaluator.java
index 9fc4282..7979afb 100644
--- a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/IndexOfEvaluator.java
+++ b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/IndexOfEvaluator.java
@@ -18,7 +18,7 @@ package org.apache.nifi.attribute.expression.language.evaluation.functions;
import java.util.Map;
-import org.apache.nifi.attribute.expression.language.evaluation.EvaluationContext;
+import org.apache.nifi.attribute.expression.language.evaluation.EvaluatorState;
import org.apache.nifi.attribute.expression.language.evaluation.Evaluator;
import org.apache.nifi.attribute.expression.language.evaluation.QueryResult;
import org.apache.nifi.attribute.expression.language.evaluation.WholeNumberEvaluator;
@@ -35,7 +35,7 @@ public class IndexOfEvaluator extends WholeNumberEvaluator {
}
@Override
- public QueryResult<Long> evaluate(final Map<String, String> attributes, final EvaluationContext context) {
+ public QueryResult<Long> evaluate(final Map<String, String> attributes, final EvaluatorState context) {
final String subjectValue = subject.evaluate(attributes, context).getValue();
if (subjectValue == null) {
return new WholeNumberQueryResult(-1L);
diff --git a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/IsEmptyEvaluator.java b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/IsEmptyEvaluator.java
index 07e7048..9253a03 100644
--- a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/IsEmptyEvaluator.java
+++ b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/IsEmptyEvaluator.java
@@ -20,7 +20,7 @@ import java.util.Map;
import org.apache.nifi.attribute.expression.language.evaluation.BooleanEvaluator;
import org.apache.nifi.attribute.expression.language.evaluation.BooleanQueryResult;
-import org.apache.nifi.attribute.expression.language.evaluation.EvaluationContext;
+import org.apache.nifi.attribute.expression.language.evaluation.EvaluatorState;
import org.apache.nifi.attribute.expression.language.evaluation.Evaluator;
import org.apache.nifi.attribute.expression.language.evaluation.QueryResult;
@@ -33,7 +33,7 @@ public class IsEmptyEvaluator extends BooleanEvaluator {
}
@Override
- public QueryResult<Boolean> evaluate(final Map<String, String> attributes, final EvaluationContext context) {
+ public QueryResult<Boolean> evaluate(final Map<String, String> attributes, final EvaluatorState context) {
final Object subjectValue = subjectEvaluator.evaluate(attributes, context).getValue();
return new BooleanQueryResult(subjectValue == null || subjectValue.toString().trim().isEmpty());
}
diff --git a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/IsNullEvaluator.java b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/IsNullEvaluator.java
index 6f2657b..22f16bc 100644
--- a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/IsNullEvaluator.java
+++ b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/IsNullEvaluator.java
@@ -20,7 +20,7 @@ import java.util.Map;
import org.apache.nifi.attribute.expression.language.evaluation.BooleanEvaluator;
import org.apache.nifi.attribute.expression.language.evaluation.BooleanQueryResult;
-import org.apache.nifi.attribute.expression.language.evaluation.EvaluationContext;
+import org.apache.nifi.attribute.expression.language.evaluation.EvaluatorState;
import org.apache.nifi.attribute.expression.language.evaluation.Evaluator;
import org.apache.nifi.attribute.expression.language.evaluation.QueryResult;
@@ -33,7 +33,7 @@ public class IsNullEvaluator extends BooleanEvaluator {
}
@Override
- public QueryResult<Boolean> evaluate(final Map<String, String> attributes, final EvaluationContext context) {
+ public QueryResult<Boolean> evaluate(final Map<String, String> attributes, final EvaluatorState context) {
final Object subjectValue = subject.evaluate(attributes, context).getValue();
return new BooleanQueryResult(subjectValue == null);
}
diff --git a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/JsonPathEvaluator.java b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/JsonPathEvaluator.java
index 32358fb..a085af4 100644
--- a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/JsonPathEvaluator.java
+++ b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/JsonPathEvaluator.java
@@ -20,7 +20,7 @@ import java.util.List;
import java.util.Map;
import java.util.Objects;
-import org.apache.nifi.attribute.expression.language.evaluation.EvaluationContext;
+import org.apache.nifi.attribute.expression.language.evaluation.EvaluatorState;
import org.apache.nifi.attribute.expression.language.evaluation.Evaluator;
import org.apache.nifi.attribute.expression.language.evaluation.QueryResult;
import org.apache.nifi.attribute.expression.language.evaluation.StringEvaluator;
@@ -53,7 +53,7 @@ public class JsonPathEvaluator extends StringEvaluator {
// time; we can just
// pre-compile it. Otherwise, it must be compiled every time.
if (jsonPathExp instanceof StringLiteralEvaluator) {
- precompiledJsonPathExp = compileJsonPathExpression(jsonPathExp.evaluate(null, new EvaluationContext()).getValue());
+ precompiledJsonPathExp = compileJsonPathExpression(jsonPathExp.evaluate(null, new EvaluatorState()).getValue());
} else {
precompiledJsonPathExp = null;
}
@@ -61,7 +61,7 @@ public class JsonPathEvaluator extends StringEvaluator {
}
@Override
- public QueryResult<String> evaluate(final Map<String, String> attributes, final EvaluationContext context) {
+ public QueryResult<String> evaluate(final Map<String, String> attributes, final EvaluatorState context) {
final String subjectValue = subject.evaluate(attributes, context).getValue();
if (subjectValue == null || subjectValue.length() == 0) {
throw new AttributeExpressionLanguageException("Subject is empty");
diff --git a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/LastIndexOfEvaluator.java b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/LastIndexOfEvaluator.java
index 0e8e57d..fe311b0 100644
--- a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/LastIndexOfEvaluator.java
+++ b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/LastIndexOfEvaluator.java
@@ -18,7 +18,7 @@ package org.apache.nifi.attribute.expression.language.evaluation.functions;
import java.util.Map;
-import org.apache.nifi.attribute.expression.language.evaluation.EvaluationContext;
+import org.apache.nifi.attribute.expression.language.evaluation.EvaluatorState;
import org.apache.nifi.attribute.expression.language.evaluation.Evaluator;
import org.apache.nifi.attribute.expression.language.evaluation.QueryResult;
import org.apache.nifi.attribute.expression.language.evaluation.WholeNumberEvaluator;
@@ -35,7 +35,7 @@ public class LastIndexOfEvaluator extends WholeNumberEvaluator {
}
@Override
- public QueryResult<Long> evaluate(final Map<String, String> attributes, final EvaluationContext context) {
+ public QueryResult<Long> evaluate(final Map<String, String> attributes, final EvaluatorState context) {
final String subjectValue = subject.evaluate(attributes, context).getValue();
if (subjectValue == null) {
return new WholeNumberQueryResult(-1L);
diff --git a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/LengthEvaluator.java b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/LengthEvaluator.java
index b537025..8e4d2a8 100644
--- a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/LengthEvaluator.java
+++ b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/LengthEvaluator.java
@@ -18,7 +18,7 @@ package org.apache.nifi.attribute.expression.language.evaluation.functions;
import java.util.Map;
-import org.apache.nifi.attribute.expression.language.evaluation.EvaluationContext;
+import org.apache.nifi.attribute.expression.language.evaluation.EvaluatorState;
import org.apache.nifi.attribute.expression.language.evaluation.Evaluator;
import org.apache.nifi.attribute.expression.language.evaluation.QueryResult;
import org.apache.nifi.attribute.expression.language.evaluation.WholeNumberEvaluator;
@@ -33,7 +33,7 @@ public class LengthEvaluator extends WholeNumberEvaluator {
}
@Override
- public QueryResult<Long> evaluate(final Map<String, String> attributes, final EvaluationContext context) {
+ public QueryResult<Long> evaluate(final Map<String, String> attributes, final EvaluatorState context) {
final String subjectValue = subject.evaluate(attributes, context).getValue();
return new WholeNumberQueryResult((long) (subjectValue == null ? 0 : subjectValue.length()));
}
diff --git a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/LessThanEvaluator.java b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/LessThanEvaluator.java
index 2dbe098..59a014e 100644
--- a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/LessThanEvaluator.java
+++ b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/LessThanEvaluator.java
@@ -20,7 +20,7 @@ import java.util.Map;
import org.apache.nifi.attribute.expression.language.evaluation.BooleanEvaluator;
import org.apache.nifi.attribute.expression.language.evaluation.BooleanQueryResult;
-import org.apache.nifi.attribute.expression.language.evaluation.EvaluationContext;
+import org.apache.nifi.attribute.expression.language.evaluation.EvaluatorState;
import org.apache.nifi.attribute.expression.language.evaluation.Evaluator;
import org.apache.nifi.attribute.expression.language.evaluation.QueryResult;
@@ -35,7 +35,7 @@ public class LessThanEvaluator extends BooleanEvaluator {
}
@Override
- public QueryResult<Boolean> evaluate(final Map<String, String> attributes, final EvaluationContext context) {
+ public QueryResult<Boolean> evaluate(final Map<String, String> attributes, final EvaluatorState context) {
final Number subjectValue = subject.evaluate(attributes, context).getValue();
if (subjectValue == null) {
return new BooleanQueryResult(false);
diff --git a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/LessThanOrEqualEvaluator.java b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/LessThanOrEqualEvaluator.java
index 90170c7..3ce14bd 100644
--- a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/LessThanOrEqualEvaluator.java
+++ b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/LessThanOrEqualEvaluator.java
@@ -20,7 +20,7 @@ import java.util.Map;
import org.apache.nifi.attribute.expression.language.evaluation.BooleanEvaluator;
import org.apache.nifi.attribute.expression.language.evaluation.BooleanQueryResult;
-import org.apache.nifi.attribute.expression.language.evaluation.EvaluationContext;
+import org.apache.nifi.attribute.expression.language.evaluation.EvaluatorState;
import org.apache.nifi.attribute.expression.language.evaluation.Evaluator;
import org.apache.nifi.attribute.expression.language.evaluation.QueryResult;
@@ -35,7 +35,7 @@ public class LessThanOrEqualEvaluator extends BooleanEvaluator {
}
@Override
- public QueryResult<Boolean> evaluate(final Map<String, String> attributes, final EvaluationContext context) {
+ public QueryResult<Boolean> evaluate(final Map<String, String> attributes, final EvaluatorState context) {
final Number subjectValue = subject.evaluate(attributes, context).getValue();
if (subjectValue == null) {
return new BooleanQueryResult(false);
diff --git a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/MatchesEvaluator.java b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/MatchesEvaluator.java
index c70b831..b970905 100644
--- a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/MatchesEvaluator.java
+++ b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/MatchesEvaluator.java
@@ -21,7 +21,7 @@ import java.util.regex.Pattern;
import org.apache.nifi.attribute.expression.language.evaluation.BooleanEvaluator;
import org.apache.nifi.attribute.expression.language.evaluation.BooleanQueryResult;
-import org.apache.nifi.attribute.expression.language.evaluation.EvaluationContext;
+import org.apache.nifi.attribute.expression.language.evaluation.EvaluatorState;
import org.apache.nifi.attribute.expression.language.evaluation.Evaluator;
import org.apache.nifi.attribute.expression.language.evaluation.QueryResult;
import org.apache.nifi.attribute.expression.language.evaluation.literals.StringLiteralEvaluator;
@@ -40,14 +40,14 @@ public class MatchesEvaluator extends BooleanEvaluator {
// if the search string is a literal, we don't need to evaluate it each time; we can just
// pre-compile it. Otherwise, it must be compiled every time.
if (search instanceof StringLiteralEvaluator) {
- this.compiledPattern = Pattern.compile(search.evaluate(null, new EvaluationContext()).getValue());
+ this.compiledPattern = Pattern.compile(search.evaluate(null, new EvaluatorState()).getValue());
} else {
this.compiledPattern = null;
}
}
@Override
- public QueryResult<Boolean> evaluate(final Map<String, String> attributes, final EvaluationContext context) {
+ public QueryResult<Boolean> evaluate(final Map<String, String> attributes, final EvaluatorState context) {
final String subjectValue = subject.evaluate(attributes, context).getValue();
if (subjectValue == null) {
return new BooleanQueryResult(false);
diff --git a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/MathEvaluator.java b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/MathEvaluator.java
index 7bb8a90..96bc3a6 100644
--- a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/MathEvaluator.java
+++ b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/MathEvaluator.java
@@ -20,7 +20,7 @@ import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.Map;
-import org.apache.nifi.attribute.expression.language.evaluation.EvaluationContext;
+import org.apache.nifi.attribute.expression.language.evaluation.EvaluatorState;
import org.apache.nifi.attribute.expression.language.evaluation.Evaluator;
import org.apache.nifi.attribute.expression.language.evaluation.NumberEvaluator;
import org.apache.nifi.attribute.expression.language.evaluation.NumberQueryResult;
@@ -40,7 +40,7 @@ public class MathEvaluator extends NumberEvaluator {
}
@Override
- public QueryResult<Number> evaluate(final Map<String, String> attributes, final EvaluationContext context) {
+ public QueryResult<Number> evaluate(final Map<String, String> attributes, final EvaluatorState context) {
final String methodNamedValue = methodName.evaluate(attributes, context).getValue();
if (methodNamedValue == null) {
return new NumberQueryResult(null);
diff --git a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/MinusEvaluator.java b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/MinusEvaluator.java
index 9412983..7011496 100644
--- a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/MinusEvaluator.java
+++ b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/MinusEvaluator.java
@@ -18,7 +18,7 @@ package org.apache.nifi.attribute.expression.language.evaluation.functions;
import java.util.Map;
-import org.apache.nifi.attribute.expression.language.evaluation.EvaluationContext;
+import org.apache.nifi.attribute.expression.language.evaluation.EvaluatorState;
import org.apache.nifi.attribute.expression.language.evaluation.Evaluator;
import org.apache.nifi.attribute.expression.language.evaluation.NumberEvaluator;
import org.apache.nifi.attribute.expression.language.evaluation.NumberQueryResult;
@@ -35,7 +35,7 @@ public class MinusEvaluator extends NumberEvaluator {
}
@Override
- public QueryResult<Number> evaluate(final Map<String, String> attributes, final EvaluationContext context) {
+ public QueryResult<Number> evaluate(final Map<String, String> attributes, final EvaluatorState context) {
final Number subjectValue = subject.evaluate(attributes, context).getValue();
if (subjectValue == null) {
return new NumberQueryResult(null);
diff --git a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/ModEvaluator.java b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/ModEvaluator.java
index 22f4f88..3652327 100644
--- a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/ModEvaluator.java
+++ b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/ModEvaluator.java
@@ -18,7 +18,7 @@ package org.apache.nifi.attribute.expression.language.evaluation.functions;
import java.util.Map;
-import org.apache.nifi.attribute.expression.language.evaluation.EvaluationContext;
+import org.apache.nifi.attribute.expression.language.evaluation.EvaluatorState;
import org.apache.nifi.attribute.expression.language.evaluation.Evaluator;
import org.apache.nifi.attribute.expression.language.evaluation.NumberEvaluator;
import org.apache.nifi.attribute.expression.language.evaluation.NumberQueryResult;
@@ -35,7 +35,7 @@ public class ModEvaluator extends NumberEvaluator {
}
@Override
- public QueryResult<Number> evaluate(final Map<String, String> attributes, final EvaluationContext context) {
+ public QueryResult<Number> evaluate(final Map<String, String> attributes, final EvaluatorState context) {
final Number subjectValue = subject.evaluate(attributes, context).getValue();
if (subjectValue == null) {
return new NumberQueryResult(null);
diff --git a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/MultiplyEvaluator.java b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/MultiplyEvaluator.java
index 664aeed..9ee42f1 100644
--- a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/MultiplyEvaluator.java
+++ b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/MultiplyEvaluator.java
@@ -18,7 +18,7 @@ package org.apache.nifi.attribute.expression.language.evaluation.functions;
import java.util.Map;
-import org.apache.nifi.attribute.expression.language.evaluation.EvaluationContext;
+import org.apache.nifi.attribute.expression.language.evaluation.EvaluatorState;
import org.apache.nifi.attribute.expression.language.evaluation.Evaluator;
import org.apache.nifi.attribute.expression.language.evaluation.NumberEvaluator;
import org.apache.nifi.attribute.expression.language.evaluation.NumberQueryResult;
@@ -35,7 +35,7 @@ public class MultiplyEvaluator extends NumberEvaluator {
}
@Override
- public QueryResult<Number> evaluate(final Map<String, String> attributes, final EvaluationContext context) {
+ public QueryResult<Number> evaluate(final Map<String, String> attributes, final EvaluatorState context) {
final Number subjectValue = subject.evaluate(attributes, context).getValue();
if (subjectValue == null) {
return new NumberQueryResult(null);
diff --git a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/NotEvaluator.java b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/NotEvaluator.java
index 15c30f5..05cbcdc 100644
--- a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/NotEvaluator.java
+++ b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/NotEvaluator.java
@@ -20,7 +20,7 @@ import java.util.Map;
import org.apache.nifi.attribute.expression.language.evaluation.BooleanEvaluator;
import org.apache.nifi.attribute.expression.language.evaluation.BooleanQueryResult;
-import org.apache.nifi.attribute.expression.language.evaluation.EvaluationContext;
+import org.apache.nifi.attribute.expression.language.evaluation.EvaluatorState;
import org.apache.nifi.attribute.expression.language.evaluation.Evaluator;
import org.apache.nifi.attribute.expression.language.evaluation.QueryResult;
@@ -33,7 +33,7 @@ public class NotEvaluator extends BooleanEvaluator {
}
@Override
- public QueryResult<Boolean> evaluate(final Map<String, String> attributes, final EvaluationContext context) {
+ public QueryResult<Boolean> evaluate(final Map<String, String> attributes, final EvaluatorState context) {
final QueryResult<Boolean> subjectValue = subjectEvaluator.evaluate(attributes, context);
if (subjectValue == null) {
return new BooleanQueryResult(null);
diff --git a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/NotNullEvaluator.java b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/NotNullEvaluator.java
index d566970..47823b1 100644
--- a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/NotNullEvaluator.java
+++ b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/NotNullEvaluator.java
@@ -20,7 +20,7 @@ import java.util.Map;
import org.apache.nifi.attribute.expression.language.evaluation.BooleanEvaluator;
import org.apache.nifi.attribute.expression.language.evaluation.BooleanQueryResult;
-import org.apache.nifi.attribute.expression.language.evaluation.EvaluationContext;
+import org.apache.nifi.attribute.expression.language.evaluation.EvaluatorState;
import org.apache.nifi.attribute.expression.language.evaluation.Evaluator;
import org.apache.nifi.attribute.expression.language.evaluation.QueryResult;
@@ -33,7 +33,7 @@ public class NotNullEvaluator extends BooleanEvaluator {
}
@Override
- public QueryResult<Boolean> evaluate(final Map<String, String> attributes, final EvaluationContext context) {
+ public QueryResult<Boolean> evaluate(final Map<String, String> attributes, final EvaluatorState context) {
final Object subjectValue = subject.evaluate(attributes, context).getValue();
return new BooleanQueryResult(subjectValue != null);
}
diff --git a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/NowEvaluator.java b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/NowEvaluator.java
index 9052f09..a8bfb12 100644
--- a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/NowEvaluator.java
+++ b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/NowEvaluator.java
@@ -21,14 +21,14 @@ import java.util.Map;
import org.apache.nifi.attribute.expression.language.evaluation.DateEvaluator;
import org.apache.nifi.attribute.expression.language.evaluation.DateQueryResult;
-import org.apache.nifi.attribute.expression.language.evaluation.EvaluationContext;
+import org.apache.nifi.attribute.expression.language.evaluation.EvaluatorState;
import org.apache.nifi.attribute.expression.language.evaluation.Evaluator;
import org.apache.nifi.attribute.expression.language.evaluation.QueryResult;
public class NowEvaluator extends DateEvaluator {
@Override
- public QueryResult<Date> evaluate(final Map<String, String> attributes, final EvaluationContext context) {
+ public QueryResult<Date> evaluate(final Map<String, String> attributes, final EvaluatorState context) {
return new DateQueryResult(new Date());
}
diff --git a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/NumberToDateEvaluator.java b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/NumberToDateEvaluator.java
index 5fc2e2e..b06b0cc 100644
--- a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/NumberToDateEvaluator.java
+++ b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/NumberToDateEvaluator.java
@@ -21,7 +21,7 @@ import java.util.Map;
import org.apache.nifi.attribute.expression.language.evaluation.DateEvaluator;
import org.apache.nifi.attribute.expression.language.evaluation.DateQueryResult;
-import org.apache.nifi.attribute.expression.language.evaluation.EvaluationContext;
+import org.apache.nifi.attribute.expression.language.evaluation.EvaluatorState;
import org.apache.nifi.attribute.expression.language.evaluation.Evaluator;
import org.apache.nifi.attribute.expression.language.evaluation.QueryResult;
@@ -34,7 +34,7 @@ public class NumberToDateEvaluator extends DateEvaluator {
}
@Override
- public QueryResult<Date> evaluate(final Map<String, String> attributes, final EvaluationContext context) {
+ public QueryResult<Date> evaluate(final Map<String, String> attributes, final EvaluatorState context) {
final QueryResult<Long> result = subject.evaluate(attributes, context);
final Long value = result.getValue();
if (value == null) {
diff --git a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/OneUpSequenceEvaluator.java b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/OneUpSequenceEvaluator.java
index f33e2d4..d364bfc 100644
--- a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/OneUpSequenceEvaluator.java
+++ b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/OneUpSequenceEvaluator.java
@@ -19,7 +19,7 @@ package org.apache.nifi.attribute.expression.language.evaluation.functions;
import java.util.Map;
import java.util.concurrent.atomic.AtomicLong;
-import org.apache.nifi.attribute.expression.language.evaluation.EvaluationContext;
+import org.apache.nifi.attribute.expression.language.evaluation.EvaluatorState;
import org.apache.nifi.attribute.expression.language.evaluation.Evaluator;
import org.apache.nifi.attribute.expression.language.evaluation.QueryResult;
import org.apache.nifi.attribute.expression.language.evaluation.WholeNumberEvaluator;
@@ -30,7 +30,7 @@ public class OneUpSequenceEvaluator extends WholeNumberEvaluator {
private static final AtomicLong value = new AtomicLong(0L);
@Override
- public QueryResult<Long> evaluate(final Map<String, String> attributes, final EvaluationContext context) {
+ public QueryResult<Long> evaluate(final Map<String, String> attributes, final EvaluatorState context) {
return new WholeNumberQueryResult(value.getAndIncrement());
}
diff --git a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/OrEvaluator.java b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/OrEvaluator.java
index f8b9c6a..71f3417 100644
--- a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/OrEvaluator.java
+++ b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/OrEvaluator.java
@@ -20,7 +20,7 @@ import java.util.Map;
import org.apache.nifi.attribute.expression.language.evaluation.BooleanEvaluator;
import org.apache.nifi.attribute.expression.language.evaluation.BooleanQueryResult;
-import org.apache.nifi.attribute.expression.language.evaluation.EvaluationContext;
+import org.apache.nifi.attribute.expression.language.evaluation.EvaluatorState;
import org.apache.nifi.attribute.expression.language.evaluation.Evaluator;
import org.apache.nifi.attribute.expression.language.evaluation.QueryResult;
@@ -35,7 +35,7 @@ public class OrEvaluator extends BooleanEvaluator {
}
@Override
- public QueryResult<Boolean> evaluate(final Map<String, String> attributes, final EvaluationContext context) {
+ public QueryResult<Boolean> evaluate(final Map<String, String> attributes, final EvaluatorState context) {
final QueryResult<Boolean> subjectValue = subjectEvaluator.evaluate(attributes, context);
if (subjectValue == null) {
return new BooleanQueryResult(null);
diff --git a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/PlusEvaluator.java b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/PlusEvaluator.java
index 1bcba7c..8649289 100644
--- a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/PlusEvaluator.java
+++ b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/PlusEvaluator.java
@@ -18,7 +18,7 @@ package org.apache.nifi.attribute.expression.language.evaluation.functions;
import java.util.Map;
-import org.apache.nifi.attribute.expression.language.evaluation.EvaluationContext;
+import org.apache.nifi.attribute.expression.language.evaluation.EvaluatorState;
import org.apache.nifi.attribute.expression.language.evaluation.Evaluator;
import org.apache.nifi.attribute.expression.language.evaluation.NumberEvaluator;
import org.apache.nifi.attribute.expression.language.evaluation.NumberQueryResult;
@@ -35,7 +35,7 @@ public class PlusEvaluator extends NumberEvaluator {
}
@Override
- public QueryResult<Number> evaluate(final Map<String, String> attributes, final EvaluationContext context) {
+ public QueryResult<Number> evaluate(final Map<String, String> attributes, final EvaluatorState context) {
final Number subjectValue = subject.evaluate(attributes, context).getValue();
if (subjectValue == null) {
return new NumberQueryResult(null);
diff --git a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/PrependEvaluator.java b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/PrependEvaluator.java
index a7363cd..6a6fdd1 100644
--- a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/PrependEvaluator.java
+++ b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/PrependEvaluator.java
@@ -18,7 +18,7 @@ package org.apache.nifi.attribute.expression.language.evaluation.functions;
import java.util.Map;
-import org.apache.nifi.attribute.expression.language.evaluation.EvaluationContext;
+import org.apache.nifi.attribute.expression.language.evaluation.EvaluatorState;
import org.apache.nifi.attribute.expression.language.evaluation.Evaluator;
import org.apache.nifi.attribute.expression.language.evaluation.QueryResult;
import org.apache.nifi.attribute.expression.language.evaluation.StringEvaluator;
@@ -35,7 +35,7 @@ public class PrependEvaluator extends StringEvaluator {
}
@Override
- public QueryResult<String> evaluate(final Map<String, String> attributes, final EvaluationContext context) {
+ public QueryResult<String> evaluate(final Map<String, String> attributes, final EvaluatorState context) {
final String subjectValue = subject.evaluate(attributes, context).getValue();
final String prependValue = prependEvaluator.evaluate(attributes, context).getValue();
diff --git a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/RandomNumberGeneratorEvaluator.java b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/RandomNumberGeneratorEvaluator.java
index 023e94f..d68d491 100644
--- a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/RandomNumberGeneratorEvaluator.java
+++ b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/RandomNumberGeneratorEvaluator.java
@@ -19,7 +19,7 @@ package org.apache.nifi.attribute.expression.language.evaluation.functions;
import java.util.Map;
import java.util.Random;
-import org.apache.nifi.attribute.expression.language.evaluation.EvaluationContext;
+import org.apache.nifi.attribute.expression.language.evaluation.EvaluatorState;
import org.apache.nifi.attribute.expression.language.evaluation.Evaluator;
import org.apache.nifi.attribute.expression.language.evaluation.QueryResult;
import org.apache.nifi.attribute.expression.language.evaluation.WholeNumberEvaluator;
@@ -31,7 +31,7 @@ public class RandomNumberGeneratorEvaluator extends WholeNumberEvaluator {
@Override
- public QueryResult<Long> evaluate(final Map<String, String> attributes, final EvaluationContext context) {
+ public QueryResult<Long> evaluate(final Map<String, String> attributes, final EvaluatorState context) {
return new WholeNumberQueryResult(Math.abs(RNG.nextLong()));
}
diff --git a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/ReplaceAllEvaluator.java b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/ReplaceAllEvaluator.java
index ba5fdff..5c9c85f 100644
--- a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/ReplaceAllEvaluator.java
+++ b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/ReplaceAllEvaluator.java
@@ -18,7 +18,7 @@ package org.apache.nifi.attribute.expression.language.evaluation.functions;
import java.util.Map;
-import org.apache.nifi.attribute.expression.language.evaluation.EvaluationContext;
+import org.apache.nifi.attribute.expression.language.evaluation.EvaluatorState;
import org.apache.nifi.attribute.expression.language.evaluation.Evaluator;
import org.apache.nifi.attribute.expression.language.evaluation.QueryResult;
import org.apache.nifi.attribute.expression.language.evaluation.StringEvaluator;
@@ -37,7 +37,7 @@ public class ReplaceAllEvaluator extends StringEvaluator {
}
@Override
- public QueryResult<String> evaluate(final Map<String, String> attributes, final EvaluationContext context) {
+ public QueryResult<String> evaluate(final Map<String, String> attributes, final EvaluatorState context) {
final String subjectValue = subject.evaluate(attributes, context).getValue();
if (subjectValue == null) {
return new StringQueryResult(null);
diff --git a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/ReplaceEmptyEvaluator.java b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/ReplaceEmptyEvaluator.java
index 219ae57..9528aa5 100644
--- a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/ReplaceEmptyEvaluator.java
+++ b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/ReplaceEmptyEvaluator.java
@@ -18,7 +18,7 @@ package org.apache.nifi.attribute.expression.language.evaluation.functions;
import java.util.Map;
-import org.apache.nifi.attribute.expression.language.evaluation.EvaluationContext;
+import org.apache.nifi.attribute.expression.language.evaluation.EvaluatorState;
import org.apache.nifi.attribute.expression.language.evaluation.Evaluator;
import org.apache.nifi.attribute.expression.language.evaluation.QueryResult;
import org.apache.nifi.attribute.expression.language.evaluation.StringEvaluator;
@@ -34,7 +34,7 @@ public class ReplaceEmptyEvaluator extends StringEvaluator {
}
@Override
- public QueryResult<String> evaluate(final Map<String, String> attributes, final EvaluationContext context) {
+ public QueryResult<String> evaluate(final Map<String, String> attributes, final EvaluatorState context) {
final QueryResult<String> subjectResult = subjectEvaluator.evaluate(attributes, context);
final String subjectValue = subjectResult.getValue();
final boolean isEmpty = subjectValue == null || subjectValue.toString().trim().isEmpty();
diff --git a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/ReplaceEvaluator.java b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/ReplaceEvaluator.java
index 3854104..b95fc50 100644
--- a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/ReplaceEvaluator.java
+++ b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/ReplaceEvaluator.java
@@ -18,7 +18,7 @@ package org.apache.nifi.attribute.expression.language.evaluation.functions;
import java.util.Map;
-import org.apache.nifi.attribute.expression.language.evaluation.EvaluationContext;
+import org.apache.nifi.attribute.expression.language.evaluation.EvaluatorState;
import org.apache.nifi.attribute.expression.language.evaluation.Evaluator;
import org.apache.nifi.attribute.expression.language.evaluation.QueryResult;
import org.apache.nifi.attribute.expression.language.evaluation.StringEvaluator;
@@ -37,7 +37,7 @@ public class ReplaceEvaluator extends StringEvaluator {
}
@Override
- public QueryResult<String> evaluate(final Map<String, String> attributes, final EvaluationContext context) {
+ public QueryResult<String> evaluate(final Map<String, String> attributes, final EvaluatorState context) {
final String subjectValue = subject.evaluate(attributes, context).getValue();
if (subjectValue == null) {
return new StringQueryResult(null);
diff --git a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/ReplaceFirstEvaluator.java b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/ReplaceFirstEvaluator.java
index 75c5ad1..490c32c 100644
--- a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/ReplaceFirstEvaluator.java
+++ b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/ReplaceFirstEvaluator.java
@@ -18,7 +18,7 @@ package org.apache.nifi.attribute.expression.language.evaluation.functions;
import java.util.Map;
-import org.apache.nifi.attribute.expression.language.evaluation.EvaluationContext;
+import org.apache.nifi.attribute.expression.language.evaluation.EvaluatorState;
import org.apache.nifi.attribute.expression.language.evaluation.Evaluator;
import org.apache.nifi.attribute.expression.language.evaluation.QueryResult;
import org.apache.nifi.attribute.expression.language.evaluation.StringEvaluator;
@@ -37,7 +37,7 @@ public class ReplaceFirstEvaluator extends StringEvaluator {
}
@Override
- public QueryResult<String> evaluate(final Map<String, String> attributes, final EvaluationContext context) {
+ public QueryResult<String> evaluate(final Map<String, String> attributes, final EvaluatorState context) {
final String subjectValue = subject.evaluate(attributes, context).getValue();
if (subjectValue == null) {
return new StringQueryResult(null);
diff --git a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/ReplaceNullEvaluator.java b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/ReplaceNullEvaluator.java
index 7968e6e..f044454 100644
--- a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/ReplaceNullEvaluator.java
+++ b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/ReplaceNullEvaluator.java
@@ -18,7 +18,7 @@ package org.apache.nifi.attribute.expression.language.evaluation.functions;
import java.util.Map;
-import org.apache.nifi.attribute.expression.language.evaluation.EvaluationContext;
+import org.apache.nifi.attribute.expression.language.evaluation.EvaluatorState;
import org.apache.nifi.attribute.expression.language.evaluation.Evaluator;
import org.apache.nifi.attribute.expression.language.evaluation.QueryResult;
import org.apache.nifi.attribute.expression.language.evaluation.StringEvaluator;
@@ -35,7 +35,7 @@ public class ReplaceNullEvaluator extends StringEvaluator {
}
@Override
- public QueryResult<String> evaluate(final Map<String, String> attributes, final EvaluationContext context) {
+ public QueryResult<String> evaluate(final Map<String, String> attributes, final EvaluatorState context) {
final String subjectValue = subject.evaluate(attributes, context).getValue();
return new StringQueryResult(subjectValue == null ? resultEvaluator.evaluate(attributes, context).getValue() : subjectValue);
}
diff --git a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/StartsWithEvaluator.java b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/StartsWithEvaluator.java
index 55c3556..f17047a 100644
--- a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/StartsWithEvaluator.java
+++ b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/StartsWithEvaluator.java
@@ -20,7 +20,7 @@ import java.util.Map;
import org.apache.nifi.attribute.expression.language.evaluation.BooleanEvaluator;
import org.apache.nifi.attribute.expression.language.evaluation.BooleanQueryResult;
-import org.apache.nifi.attribute.expression.language.evaluation.EvaluationContext;
+import org.apache.nifi.attribute.expression.language.evaluation.EvaluatorState;
import org.apache.nifi.attribute.expression.language.evaluation.Evaluator;
import org.apache.nifi.attribute.expression.language.evaluation.QueryResult;
@@ -35,7 +35,7 @@ public class StartsWithEvaluator extends BooleanEvaluator {
}
@Override
- public QueryResult<Boolean> evaluate(final Map<String, String> attributes, final EvaluationContext context) {
+ public QueryResult<Boolean> evaluate(final Map<String, String> attributes, final EvaluatorState context) {
final String subjectValue = subject.evaluate(attributes, context).getValue();
if (subjectValue == null) {
return new BooleanQueryResult(false);
diff --git a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/StringToDateEvaluator.java b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/StringToDateEvaluator.java
index e7bc339..e87fb17 100644
--- a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/StringToDateEvaluator.java
+++ b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/StringToDateEvaluator.java
@@ -25,7 +25,7 @@ import java.util.TimeZone;
import org.apache.nifi.attribute.expression.language.evaluation.DateEvaluator;
import org.apache.nifi.attribute.expression.language.evaluation.DateQueryResult;
-import org.apache.nifi.attribute.expression.language.evaluation.EvaluationContext;
+import org.apache.nifi.attribute.expression.language.evaluation.EvaluatorState;
import org.apache.nifi.attribute.expression.language.evaluation.Evaluator;
import org.apache.nifi.attribute.expression.language.evaluation.QueryResult;
import org.apache.nifi.attribute.expression.language.exception.IllegalAttributeException;
@@ -43,7 +43,7 @@ public class StringToDateEvaluator extends DateEvaluator {
}
@Override
- public QueryResult<Date> evaluate(final Map<String, String> attributes, final EvaluationContext context) {
+ public QueryResult<Date> evaluate(final Map<String, String> attributes, final EvaluatorState context) {
final String subjectValue = subject.evaluate(attributes, context).getValue();
final String formatValue = format.evaluate(attributes, context).getValue();
if (subjectValue == null || formatValue == null) {
diff --git a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/SubstringAfterEvaluator.java b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/SubstringAfterEvaluator.java
index 8370bb4..9c51d12 100644
--- a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/SubstringAfterEvaluator.java
+++ b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/SubstringAfterEvaluator.java
@@ -18,7 +18,7 @@ package org.apache.nifi.attribute.expression.language.evaluation.functions;
import java.util.Map;
-import org.apache.nifi.attribute.expression.language.evaluation.EvaluationContext;
+import org.apache.nifi.attribute.expression.language.evaluation.EvaluatorState;
import org.apache.nifi.attribute.expression.language.evaluation.Evaluator;
import org.apache.nifi.attribute.expression.language.evaluation.QueryResult;
import org.apache.nifi.attribute.expression.language.evaluation.StringEvaluator;
@@ -35,7 +35,7 @@ public class SubstringAfterEvaluator extends StringEvaluator {
}
@Override
- public QueryResult<String> evaluate(final Map<String, String> attributes, final EvaluationContext context) {
+ public QueryResult<String> evaluate(final Map<String, String> attributes, final EvaluatorState context) {
final String subjectValue = subject.evaluate(attributes, context).getValue();
if (subjectValue == null) {
return new StringQueryResult("");
diff --git a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/SubstringAfterLastEvaluator.java b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/SubstringAfterLastEvaluator.java
index 59b4f8e..37dce3d 100644
--- a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/SubstringAfterLastEvaluator.java
+++ b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/SubstringAfterLastEvaluator.java
@@ -18,7 +18,7 @@ package org.apache.nifi.attribute.expression.language.evaluation.functions;
import java.util.Map;
-import org.apache.nifi.attribute.expression.language.evaluation.EvaluationContext;
+import org.apache.nifi.attribute.expression.language.evaluation.EvaluatorState;
import org.apache.nifi.attribute.expression.language.evaluation.Evaluator;
import org.apache.nifi.attribute.expression.language.evaluation.QueryResult;
import org.apache.nifi.attribute.expression.language.evaluation.StringEvaluator;
@@ -35,7 +35,7 @@ public class SubstringAfterLastEvaluator extends StringEvaluator {
}
@Override
- public QueryResult<String> evaluate(final Map<String, String> attributes, final EvaluationContext context) {
+ public QueryResult<String> evaluate(final Map<String, String> attributes, final EvaluatorState context) {
final String subjectValue = subject.evaluate(attributes, context).getValue();
if (subjectValue == null) {
return new StringQueryResult("");
diff --git a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/SubstringBeforeEvaluator.java b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/SubstringBeforeEvaluator.java
index 46b0a17..2b8e8b8 100644
--- a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/SubstringBeforeEvaluator.java
+++ b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/SubstringBeforeEvaluator.java
@@ -18,7 +18,7 @@ package org.apache.nifi.attribute.expression.language.evaluation.functions;
import java.util.Map;
-import org.apache.nifi.attribute.expression.language.evaluation.EvaluationContext;
+import org.apache.nifi.attribute.expression.language.evaluation.EvaluatorState;
import org.apache.nifi.attribute.expression.language.evaluation.Evaluator;
import org.apache.nifi.attribute.expression.language.evaluation.QueryResult;
import org.apache.nifi.attribute.expression.language.evaluation.StringEvaluator;
@@ -35,7 +35,7 @@ public class SubstringBeforeEvaluator extends StringEvaluator {
}
@Override
- public QueryResult<String> evaluate(final Map<String, String> attributes, final EvaluationContext context) {
+ public QueryResult<String> evaluate(final Map<String, String> attributes, final EvaluatorState context) {
final String subjectValue = subject.evaluate(attributes, context).getValue();
if (subjectValue == null) {
return new StringQueryResult("");
diff --git a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/SubstringBeforeLastEvaluator.java b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/SubstringBeforeLastEvaluator.java
index 505e5b9..664fc37 100644
--- a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/SubstringBeforeLastEvaluator.java
+++ b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/SubstringBeforeLastEvaluator.java
@@ -18,7 +18,7 @@ package org.apache.nifi.attribute.expression.language.evaluation.functions;
import java.util.Map;
-import org.apache.nifi.attribute.expression.language.evaluation.EvaluationContext;
+import org.apache.nifi.attribute.expression.language.evaluation.EvaluatorState;
import org.apache.nifi.attribute.expression.language.evaluation.Evaluator;
import org.apache.nifi.attribute.expression.language.evaluation.QueryResult;
import org.apache.nifi.attribute.expression.language.evaluation.StringEvaluator;
@@ -35,7 +35,7 @@ public class SubstringBeforeLastEvaluator extends StringEvaluator {
}
@Override
- public QueryResult<String> evaluate(final Map<String, String> attributes, final EvaluationContext context) {
+ public QueryResult<String> evaluate(final Map<String, String> attributes, final EvaluatorState context) {
final String subjectValue = subject.evaluate(attributes, context).getValue();
if (subjectValue == null) {
return new StringQueryResult("");
diff --git a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/SubstringEvaluator.java b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/SubstringEvaluator.java
index 0297983..a617c3b 100644
--- a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/SubstringEvaluator.java
+++ b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/SubstringEvaluator.java
@@ -18,7 +18,7 @@ package org.apache.nifi.attribute.expression.language.evaluation.functions;
import java.util.Map;
-import org.apache.nifi.attribute.expression.language.evaluation.EvaluationContext;
+import org.apache.nifi.attribute.expression.language.evaluation.EvaluatorState;
import org.apache.nifi.attribute.expression.language.evaluation.Evaluator;
import org.apache.nifi.attribute.expression.language.evaluation.QueryResult;
import org.apache.nifi.attribute.expression.language.evaluation.StringEvaluator;
@@ -43,7 +43,7 @@ public class SubstringEvaluator extends StringEvaluator {
}
@Override
- public QueryResult<String> evaluate(final Map<String, String> attributes, final EvaluationContext context) {
+ public QueryResult<String> evaluate(final Map<String, String> attributes, final EvaluatorState context) {
final String subjectValue = subject.evaluate(attributes, context).getValue();
if (subjectValue == null) {
return new StringQueryResult("");
diff --git a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/ThreadEvaluator.java b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/ThreadEvaluator.java
index 4c5a49e..3413309 100644
--- a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/ThreadEvaluator.java
+++ b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/ThreadEvaluator.java
@@ -18,7 +18,7 @@ package org.apache.nifi.attribute.expression.language.evaluation.functions;
import java.util.Map;
-import org.apache.nifi.attribute.expression.language.evaluation.EvaluationContext;
+import org.apache.nifi.attribute.expression.language.evaluation.EvaluatorState;
import org.apache.nifi.attribute.expression.language.evaluation.Evaluator;
import org.apache.nifi.attribute.expression.language.evaluation.QueryResult;
import org.apache.nifi.attribute.expression.language.evaluation.StringEvaluator;
@@ -27,7 +27,7 @@ import org.apache.nifi.attribute.expression.language.evaluation.StringQueryResul
public class ThreadEvaluator extends StringEvaluator {
@Override
- public QueryResult<String> evaluate(final Map<String, String> attributes, final EvaluationContext context) {
+ public QueryResult<String> evaluate(final Map<String, String> attributes, final EvaluatorState context) {
// See org.apache.nifi.engine.FlowEngine
return new StringQueryResult(Thread.currentThread().getName());
}
diff --git a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/ToLowerEvaluator.java b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/ToLowerEvaluator.java
index 4285390..6941f46 100644
--- a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/ToLowerEvaluator.java
+++ b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/ToLowerEvaluator.java
@@ -18,7 +18,7 @@ package org.apache.nifi.attribute.expression.language.evaluation.functions;
import java.util.Map;
-import org.apache.nifi.attribute.expression.language.evaluation.EvaluationContext;
+import org.apache.nifi.attribute.expression.language.evaluation.EvaluatorState;
import org.apache.nifi.attribute.expression.language.evaluation.Evaluator;
import org.apache.nifi.attribute.expression.language.evaluation.QueryResult;
import org.apache.nifi.attribute.expression.language.evaluation.StringEvaluator;
@@ -33,7 +33,7 @@ public class ToLowerEvaluator extends StringEvaluator {
}
@Override
- public QueryResult<String> evaluate(final Map<String, String> attributes, final EvaluationContext context) {
+ public QueryResult<String> evaluate(final Map<String, String> attributes, final EvaluatorState context) {
final String subjectValue = subject.evaluate(attributes, context).getValue();
return new StringQueryResult(subjectValue == null ? null : subjectValue.toLowerCase());
}
diff --git a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/ToRadixEvaluator.java b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/ToRadixEvaluator.java
index 194ae0a..3a0db49 100644
--- a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/ToRadixEvaluator.java
+++ b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/ToRadixEvaluator.java
@@ -19,7 +19,7 @@ package org.apache.nifi.attribute.expression.language.evaluation.functions;
import java.util.Arrays;
import java.util.Map;
-import org.apache.nifi.attribute.expression.language.evaluation.EvaluationContext;
+import org.apache.nifi.attribute.expression.language.evaluation.EvaluatorState;
import org.apache.nifi.attribute.expression.language.evaluation.Evaluator;
import org.apache.nifi.attribute.expression.language.evaluation.QueryResult;
import org.apache.nifi.attribute.expression.language.evaluation.StringEvaluator;
@@ -42,7 +42,7 @@ public class ToRadixEvaluator extends StringEvaluator {
}
@Override
- public QueryResult<String> evaluate(final Map<String, String> attributes, final EvaluationContext context) {
+ public QueryResult<String> evaluate(final Map<String, String> attributes, final EvaluatorState context) {
final Long result = numberEvaluator.evaluate(attributes, context).getValue();
if (result == null) {
return new StringQueryResult(null);
diff --git a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/ToStringEvaluator.java b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/ToStringEvaluator.java
index 36e1d7c..bc8f5a8 100644
--- a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/ToStringEvaluator.java
+++ b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/ToStringEvaluator.java
@@ -18,7 +18,7 @@ package org.apache.nifi.attribute.expression.language.evaluation.functions;
import java.util.Map;
-import org.apache.nifi.attribute.expression.language.evaluation.EvaluationContext;
+import org.apache.nifi.attribute.expression.language.evaluation.EvaluatorState;
import org.apache.nifi.attribute.expression.language.evaluation.Evaluator;
import org.apache.nifi.attribute.expression.language.evaluation.QueryResult;
import org.apache.nifi.attribute.expression.language.evaluation.StringEvaluator;
@@ -33,7 +33,7 @@ public class ToStringEvaluator extends StringEvaluator {
}
@Override
- public QueryResult<String> evaluate(final Map<String, String> attributes, final EvaluationContext context) {
+ public QueryResult<String> evaluate(final Map<String, String> attributes, final EvaluatorState context) {
final Object result = subject.evaluate(attributes, context).getValue();
return new StringQueryResult(result == null ? null : result.toString());
}
diff --git a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/ToUpperEvaluator.java b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/ToUpperEvaluator.java
index a8269d1..342ab2b 100644
--- a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/ToUpperEvaluator.java
+++ b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/ToUpperEvaluator.java
@@ -18,7 +18,7 @@ package org.apache.nifi.attribute.expression.language.evaluation.functions;
import java.util.Map;
-import org.apache.nifi.attribute.expression.language.evaluation.EvaluationContext;
+import org.apache.nifi.attribute.expression.language.evaluation.EvaluatorState;
import org.apache.nifi.attribute.expression.language.evaluation.Evaluator;
import org.apache.nifi.attribute.expression.language.evaluation.QueryResult;
import org.apache.nifi.attribute.expression.language.evaluation.StringEvaluator;
@@ -33,7 +33,7 @@ public class ToUpperEvaluator extends StringEvaluator {
}
@Override
- public QueryResult<String> evaluate(final Map<String, String> attributes, final EvaluationContext context) {
+ public QueryResult<String> evaluate(final Map<String, String> attributes, final EvaluatorState context) {
final String subjectValue = subject.evaluate(attributes, context).getValue();
return new StringQueryResult(subjectValue == null ? null : subjectValue.toUpperCase());
}
diff --git a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/TrimEvaluator.java b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/TrimEvaluator.java
index 3d6f988..ad96892 100644
--- a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/TrimEvaluator.java
+++ b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/TrimEvaluator.java
@@ -18,7 +18,7 @@ package org.apache.nifi.attribute.expression.language.evaluation.functions;
import java.util.Map;
-import org.apache.nifi.attribute.expression.language.evaluation.EvaluationContext;
+import org.apache.nifi.attribute.expression.language.evaluation.EvaluatorState;
import org.apache.nifi.attribute.expression.language.evaluation.Evaluator;
import org.apache.nifi.attribute.expression.language.evaluation.QueryResult;
import org.apache.nifi.attribute.expression.language.evaluation.StringEvaluator;
@@ -33,7 +33,7 @@ public class TrimEvaluator extends StringEvaluator {
}
@Override
- public QueryResult<String> evaluate(Map<String, String> attributes, final EvaluationContext context) {
+ public QueryResult<String> evaluate(Map<String, String> attributes, final EvaluatorState context) {
final String subjectValue = subject.evaluate(attributes, context).getValue();
return new StringQueryResult(subjectValue == null ? null : subjectValue.trim());
}
diff --git a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/UrlDecodeEvaluator.java b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/UrlDecodeEvaluator.java
index daa949e..61156c4 100644
--- a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/UrlDecodeEvaluator.java
+++ b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/UrlDecodeEvaluator.java
@@ -20,7 +20,7 @@ import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import java.util.Map;
-import org.apache.nifi.attribute.expression.language.evaluation.EvaluationContext;
+import org.apache.nifi.attribute.expression.language.evaluation.EvaluatorState;
import org.apache.nifi.attribute.expression.language.evaluation.Evaluator;
import org.apache.nifi.attribute.expression.language.evaluation.QueryResult;
import org.apache.nifi.attribute.expression.language.evaluation.StringEvaluator;
@@ -35,7 +35,7 @@ public class UrlDecodeEvaluator extends StringEvaluator {
}
@Override
- public QueryResult<String> evaluate(final Map<String, String> attributes, final EvaluationContext context) {
+ public QueryResult<String> evaluate(final Map<String, String> attributes, final EvaluatorState context) {
final String subjectValue = subject.evaluate(attributes, context).getValue();
if (subjectValue == null) {
return new StringQueryResult(null);
diff --git a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/UrlEncodeEvaluator.java b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/UrlEncodeEvaluator.java
index 6b856ab..ceed25d 100644
--- a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/UrlEncodeEvaluator.java
+++ b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/UrlEncodeEvaluator.java
@@ -20,7 +20,7 @@ import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
import java.util.Map;
-import org.apache.nifi.attribute.expression.language.evaluation.EvaluationContext;
+import org.apache.nifi.attribute.expression.language.evaluation.EvaluatorState;
import org.apache.nifi.attribute.expression.language.evaluation.Evaluator;
import org.apache.nifi.attribute.expression.language.evaluation.QueryResult;
import org.apache.nifi.attribute.expression.language.evaluation.StringEvaluator;
@@ -35,7 +35,7 @@ public class UrlEncodeEvaluator extends StringEvaluator {
}
@Override
- public QueryResult<String> evaluate(final Map<String, String> attributes, final EvaluationContext context) {
+ public QueryResult<String> evaluate(final Map<String, String> attributes, final EvaluatorState context) {
final String subjectValue = subject.evaluate(attributes, context).getValue();
if (subjectValue == null) {
return new StringQueryResult(null);
diff --git a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/UuidEvaluator.java b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/UuidEvaluator.java
index d95fe6e..bbe5866 100644
--- a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/UuidEvaluator.java
+++ b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/UuidEvaluator.java
@@ -19,7 +19,7 @@ package org.apache.nifi.attribute.expression.language.evaluation.functions;
import java.util.Map;
import java.util.UUID;
-import org.apache.nifi.attribute.expression.language.evaluation.EvaluationContext;
+import org.apache.nifi.attribute.expression.language.evaluation.EvaluatorState;
import org.apache.nifi.attribute.expression.language.evaluation.Evaluator;
import org.apache.nifi.attribute.expression.language.evaluation.QueryResult;
import org.apache.nifi.attribute.expression.language.evaluation.StringEvaluator;
@@ -28,7 +28,7 @@ import org.apache.nifi.attribute.expression.language.evaluation.StringQueryResul
public class UuidEvaluator extends StringEvaluator {
@Override
- public QueryResult<String> evaluate(final Map<String, String> attributes, final EvaluationContext context) {
+ public QueryResult<String> evaluate(final Map<String, String> attributes, final EvaluatorState context) {
return new StringQueryResult(UUID.randomUUID().toString());
}
diff --git a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/literals/BooleanLiteralEvaluator.java b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/literals/BooleanLiteralEvaluator.java
index 0f179a4..cd04eec 100644
--- a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/literals/BooleanLiteralEvaluator.java
+++ b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/literals/BooleanLiteralEvaluator.java
@@ -20,7 +20,7 @@ import java.util.Map;
import org.apache.nifi.attribute.expression.language.evaluation.BooleanEvaluator;
import org.apache.nifi.attribute.expression.language.evaluation.BooleanQueryResult;
-import org.apache.nifi.attribute.expression.language.evaluation.EvaluationContext;
+import org.apache.nifi.attribute.expression.language.evaluation.EvaluatorState;
import org.apache.nifi.attribute.expression.language.evaluation.Evaluator;
import org.apache.nifi.attribute.expression.language.evaluation.QueryResult;
@@ -33,7 +33,7 @@ public class BooleanLiteralEvaluator extends BooleanEvaluator {
}
@Override
- public QueryResult<Boolean> evaluate(final Map<String, String> attributes, final EvaluationContext context) {
+ public QueryResult<Boolean> evaluate(final Map<String, String> attributes, final EvaluatorState context) {
return new BooleanQueryResult(value);
}
diff --git a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/literals/DecimalLiteralEvaluator.java b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/literals/DecimalLiteralEvaluator.java
index b8330ff..cf351eb 100644
--- a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/literals/DecimalLiteralEvaluator.java
+++ b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/literals/DecimalLiteralEvaluator.java
@@ -18,7 +18,7 @@ package org.apache.nifi.attribute.expression.language.evaluation.literals;
import org.apache.nifi.attribute.expression.language.evaluation.DecimalEvaluator;
import org.apache.nifi.attribute.expression.language.evaluation.DecimalQueryResult;
-import org.apache.nifi.attribute.expression.language.evaluation.EvaluationContext;
+import org.apache.nifi.attribute.expression.language.evaluation.EvaluatorState;
import org.apache.nifi.attribute.expression.language.evaluation.Evaluator;
import org.apache.nifi.attribute.expression.language.evaluation.QueryResult;
@@ -34,7 +34,7 @@ public class DecimalLiteralEvaluator extends DecimalEvaluator {
}
@Override
- public QueryResult<Double> evaluate(final Map<String, String> attributes, final EvaluationContext context) {
+ public QueryResult<Double> evaluate(final Map<String, String> attributes, final EvaluatorState context) {
return new DecimalQueryResult(literal);
}
diff --git a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/literals/StringLiteralEvaluator.java b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/literals/StringLiteralEvaluator.java
index c372f04..9c0c0ab 100644
--- a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/literals/StringLiteralEvaluator.java
+++ b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/literals/StringLiteralEvaluator.java
@@ -18,7 +18,7 @@ package org.apache.nifi.attribute.expression.language.evaluation.literals;
import java.util.Map;
-import org.apache.nifi.attribute.expression.language.evaluation.EvaluationContext;
+import org.apache.nifi.attribute.expression.language.evaluation.EvaluatorState;
import org.apache.nifi.attribute.expression.language.evaluation.Evaluator;
import org.apache.nifi.attribute.expression.language.evaluation.QueryResult;
import org.apache.nifi.attribute.expression.language.evaluation.StringEvaluator;
@@ -66,7 +66,7 @@ public class StringLiteralEvaluator extends StringEvaluator {
}
@Override
- public QueryResult<String> evaluate(final Map<String, String> attributes, final EvaluationContext context) {
+ public QueryResult<String> evaluate(final Map<String, String> attributes, final EvaluatorState context) {
return new StringQueryResult(value);
}
diff --git a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/literals/ToLiteralEvaluator.java b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/literals/ToLiteralEvaluator.java
index 240abc0..f44591a 100644
--- a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/literals/ToLiteralEvaluator.java
+++ b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/literals/ToLiteralEvaluator.java
@@ -18,7 +18,7 @@ package org.apache.nifi.attribute.expression.language.evaluation.literals;
import java.util.Map;
-import org.apache.nifi.attribute.expression.language.evaluation.EvaluationContext;
+import org.apache.nifi.attribute.expression.language.evaluation.EvaluatorState;
import org.apache.nifi.attribute.expression.language.evaluation.Evaluator;
import org.apache.nifi.attribute.expression.language.evaluation.QueryResult;
import org.apache.nifi.attribute.expression.language.evaluation.StringEvaluator;
@@ -32,7 +32,7 @@ public class ToLiteralEvaluator extends StringEvaluator {
}
@Override
- public QueryResult<String> evaluate(final Map<String, String> attributes, final EvaluationContext context) {
+ public QueryResult<String> evaluate(final Map<String, String> attributes, final EvaluatorState context) {
final Object result = argEvaluator.evaluate(attributes, context);
return new StringQueryResult(result == null ? null : result.toString());
}
diff --git a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/literals/WholeNumberLiteralEvaluator.java b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/literals/WholeNumberLiteralEvaluator.java
index 5155b6c..f476ba0 100644
--- a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/literals/WholeNumberLiteralEvaluator.java
+++ b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/literals/WholeNumberLiteralEvaluator.java
@@ -18,7 +18,7 @@ package org.apache.nifi.attribute.expression.language.evaluation.literals;
import java.util.Map;
-import org.apache.nifi.attribute.expression.language.evaluation.EvaluationContext;
+import org.apache.nifi.attribute.expression.language.evaluation.EvaluatorState;
import org.apache.nifi.attribute.expression.language.evaluation.Evaluator;
import org.apache.nifi.attribute.expression.language.evaluation.QueryResult;
import org.apache.nifi.attribute.expression.language.evaluation.WholeNumberEvaluator;
@@ -33,7 +33,7 @@ public class WholeNumberLiteralEvaluator extends WholeNumberEvaluator {
}
@Override
- public QueryResult<Long> evaluate(final Map<String, String> attributes, final EvaluationContext context) {
+ public QueryResult<Long> evaluate(final Map<String, String> attributes, final EvaluatorState context) {
return new WholeNumberQueryResult(literal);
}
diff --git a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/reduce/CountEvaluator.java b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/reduce/CountEvaluator.java
index d443152..59df3b9 100644
--- a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/reduce/CountEvaluator.java
+++ b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/reduce/CountEvaluator.java
@@ -18,7 +18,7 @@ package org.apache.nifi.attribute.expression.language.evaluation.reduce;
import java.util.Map;
-import org.apache.nifi.attribute.expression.language.evaluation.EvaluationContext;
+import org.apache.nifi.attribute.expression.language.evaluation.EvaluatorState;
import org.apache.nifi.attribute.expression.language.evaluation.Evaluator;
import org.apache.nifi.attribute.expression.language.evaluation.QueryResult;
import org.apache.nifi.attribute.expression.language.evaluation.WholeNumberEvaluator;
@@ -34,7 +34,7 @@ public class CountEvaluator extends WholeNumberEvaluator implements ReduceEvalua
}
@Override
- public QueryResult<Long> evaluate(final Map<String, String> attributes, final EvaluationContext context) {
+ public QueryResult<Long> evaluate(final Map<String, String> attributes, final EvaluatorState context) {
final QueryResult<?> result = subjectEvaluator.evaluate(attributes, context);
Long count = context.getState(this, Long.class);
if (count == null) {
diff --git a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/reduce/JoinEvaluator.java b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/reduce/JoinEvaluator.java
index 40efaa8..8b7cdf4 100644
--- a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/reduce/JoinEvaluator.java
+++ b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/reduce/JoinEvaluator.java
@@ -18,7 +18,7 @@ package org.apache.nifi.attribute.expression.language.evaluation.reduce;
import java.util.Map;
-import org.apache.nifi.attribute.expression.language.evaluation.EvaluationContext;
+import org.apache.nifi.attribute.expression.language.evaluation.EvaluatorState;
import org.apache.nifi.attribute.expression.language.evaluation.Evaluator;
import org.apache.nifi.attribute.expression.language.evaluation.QueryResult;
import org.apache.nifi.attribute.expression.language.evaluation.StringEvaluator;
@@ -35,7 +35,7 @@ public class JoinEvaluator extends StringEvaluator implements ReduceEvaluator<St
}
@Override
- public QueryResult<String> evaluate(final Map<String, String> attributes, final EvaluationContext context) {
+ public QueryResult<String> evaluate(final Map<String, String> attributes, final EvaluatorState context) {
String subject = subjectEvaluator.evaluate(attributes, context).getValue();
if (subject == null) {
subject = "";
diff --git a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/selection/AllAttributesEvaluator.java b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/selection/AllAttributesEvaluator.java
index 643995c..c2a7144 100644
--- a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/selection/AllAttributesEvaluator.java
+++ b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/selection/AllAttributesEvaluator.java
@@ -20,7 +20,7 @@ import java.util.Map;
import org.apache.nifi.attribute.expression.language.evaluation.BooleanEvaluator;
import org.apache.nifi.attribute.expression.language.evaluation.BooleanQueryResult;
-import org.apache.nifi.attribute.expression.language.evaluation.EvaluationContext;
+import org.apache.nifi.attribute.expression.language.evaluation.EvaluatorState;
import org.apache.nifi.attribute.expression.language.evaluation.Evaluator;
import org.apache.nifi.attribute.expression.language.evaluation.QueryResult;
@@ -35,7 +35,7 @@ public class AllAttributesEvaluator extends BooleanEvaluator implements Iteratin
}
@Override
- public QueryResult<Boolean> evaluate(final Map<String, String> attributes, final EvaluationContext context) {
+ public QueryResult<Boolean> evaluate(final Map<String, String> attributes, final EvaluatorState context) {
QueryResult<Boolean> attributeValueQuery = booleanEvaluator.evaluate(attributes, context);
Boolean result = attributeValueQuery.getValue();
if (result == null) {
@@ -58,7 +58,7 @@ public class AllAttributesEvaluator extends BooleanEvaluator implements Iteratin
}
@Override
- public int getEvaluationsRemaining(final EvaluationContext context) {
+ public int getEvaluationsRemaining(final EvaluatorState context) {
return 0;
}
diff --git a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/selection/AnyAttributeEvaluator.java b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/selection/AnyAttributeEvaluator.java
index b8e75c1..a800b45 100644
--- a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/selection/AnyAttributeEvaluator.java
+++ b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/selection/AnyAttributeEvaluator.java
@@ -20,7 +20,7 @@ import java.util.Map;
import org.apache.nifi.attribute.expression.language.evaluation.BooleanEvaluator;
import org.apache.nifi.attribute.expression.language.evaluation.BooleanQueryResult;
-import org.apache.nifi.attribute.expression.language.evaluation.EvaluationContext;
+import org.apache.nifi.attribute.expression.language.evaluation.EvaluatorState;
import org.apache.nifi.attribute.expression.language.evaluation.Evaluator;
import org.apache.nifi.attribute.expression.language.evaluation.QueryResult;
@@ -35,7 +35,7 @@ public class AnyAttributeEvaluator extends BooleanEvaluator implements Iterating
}
@Override
- public QueryResult<Boolean> evaluate(final Map<String, String> attributes, final EvaluationContext context) {
+ public QueryResult<Boolean> evaluate(final Map<String, String> attributes, final EvaluatorState context) {
QueryResult<Boolean> attributeValueQuery = booleanEvaluator.evaluate(attributes, context);
Boolean result = attributeValueQuery.getValue();
if (result == null) {
@@ -58,7 +58,7 @@ public class AnyAttributeEvaluator extends BooleanEvaluator implements Iterating
}
@Override
- public int getEvaluationsRemaining(final EvaluationContext context) {
+ public int getEvaluationsRemaining(final EvaluatorState context) {
return 0;
}
diff --git a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/selection/AttributeEvaluator.java b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/selection/AttributeEvaluator.java
index 76150b1..41c9853 100644
--- a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/selection/AttributeEvaluator.java
+++ b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/selection/AttributeEvaluator.java
@@ -18,7 +18,7 @@ package org.apache.nifi.attribute.expression.language.evaluation.selection;
import java.util.Map;
-import org.apache.nifi.attribute.expression.language.evaluation.EvaluationContext;
+import org.apache.nifi.attribute.expression.language.evaluation.EvaluatorState;
import org.apache.nifi.attribute.expression.language.evaluation.Evaluator;
import org.apache.nifi.attribute.expression.language.evaluation.QueryResult;
import org.apache.nifi.attribute.expression.language.evaluation.StringEvaluator;
@@ -33,7 +33,7 @@ public class AttributeEvaluator extends StringEvaluator {
}
@Override
- public QueryResult<String> evaluate(final Map<String, String> attributes, final EvaluationContext context) {
+ public QueryResult<String> evaluate(final Map<String, String> attributes, final EvaluatorState context) {
final String nameValue = nameEvaluator.evaluate(attributes, context).getValue();
final String attributeValue = attributes.get(nameValue);
return new StringQueryResult(attributeValue);
diff --git a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/selection/DelineatedAttributeEvaluator.java b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/selection/DelineatedAttributeEvaluator.java
index 8df0202..5dd7b45 100644
--- a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/selection/DelineatedAttributeEvaluator.java
+++ b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/selection/DelineatedAttributeEvaluator.java
@@ -18,7 +18,7 @@ package org.apache.nifi.attribute.expression.language.evaluation.selection;
import java.util.Map;
-import org.apache.nifi.attribute.expression.language.evaluation.EvaluationContext;
+import org.apache.nifi.attribute.expression.language.evaluation.EvaluatorState;
import org.apache.nifi.attribute.expression.language.evaluation.Evaluator;
import org.apache.nifi.attribute.expression.language.evaluation.QueryResult;
import org.apache.nifi.attribute.expression.language.evaluation.StringQueryResult;
@@ -36,7 +36,7 @@ public class DelineatedAttributeEvaluator extends MultiAttributeEvaluator {
}
@Override
- public QueryResult<String> evaluate(final Map<String, String> attributes, final EvaluationContext context) {
+ public QueryResult<String> evaluate(final Map<String, String> attributes, final EvaluatorState context) {
State state = context.getState(this, State.class);
if (state == null) {
state = new State();
@@ -74,7 +74,7 @@ public class DelineatedAttributeEvaluator extends MultiAttributeEvaluator {
}
@Override
- public int getEvaluationsRemaining(final EvaluationContext context) {
+ public int getEvaluationsRemaining(final EvaluatorState context) {
State state = context.getState(this, State.class);
if (state == null) {
state = new State();
diff --git a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/selection/MappingEvaluator.java b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/selection/MappingEvaluator.java
index a8a79ea..9ea578d 100644
--- a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/selection/MappingEvaluator.java
+++ b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/selection/MappingEvaluator.java
@@ -18,7 +18,7 @@ package org.apache.nifi.attribute.expression.language.evaluation.selection;
import java.util.Map;
-import org.apache.nifi.attribute.expression.language.evaluation.EvaluationContext;
+import org.apache.nifi.attribute.expression.language.evaluation.EvaluatorState;
import org.apache.nifi.attribute.expression.language.evaluation.Evaluator;
import org.apache.nifi.attribute.expression.language.evaluation.QueryResult;
import org.apache.nifi.attribute.expression.language.evaluation.reduce.ReduceEvaluator;
@@ -35,7 +35,7 @@ public class MappingEvaluator<T> implements Evaluator<T> {
}
@Override
- public QueryResult<T> evaluate(final Map<String, String> attributes, final EvaluationContext context) {
+ public QueryResult<T> evaluate(final Map<String, String> attributes, final EvaluatorState context) {
QueryResult<T> result = mappingEvaluator.evaluate(attributes, context);
while (multiAttributeEvaluator.getEvaluationsRemaining(context) > 0) {
@@ -51,7 +51,7 @@ public class MappingEvaluator<T> implements Evaluator<T> {
}
@Override
- public int getEvaluationsRemaining(final EvaluationContext context) {
+ public int getEvaluationsRemaining(final EvaluatorState context) {
return 0;
}
diff --git a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/selection/MultiMatchAttributeEvaluator.java b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/selection/MultiMatchAttributeEvaluator.java
index 0f37c9f..9b3dcb9 100644
--- a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/selection/MultiMatchAttributeEvaluator.java
+++ b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/selection/MultiMatchAttributeEvaluator.java
@@ -21,7 +21,7 @@ import java.util.List;
import java.util.Map;
import java.util.regex.Pattern;
-import org.apache.nifi.attribute.expression.language.evaluation.EvaluationContext;
+import org.apache.nifi.attribute.expression.language.evaluation.EvaluatorState;
import org.apache.nifi.attribute.expression.language.evaluation.Evaluator;
import org.apache.nifi.attribute.expression.language.evaluation.QueryResult;
import org.apache.nifi.attribute.expression.language.evaluation.StringQueryResult;
@@ -46,7 +46,7 @@ public class MultiMatchAttributeEvaluator extends MultiAttributeEvaluator {
* @return number of remaining evaluations
*/
@Override
- public int getEvaluationsRemaining(final EvaluationContext context) {
+ public int getEvaluationsRemaining(final EvaluatorState context) {
State state = context.getState(this, State.class);
if (state == null) {
state = new State();
@@ -56,7 +56,7 @@ public class MultiMatchAttributeEvaluator extends MultiAttributeEvaluator {
}
@Override
- public QueryResult<String> evaluate(final Map<String, String> attributes, final EvaluationContext context) {
+ public QueryResult<String> evaluate(final Map<String, String> attributes, final EvaluatorState context) {
State state = context.getState(this, State.class);
if (state == null) {
state = new State();
diff --git a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/selection/MultiNamedAttributeEvaluator.java b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/selection/MultiNamedAttributeEvaluator.java
index 0f14dcc..523376a 100644
--- a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/selection/MultiNamedAttributeEvaluator.java
+++ b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/selection/MultiNamedAttributeEvaluator.java
@@ -20,7 +20,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
-import org.apache.nifi.attribute.expression.language.evaluation.EvaluationContext;
+import org.apache.nifi.attribute.expression.language.evaluation.EvaluatorState;
import org.apache.nifi.attribute.expression.language.evaluation.Evaluator;
import org.apache.nifi.attribute.expression.language.evaluation.QueryResult;
import org.apache.nifi.attribute.expression.language.evaluation.StringQueryResult;
@@ -36,7 +36,7 @@ public class MultiNamedAttributeEvaluator extends MultiAttributeEvaluator {
}
@Override
- public QueryResult<String> evaluate(final Map<String, String> attributes, final EvaluationContext context) {
+ public QueryResult<String> evaluate(final Map<String, String> attributes, final EvaluatorState context) {
State state = context.getState(this, State.class);
if (state == null) {
state = new State();
@@ -52,7 +52,7 @@ public class MultiNamedAttributeEvaluator extends MultiAttributeEvaluator {
}
@Override
- public int getEvaluationsRemaining(final EvaluationContext context) {
+ public int getEvaluationsRemaining(final EvaluatorState context) {
State state = context.getState(this, State.class);
if (state == null) {
state = new State();