NIFI-6028: Updates to ignore changes between local version of a flow …#3544
Closed
markap14 wants to merge 2 commits intoapache:masterfrom
Closed
NIFI-6028: Updates to ignore changes between local version of a flow …#3544markap14 wants to merge 2 commits intoapache:masterfrom
markap14 wants to merge 2 commits intoapache:masterfrom
Conversation
…and a remote version of a flow if the difference is the addition of a new property that has the default value
Contributor
|
Will review... |
mcgilman
reviewed
Jun 25, 2019
| return false; | ||
| } | ||
|
|
||
| private static boolean isNewPropertyWithDefaultValue(final FlowDifference fd, final ProcessorNode processorNode) { |
Contributor
There was a problem hiding this comment.
This method appears to be overloaded below. However, the parameter that differs shares a common ancestor interface. I think we can update the args to use a ComponentNode and remove the duplicated code.
Contributor
Author
There was a problem hiding this comment.
D'oh, good point! Will push a new commit that takes advantage of this.
Contributor
|
Outside of the minor comment above, I am a +1 for this PR. However, we cannot merge it in as it requires a new version of NiFi Registry. Once the Registry is released, we should be good to merge this in. |
Contributor
|
I tested this with nifi.registry.version set to the released 0.5.0 version and all looks good, going to merge |
szaboferee
pushed a commit
to szaboferee/nifi
that referenced
this pull request
Oct 7, 2019
…and a remote version of a flow if the difference is the addition of a new property that has the default value NIFI-6028: Code refactoring to address review feedback This closes apache#3544. Signed-off-by: Bryan Bende <bbende@apache.org>
patricker
pushed a commit
to patricker/nifi
that referenced
this pull request
Jan 22, 2020
…and a remote version of a flow if the difference is the addition of a new property that has the default value NIFI-6028: Code refactoring to address review feedback This closes apache#3544. Signed-off-by: Bryan Bende <bbende@apache.org>
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
3 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.
…and a remote version of a flow if the difference is the addition of a new property that has the default value
Thank you for submitting a contribution to Apache NiFi.
Please provide a short description of the PR here:
Description of PR
Enables X functionality; fixes bug NIFI-YYYY.
In order to streamline the review of the contribution we ask you
to ensure the following steps have been taken:
For all changes:
Is there a JIRA ticket associated with this PR? Is it referenced
in the commit message?
Does your PR title start with NIFI-XXXX where XXXX is the JIRA number you are trying to resolve? Pay particular attention to the hyphen "-" character.
Has your PR been rebased against the latest commit within the target branch (typically
master)?Is your initial contribution a single, squashed commit? Additional commits in response to PR reviewer feedback should be made on this branch and pushed to allow change tracking. Do not
squashor use--forcewhen pushing to allow for clean monitoring of changes.For code changes:
mvn -Pcontrib-check clean installat the rootnififolder?LICENSEfile, including the mainLICENSEfile undernifi-assembly?NOTICEfile, including the mainNOTICEfile found undernifi-assembly?.displayNamein addition to .name (programmatic access) for each of the new properties?For documentation related changes:
Note:
Please ensure that once the PR is submitted, you check travis-ci for build issues and submit an update to your PR as soon as possible.