Repository: nifi Updated Branches: refs/heads/NIFI-1563 c335d810f -> a531a3b3d
NIFI-1563: Removed the getCounters / setCounters method from HeartbeatPayload Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/a531a3b3 Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/a531a3b3 Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/a531a3b3 Branch: refs/heads/NIFI-1563 Commit: a531a3b3daf7b470876c379874b3b7aae1e93ef4 Parents: c335d81 Author: Mark Payne <[email protected]> Authored: Thu Mar 17 15:00:55 2016 -0400 Committer: Mark Payne <[email protected]> Committed: Thu Mar 17 15:00:55 2016 -0400 ---------------------------------------------------------------------- .../apache/nifi/cluster/HeartbeatPayload.java | 14 -------- .../apache/nifi/controller/FlowController.java | 2 -- .../nifi/cluster/HeartbeatPayloadTest.java | 37 -------------------- 3 files changed, 53 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/a531a3b3/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/cluster/HeartbeatPayload.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/cluster/HeartbeatPayload.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/cluster/HeartbeatPayload.java index 27eef18..94ed570 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/cluster/HeartbeatPayload.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/cluster/HeartbeatPayload.java @@ -20,19 +20,15 @@ import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.InputStream; import java.io.OutputStream; -import java.util.List; import javax.xml.bind.JAXBContext; import javax.xml.bind.JAXBException; import javax.xml.bind.Marshaller; import javax.xml.bind.Unmarshaller; import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import org.apache.nifi.cluster.protocol.ProtocolException; -import org.apache.nifi.controller.Counter; import org.apache.nifi.controller.status.ProcessGroupStatus; -import org.apache.nifi.jaxb.CounterAdapter; /** * The payload of the heartbeat. The payload contains status to inform the cluster manager the current workload of this node. @@ -51,22 +47,12 @@ public class HeartbeatPayload { } } - private List<Counter> counters; private ProcessGroupStatus processGroupStatus; private int activeThreadCount; private long totalFlowFileCount; private long totalFlowFileBytes; private long systemStartTime; - @XmlJavaTypeAdapter(CounterAdapter.class) - public List<Counter> getCounters() { - return counters; - } - - public void setCounters(final List<Counter> counters) { - this.counters = counters; - } - public int getActiveThreadCount() { return activeThreadCount; } http://git-wip-us.apache.org/repos/asf/nifi/blob/a531a3b3/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowController.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowController.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowController.java index 80c1ddc..01ffd2a 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowController.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowController.java @@ -3695,8 +3695,6 @@ public class FlowController implements EventAccess, ControllerServiceProvider, R hbPayload.setTotalFlowFileCount(queueSize.getObjectCount()); hbPayload.setTotalFlowFileBytes(queueSize.getByteCount()); - hbPayload.setCounters(getCounters()); - // create heartbeat message final Heartbeat heartbeat = new Heartbeat(getNodeId(), bean.isPrimary(), bean.isConnected(), hbPayload.marshal()); final HeartbeatMessage message = new HeartbeatMessage(); http://git-wip-us.apache.org/repos/asf/nifi/blob/a531a3b3/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/cluster/HeartbeatPayloadTest.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/cluster/HeartbeatPayloadTest.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/cluster/HeartbeatPayloadTest.java index a3d993c..af73eef 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/cluster/HeartbeatPayloadTest.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/cluster/HeartbeatPayloadTest.java @@ -17,15 +17,10 @@ package org.apache.nifi.cluster; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; -import java.util.ArrayList; -import java.util.List; -import org.apache.nifi.controller.Counter; -import org.apache.nifi.controller.StandardCounter; import org.apache.nifi.util.NiFiProperties; import org.junit.Before; import org.junit.BeforeClass; @@ -36,15 +31,8 @@ import org.junit.Test; public class HeartbeatPayloadTest { private HeartbeatPayload payload; - - private List<Counter> counters; - - private Counter counter; - private int activeThreadCount; - private int totalFlowFileCount; - private ByteArrayOutputStream marshalledBytes; @BeforeClass @@ -54,19 +42,9 @@ public class HeartbeatPayloadTest { @Before public void setup() { - payload = new HeartbeatPayload(); - activeThreadCount = 15; totalFlowFileCount = 25; - - counters = new ArrayList<>(); - String identifier = "identifier"; - String context = "context"; - String name = "name"; - counter = new StandardCounter(identifier, context, name); - counters.add(counter); - marshalledBytes = new ByteArrayOutputStream(); } @@ -74,7 +52,6 @@ public class HeartbeatPayloadTest { public void testMarshallingWithNoInfo() { HeartbeatPayload.marshal(payload, marshalledBytes); HeartbeatPayload newPayload = HeartbeatPayload.unmarshal(new ByteArrayInputStream(marshalledBytes.toByteArray())); - assertNull(newPayload.getCounters()); assertEquals(0, newPayload.getActiveThreadCount()); assertEquals(0, newPayload.getTotalFlowFileCount()); } @@ -83,25 +60,11 @@ public class HeartbeatPayloadTest { public void testMarshalling() { payload.setActiveThreadCount(activeThreadCount); payload.setTotalFlowFileCount(totalFlowFileCount); - payload.setCounters(counters); HeartbeatPayload.marshal(payload, marshalledBytes); HeartbeatPayload newPayload = HeartbeatPayload.unmarshal(new ByteArrayInputStream(marshalledBytes.toByteArray())); - List<Counter> newCounters = newPayload.getCounters(); - assertEquals(1, newCounters.size()); - - Counter newCounter = newCounters.get(0); - assertCounterEquals(counter, newCounter); - assertEquals(activeThreadCount, newPayload.getActiveThreadCount()); assertEquals(totalFlowFileCount, newPayload.getTotalFlowFileCount()); } - - private void assertCounterEquals(Counter expected, Counter actual) { - assertEquals(expected.getContext(), actual.getContext()); - assertEquals(expected.getIdentifier(), actual.getIdentifier()); - assertEquals(expected.getName(), actual.getName()); - assertEquals(expected.getValue(), actual.getValue()); - } }
