refactor processor run status handling and update error state return values

Author: Mihhai

minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-framework-core/src/main/java/org/apache/nifi/minifi/c2/C2NifiClientService.java

@@ -435,29 +435,14 @@ private ProcessorStatus convertProcessorStatus(org.apache.nifi.controller.status
         result.setProcessingNanos(processorStatus.getProcessingNanos());
         result.setActiveThreadCount(processorStatus.getActiveThreadCount());
         result.setTerminatedThreadCount(processorStatus.getTerminatedThreadCount());
-        RunStatus mappedRunStatus = mapProcessorRunStatus(processorStatus.getRunStatus());
-        if (mappedRunStatus != null) {
-            result.setRunStatus(mappedRunStatus);
-        }
+        result.setRunStatus(
+                processorStatus.getRunStatus() == org.apache.nifi.controller.status.RunStatus.Running
+                        ? RUNNING
+                        : STOPPED
+        );
         return result;
     }
 
-    private RunStatus mapProcessorRunStatus(org.apache.nifi.controller.status.RunStatus controllerRunStatus) {
-        if (controllerRunStatus == null) {
-            return null;
-        }
-        switch (controllerRunStatus) {
-            case Running:
-                return RUNNING;
-            case Stopped:
-            case Disabled:
-            case Invalid:
-            case Validating:
-                return STOPPED;
-        }
-        return null;
-    }
-
     private RunStatus getRunStatus() {
         ProcessGroup processGroup = flowController.getFlowManager().getRootGroup();
         return isProcessGroupRunning(processGroup)

minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-framework-core/src/main/java/org/apache/nifi/minifi/c2/command/DefaultProcessorStateStrategy.java

@@ -27,7 +27,6 @@
 
 import static org.apache.nifi.c2.protocol.api.C2OperationState.OperationState.FULLY_APPLIED;
 import static org.apache.nifi.c2.protocol.api.C2OperationState.OperationState.NOT_APPLIED;
-import static org.apache.nifi.c2.protocol.api.C2OperationState.OperationState.PARTIALLY_APPLIED;
 
 public class DefaultProcessorStateStrategy implements ProcessorStateStrategy {
 
@@ -67,7 +66,7 @@ private OperationState changeState(String processorId, boolean start) {
             return FULLY_APPLIED;
         } catch (Exception e) {
             LOGGER.error("Failed to change state for processor {}", processorId, e);
-            return PARTIALLY_APPLIED;
+            return NOT_APPLIED;
         }
     }
 }

minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-framework-core/src/test/java/org/apache/nifi/minifi/c2/command/DefaultProcessorStateStrategyTest.java

@@ -30,7 +30,6 @@
 
 import static org.apache.nifi.c2.protocol.api.C2OperationState.OperationState.FULLY_APPLIED;
 import static org.apache.nifi.c2.protocol.api.C2OperationState.OperationState.NOT_APPLIED;
-import static org.apache.nifi.c2.protocol.api.C2OperationState.OperationState.PARTIALLY_APPLIED;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mockito.Mockito.doThrow;
 import static org.mockito.Mockito.mock;
@@ -79,15 +78,15 @@ public void testStartProcessorNotAppliedWhenMissing() {
     }
 
     @Test
-    public void testStartProcessorPartiallyAppliedOnError() {
+    public void testStartProcessorNotAppliedOnError() {
         ProcessorNode node = mock(ProcessorNode.class);
         when(flowManager.getProcessorNode(PROCESSOR_ID)).thenReturn(node);
         when(node.getProcessGroupIdentifier()).thenReturn(GROUP_ID);
         doThrow(new RuntimeException("boom")).when(flowController).startProcessor(GROUP_ID, PROCESSOR_ID, true);
 
         OperationState result = victim.startProcessor(PROCESSOR_ID);
 
-        assertEquals(PARTIALLY_APPLIED, result);
+        assertEquals(NOT_APPLIED, result);
     }
 
     @Test
@@ -103,15 +102,15 @@ public void testStopProcessorFullyApplied() {
     }
 
     @Test
-    public void testStopProcessorPartiallyAppliedOnError() {
+    public void testStopProcessorNotAppliedOnError() {
         ProcessorNode node = mock(ProcessorNode.class);
         when(flowManager.getProcessorNode(PROCESSOR_ID)).thenReturn(node);
         when(node.getProcessGroupIdentifier()).thenReturn(GROUP_ID);
         doThrow(new RuntimeException("boom")).when(flowController).stopProcessor(GROUP_ID, PROCESSOR_ID);
 
         OperationState result = victim.stopProcessor(PROCESSOR_ID);
 
-        assertEquals(PARTIALLY_APPLIED, result);
+        assertEquals(NOT_APPLIED, result);
     }
 
     @Test