You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by bb...@apache.org on 2019/07/26 18:13:30 UTC
[nifi-registry] branch master updated: NIFIREG-294: Added Scheduled
State Changed as a difference type and updated the descriptors and
comparators to make use of it
This is an automated email from the ASF dual-hosted git repository.
bbende pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nifi-registry.git
The following commit(s) were added to refs/heads/master by this push:
new 990834f NIFIREG-294: Added Scheduled State Changed as a difference type and updated the descriptors and comparators to make use of it
990834f is described below
commit 990834f03866ba47d0651e0302754d0370257b08
Author: Mark Payne <ma...@hotmail.com>
AuthorDate: Thu Jul 25 11:06:21 2019 -0400
NIFIREG-294: Added Scheduled State Changed as a difference type and updated the descriptors and comparators to make use of it
---
.../registry/flow/diff/ConciseEvolvingDifferenceDescriptor.java | 8 ++++++++
.../java/org/apache/nifi/registry/flow/diff/DifferenceType.java | 5 +++++
.../nifi/registry/flow/diff/EvolvingDifferenceDescriptor.java | 8 ++++++++
.../apache/nifi/registry/flow/diff/StandardFlowComparator.java | 1 +
.../nifi/registry/flow/diff/StaticDifferenceDescriptor.java | 8 ++++++++
5 files changed, 30 insertions(+)
diff --git a/nifi-registry-core/nifi-registry-flow-diff/src/main/java/org/apache/nifi/registry/flow/diff/ConciseEvolvingDifferenceDescriptor.java b/nifi-registry-core/nifi-registry-flow-diff/src/main/java/org/apache/nifi/registry/flow/diff/ConciseEvolvingDifferenceDescriptor.java
index 76fdfc5..177bad9 100644
--- a/nifi-registry-core/nifi-registry-flow-diff/src/main/java/org/apache/nifi/registry/flow/diff/ConciseEvolvingDifferenceDescriptor.java
+++ b/nifi-registry-core/nifi-registry-flow-diff/src/main/java/org/apache/nifi/registry/flow/diff/ConciseEvolvingDifferenceDescriptor.java
@@ -19,6 +19,7 @@ package org.apache.nifi.registry.flow.diff;
import java.util.Objects;
+import org.apache.nifi.registry.flow.ScheduledState;
import org.apache.nifi.registry.flow.VersionedComponent;
import org.apache.nifi.registry.flow.VersionedFlowCoordinates;
@@ -40,6 +41,13 @@ public class ConciseEvolvingDifferenceDescriptor implements DifferenceDescriptor
case COMPONENT_REMOVED:
description = String.format("%s was removed", componentA.getComponentType().getTypeName());
break;
+ case SCHEDULED_STATE_CHANGED:
+ if (ScheduledState.DISABLED.equals(valueA)) {
+ description = String.format("%s was enabled", componentA.getComponentType().getTypeName());
+ } else {
+ description = String.format("%s was disabled", componentA.getComponentType().getTypeName());
+ }
+ break;
case PROPERTY_ADDED:
description = String.format("Property '%s' was added", fieldName);
break;
diff --git a/nifi-registry-core/nifi-registry-flow-diff/src/main/java/org/apache/nifi/registry/flow/diff/DifferenceType.java b/nifi-registry-core/nifi-registry-flow-diff/src/main/java/org/apache/nifi/registry/flow/diff/DifferenceType.java
index 047f557..ebba0f9 100644
--- a/nifi-registry-core/nifi-registry-flow-diff/src/main/java/org/apache/nifi/registry/flow/diff/DifferenceType.java
+++ b/nifi-registry-core/nifi-registry-flow-diff/src/main/java/org/apache/nifi/registry/flow/diff/DifferenceType.java
@@ -79,6 +79,11 @@ public enum DifferenceType {
RUN_SCHEDULE_CHANGED("Run Schedule Changed"),
/**
+ * The component has a different scheduled state (enabled/disabled) in each of the flows
+ */
+ SCHEDULED_STATE_CHANGED("Scheduled State Changed"),
+
+ /**
* The component has a different execution mode in each of the flows
*/
EXECUTION_MODE_CHANGED("Execution Mode Changed"),
diff --git a/nifi-registry-core/nifi-registry-flow-diff/src/main/java/org/apache/nifi/registry/flow/diff/EvolvingDifferenceDescriptor.java b/nifi-registry-core/nifi-registry-flow-diff/src/main/java/org/apache/nifi/registry/flow/diff/EvolvingDifferenceDescriptor.java
index c3300e6..9a21026 100644
--- a/nifi-registry-core/nifi-registry-flow-diff/src/main/java/org/apache/nifi/registry/flow/diff/EvolvingDifferenceDescriptor.java
+++ b/nifi-registry-core/nifi-registry-flow-diff/src/main/java/org/apache/nifi/registry/flow/diff/EvolvingDifferenceDescriptor.java
@@ -17,6 +17,7 @@
package org.apache.nifi.registry.flow.diff;
+import org.apache.nifi.registry.flow.ScheduledState;
import org.apache.nifi.registry.flow.VersionedComponent;
/**
@@ -37,6 +38,13 @@ public class EvolvingDifferenceDescriptor implements DifferenceDescriptor {
case COMPONENT_REMOVED:
description = String.format("%s with ID %s was removed from flow", componentA.getComponentType().getTypeName(), componentA.getIdentifier());
break;
+ case SCHEDULED_STATE_CHANGED:
+ if (ScheduledState.DISABLED.equals(valueA)) {
+ description = String.format("%s was enabled", componentA.getComponentType().getTypeName());
+ } else {
+ description = String.format("%s was disabled", componentA.getComponentType().getTypeName());
+ }
+ break;
case PROPERTY_ADDED:
description = String.format("Property '%s' was added to %s with ID %s", fieldName, componentB.getComponentType().getTypeName(), componentB.getIdentifier());
break;
diff --git a/nifi-registry-core/nifi-registry-flow-diff/src/main/java/org/apache/nifi/registry/flow/diff/StandardFlowComparator.java b/nifi-registry-core/nifi-registry-flow-diff/src/main/java/org/apache/nifi/registry/flow/diff/StandardFlowComparator.java
index e583d99..cb28b83 100644
--- a/nifi-registry-core/nifi-registry-flow-diff/src/main/java/org/apache/nifi/registry/flow/diff/StandardFlowComparator.java
+++ b/nifi-registry-core/nifi-registry-flow-diff/src/main/java/org/apache/nifi/registry/flow/diff/StandardFlowComparator.java
@@ -147,6 +147,7 @@ public class StandardFlowComparator implements FlowComparator {
addIfDifferent(differences, DifferenceType.RUN_DURATION_CHANGED, processorA, processorB, VersionedProcessor::getRunDurationMillis);
addIfDifferent(differences, DifferenceType.RUN_SCHEDULE_CHANGED, processorA, processorB, VersionedProcessor::getSchedulingPeriod);
addIfDifferent(differences, DifferenceType.SCHEDULING_STRATEGY_CHANGED, processorA, processorB, VersionedProcessor::getSchedulingStrategy);
+ addIfDifferent(differences, DifferenceType.SCHEDULED_STATE_CHANGED, processorA, processorB, VersionedProcessor::getScheduledState);
addIfDifferent(differences, DifferenceType.STYLE_CHANGED, processorA, processorB, VersionedProcessor::getStyle);
addIfDifferent(differences, DifferenceType.YIELD_DURATION_CHANGED, processorA, processorB, VersionedProcessor::getYieldDuration);
compareProperties(processorA, processorB, processorA.getProperties(), processorB.getProperties(), processorA.getPropertyDescriptors(), processorB.getPropertyDescriptors(), differences);
diff --git a/nifi-registry-core/nifi-registry-flow-diff/src/main/java/org/apache/nifi/registry/flow/diff/StaticDifferenceDescriptor.java b/nifi-registry-core/nifi-registry-flow-diff/src/main/java/org/apache/nifi/registry/flow/diff/StaticDifferenceDescriptor.java
index 5bf82c1..9dd9c5c 100644
--- a/nifi-registry-core/nifi-registry-flow-diff/src/main/java/org/apache/nifi/registry/flow/diff/StaticDifferenceDescriptor.java
+++ b/nifi-registry-core/nifi-registry-flow-diff/src/main/java/org/apache/nifi/registry/flow/diff/StaticDifferenceDescriptor.java
@@ -19,6 +19,7 @@ package org.apache.nifi.registry.flow.diff;
import java.util.Objects;
+import org.apache.nifi.registry.flow.ScheduledState;
import org.apache.nifi.registry.flow.VersionedComponent;
import org.apache.nifi.registry.flow.VersionedFlowCoordinates;
@@ -50,6 +51,13 @@ public class StaticDifferenceDescriptor implements DifferenceDescriptor {
description = String.format("Property '%s' exists for %s with ID %s in %s but not in %s",
fieldName, componentA.getComponentType().getTypeName(), componentA.getIdentifier(), flowAName, flowBName);
break;
+ case SCHEDULED_STATE_CHANGED:
+ if (ScheduledState.DISABLED.equals(valueA)) {
+ description = String.format("%s is disabled in %s but enabled in %s", componentA.getComponentType().getTypeName(), flowAName, flowBName);
+ } else {
+ description = String.format("%s is enabled in %s but disabled in %s", componentA.getComponentType().getTypeName(), flowAName, flowBName);
+ }
+ break;
case VARIABLE_ADDED:
description = String.format("Variable '%s' exists for Process Group with ID %s in %s but not in %s",
fieldName, componentB.getIdentifier(), flowBName, flowAName);