Repository: nifi Updated Branches: refs/heads/master aabb5d783 -> 0c9120a73
NIFI-5777: Update the log-level property of LogMessage to support EL This closes #3122. Signed-off-by: Koji Kawamura <ijokaruma...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/0c9120a7 Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/0c9120a7 Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/0c9120a7 Branch: refs/heads/master Commit: 0c9120a73fe99bc4ced50997ee9d65250fb7cf3a Parents: aabb5d7 Author: Kotaro Terada <koter...@yahoo-corp.jp> Authored: Tue Nov 6 14:26:50 2018 +0900 Committer: Koji Kawamura <ijokaruma...@apache.org> Committed: Tue Nov 6 16:20:40 2018 +0900 ---------------------------------------------------------------------- .../java/org/apache/nifi/processors/standard/LogMessage.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/0c9120a7/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/LogMessage.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/LogMessage.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/LogMessage.java index d8e33ca..5ec07eb 100644 --- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/LogMessage.java +++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/LogMessage.java @@ -37,6 +37,7 @@ import org.apache.nifi.processor.util.StandardValidators; import org.eclipse.jetty.util.StringUtil; import java.util.ArrayList; +import java.util.Arrays; import java.util.Collections; import java.util.HashSet; import java.util.List; @@ -54,8 +55,8 @@ public class LogMessage extends AbstractProcessor { .name("log-level") .displayName("Log Level") .required(true) - .description("The Log Level to use when logging the message") - .allowableValues(MessageLogLevel.values()) + .description("The Log Level to use when logging the message: " + Arrays.toString(MessageLogLevel.values())) + .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) .defaultValue(MessageLogLevel.info.toString()) .expressionLanguageSupported(ExpressionLanguageScope.FLOWFILE_ATTRIBUTES) .build();