You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by ma...@apache.org on 2016/07/14 19:20:08 UTC
[2/2] nifi git commit: NIFI-1413: Rebased against master and updated
templates endpoint merge to use template entities instead of template dto's
NIFI-1413: Rebased against master and updated templates endpoint merge to use template entities instead of template dto's
This closes #649
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/f6136b69
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/f6136b69
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/f6136b69
Branch: refs/heads/master
Commit: f6136b69e53feeb77768096afba6f5cd800014a1
Parents: 329192a
Author: Mark Payne <ma...@hotmail.com>
Authored: Thu Jul 14 10:06:46 2016 -0400
Committer: Matt Burgess <ma...@apache.org>
Committed: Thu Jul 14 15:19:47 2016 -0400
----------------------------------------------------------------------
.../http/endpoints/TemplatesEndpointMerger.java | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi/blob/f6136b69/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/coordination/http/endpoints/TemplatesEndpointMerger.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/coordination/http/endpoints/TemplatesEndpointMerger.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/coordination/http/endpoints/TemplatesEndpointMerger.java
index a07289d..516cba9 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/coordination/http/endpoints/TemplatesEndpointMerger.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/coordination/http/endpoints/TemplatesEndpointMerger.java
@@ -28,6 +28,7 @@ import java.util.stream.Collectors;
import org.apache.nifi.cluster.coordination.http.EndpointResponseMerger;
import org.apache.nifi.cluster.manager.NodeResponse;
import org.apache.nifi.web.api.dto.TemplateDTO;
+import org.apache.nifi.web.api.entity.TemplateEntity;
import org.apache.nifi.web.api.entity.TemplatesEntity;
public class TemplatesEndpointMerger implements EndpointResponseMerger {
@@ -42,7 +43,7 @@ public class TemplatesEndpointMerger implements EndpointResponseMerger {
return TemplatesEntity.class;
}
- protected Set<TemplateDTO> getDtos(final TemplatesEntity entity) {
+ protected Set<TemplateEntity> getDtos(final TemplatesEntity entity) {
return entity.getTemplates();
}
@@ -61,11 +62,11 @@ public class TemplatesEndpointMerger implements EndpointResponseMerger {
// Find the templates that all nodes know about. We do this by mapping Template ID to Template and
// then for each node, removing any template whose ID is not known to that node. After iterating over
// all of the nodes, we are left with a Map whose contents are those Templates known by all nodes.
- Map<String, TemplateDTO> templatesById = null;
+ Map<String, TemplateEntity> templatesById = null;
for (final NodeResponse nodeResponse : successfulResponses) {
final TemplatesEntity entity = nodeResponse == clientResponse ? responseEntity : nodeResponse.getClientResponse().getEntity(TemplatesEntity.class);
- final Set<TemplateDTO> templateDtos = entity.getTemplates();
- final Map<String, TemplateDTO> nodeTemplatesById = templateDtos.stream().collect(Collectors.toMap(dto -> dto.getId(), dto -> dto));
+ final Set<TemplateEntity> templateEntities = entity.getTemplates();
+ final Map<String, TemplateEntity> nodeTemplatesById = templateEntities.stream().collect(Collectors.toMap(ent -> ent.getId(), ent -> ent));
if (templatesById == null) {
// Create new HashMap so that the map that we have is modifiable.