From 0e7a61cc6b807879d09e5f3b97afccf6def39155 Mon Sep 17 00:00:00 2001 From: Kotaro Terada Date: Thu, 1 Nov 2018 16:40:17 +0900 Subject: [PATCH 1/3] NIFI-5777: Update the tag and the property of LogMessage --- .../java/org/apache/nifi/processors/standard/LogMessage.java | 3 +-- .../org/apache/nifi/processors/standard/TestLogMessage.java | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) 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 d8e33ca273b6..37ca7a6068ec 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 @@ -45,7 +45,7 @@ @EventDriven @SideEffectFree @SupportsBatching -@Tags({"attributes", "logging"}) +@Tags({"logging"}) @InputRequirement(Requirement.INPUT_REQUIRED) @CapabilityDescription("Emits a log message at the specified log level") public class LogMessage extends AbstractProcessor { @@ -57,7 +57,6 @@ public class LogMessage extends AbstractProcessor { .description("The Log Level to use when logging the message") .allowableValues(MessageLogLevel.values()) .defaultValue(MessageLogLevel.info.toString()) - .expressionLanguageSupported(ExpressionLanguageScope.FLOWFILE_ATTRIBUTES) .build(); public static final PropertyDescriptor LOG_PREFIX = new PropertyDescriptor.Builder() diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestLogMessage.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestLogMessage.java index a07bfb1b956e..21920b01e4bf 100644 --- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestLogMessage.java +++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestLogMessage.java @@ -57,7 +57,7 @@ MockComponentLog getMockComponentLog() { public void before() throws InitializationException { testableLogMessage = new TestableLogMessage(); runner = TestRunners.newTestRunner(testableLogMessage); - + runner.setValidateExpressionUsage(false); } @After From edd890935991b336e5c6f01492fbbf733c993ee7 Mon Sep 17 00:00:00 2001 From: Kotaro Terada Date: Thu, 1 Nov 2018 17:54:40 +0900 Subject: [PATCH 2/3] NIFI-5777: Revert the change of the tags in LogMessage --- .../java/org/apache/nifi/processors/standard/LogMessage.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 37ca7a6068ec..09e148789494 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 @@ -45,7 +45,7 @@ @EventDriven @SideEffectFree @SupportsBatching -@Tags({"logging"}) +@Tags({"attributes", "logging"}) @InputRequirement(Requirement.INPUT_REQUIRED) @CapabilityDescription("Emits a log message at the specified log level") public class LogMessage extends AbstractProcessor { From 917daff781b3c4a28a6f3f4814fc0b7cb56ea70d Mon Sep 17 00:00:00 2001 From: Kotaro Terada Date: Tue, 6 Nov 2018 14:26:50 +0900 Subject: [PATCH 3/3] NIFI-5777: Update the log-level property of LogMessage to support EL --- .../org/apache/nifi/processors/standard/LogMessage.java | 6 ++++-- .../org/apache/nifi/processors/standard/TestLogMessage.java | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) 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 09e148789494..5ec07ebeeccc 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.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,9 +55,10 @@ 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(); public static final PropertyDescriptor LOG_PREFIX = new PropertyDescriptor.Builder() diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestLogMessage.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestLogMessage.java index 21920b01e4bf..a07bfb1b956e 100644 --- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestLogMessage.java +++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestLogMessage.java @@ -57,7 +57,7 @@ MockComponentLog getMockComponentLog() { public void before() throws InitializationException { testableLogMessage = new TestableLogMessage(); runner = TestRunners.newTestRunner(testableLogMessage); - runner.setValidateExpressionUsage(false); + } @After