pvillard31 opened a new pull request, #10955:
URL: https://github.com/apache/nifi/pull/10955

   # Summary
   
   NIFI-15661 - Flow Comparison should not report child components for nested 
versioned PGs with version-only changes
   
   When a separately version-controlled nested Process Group has only its 
version number changed (same registry, bucket, and flow), the parent's "Show 
Local Changes" incorrectly reports every individual component inside the child 
PG as added/removed. This is because the `hasProcessGroupContents` check in the 
`compareGroupContents` condition overrides the version-only skip logic, causing 
a full content comparison even when `shouldCompareVersioned` is correctly 
`false`.
   
   The fix removes the `hasProcessGroupContents` check from the condition. This 
is safe because the remaining conditions already cover all cases:
   - `!bothGroupsVersioned` handles regular (non-versioned) nested PGs — their 
contents are always compared
   - `shouldCompareVersioned` handles versioned PGs where registry/bucket/flow 
coordinates changed, or when DEEP strategy is requested
   - The early return added by NIFI-15366 handles versioned PGs where all 
coordinates match (contents skipped)
   
   The `hasProcessGroupContents` method was only needed to fill a gap that 
doesn't actually exist: when both groups are versioned and only the version 
number differs, there is no reason to compare contents. The version coordinate 
change itself is the meaningful difference to report.
   
   # Tracking
   
   Please complete the following tracking steps prior to pull request creation.
   
   ### Issue Tracking
   
   - [ ] [Apache NiFi Jira](https://issues.apache.org/jira/browse/NIFI) issue 
created
   
   ### Pull Request Tracking
   
   - [ ] Pull Request title starts with Apache NiFi Jira issue number, such as 
`NIFI-00000`
   - [ ] Pull Request commit message starts with Apache NiFi Jira issue number, 
as such `NIFI-00000`
   - [ ] Pull request contains [commits 
signed](https://docs.github.com/en/authentication/managing-commit-signature-verification/signing-commits)
 with a registered key indicating `Verified` status
   
   ### Pull Request Formatting
   
   - [ ] Pull Request based on current revision of the `main` branch
   - [ ] Pull Request refers to a feature branch with one commit containing 
changes
   
   # Verification
   
   Please indicate the verification steps performed prior to pull request 
creation.
   
   ### Build
   
   - [ ] Build completed using `./mvnw clean install -P contrib-check`
     - [ ] JDK 21
     - [ ] JDK 25
   
   ### Licensing
   
   - [ ] New dependencies are compatible with the [Apache License 
2.0](https://apache.org/licenses/LICENSE-2.0) according to the [License 
Policy](https://www.apache.org/legal/resolved.html)
   - [ ] New dependencies are documented in applicable `LICENSE` and `NOTICE` 
files
   
   ### Documentation
   
   - [ ] Documentation formatting appears as expected in rendered files
   


-- 
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]

Reply via email to