NIFI-16235 - Support rebasing locally added Controller Services in versioned Process Groups - #11571
Open
pvillard31 wants to merge 1 commit into
Open
NIFI-16235 - Support rebasing locally added Controller Services in versioned Process Groups#11571pvillard31 wants to merge 1 commit into
pvillard31 wants to merge 1 commit into
Conversation
…rsioned Process Groups
exceptionfactory
requested changes
Aug 25, 2026
exceptionfactory
left a comment
exceptionfactory
left a comment
Contributor
There was a problem hiding this comment.
Thanks for this addition @pvillard31. The basic approach looks good, I noted a handful of mostly test-related recommendations
Comment on lines
+168
to
+172
| assertEquals("Local Controller Service", insertedService.getName()); | ||
| assertEquals("org.apache.nifi.services.LocalControllerService", insertedService.getType()); | ||
| assertEquals("group", insertedService.getBundle().getGroup()); | ||
| assertEquals("artifact", insertedService.getBundle().getArtifact()); | ||
| assertEquals("1.0.0", insertedService.getBundle().getVersion()); |
Contributor
There was a problem hiding this comment.
These values should be declared statically and reused
| final ProcessGroupEntity originalGroup = util.createProcessGroup("Original", "root"); | ||
| final ControllerServiceEntity serviceX = util.createControllerService("FakeControllerService1", originalGroup.getId()); | ||
| final ProcessorEntity fakeProcessor = util.createProcessor("FakeProcessor", originalGroup.getId()); | ||
| util.updateProcessorProperties(fakeProcessor, Map.of("Fake Service", serviceX.getId())); |
Contributor
There was a problem hiding this comment.
It looks like Fake Service and some other values in this method should be declared once and reused
Comment on lines
+171
to
+175
| final VersionedControllerService versionNService = createControllerService("service-x", "Service X", "root"); | ||
| final VersionedControllerService localAddedService = createControllerService("service-y", "Service Y", "root"); | ||
|
|
||
| final VersionedProcessor versionNProcessor = createProcessorWithProperty("proc-a", "ProcessorA", "controller.service", "service-x"); | ||
| final VersionedProcessor localProcessor = createProcessorWithProperty("proc-a", "ProcessorA", "controller.service", "service-y"); |
Contributor
There was a problem hiding this comment.
The string values in this method and others could use promotion to static final variables
| final VersionedProcessGroup targetSnapshot) { | ||
| final VersionedComponent addedComponent = localDifference.getComponentB(); | ||
| if (!(addedComponent instanceof VersionedControllerService controllerService)) { | ||
| final String componentType = addedComponent == null ? "null" : addedComponent.getClass().getSimpleName(); |
Contributor
There was a problem hiding this comment.
Is the use of "null" as a string for componenType intentional? That seems like an odd default value. If it should be used, recommend declaring it statically as NULL_COMPONENT_TYPE
| final VersionedProcessGroup parentGroup = resolveParentGroup(targetSnapshot, parentGroupIdentifier, upstreamDifferences); | ||
| if (parentGroup == null) { | ||
| return RebaseAnalysis.ClassifiedDifference.unsupported(localDifference, RebaseConflictCode.COMPONENT_NOT_FOUND, | ||
| "Parent process group %s for controller service %s not found in target snapshot" |
Contributor
There was a problem hiding this comment.
Recommend capitalizing Process Group and Controller Service here an elsewhere as needed
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
NIFI-16235 - Support rebasing locally added Controller Services in versioned Process Groups
Tracking
Please complete the following tracking steps prior to pull request creation.
Issue Tracking
Pull Request Tracking
NIFI-00000NIFI-00000VerifiedstatusPull Request Formatting
mainbranchVerification
Please indicate the verification steps performed prior to pull request creation.
Build
./mvnw clean install -P contrib-checkLicensing
LICENSEandNOTICEfilesDocumentation