Apache
/
nifi
mirror of https://github.com/apache/nifi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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 <exceptionfactory@apache.org>
This commit is contained in:
Joe Gresock 2022-10-03 11:29:01 -04:00 committed by exceptionfactory
parent 11ff622882
commit 10a5e9194c
No known key found for this signature in database
GPG Key ID: 29B6A52D2AAE8DBA
2 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/flow/synchronization/StandardVersionedComponentSynchronizer.java
View File

@ -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); group.setVariables(updatedVariableMap);
} }

22
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/util/FlowDifferenceFilters.java
View File

@ -31,6 +31,7 @@ import org.apache.nifi.flow.VersionedLabel;
import org.apache.nifi.flow.VersionedPort; import org.apache.nifi.flow.VersionedPort;
import org.apache.nifi.flow.VersionedProcessGroup; import org.apache.nifi.flow.VersionedProcessGroup;
import org.apache.nifi.flow.VersionedProcessor; import org.apache.nifi.flow.VersionedProcessor;
import org.apache.nifi.groups.ProcessGroup;
import org.apache.nifi.processor.Relationship; import org.apache.nifi.processor.Relationship;
import org.apache.nifi.registry.flow.diff.DifferenceType; import org.apache.nifi.registry.flow.diff.DifferenceType;
import org.apache.nifi.registry.flow.diff.FlowDifference; 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) { public static boolean isEnvironmentalChange(final FlowDifference difference, final VersionedProcessGroup localGroup, final FlowManager flowManager) {
return difference.getDifferenceType() == DifferenceType.BUNDLE_CHANGED return difference.getDifferenceType() == DifferenceType.BUNDLE_CHANGED
|| isVariableValueChange(difference) || isVariableValueChange(difference)
|| isAncestorVariableAdded(difference, flowManager)
|| isRpgUrlChange(difference) || isRpgUrlChange(difference)
|| isAddedOrRemovedRemotePort(difference) || isAddedOrRemovedRemotePort(difference)
|| isPublicPortNameChange(difference) || isPublicPortNameChange(difference)
@ -322,6 +324,26 @@ public class FlowDifferenceFilters {
return flowDifference.getDifferenceType() == DifferenceType.VARIABLE_CHANGED; 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) { public static boolean isRpgUrlChange(final FlowDifference flowDifference) {
return flowDifference.getDifferenceType() == DifferenceType.RPG_URL_CHANGED; return flowDifference.getDifferenceType() == DifferenceType.RPG_URL_CHANGED;
} }