markap14 commented on code in PR #7017:
URL: https://github.com/apache/nifi/pull/7017#discussion_r1128388656
##########
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/util/FlowDifferenceFilters.java:
##########
@@ -192,22 +193,13 @@ public static boolean
isIgnorableVersionedFlowCoordinateChange(final FlowDiffere
final VersionedFlowCoordinates coordinatesB =
versionedProcessGroupB.getVersionedFlowCoordinates();
if (coordinatesA != null && coordinatesB != null) {
- String registryUrlA = coordinatesA.getRegistryUrl();
- String registryUrlB = coordinatesB.getRegistryUrl();
-
- if (registryUrlA != null && registryUrlB != null &&
!registryUrlA.equals(registryUrlB)) {
- if (registryUrlA.endsWith("/")) {
- registryUrlA = registryUrlA.substring(0,
registryUrlA.length() - 1);
- }
-
- if (registryUrlB.endsWith("/")) {
- registryUrlB = registryUrlB.substring(0,
registryUrlB.length() - 1);
- }
-
- if (registryUrlA.equals(registryUrlB)) {
- return true;
- }
+ if (coordinatesA.getStorageLocation() != null ||
coordinatesB.getStorageLocation() != null) {
+ return false;
}
+
+ return
!FlowDifferenceUtil.areRegistryStrictlyEqual(coordinatesA, coordinatesB)
+ &&
FlowDifferenceUtil.areRegistryUrlsEqual(coordinatesA, coordinatesB)
Review Comment:
I don't think this logic is accurate. We're saying here "If the registry
URLs are different but logically the same" - and the version is the same.
Shouldn't the `!FlowDifferenceUtil.areRegistryStrictlyEqual(coordinatesA,
coordinatesB)` be removed?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
