You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by ij...@apache.org on 2017/05/24 15:33:53 UTC
nifi git commit: NIFI-3816 - Added correct mime.type to S2S bulletin
and provenance reporting tasks
Repository: nifi
Updated Branches:
refs/heads/master 7a46238ba -> bb96b0f46
NIFI-3816 - Added correct mime.type to S2S bulletin and provenance reporting tasks
This closes #1758.
Signed-off-by: Koji Kawamura <ij...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/bb96b0f4
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/bb96b0f4
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/bb96b0f4
Branch: refs/heads/master
Commit: bb96b0f46412008ade2b5abe2d4ee9970af576fd
Parents: 7a46238
Author: Pierre Villard <pi...@gmail.com>
Authored: Fri May 5 18:09:04 2017 +0200
Committer: Koji Kawamura <ij...@apache.org>
Committed: Thu May 25 00:33:50 2017 +0900
----------------------------------------------------------------------
.../nifi/reporting/SiteToSiteBulletinReportingTask.java | 7 ++++++-
.../nifi/reporting/SiteToSiteProvenanceReportingTask.java | 1 +
2 files changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi/blob/bb96b0f4/nifi-nar-bundles/nifi-site-to-site-reporting-bundle/nifi-site-to-site-reporting-task/src/main/java/org/apache/nifi/reporting/SiteToSiteBulletinReportingTask.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-site-to-site-reporting-bundle/nifi-site-to-site-reporting-task/src/main/java/org/apache/nifi/reporting/SiteToSiteBulletinReportingTask.java b/nifi-nar-bundles/nifi-site-to-site-reporting-bundle/nifi-site-to-site-reporting-task/src/main/java/org/apache/nifi/reporting/SiteToSiteBulletinReportingTask.java
index 9d9b1b7..566b780 100644
--- a/nifi-nar-bundles/nifi-site-to-site-reporting-bundle/nifi-site-to-site-reporting-task/src/main/java/org/apache/nifi/reporting/SiteToSiteBulletinReportingTask.java
+++ b/nifi-nar-bundles/nifi-site-to-site-reporting-bundle/nifi-site-to-site-reporting-task/src/main/java/org/apache/nifi/reporting/SiteToSiteBulletinReportingTask.java
@@ -23,6 +23,7 @@ import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Collections;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.OptionalLong;
@@ -163,9 +164,13 @@ public class SiteToSiteBulletinReportingTask extends AbstractSiteToSiteReporting
return;
}
+ final Map<String, String> attributes = new HashMap<>();
final String transactionId = UUID.randomUUID().toString();
+ attributes.put("reporting.task.transaction.id", transactionId);
+ attributes.put("mime.type", "application/json");
+
final byte[] data = jsonArray.toString().getBytes(StandardCharsets.UTF_8);
- transaction.send(data, Collections.singletonMap("reporting.task.transaction.id", transactionId));
+ transaction.send(data, attributes);
transaction.confirm();
transaction.complete();
http://git-wip-us.apache.org/repos/asf/nifi/blob/bb96b0f4/nifi-nar-bundles/nifi-site-to-site-reporting-bundle/nifi-site-to-site-reporting-task/src/main/java/org/apache/nifi/reporting/SiteToSiteProvenanceReportingTask.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-site-to-site-reporting-bundle/nifi-site-to-site-reporting-task/src/main/java/org/apache/nifi/reporting/SiteToSiteProvenanceReportingTask.java b/nifi-nar-bundles/nifi-site-to-site-reporting-bundle/nifi-site-to-site-reporting-task/src/main/java/org/apache/nifi/reporting/SiteToSiteProvenanceReportingTask.java
index 2123e31..9d6d009 100644
--- a/nifi-nar-bundles/nifi-site-to-site-reporting-bundle/nifi-site-to-site-reporting-task/src/main/java/org/apache/nifi/reporting/SiteToSiteProvenanceReportingTask.java
+++ b/nifi-nar-bundles/nifi-site-to-site-reporting-bundle/nifi-site-to-site-reporting-task/src/main/java/org/apache/nifi/reporting/SiteToSiteProvenanceReportingTask.java
@@ -212,6 +212,7 @@ public class SiteToSiteProvenanceReportingTask extends AbstractSiteToSiteReporti
final Map<String, String> attributes = new HashMap<>();
final String transactionId = UUID.randomUUID().toString();
attributes.put("reporting.task.transaction.id", transactionId);
+ attributes.put("mime.type", "application/json");
final byte[] data = jsonArray.toString().getBytes(StandardCharsets.UTF_8);
transaction.send(data, attributes);