Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

NIFI-12368 Clear versionedComponentId on top-level components of popu… #8025

Closed
wants to merge 3 commits into from
Closed

NIFI-12368 Clear versionedComponentId on top-level components of popu… #8025

wants to merge 3 commits into from

Conversation

bbende
Copy link
Contributor

@bbende bbende commented Nov 14, 2023

…lated Snippet

Summary

NIFI-12368

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 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 mvn clean install -P contrib-check
    • JDK 21

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

exceptionfactory
exceptionfactory reviewed Nov 16, 2023
View reviewed changes
Copy link
Contributor

@exceptionfactory exceptionfactory left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks addressing this issue @bbende. The change appears straightforward, so I created a unit test to validate the behavior. In the course of the testing, I was wondering whether the source snippet or the destination versionedComponentId values should be cleared. I created the test based on the behavior you have implemented, but just wanted to verify that is the intent.

...ifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/util/SnippetUtils.java Outdated
@@ -404,9 +404,26 @@ private Set<ControllerServiceDTO> getControllerServices(final Map<PropertyDescri
public FlowSnippetDTO copy(final FlowSnippetDTO snippetContents, final ProcessGroup group, final String idGenerationSeed, boolean isCopy) {
final FlowSnippetDTO snippetCopy = copyContentsForGroup(snippetContents, group.getIdentifier(), null, null, idGenerationSeed, isCopy);
resolveNameConflicts(snippetCopy, group);
removeTopLevelVersionedIds(snippetContents);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this clear the source snippet, as it is doing now, or the copy snippet?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch, it was meant to clear the copy since that is what will be used to instantiate the components, will update

exceptionfactory
exceptionfactory approved these changes Nov 16, 2023
View reviewed changes
Copy link
Contributor

@exceptionfactory exceptionfactory left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for making the adjustment @bbende, looks good! +1 merging

exceptionfactory pushed a commit that referenced this pull request Nov 16, 2023
@bbende @exceptionfactory
NIFI-12368 Clear versionedComponentId for copied Snippets
ac2a5af 
This closes #8025

Signed-off-by: David Handermann <exceptionfactory@apache.org>
(cherry picked from commit 1cc346b)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@exceptionfactory exceptionfactory exceptionfactory approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@bbende @exceptionfactory