[nifi] branch main updated: NIFI-10572: Allowing variables to be deleted between versions, and considering ancestor variable additions to be environmental

[exceptionfactory]

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

exceptionfactory 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 10a5e9194c NIFI-10572: Allowing variables to be deleted between 
versions, and considering ancestor variable additions to be environmental
10a5e9194c is described below

commit 10a5e9194cdaed555badc30b9e3bd5585b56cedd
Author: Joe Gresock <jgres...@gmail.com>
AuthorDate: Mon Oct 3 11:29:01 2022 -0400

    NIFI-10572: Allowing variables to be deleted between versions, and 
considering ancestor variable additions to be environmental
    
    This closes #6474
    
    Signed-off-by: David Handermann <exceptionfact...@apache.org>
---
 .../StandardVersionedComponentSynchronizer.java    |  7 +++++++
 .../apache/nifi/util/FlowDifferenceFilters.java    | 22 ++++++++++++++++++++++
 2 files changed, 29 insertions(+)

diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/flow/synchronization/StandardVersionedComponentSynchronizer.java
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/flow/synchronization/StandardVersionedComponentSynchronizer.java
index ea6bf81de9..401c8b5463 100644
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/flow/synchronization/StandardVersionedComponentSynchronizer.java
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/flow/synchronization/StandardVersionedComponentSynchronizer.java
@@ -1939,6 +1939,13 @@ public class StandardVersionedComponentSynchronizer 
implements VersionedComponen
             }
         }
 
+        // If any variables were removed from the proposed flow, add those as 
null values to remove them from the variable registry.
+        for (final String existingVariableName : existingVariableMap.keySet()) 
{
+            if (!proposed.getVariables().containsKey(existingVariableName)) {
+                updatedVariableMap.put(existingVariableName, null);
+            }
+        }
+
         group.setVariables(updatedVariableMap);
     }
 
diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/util/FlowDifferenceFilters.java
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/util/FlowDifferenceFilters.java
index a170833985..512bc3696e 100644
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/util/FlowDifferenceFilters.java
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/util/FlowDifferenceFilters.java
@@ -31,6 +31,7 @@ import org.apache.nifi.flow.VersionedLabel;
 import org.apache.nifi.flow.VersionedPort;
 import org.apache.nifi.flow.VersionedProcessGroup;
 import org.apache.nifi.flow.VersionedProcessor;
+import org.apache.nifi.groups.ProcessGroup;
 import org.apache.nifi.processor.Relationship;
 import org.apache.nifi.registry.flow.diff.DifferenceType;
 import org.apache.nifi.registry.flow.diff.FlowDifference;
@@ -58,6 +59,7 @@ public class FlowDifferenceFilters {
     public static boolean isEnvironmentalChange(final FlowDifference 
difference, final VersionedProcessGroup localGroup, final FlowManager 
flowManager) {
         return difference.getDifferenceType() == DifferenceType.BUNDLE_CHANGED
             || isVariableValueChange(difference)
+            || isAncestorVariableAdded(difference, flowManager)
             || isRpgUrlChange(difference)
             || isAddedOrRemovedRemotePort(difference)
             || isPublicPortNameChange(difference)
@@ -322,6 +324,26 @@ public class FlowDifferenceFilters {
         return flowDifference.getDifferenceType() == 
DifferenceType.VARIABLE_CHANGED;
     }
 
+    public static boolean isAncestorVariableAdded(final FlowDifference fd, 
final FlowManager flowManager) {
+        if (fd.getDifferenceType() == DifferenceType.VARIABLE_ADDED) {
+            if (fd.getComponentA() instanceof InstantiatedVersionedComponent) {
+                final InstantiatedVersionedComponent componentA = 
(InstantiatedVersionedComponent) fd.getComponentA();
+                final ProcessGroup processGroup = 
flowManager.getGroup(componentA.getInstanceIdentifier());
+                if 
(processGroup.getVariableRegistry().getVariableKey(fd.getFieldName().get()) == 
null)  {
+                    return true;
+                }
+            } else if (fd.getComponentB() instanceof 
InstantiatedVersionedComponent) {
+                final InstantiatedVersionedComponent componentB = 
(InstantiatedVersionedComponent) fd.getComponentB();
+                final ProcessGroup processGroup = 
flowManager.getGroup(componentB.getInstanceIdentifier());
+                if 
(processGroup.getVariableRegistry().getVariableKey(fd.getFieldName().get()) == 
null)  {
+                    return true;
+                }
+            }
+        }
+
+        return false;
+    }
+
     public static boolean isRpgUrlChange(final FlowDifference flowDifference) {
         return flowDifference.getDifferenceType() == 
DifferenceType.RPG_URL_CHANGED;
     }