Repository: nifi Updated Branches: refs/heads/master 0c27a0888 -> 8b5342dec
NIFI-3974 - Added charset in LogAttribute This closes #1967 Signed-off-by: Tony Kurc <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/8b5342de Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/8b5342de Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/8b5342de Branch: refs/heads/master Commit: 8b5342dec0c5d7f60a8c4d3f6d52b7eae9645d84 Parents: 0c27a08 Author: Pierre Villard <[email protected]> Authored: Sat Jul 1 11:36:19 2017 +0200 Committer: Tony Kurc <[email protected]> Committed: Sun Jul 2 12:03:07 2017 -0400 ---------------------------------------------------------------------- .../nifi/processors/standard/LogAttribute.java | 23 +++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/8b5342de/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/LogAttribute.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/LogAttribute.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/LogAttribute.java index 0aeff11..cb143d8 100644 --- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/LogAttribute.java +++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/LogAttribute.java @@ -18,6 +18,7 @@ package org.apache.nifi.processors.standard; import java.io.IOException; import java.io.InputStream; +import java.nio.charset.Charset; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; @@ -90,10 +91,19 @@ public class LogAttribute extends AbstractProcessor { .expressionLanguageSupported(true) .build(); + public static final PropertyDescriptor CHARSET = new PropertyDescriptor.Builder() + .name("character-set") + .displayName("Character Set") + .description("The name of the CharacterSet to use") + .expressionLanguageSupported(true) + .addValidator(StandardValidators.CHARACTER_SET_VALIDATOR) + .defaultValue(Charset.defaultCharset().name()) + .required(true) + .build(); + public static final String FIFTY_DASHES = "--------------------------------------------------"; public static enum DebugLevels { - trace, debug, info, warn, error } @@ -119,6 +129,7 @@ public class LogAttribute extends AbstractProcessor { supDescriptors.add(ATTRIBUTES_TO_LOG_CSV); supDescriptors.add(ATTRIBUTES_TO_IGNORE_CSV); supDescriptors.add(LOG_PREFIX); + supDescriptors.add(CHARSET); supportedDescriptors = Collections.unmodifiableList(supDescriptors); } @@ -138,6 +149,7 @@ public class LogAttribute extends AbstractProcessor { final String dashedLine; String logPrefix = context.getProperty(LOG_PREFIX).evaluateAttributeExpressions(flowFile).getValue(); + Charset charset = Charset.forName(context.getProperty(CHARSET).evaluateAttributeExpressions(flowFile).getValue()); if (StringUtil.isBlank(logPrefix)) { dashedLine = StringUtils.repeat('-', 50); @@ -171,7 +183,7 @@ public class LogAttribute extends AbstractProcessor { if (logPayload) { message.append("\n"); if (flowFile.getSize() < ONE_MB) { - final FlowFilePayloadCallback callback = new FlowFilePayloadCallback(); + final FlowFilePayloadCallback callback = new FlowFilePayloadCallback(charset); session.read(flowFile, callback); message.append(callback.getContents()); } else { @@ -277,10 +289,15 @@ public class LogAttribute extends AbstractProcessor { protected static class FlowFilePayloadCallback implements InputStreamCallback { private String contents = ""; + private Charset charset; + + public FlowFilePayloadCallback(Charset charset) { + this.charset = charset; + } @Override public void process(final InputStream in) throws IOException { - contents = IOUtils.toString(in); + contents = IOUtils.toString(in, charset); } public String getContents() {
