Skip to content

NIFI-15661 - Flow Comparison should not report child components for nested versioned PGs with version-only changes#10955

Open
pvillard31 wants to merge 1 commit intoapache:mainfrom
pvillard31:NIFI-15661
Open

NIFI-15661 - Flow Comparison should not report child components for nested versioned PGs with version-only changes#10955
pvillard31 wants to merge 1 commit intoapache:mainfrom
pvillard31:NIFI-15661

Conversation

@pvillard31
Copy link
Contributor

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

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 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 according to the License Policy
  • New dependencies are documented in applicable LICENSE and NOTICE files

Documentation

  • Documentation formatting appears as expected in rendered files

…ested versioned PGs with version-only changes
@pvillard31 pvillard31 added the bug label Mar 3, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant