[nifi] branch main updated: NIFI-7627: Fixed typo that showed the wrong case for Run Statuses in the ProcessorRunStatusDetailsDTO (#4400)

[bbende]

This is an automated email from the ASF dual-hosted git repository.

bbende pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git


The following commit(s) were added to refs/heads/main by this push:
     new f8a7305  NIFI-7627: Fixed typo that showed the wrong case for Run 
Statuses in the ProcessorRunStatusDetailsDTO (#4400)
f8a7305 is described below

commit f8a730568fcb7734fb0e70755581622d8261d424
Author: markap14 <marka...@hotmail.com>
AuthorDate: Tue Jul 14 15:44:52 2020 -0400

    NIFI-7627: Fixed typo that showed the wrong case for Run Statuses in the 
ProcessorRunStatusDetailsDTO (#4400)
---
 .../nifi/web/api/dto/ProcessorRunStatusDetailsDTO.java      | 13 ++++++-------
 .../nifi/web/util/ClusterReplicationComponentLifecycle.java |  4 +++-
 .../java/org/apache/nifi/tests/system/NiFiSystemIT.java     |  2 +-
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ProcessorRunStatusDetailsDTO.java
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ProcessorRunStatusDetailsDTO.java
index 862c80d..87fc14c 100644
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ProcessorRunStatusDetailsDTO.java
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ProcessorRunStatusDetailsDTO.java
@@ -24,12 +24,11 @@ import java.util.Set;
 
 @XmlType(name = "runStatusDetails")
 public class ProcessorRunStatusDetailsDTO {
-    public static final String VALID = "VALID";
-    public static final String RUNNING = "RUNNING";
-    public static final String STOPPED = "STOPPED";
-    public static final String INVALID = "INVALID";
-    public static final String VALIDATING = "VALIDATING";
-    public static final String DISABLED = "DISABLED";
+    public static final String RUNNING = "Running";
+    public static final String STOPPED = "Stopped";
+    public static final String INVALID = "Invalid";
+    public static final String VALIDATING = "Validating";
+    public static final String DISABLED = "Disabled";
 
 
     private String id;
@@ -58,7 +57,7 @@ public class ProcessorRunStatusDetailsDTO {
 
     @ApiModelProperty(
         value = "The run status of the processor",
-        allowableValues = RUNNING + ", " + STOPPED + ", " + INVALID + ", " + 
VALIDATING + ", " + VALID + ", " + DISABLED
+        allowableValues = RUNNING + ", " + STOPPED + ", " + INVALID + ", " + 
VALIDATING + ", " + DISABLED
     )
     public String getRunStatus() {
         return runStatus;
diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/util/ClusterReplicationComponentLifecycle.java
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/util/ClusterReplicationComponentLifecycle.java
index 6c20b7e..8c96336 100644
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/util/ClusterReplicationComponentLifecycle.java
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/util/ClusterReplicationComponentLifecycle.java
@@ -203,7 +203,7 @@ public class ClusterReplicationComponentLifecycle 
implements ComponentLifecycle
             final ProcessorsRunStatusDetailsEntity runStatusDetailsEntity = 
getResponseEntity(clusterResponse, ProcessorsRunStatusDetailsEntity.class);
 
             if (isProcessorValidationComplete(runStatusDetailsEntity, 
processors)) {
-                logger.debug("All {} processors of interest now have been 
validated", processors.size());
+                logger.debug("All {} processors of interest now have been 
validated: {}", processors.size(), processorIds);
                 return true;
             }
 
@@ -219,6 +219,8 @@ public class ClusterReplicationComponentLifecycle 
implements ComponentLifecycle
 
         for (final ProcessorRunStatusDetailsEntity statusDetailsEntity : 
runStatusDetailsEntity.getRunStatusDetails()) {
             final ProcessorRunStatusDetailsDTO runStatusDetails = 
statusDetailsEntity.getRunStatusDetails();
+
+            logger.debug("Processor {} now has Run Status of {}", 
runStatusDetails.getId(), runStatusDetails.getRunStatus());
             if (!affectedComponents.containsKey(runStatusDetails.getId())) {
                 continue;
             }
diff --git 
a/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/NiFiSystemIT.java
 
b/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/NiFiSystemIT.java
index 55b1402..84aa978 100644
--- 
a/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/NiFiSystemIT.java
+++ 
b/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/NiFiSystemIT.java
@@ -151,7 +151,7 @@ public abstract class NiFiSystemIT {
                     return;
                 }
 
-                logEverySecond("Waiting for {} nodes to connect but currently 
on {} nodes are connected", expectedNumberOfNodes, connectedNodeCount);
+                logEverySecond("Waiting for {} nodes to connect but currently 
only {} nodes are connected", expectedNumberOfNodes, connectedNodeCount);
 
                 if (System.currentTimeMillis() > maxTime) {
                     throw new RuntimeException("Waited up to 60 seconds for 
both nodes to connect but only " + connectedNodeCount + " nodes connected");