NIFI-2708 Added merging of SiteToSite details#981
Closed
jtstorck wants to merge 2 commits intoapache:masterfrom
Closed
NIFI-2708 Added merging of SiteToSite details#981jtstorck wants to merge 2 commits intoapache:masterfrom
jtstorck wants to merge 2 commits intoapache:masterfrom
Conversation
Contributor
Author
|
Ready for review. |
Contributor
|
Reviewing... |
| final PortDTO outputPort = nodeOutputPorts.iterator().next(); | ||
| final PortDTO clientOutputPort = clientDto.getInputPorts().stream().filter(p -> p.getId().equals(outputPort.getId())).findFirst().orElse(null); | ||
| if (clientOutputPort != null) { | ||
| PortEntityMerger.mergeDtos(clientOutputPort, outputPortByNodeId); |
Contributor
There was a problem hiding this comment.
It looks like PortEntityMerger.mergeDtos is expecting the dtoMap (2nd argument) to contain all DTOs including the clientDto. In the ControllerEndpointMerger it looks like the dtoMap will contain all DTOs except the clientDto. As a result, it looks like any validationErrors in clientDto will be lost.
Contributor
Author
|
Good catch. Updated so that it doesn't skip over aggregating the clientDto ports. |
Contributor
|
Looks good @jtstorck! This has been merged to master. |
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.
No description provided.