Repository: nifi-minifi Updated Branches: refs/heads/master 5c6add80a -> b5313503f
MINIFI-281 - Using RemoteProcessGroupSchemaV2 This closes #83. Signed-off-by: Aldrin Piri <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/nifi-minifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi-minifi/commit/b5313503 Tree: http://git-wip-us.apache.org/repos/asf/nifi-minifi/tree/b5313503 Diff: http://git-wip-us.apache.org/repos/asf/nifi-minifi/diff/b5313503 Branch: refs/heads/master Commit: b5313503f5d263d1054cf37a0a996248f91b7ae8 Parents: 5c6add8 Author: Bryan Rosander <[email protected]> Authored: Fri Apr 28 10:48:31 2017 -0400 Committer: Aldrin Piri <[email protected]> Committed: Mon May 8 08:06:00 2017 -0400 ---------------------------------------------------------------------- .../bootstrap/util/ParentGroupIdResolverTest.java | 2 +- .../nifi/minifi/commons/schema/v2/ConfigSchemaV2.java | 5 ++--- .../minifi/commons/schema/v2/ProcessGroupSchemaV2.java | 9 ++++----- .../commons/schema/v2/RemoteProcessGroupSchemaV2.java | 12 ++++++++++++ 4 files changed, 19 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/b5313503/minifi-bootstrap/src/test/java/org/apache/nifi/minifi/bootstrap/util/ParentGroupIdResolverTest.java ---------------------------------------------------------------------- diff --git a/minifi-bootstrap/src/test/java/org/apache/nifi/minifi/bootstrap/util/ParentGroupIdResolverTest.java b/minifi-bootstrap/src/test/java/org/apache/nifi/minifi/bootstrap/util/ParentGroupIdResolverTest.java index cdcd47b..9c5e65f 100644 --- a/minifi-bootstrap/src/test/java/org/apache/nifi/minifi/bootstrap/util/ParentGroupIdResolverTest.java +++ b/minifi-bootstrap/src/test/java/org/apache/nifi/minifi/bootstrap/util/ParentGroupIdResolverTest.java @@ -67,7 +67,7 @@ public class ParentGroupIdResolverTest { @Test public void testRemoteOutputPortParentId() throws IOException, SchemaLoaderException { List<String> configLines = new ArrayList<>(); - configLines.add("MiNiFi Config Version: 2"); + configLines.add("MiNiFi Config Version: 3"); configLines.add("Remote Process Groups:"); configLines.add("- name: rpgOne"); configLines.add(" id: rpgOneId"); http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/b5313503/minifi-commons/minifi-commons-schema/src/main/java/org/apache/nifi/minifi/commons/schema/v2/ConfigSchemaV2.java ---------------------------------------------------------------------- diff --git a/minifi-commons/minifi-commons-schema/src/main/java/org/apache/nifi/minifi/commons/schema/v2/ConfigSchemaV2.java b/minifi-commons/minifi-commons-schema/src/main/java/org/apache/nifi/minifi/commons/schema/v2/ConfigSchemaV2.java index 9daec38..b4b106d 100644 --- a/minifi-commons/minifi-commons-schema/src/main/java/org/apache/nifi/minifi/commons/schema/v2/ConfigSchemaV2.java +++ b/minifi-commons/minifi-commons-schema/src/main/java/org/apache/nifi/minifi/commons/schema/v2/ConfigSchemaV2.java @@ -45,7 +45,6 @@ import org.apache.nifi.minifi.commons.schema.ProcessorSchema; import org.apache.nifi.minifi.commons.schema.ProvenanceReportingSchema; import org.apache.nifi.minifi.commons.schema.ProvenanceRepositorySchema; import org.apache.nifi.minifi.commons.schema.RemotePortSchema; -import org.apache.nifi.minifi.commons.schema.RemoteProcessGroupSchema; import org.apache.nifi.minifi.commons.schema.SecurityPropertiesSchema; import org.apache.nifi.minifi.commons.schema.common.BaseSchema; import org.apache.nifi.minifi.commons.schema.common.CollectionOverlap; @@ -109,12 +108,12 @@ public class ConfigSchemaV2 extends BaseSchema implements ConvertableSchema<Conf List<ProcessGroupSchemaV2> allProcessGroups = getAllProcessGroups(processGroupSchema); List<ConnectionSchema> allConnectionSchemas = allProcessGroups.stream().flatMap(p -> p.getConnections().stream()).collect(Collectors.toList()); - List<RemoteProcessGroupSchema> allRemoteProcessGroups = allProcessGroups.stream().flatMap(p -> p.getRemoteProcessGroups().stream()).collect(Collectors.toList()); + List<RemoteProcessGroupSchemaV2> allRemoteProcessGroups = allProcessGroups.stream().flatMap(p -> p.getRemoteProcessGroups().stream()).collect(Collectors.toList()); List<String> allProcessorIds = allProcessGroups.stream().flatMap(p -> p.getProcessors().stream()).map(ProcessorSchema::getId).collect(Collectors.toList()); List<String> allFunnelIds = allProcessGroups.stream().flatMap(p -> p.getFunnels().stream()).map(FunnelSchema::getId).collect(Collectors.toList()); List<String> allConnectionIds = allConnectionSchemas.stream().map(ConnectionSchema::getId).collect(Collectors.toList()); - List<String> allRemoteProcessGroupNames = allRemoteProcessGroups.stream().map(RemoteProcessGroupSchema::getName).collect(Collectors.toList()); + List<String> allRemoteProcessGroupNames = allRemoteProcessGroups.stream().map(RemoteProcessGroupSchemaV2::getName).collect(Collectors.toList()); List<String> allRemoteInputPortIds = allRemoteProcessGroups.stream().filter(r -> r.getInputPorts() != null) .flatMap(r -> r.getInputPorts().stream()).map(RemotePortSchema::getId).collect(Collectors.toList()); List<String> allInputPortIds = allProcessGroups.stream().flatMap(p -> p.getInputPortSchemas().stream()).map(PortSchema::getId).collect(Collectors.toList()); http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/b5313503/minifi-commons/minifi-commons-schema/src/main/java/org/apache/nifi/minifi/commons/schema/v2/ProcessGroupSchemaV2.java ---------------------------------------------------------------------- diff --git a/minifi-commons/minifi-commons-schema/src/main/java/org/apache/nifi/minifi/commons/schema/v2/ProcessGroupSchemaV2.java b/minifi-commons/minifi-commons-schema/src/main/java/org/apache/nifi/minifi/commons/schema/v2/ProcessGroupSchemaV2.java index 2e8559a..187a618 100644 --- a/minifi-commons/minifi-commons-schema/src/main/java/org/apache/nifi/minifi/commons/schema/v2/ProcessGroupSchemaV2.java +++ b/minifi-commons/minifi-commons-schema/src/main/java/org/apache/nifi/minifi/commons/schema/v2/ProcessGroupSchemaV2.java @@ -23,7 +23,6 @@ import org.apache.nifi.minifi.commons.schema.FunnelSchema; import org.apache.nifi.minifi.commons.schema.PortSchema; import org.apache.nifi.minifi.commons.schema.ProcessGroupSchema; import org.apache.nifi.minifi.commons.schema.ProcessorSchema; -import org.apache.nifi.minifi.commons.schema.RemoteProcessGroupSchema; import org.apache.nifi.minifi.commons.schema.common.BaseSchemaWithIdAndName; import org.apache.nifi.minifi.commons.schema.common.ConvertableSchema; import org.apache.nifi.minifi.commons.schema.common.StringUtil; @@ -55,7 +54,7 @@ public class ProcessGroupSchemaV2 extends BaseSchemaWithIdAndName implements Wri private List<ProcessorSchema> processors; private List<FunnelSchema> funnels; private List<ConnectionSchema> connections; - private List<RemoteProcessGroupSchema> remoteProcessGroups; + private List<RemoteProcessGroupSchemaV2> remoteProcessGroups; private List<ProcessGroupSchemaV2> processGroupSchemas; private List<PortSchema> inputPortSchemas; private List<PortSchema> outputPortSchemas; @@ -65,7 +64,7 @@ public class ProcessGroupSchemaV2 extends BaseSchemaWithIdAndName implements Wri processors = getOptionalKeyAsList(map, PROCESSORS_KEY, ProcessorSchema::new, wrapperName); funnels = getOptionalKeyAsList(map, FUNNELS_KEY, FunnelSchema::new, wrapperName); - remoteProcessGroups = getOptionalKeyAsList(map, REMOTE_PROCESS_GROUPS_KEY, RemoteProcessGroupSchema::new, wrapperName); + remoteProcessGroups = getOptionalKeyAsList(map, REMOTE_PROCESS_GROUPS_KEY, RemoteProcessGroupSchemaV2::new, wrapperName); connections = getOptionalKeyAsList(map, CONNECTIONS_KEY, ConnectionSchema::new, wrapperName); inputPortSchemas = getOptionalKeyAsList(map, INPUT_PORTS_KEY, m -> new PortSchema(m, "InputPort(id: {id}, name: {name})"), wrapperName); outputPortSchemas = getOptionalKeyAsList(map, OUTPUT_PORTS_KEY, m -> new PortSchema(m, "OutputPort(id: {id}, name: {name})"), wrapperName); @@ -109,7 +108,7 @@ public class ProcessGroupSchemaV2 extends BaseSchemaWithIdAndName implements Wri putListIfNotNull(result, OUTPUT_PORTS_KEY, outputPortSchemas); putListIfNotNull(result, FUNNELS_KEY, funnels); putListIfNotNull(result, CONNECTIONS_KEY, connections); - putListIfNotNull(result, REMOTE_PROCESS_GROUPS_KEY, remoteProcessGroups); + putListIfNotNull(result, REMOTE_PROCESS_GROUPS_KEY, remoteProcessGroups.stream().map(RemoteProcessGroupSchemaV2::convert).collect(Collectors.toList())); return result; } @@ -125,7 +124,7 @@ public class ProcessGroupSchemaV2 extends BaseSchemaWithIdAndName implements Wri return connections; } - public List<RemoteProcessGroupSchema> getRemoteProcessGroups() { + public List<RemoteProcessGroupSchemaV2> getRemoteProcessGroups() { return remoteProcessGroups; } http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/b5313503/minifi-commons/minifi-commons-schema/src/main/java/org/apache/nifi/minifi/commons/schema/v2/RemoteProcessGroupSchemaV2.java ---------------------------------------------------------------------- diff --git a/minifi-commons/minifi-commons-schema/src/main/java/org/apache/nifi/minifi/commons/schema/v2/RemoteProcessGroupSchemaV2.java b/minifi-commons/minifi-commons-schema/src/main/java/org/apache/nifi/minifi/commons/schema/v2/RemoteProcessGroupSchemaV2.java index 447a848..23076b1 100644 --- a/minifi-commons/minifi-commons-schema/src/main/java/org/apache/nifi/minifi/commons/schema/v2/RemoteProcessGroupSchemaV2.java +++ b/minifi-commons/minifi-commons-schema/src/main/java/org/apache/nifi/minifi/commons/schema/v2/RemoteProcessGroupSchemaV2.java @@ -98,4 +98,16 @@ public class RemoteProcessGroupSchemaV2 extends BaseSchema implements Convertabl public String getTransportProtocol() { return transportProtocol; } + + public String getName() { + return idAndName.getName(); + } + + public String getId() { + return idAndName.getId(); + } + + public List<RemotePortSchema> getInputPorts() { + return inputPorts; + } }
