Github user jtstorck commented on a diff in the pull request:
https://github.com/apache/nifi/pull/471#discussion_r65096222
--- Diff:
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/StandardNiFiServiceFacade.java
---
@@ -1354,55 +1349,55 @@ private void validateSnippetContents(final
FlowSnippetDTO flow) {
@Override
public FlowEntity copySnippet(final String groupId, final String
snippetId, final Double originX, final Double originY, final String
idGenerationSeed) {
final FlowDTO flowDto = revisionManager.get(groupId,
- rev -> {
- // create the new snippet
- final FlowSnippetDTO snippet =
snippetDAO.copySnippet(groupId, snippetId, originX, originY, idGenerationSeed);
-
- // validate the new snippet
- validateSnippetContents(snippet);
+ rev -> {
+ // create the new snippet
+ final FlowSnippetDTO snippet =
snippetDAO.copySnippet(groupId, snippetId, originX, originY, idGenerationSeed);
- // save the flow
- controllerFacade.save();
-
- // drop the snippet
- snippetDAO.dropSnippet(snippetId);
+ // validate the new snippet
+ validateSnippetContents(snippet);
- // identify all components added
- final Set<String> identifiers = new HashSet<>();
- snippet.getProcessors().stream()
- .map(proc -> proc.getId())
- .forEach(id -> identifiers.add(id));
- snippet.getConnections().stream()
- .map(conn -> conn.getId())
- .forEach(id -> identifiers.add(id));
- snippet.getInputPorts().stream()
- .map(port -> port.getId())
- .forEach(id -> identifiers.add(id));
- snippet.getOutputPorts().stream()
- .map(port -> port.getId())
- .forEach(id -> identifiers.add(id));
- snippet.getProcessGroups().stream()
- .map(group -> group.getId())
- .forEach(id -> identifiers.add(id));
- snippet.getRemoteProcessGroups().stream()
- .map(remoteGroup -> remoteGroup.getId())
- .forEach(id -> identifiers.add(id));
- snippet.getRemoteProcessGroups().stream()
- .flatMap(remoteGroup ->
remoteGroup.getContents().getInputPorts().stream())
- .map(remoteInputPort -> remoteInputPort.getId())
- .forEach(id -> identifiers.add(id));
- snippet.getRemoteProcessGroups().stream()
- .flatMap(remoteGroup ->
remoteGroup.getContents().getOutputPorts().stream())
- .map(remoteOutputPort -> remoteOutputPort.getId())
- .forEach(id -> identifiers.add(id));
+ // save the flow
+ controllerFacade.save();
- final ProcessGroup processGroup =
processGroupDAO.getProcessGroup(groupId);
- return revisionManager.get(identifiers,
- () -> {
- final ProcessGroupStatus groupStatus =
controllerFacade.getProcessGroupStatus(groupId);
- return dtoFactory.createFlowDto(processGroup,
groupStatus, snippet, revisionManager);
- });
- });
+ // drop the snippet
+ snippetDAO.dropSnippet(snippetId);
+
+ // identify all components added
+ final Set<String> identifiers = new HashSet<>();
+ snippet.getProcessors().stream()
+ .map(proc -> proc.getId())
+ .forEach(id -> identifiers.add(id));
+ snippet.getConnections().stream()
+ .map(conn -> conn.getId())
+ .forEach(id -> identifiers.add(id));
+ snippet.getInputPorts().stream()
+ .map(port -> port.getId())
+ .forEach(id -> identifiers.add(id));
+ snippet.getOutputPorts().stream()
+ .map(port -> port.getId())
+ .forEach(id -> identifiers.add(id));
+ snippet.getProcessGroups().stream()
+ .map(group -> group.getId())
+ .forEach(id -> identifiers.add(id));
+ snippet.getRemoteProcessGroups().stream()
+ .map(remoteGroup -> remoteGroup.getId())
+ .forEach(id -> identifiers.add(id));
+ snippet.getRemoteProcessGroups().stream()
+ .flatMap(remoteGroup ->
remoteGroup.getContents().getInputPorts().stream())
--- End diff --
I did fix that bug, in the createTemplateInstance method. Looks like
copySnippet might have the same issue.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [email protected] or file a JIRA ticket
with INFRA.
---
