Apache
/
nifi
mirror of https://github.com/apache/nifi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

NIFI-3974 - Added charset in LogAttribute 

This closes #1967

Signed-off-by: Tony Kurc <tkurc@apache.org>
This commit is contained in:
Pierre Villard 2017-07-01 11:36:19 +02:00 committed by Tony Kurc
parent 0c27a0888d
commit 8b5342dec0
1 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/LogAttribute.java
View File

@ -18,6 +18,7 @@ package org.apache.nifi.processors.standard;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.nio.charset.Charset;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collections; import java.util.Collections;
@ -90,10 +91,19 @@ public class LogAttribute extends AbstractProcessor {
.expressionLanguageSupported(true) .expressionLanguageSupported(true)
.build(); .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 final String FIFTY_DASHES = "--------------------------------------------------";
public static enum DebugLevels { public static enum DebugLevels {
trace, debug, info, warn, error trace, debug, info, warn, error
} }
@ -119,6 +129,7 @@ public class LogAttribute extends AbstractProcessor {
supDescriptors.add(ATTRIBUTES_TO_LOG_CSV); supDescriptors.add(ATTRIBUTES_TO_LOG_CSV);
supDescriptors.add(ATTRIBUTES_TO_IGNORE_CSV); supDescriptors.add(ATTRIBUTES_TO_IGNORE_CSV);
supDescriptors.add(LOG_PREFIX); supDescriptors.add(LOG_PREFIX);
supDescriptors.add(CHARSET);
supportedDescriptors = Collections.unmodifiableList(supDescriptors); supportedDescriptors = Collections.unmodifiableList(supDescriptors);
} }
@ -138,6 +149,7 @@ public class LogAttribute extends AbstractProcessor {
final String dashedLine; final String dashedLine;
String logPrefix = context.getProperty(LOG_PREFIX).evaluateAttributeExpressions(flowFile).getValue(); String logPrefix = context.getProperty(LOG_PREFIX).evaluateAttributeExpressions(flowFile).getValue();
Charset charset = Charset.forName(context.getProperty(CHARSET).evaluateAttributeExpressions(flowFile).getValue());
if (StringUtil.isBlank(logPrefix)) { if (StringUtil.isBlank(logPrefix)) {
dashedLine = StringUtils.repeat('-', 50); dashedLine = StringUtils.repeat('-', 50);
@ -171,7 +183,7 @@ public class LogAttribute extends AbstractProcessor {
if (logPayload) { if (logPayload) {
message.append("\n"); message.append("\n");
if (flowFile.getSize() < ONE_MB) { if (flowFile.getSize() < ONE_MB) {
final FlowFilePayloadCallback callback = new FlowFilePayloadCallback(); final FlowFilePayloadCallback callback = new FlowFilePayloadCallback(charset);
session.read(flowFile, callback); session.read(flowFile, callback);
message.append(callback.getContents()); message.append(callback.getContents());
} else { } else {
@ -277,10 +289,15 @@ public class LogAttribute extends AbstractProcessor {
protected static class FlowFilePayloadCallback implements InputStreamCallback { protected static class FlowFilePayloadCallback implements InputStreamCallback {
private String contents = ""; private String contents = "";
private Charset charset;
public FlowFilePayloadCallback(Charset charset) {
this.charset = charset;
}
@Override @Override
public void process(final InputStream in) throws IOException { public void process(final InputStream in) throws IOException {
contents = IOUtils.toString(in); contents = IOUtils.toString(in, charset);
} }
public String getContents() { public String getContents() {