Repository: nifi Updated Branches: refs/heads/master c575a9893 -> 262bf011e
NIFI-5078 - added source/destination connection info in S2SStatusRT Signed-off-by: Matthew Burgess <[email protected]> This closes #2632 Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/262bf011 Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/262bf011 Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/262bf011 Branch: refs/heads/master Commit: 262bf011e495a2e94c3975b91ba7c24d822e0a86 Parents: c575a98 Author: Pierre Villard <[email protected]> Authored: Thu Apr 12 17:31:00 2018 +0200 Committer: Matthew Burgess <[email protected]> Committed: Fri Apr 20 11:50:06 2018 -0400 ---------------------------------------------------------------------- .../nifi/reporting/SiteToSiteStatusReportingTask.java | 4 ++++ .../nifi/reporting/TestSiteToSiteStatusReportingTask.java | 10 +++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/262bf011/nifi-nar-bundles/nifi-site-to-site-reporting-bundle/nifi-site-to-site-reporting-task/src/main/java/org/apache/nifi/reporting/SiteToSiteStatusReportingTask.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/SiteToSiteStatusReportingTask.java b/nifi-nar-bundles/nifi-site-to-site-reporting-bundle/nifi-site-to-site-reporting-task/src/main/java/org/apache/nifi/reporting/SiteToSiteStatusReportingTask.java index 46b465d..c419d5c 100644 --- a/nifi-nar-bundles/nifi-site-to-site-reporting-bundle/nifi-site-to-site-reporting-task/src/main/java/org/apache/nifi/reporting/SiteToSiteStatusReportingTask.java +++ b/nifi-nar-bundles/nifi-site-to-site-reporting-bundle/nifi-site-to-site-reporting-task/src/main/java/org/apache/nifi/reporting/SiteToSiteStatusReportingTask.java @@ -339,6 +339,10 @@ public class SiteToSiteStatusReportingTask extends AbstractSiteToSiteReportingTa componentType, componentName); addField(builder, "componentId", status.getId()); + addField(builder, "sourceId", status.getSourceId()); + addField(builder, "sourceName", status.getSourceName()); + addField(builder, "destinationId", status.getDestinationId()); + addField(builder, "destinationName", status.getDestinationName()); addField(builder, "maxQueuedBytes", status.getMaxQueuedBytes()); addField(builder, "maxQueuedCount", status.getMaxQueuedCount()); addField(builder, "queuedBytes", status.getQueuedBytes()); http://git-wip-us.apache.org/repos/asf/nifi/blob/262bf011/nifi-nar-bundles/nifi-site-to-site-reporting-bundle/nifi-site-to-site-reporting-task/src/test/java/org/apache/nifi/reporting/TestSiteToSiteStatusReportingTask.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-site-to-site-reporting-bundle/nifi-site-to-site-reporting-task/src/test/java/org/apache/nifi/reporting/TestSiteToSiteStatusReportingTask.java b/nifi-nar-bundles/nifi-site-to-site-reporting-bundle/nifi-site-to-site-reporting-task/src/test/java/org/apache/nifi/reporting/TestSiteToSiteStatusReportingTask.java index 443981c..79ba213 100644 --- a/nifi-nar-bundles/nifi-site-to-site-reporting-bundle/nifi-site-to-site-reporting-task/src/test/java/org/apache/nifi/reporting/TestSiteToSiteStatusReportingTask.java +++ b/nifi-nar-bundles/nifi-site-to-site-reporting-bundle/nifi-site-to-site-reporting-task/src/test/java/org/apache/nifi/reporting/TestSiteToSiteStatusReportingTask.java @@ -31,6 +31,7 @@ import java.util.Map; import java.util.UUID; import javax.json.Json; +import javax.json.JsonObject; import javax.json.JsonReader; import javax.json.JsonString; @@ -144,8 +145,11 @@ public class TestSiteToSiteStatusReportingTask { final String msg = new String(task.dataSent.get(0), StandardCharsets.UTF_8); JsonReader jsonReader = Json.createReader(new ByteArrayInputStream(msg.getBytes())); - JsonString backpressure = jsonReader.readArray().getJsonObject(0).getJsonString("isBackPressureEnabled"); + JsonObject object = jsonReader.readArray().getJsonObject(0); + JsonString backpressure = object.getJsonString("isBackPressureEnabled"); + JsonString source = object.getJsonString("sourceName"); assertEquals("true", backpressure.getString()); + assertEquals("source", source.getString()); } @Test @@ -318,6 +322,10 @@ public class TestSiteToSiteStatusReportingTask { cStatus.setOutputCount(7); cStatus.setQueuedBytes(8l); cStatus.setQueuedCount(9); + cStatus.setSourceId(id); + cStatus.setSourceName("source"); + cStatus.setDestinationId(id); + cStatus.setDestinationName("destination"); return cStatus; }
