You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by pv...@apache.org on 2018/09/20 10:08:10 UTC
nifi git commit: NIFI-5615: set the avro-binary MIME type for
converting processors
Repository: nifi
Updated Branches:
refs/heads/master 854ee3021 -> 8cf0662e5
NIFI-5615: set the avro-binary MIME type for converting processors
Signed-off-by: Pierre Villard <pi...@gmail.com>
This closes #3016.
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/8cf0662e
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/8cf0662e
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/8cf0662e
Branch: refs/heads/master
Commit: 8cf0662e5b0ab99f49d7ffb12ca06516a0bf8632
Parents: 854ee30
Author: Kemix Koo <ke...@163.com>
Authored: Thu Sep 20 09:59:15 2018 +0800
Committer: Pierre Villard <pi...@gmail.com>
Committed: Thu Sep 20 12:07:43 2018 +0200
----------------------------------------------------------------------
.../java/org/apache/nifi/processors/kite/ConvertAvroSchema.java | 2 ++
.../java/org/apache/nifi/processors/kite/ConvertCSVToAvro.java | 2 ++
.../java/org/apache/nifi/processors/kite/ConvertJSONToAvro.java | 2 ++
3 files changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi/blob/8cf0662e/nifi-nar-bundles/nifi-kite-bundle/nifi-kite-processors/src/main/java/org/apache/nifi/processors/kite/ConvertAvroSchema.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-kite-bundle/nifi-kite-processors/src/main/java/org/apache/nifi/processors/kite/ConvertAvroSchema.java b/nifi-nar-bundles/nifi-kite-bundle/nifi-kite-processors/src/main/java/org/apache/nifi/processors/kite/ConvertAvroSchema.java
index a3602e3..afd2aec 100644
--- a/nifi-nar-bundles/nifi-kite-bundle/nifi-kite-processors/src/main/java/org/apache/nifi/processors/kite/ConvertAvroSchema.java
+++ b/nifi-nar-bundles/nifi-kite-bundle/nifi-kite-processors/src/main/java/org/apache/nifi/processors/kite/ConvertAvroSchema.java
@@ -48,6 +48,7 @@ import org.apache.nifi.components.ValidationResult;
import org.apache.nifi.components.Validator;
import org.apache.nifi.expression.ExpressionLanguageScope;
import org.apache.nifi.flowfile.FlowFile;
+import org.apache.nifi.flowfile.attributes.CoreAttributes;
import org.apache.nifi.processor.ProcessContext;
import org.apache.nifi.processor.ProcessSession;
import org.apache.nifi.processor.Relationship;
@@ -351,6 +352,7 @@ public class ConvertAvroSchema extends AbstractKiteConvertProcessor {
session.adjustCounter("Conversion errors", errors, false);
if (written.get() > 0L) {
+ outgoingAvro = session.putAttribute(outgoingAvro, CoreAttributes.MIME_TYPE.key(), InferAvroSchema.AVRO_MIME_TYPE);
session.transfer(outgoingAvro, SUCCESS);
} else {
session.remove(outgoingAvro);
http://git-wip-us.apache.org/repos/asf/nifi/blob/8cf0662e/nifi-nar-bundles/nifi-kite-bundle/nifi-kite-processors/src/main/java/org/apache/nifi/processors/kite/ConvertCSVToAvro.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-kite-bundle/nifi-kite-processors/src/main/java/org/apache/nifi/processors/kite/ConvertCSVToAvro.java b/nifi-nar-bundles/nifi-kite-bundle/nifi-kite-processors/src/main/java/org/apache/nifi/processors/kite/ConvertCSVToAvro.java
index 68e2647..3646680 100644
--- a/nifi-nar-bundles/nifi-kite-bundle/nifi-kite-processors/src/main/java/org/apache/nifi/processors/kite/ConvertCSVToAvro.java
+++ b/nifi-nar-bundles/nifi-kite-bundle/nifi-kite-processors/src/main/java/org/apache/nifi/processors/kite/ConvertCSVToAvro.java
@@ -41,6 +41,7 @@ import org.apache.nifi.components.ValidationResult;
import org.apache.nifi.components.Validator;
import org.apache.nifi.expression.ExpressionLanguageScope;
import org.apache.nifi.flowfile.FlowFile;
+import org.apache.nifi.flowfile.attributes.CoreAttributes;
import org.apache.nifi.processor.ProcessContext;
import org.apache.nifi.processor.ProcessSession;
import org.apache.nifi.processor.Relationship;
@@ -260,6 +261,7 @@ public class ConvertCSVToAvro extends AbstractKiteConvertProcessor {
false /* update only if file transfer is successful */);
if (written.get() > 0L) {
+ outgoingAvro = session.putAttribute(outgoingAvro, CoreAttributes.MIME_TYPE.key(), InferAvroSchema.AVRO_MIME_TYPE);
session.transfer(outgoingAvro, SUCCESS);
if (errors > 0L) {
http://git-wip-us.apache.org/repos/asf/nifi/blob/8cf0662e/nifi-nar-bundles/nifi-kite-bundle/nifi-kite-processors/src/main/java/org/apache/nifi/processors/kite/ConvertJSONToAvro.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-kite-bundle/nifi-kite-processors/src/main/java/org/apache/nifi/processors/kite/ConvertJSONToAvro.java b/nifi-nar-bundles/nifi-kite-bundle/nifi-kite-processors/src/main/java/org/apache/nifi/processors/kite/ConvertJSONToAvro.java
index f93e522..c8b8d51 100644
--- a/nifi-nar-bundles/nifi-kite-bundle/nifi-kite-processors/src/main/java/org/apache/nifi/processors/kite/ConvertJSONToAvro.java
+++ b/nifi-nar-bundles/nifi-kite-bundle/nifi-kite-processors/src/main/java/org/apache/nifi/processors/kite/ConvertJSONToAvro.java
@@ -35,6 +35,7 @@ import org.apache.nifi.annotation.documentation.Tags;
import org.apache.nifi.components.PropertyDescriptor;
import org.apache.nifi.expression.ExpressionLanguageScope;
import org.apache.nifi.flowfile.FlowFile;
+import org.apache.nifi.flowfile.attributes.CoreAttributes;
import org.apache.nifi.processor.ProcessContext;
import org.apache.nifi.processor.ProcessSession;
import org.apache.nifi.processor.Relationship;
@@ -167,6 +168,7 @@ public class ConvertJSONToAvro extends AbstractKiteConvertProcessor {
false /* update only if file transfer is successful */);
if (written.get() > 0L) {
+ outgoingAvro = session.putAttribute(outgoingAvro, CoreAttributes.MIME_TYPE.key(), InferAvroSchema.AVRO_MIME_TYPE);
session.transfer(outgoingAvro, SUCCESS);
if (errors > 0L) {