Repository: nifi-minifi Updated Branches: refs/heads/master d681f8fd6 -> 98877d674
http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/98877d67/minifi-toolkit/minifi-toolkit-configuration/src/test/java/org/apache/nifi/minifi/toolkit/configuration/ConfigMainTest.java ---------------------------------------------------------------------- diff --git a/minifi-toolkit/minifi-toolkit-configuration/src/test/java/org/apache/nifi/minifi/toolkit/configuration/ConfigMainTest.java b/minifi-toolkit/minifi-toolkit-configuration/src/test/java/org/apache/nifi/minifi/toolkit/configuration/ConfigMainTest.java index 10f263e..70f9e75 100644 --- a/minifi-toolkit/minifi-toolkit-configuration/src/test/java/org/apache/nifi/minifi/toolkit/configuration/ConfigMainTest.java +++ b/minifi-toolkit/minifi-toolkit-configuration/src/test/java/org/apache/nifi/minifi/toolkit/configuration/ConfigMainTest.java @@ -23,6 +23,7 @@ import org.apache.nifi.minifi.commons.schema.ConfigSchema; import org.apache.nifi.minifi.commons.schema.ConnectionSchema; import org.apache.nifi.minifi.commons.schema.ProcessorSchema; import org.apache.nifi.minifi.commons.schema.RemoteInputPortSchema; +import org.apache.nifi.minifi.commons.schema.RemoteProcessGroupSchema; import org.apache.nifi.minifi.commons.schema.common.ConvertableSchema; import org.apache.nifi.minifi.commons.schema.serialization.SchemaLoader; import org.apache.nifi.minifi.commons.schema.exception.SchemaLoaderException; @@ -202,6 +203,11 @@ public class ConfigMainTest { } @Test + public void testTransformRoundTripSimpleTailFileToRPG() throws IOException, JAXBException, SchemaLoaderException { + transformRoundTrip("SimpleTailFileToRPG"); + } + + @Test public void testSuccessTransformProcessGroup() throws IOException, JAXBException, SchemaLoaderException { ConfigMain.transformTemplateToSchema(getClass().getClassLoader().getResourceAsStream("TemplateWithProcessGroup.xml")).toMap(); } @@ -303,7 +309,18 @@ public class ConfigMainTest { v1Processor.setId(currentProcessor.getId()); } - configSchemaUpgradedFromV1.getProcessGroupSchema().getRemoteProcessingGroups().stream().flatMap(g -> g.getInputPorts().stream()).map(RemoteInputPortSchema::getId).sequential() + List<RemoteProcessGroupSchema> currentRPGs = configSchemaFromCurrent.getProcessGroupSchema().getRemoteProcessGroups(); + List<RemoteProcessGroupSchema> v1RPGs = configSchemaUpgradedFromV1.getProcessGroupSchema().getRemoteProcessGroups(); + // V1 doesn't have ids so we need to map the autogenerated ones to the ones from the template + for (int i = 0; i < currentRPGs.size(); i++) { + RemoteProcessGroupSchema currentRPG = currentRPGs.get(i); + RemoteProcessGroupSchema v1RPG = v1RPGs.get(i); + assertEquals(currentRPG.getName(), v1RPG.getName()); + v1IdToCurrentIdMap.put(v1RPG.getId(), currentRPG.getId()); + v1RPG.setId(currentRPG.getId()); + } + + configSchemaUpgradedFromV1.getProcessGroupSchema().getRemoteProcessGroups().stream().flatMap(g -> g.getInputPorts().stream()).map(RemoteInputPortSchema::getId).sequential() .forEach(id -> v1IdToCurrentIdMap.put(id, id)); List<ConnectionSchema> currentConnections = configSchemaFromCurrent.getProcessGroupSchema().getConnections(); http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/98877d67/minifi-toolkit/minifi-toolkit-configuration/src/test/java/org/apache/nifi/minifi/toolkit/configuration/dto/RemoteProcessGroupSchemaTest.java ---------------------------------------------------------------------- diff --git a/minifi-toolkit/minifi-toolkit-configuration/src/test/java/org/apache/nifi/minifi/toolkit/configuration/dto/RemoteProcessGroupSchemaTest.java b/minifi-toolkit/minifi-toolkit-configuration/src/test/java/org/apache/nifi/minifi/toolkit/configuration/dto/RemoteProcessGroupSchemaTest.java new file mode 100644 index 0000000..e4d5b46 --- /dev/null +++ b/minifi-toolkit/minifi-toolkit-configuration/src/test/java/org/apache/nifi/minifi/toolkit/configuration/dto/RemoteProcessGroupSchemaTest.java @@ -0,0 +1,161 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.nifi.minifi.toolkit.configuration.dto; + +import org.apache.nifi.minifi.commons.schema.RemoteInputPortSchema; +import org.apache.nifi.minifi.commons.schema.RemoteProcessGroupSchema; +import org.apache.nifi.minifi.commons.schema.common.CommonPropertyKeys; +import org.apache.nifi.web.api.dto.RemoteProcessGroupContentsDTO; +import org.apache.nifi.web.api.dto.RemoteProcessGroupDTO; +import org.junit.Before; +import org.junit.Test; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.UUID; +import java.util.stream.Collectors; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; + +public class RemoteProcessGroupSchemaTest extends BaseSchemaTester<RemoteProcessGroupSchema, RemoteProcessGroupDTO> { + private final RemoteInputPortSchemaTest remoteInputPortSchemaTest; + private String testId = UUID.randomUUID().toString(); + private String testName = "testName"; + private String testUrl = "testUrl"; + private String testComment = "testComment"; + private String testTimeout = "11 s"; + private String testYieldPeriod = "22 s"; + private String transportProtocol = "HTTP"; + + public RemoteProcessGroupSchemaTest() { + super(new RemoteProcessGroupSchemaFunction(new RemoteInputPortSchemaFunction()), RemoteProcessGroupSchema::new); + remoteInputPortSchemaTest = new RemoteInputPortSchemaTest(); + } + + @Before + public void setup() { + remoteInputPortSchemaTest.setup(); + + dto = new RemoteProcessGroupDTO(); + dto.setId(testId); + dto.setName(testName); + dto.setTargetUri(testUrl); + + RemoteProcessGroupContentsDTO contents = new RemoteProcessGroupContentsDTO(); + contents.setInputPorts(Arrays.asList(remoteInputPortSchemaTest.dto).stream().collect(Collectors.toSet())); + dto.setContents(contents); + + dto.setComments(testComment); + dto.setCommunicationsTimeout(testTimeout); + dto.setYieldDuration(testYieldPeriod); + dto.setTransportProtocol(transportProtocol); + + map = new HashMap<>(); + + map.put(CommonPropertyKeys.ID_KEY, testId); + map.put(CommonPropertyKeys.NAME_KEY, testName); + map.put(RemoteProcessGroupSchema.URL_KEY, testUrl); + map.put(CommonPropertyKeys.INPUT_PORTS_KEY, new ArrayList<>(Arrays.asList(remoteInputPortSchemaTest.map))); + map.put(CommonPropertyKeys.COMMENT_KEY, testComment); + map.put(RemoteProcessGroupSchema.TIMEOUT_KEY, testTimeout); + map.put(CommonPropertyKeys.YIELD_PERIOD_KEY, testYieldPeriod); + map.put(RemoteProcessGroupSchema.TRANSPORT_PROTOCOL_KEY, transportProtocol); + } + + @Test + public void testNoId() { + dto.setId(null); + map.remove(CommonPropertyKeys.ID_KEY); + assertDtoAndMapConstructorAreSame(1); + } + + @Test + public void testNoName() { + dto.setName(null); + map.remove(CommonPropertyKeys.NAME_KEY); + assertDtoAndMapConstructorAreSame(0); + } + + @Test + public void testNoUrl() { + dto.setTargetUri(null); + map.remove(RemoteProcessGroupSchema.URL_KEY); + assertDtoAndMapConstructorAreSame(1); + } + + @Test + public void testNoInputPorts() { + dto.getContents().setInputPorts(null); + map.remove(CommonPropertyKeys.INPUT_PORTS_KEY); + assertDtoAndMapConstructorAreSame(1); + } + + @Test + public void testNoComment() { + dto.setComments(null); + map.remove(CommonPropertyKeys.COMMENT_KEY); + assertDtoAndMapConstructorAreSame(0); + } + + @Test + public void testNoTimeout() { + dto.setCommunicationsTimeout(null); + map.remove(RemoteProcessGroupSchema.TIMEOUT_KEY); + assertDtoAndMapConstructorAreSame(0); + } + + @Test + public void testNoYield() { + dto.setYieldDuration(null); + map.remove(CommonPropertyKeys.YIELD_PERIOD_KEY); + assertDtoAndMapConstructorAreSame(0); + } + + @Test + public void testNoTransportProtocol() { + dto.setTransportProtocol(null); + map.remove(RemoteProcessGroupSchema.TRANSPORT_PROTOCOL_KEY); + assertDtoAndMapConstructorAreSame(0); + } + + @Override + public void assertSchemaEquals(RemoteProcessGroupSchema one, RemoteProcessGroupSchema two) { + assertEquals(one.getName(), two.getName()); + assertEquals(one.getUrl(), two.getUrl()); + + List<RemoteInputPortSchema> oneInputPorts = one.getInputPorts(); + List<RemoteInputPortSchema> twoInputPorts = two.getInputPorts(); + if (oneInputPorts == null) { + assertNull(twoInputPorts); + } else { + assertNotNull(twoInputPorts); + assertEquals(oneInputPorts.size(), twoInputPorts.size()); + for (int i = 0; i < oneInputPorts.size(); i++) { + remoteInputPortSchemaTest.assertSchemaEquals(oneInputPorts.get(i), twoInputPorts.get(i)); + } + } + + assertEquals(one.getComment(), two.getComment()); + assertEquals(one.getTimeout(), two.getTimeout()); + assertEquals(one.getYieldPeriod(), two.getYieldPeriod()); + } +} http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/98877d67/minifi-toolkit/minifi-toolkit-configuration/src/test/java/org/apache/nifi/minifi/toolkit/configuration/dto/RemoteProcessingGroupSchemaTest.java ---------------------------------------------------------------------- diff --git a/minifi-toolkit/minifi-toolkit-configuration/src/test/java/org/apache/nifi/minifi/toolkit/configuration/dto/RemoteProcessingGroupSchemaTest.java b/minifi-toolkit/minifi-toolkit-configuration/src/test/java/org/apache/nifi/minifi/toolkit/configuration/dto/RemoteProcessingGroupSchemaTest.java deleted file mode 100644 index bcd0a77..0000000 --- a/minifi-toolkit/minifi-toolkit-configuration/src/test/java/org/apache/nifi/minifi/toolkit/configuration/dto/RemoteProcessingGroupSchemaTest.java +++ /dev/null @@ -1,151 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.nifi.minifi.toolkit.configuration.dto; - -import org.apache.nifi.minifi.commons.schema.RemoteInputPortSchema; -import org.apache.nifi.minifi.commons.schema.RemoteProcessingGroupSchema; -import org.apache.nifi.minifi.commons.schema.common.CommonPropertyKeys; -import org.apache.nifi.web.api.dto.RemoteProcessGroupContentsDTO; -import org.apache.nifi.web.api.dto.RemoteProcessGroupDTO; -import org.junit.Before; -import org.junit.Test; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashMap; -import java.util.List; -import java.util.UUID; -import java.util.stream.Collectors; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; - -public class RemoteProcessingGroupSchemaTest extends BaseSchemaTester<RemoteProcessingGroupSchema, RemoteProcessGroupDTO> { - private final RemoteInputPortSchemaTest remoteInputPortSchemaTest; - private String testId = UUID.randomUUID().toString(); - private String testName = "testName"; - private String testUrl = "testUrl"; - private String testComment = "testComment"; - private String testTimeout = "11 s"; - private String testYieldPeriod = "22 s"; - - public RemoteProcessingGroupSchemaTest() { - super(new RemoteProcessingGroupSchemaFunction(new RemoteInputPortSchemaFunction()), RemoteProcessingGroupSchema::new); - remoteInputPortSchemaTest = new RemoteInputPortSchemaTest(); - } - - @Before - public void setup() { - remoteInputPortSchemaTest.setup(); - - dto = new RemoteProcessGroupDTO(); - dto.setId(testId); - dto.setName(testName); - dto.setTargetUri(testUrl); - - RemoteProcessGroupContentsDTO contents = new RemoteProcessGroupContentsDTO(); - contents.setInputPorts(Arrays.asList(remoteInputPortSchemaTest.dto).stream().collect(Collectors.toSet())); - dto.setContents(contents); - - dto.setComments(testComment); - dto.setCommunicationsTimeout(testTimeout); - dto.setYieldDuration(testYieldPeriod); - - map = new HashMap<>(); - - map.put(CommonPropertyKeys.ID_KEY, testId); - map.put(CommonPropertyKeys.NAME_KEY, testName); - map.put(RemoteProcessingGroupSchema.URL_KEY, testUrl); - map.put(CommonPropertyKeys.INPUT_PORTS_KEY, new ArrayList<>(Arrays.asList(remoteInputPortSchemaTest.map))); - map.put(CommonPropertyKeys.COMMENT_KEY, testComment); - map.put(RemoteProcessingGroupSchema.TIMEOUT_KEY, testTimeout); - map.put(CommonPropertyKeys.YIELD_PERIOD_KEY, testYieldPeriod); - } - - @Test - public void testNoId() { - dto.setId(null); - map.remove(CommonPropertyKeys.ID_KEY); - assertDtoAndMapConstructorAreSame(1); - } - - @Test - public void testNoName() { - dto.setName(null); - map.remove(CommonPropertyKeys.NAME_KEY); - assertDtoAndMapConstructorAreSame(0); - } - - @Test - public void testNoUrl() { - dto.setTargetUri(null); - map.remove(RemoteProcessingGroupSchema.URL_KEY); - assertDtoAndMapConstructorAreSame(1); - } - - @Test - public void testNoInputPorts() { - dto.getContents().setInputPorts(null); - map.remove(CommonPropertyKeys.INPUT_PORTS_KEY); - assertDtoAndMapConstructorAreSame(1); - } - - @Test - public void testNoComment() { - dto.setComments(null); - map.remove(CommonPropertyKeys.COMMENT_KEY); - assertDtoAndMapConstructorAreSame(0); - } - - @Test - public void testNoTimeout() { - dto.setCommunicationsTimeout(null); - map.remove(RemoteProcessingGroupSchema.TIMEOUT_KEY); - assertDtoAndMapConstructorAreSame(0); - } - - @Test - public void testNoYield() { - dto.setYieldDuration(null); - map.remove(CommonPropertyKeys.YIELD_PERIOD_KEY); - assertDtoAndMapConstructorAreSame(0); - } - - @Override - public void assertSchemaEquals(RemoteProcessingGroupSchema one, RemoteProcessingGroupSchema two) { - assertEquals(one.getName(), two.getName()); - assertEquals(one.getUrl(), two.getUrl()); - - List<RemoteInputPortSchema> oneInputPorts = one.getInputPorts(); - List<RemoteInputPortSchema> twoInputPorts = two.getInputPorts(); - if (oneInputPorts == null) { - assertNull(twoInputPorts); - } else { - assertNotNull(twoInputPorts); - assertEquals(oneInputPorts.size(), twoInputPorts.size()); - for (int i = 0; i < oneInputPorts.size(); i++) { - remoteInputPortSchemaTest.assertSchemaEquals(oneInputPorts.get(i), twoInputPorts.get(i)); - } - } - - assertEquals(one.getComment(), two.getComment()); - assertEquals(one.getTimeout(), two.getTimeout()); - assertEquals(one.getYieldPeriod(), two.getYieldPeriod()); - } -} http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/98877d67/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/CsvToJson.yml ---------------------------------------------------------------------- diff --git a/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/CsvToJson.yml b/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/CsvToJson.yml index 3707335..eaa16c2 100644 --- a/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/CsvToJson.yml +++ b/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/CsvToJson.yml @@ -193,4 +193,4 @@ Connections: max work queue data size: 0 MB flowfile expiration: 0 sec queue prioritizer class: org.apache.nifi.prioritizer.FirstInFirstOutPrioritizer -Remote Processing Groups: [] +Remote Process Groups: [] http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/98877d67/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/DecompressionCircularFlow.yml ---------------------------------------------------------------------- diff --git a/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/DecompressionCircularFlow.yml b/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/DecompressionCircularFlow.yml index c27fb62..4d11eac 100644 --- a/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/DecompressionCircularFlow.yml +++ b/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/DecompressionCircularFlow.yml @@ -332,4 +332,4 @@ Connections: max work queue data size: 0 MB flowfile expiration: 0 sec queue prioritizer class: org.apache.nifi.prioritizer.FirstInFirstOutPrioritizer -Remote Processing Groups: [] +Remote Process Groups: [] http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/98877d67/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/InvokeHttpMiNiFiTemplateTest.yml ---------------------------------------------------------------------- diff --git a/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/InvokeHttpMiNiFiTemplateTest.yml b/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/InvokeHttpMiNiFiTemplateTest.yml index 30e33f4..a427409 100644 --- a/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/InvokeHttpMiNiFiTemplateTest.yml +++ b/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/InvokeHttpMiNiFiTemplateTest.yml @@ -281,13 +281,14 @@ Connections: max work queue data size: 0 MB flowfile expiration: 0 sec queue prioritizer class: org.apache.nifi.prioritizer.FirstInFirstOutPrioritizer -Remote Processing Groups: +Remote Process Groups: - id: d41d8cd9-8f00-3204-a980-0998ecf8427e name: '' url: http://nifi:8080/nifi comment: '' timeout: 30 sec yield period: 10 sec + transport protocol: RAW Input Ports: - name: response id: b23a4621-cf19-42e6-967c-ffd3716e6a24 http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/98877d67/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/MultipleRelationships.yml ---------------------------------------------------------------------- diff --git a/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/MultipleRelationships.yml b/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/MultipleRelationships.yml index 4e3b479..8f8b038 100644 --- a/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/MultipleRelationships.yml +++ b/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/MultipleRelationships.yml @@ -150,4 +150,4 @@ Connections: max work queue data size: 1 GB flowfile expiration: 0 sec queue prioritizer class: '' -Remote Processing Groups: [] +Remote Process Groups: [] http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/98877d67/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/ProcessGroupsAndRemoteProcessGroups.xml ---------------------------------------------------------------------- diff --git a/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/ProcessGroupsAndRemoteProcessGroups.xml b/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/ProcessGroupsAndRemoteProcessGroups.xml index 8cd6f1b..d87c9b2 100644 --- a/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/ProcessGroupsAndRemoteProcessGroups.xml +++ b/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/ProcessGroupsAndRemoteProcessGroups.xml @@ -441,7 +441,7 @@ limitations under the License. <proxyHost></proxyHost> <proxyUser></proxyUser> <targetUri>http://localhost:9090/nifi</targetUri> - <transportProtocol>RAW</transportProtocol> + <transportProtocol>HTTP</transportProtocol> <yieldDuration>10 sec</yieldDuration> </remoteProcessGroups> </contents> http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/98877d67/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/ProcessGroupsAndRemoteProcessGroups.yml ---------------------------------------------------------------------- diff --git a/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/ProcessGroupsAndRemoteProcessGroups.yml b/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/ProcessGroupsAndRemoteProcessGroups.yml index 064cd44..46be605 100644 --- a/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/ProcessGroupsAndRemoteProcessGroups.yml +++ b/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/ProcessGroupsAndRemoteProcessGroups.yml @@ -173,13 +173,14 @@ Process Groups: max work queue data size: 1 GB flowfile expiration: 0 sec queue prioritizer class: '' - Remote Processing Groups: + Remote Process Groups: - id: 21a651bb-0158-1000-0000-000000000000 name: '' url: http://localhost:9091/nifi comment: '' timeout: 30 sec yield period: 10 sec + transport protocol: RAW Input Ports: - id: 21a39aba-0158-1000-a1a0-1b55bcddcd72 name: input2 @@ -232,13 +233,14 @@ Process Groups: max work queue data size: 1 GB flowfile expiration: 0 sec queue prioritizer class: '' - Remote Processing Groups: + Remote Process Groups: - id: 21a4e2f0-0158-1000-0000-000000000000 name: '' url: http://localhost:9090/nifi comment: '' timeout: 30 sec yield period: 10 sec + transport protocol: HTTP Input Ports: - id: 21a2fb5e-0158-1000-3b5e-5a7d3aaee01b name: input @@ -278,4 +280,4 @@ Connections: max work queue data size: 1 GB flowfile expiration: 0 sec queue prioritizer class: '' -Remote Processing Groups: [] +Remote Process Groups: [] http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/98877d67/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/ReplaceTextExpressionLanguageCSVReformatting.yml ---------------------------------------------------------------------- diff --git a/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/ReplaceTextExpressionLanguageCSVReformatting.yml b/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/ReplaceTextExpressionLanguageCSVReformatting.yml index 64a9108..cc89aa6 100644 --- a/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/ReplaceTextExpressionLanguageCSVReformatting.yml +++ b/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/ReplaceTextExpressionLanguageCSVReformatting.yml @@ -158,4 +158,4 @@ Connections: max work queue data size: 0 MB flowfile expiration: 0 sec queue prioritizer class: org.apache.nifi.prioritizer.FirstInFirstOutPrioritizer -Remote Processing Groups: [] +Remote Process Groups: [] http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/98877d67/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/SimpleTailFileToRPG-v1.yml ---------------------------------------------------------------------- diff --git a/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/SimpleTailFileToRPG-v1.yml b/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/SimpleTailFileToRPG-v1.yml new file mode 100644 index 0000000..183d891 --- /dev/null +++ b/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/SimpleTailFileToRPG-v1.yml @@ -0,0 +1,102 @@ +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the \"License\"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an \"AS IS\" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +Flow Controller: + name: Simple TailFile To RPG + comment: '' +Core Properties: + flow controller graceful shutdown period: 10 sec + flow service write delay interval: 500 ms + administrative yield duration: 30 sec + bored yield duration: 10 millis + max concurrent threads: 1 +FlowFile Repository: + partitions: 256 + checkpoint interval: 2 mins + always sync: false + Swap: + threshold: 20000 + in period: 5 sec + in threads: 1 + out period: 5 sec + out threads: 4 +Content Repository: + content claim max appendable size: 10 MB + content claim max flow files: 100 + always sync: false +Provenance Repository: + provenance rollover time: 1 min +Component Status Repository: + buffer size: 1440 + snapshot frequency: 1 min +Security Properties: + keystore: '' + keystore type: '' + keystore password: '' + key password: '' + truststore: '' + truststore type: '' + truststore password: '' + ssl protocol: '' + Sensitive Props: + key: + algorithm: PBEWITHMD5AND256BITAES-CBC-OPENSSL + provider: BC +Processors: +- name: TailFile + class: org.apache.nifi.processors.standard.TailFile + max concurrent tasks: 1 + scheduling strategy: TIMER_DRIVEN + scheduling period: 1 sec + penalization period: 30 sec + yield period: 1 sec + run duration nanos: 0 + auto-terminated relationships list: [] + Properties: + File Location: Local + File to Tail: ./logs/minifi-app.log + Initial Start Position: Beginning of File + Rolling Filename Pattern: + tail-base-directory: + tail-mode: Single file + tailfile-lookup-frequency: 10 minutes + tailfile-maximum-age: 24 hours + tailfile-recursive-lookup: 'false' + tailfile-rolling-strategy: Fixed name +Connections: +- name: TailFile/success/ac0e798c-0158-1000-0588-cda9b944e011 + source name: TailFile + source relationship name: success + destination name: ac0e798c-0158-1000-0588-cda9b944e011 + max work queue size: 10000 + max work queue data size: 1 GB + flowfile expiration: 0 sec + queue prioritizer class: '' +Remote Processing Groups: +- url: http://localhost:8080/nifi + comment: '' + timeout: 30 sec + yield period: 10 sec + Input Ports: + - id: aca664f8-0158-1000-a139-92485891d349 + name: test2 + comment: '' + max concurrent tasks: 1 + use compression: false + - id: ac0e798c-0158-1000-0588-cda9b944e011 + name: test + comment: '' + max concurrent tasks: 1 + use compression: false http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/98877d67/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/SimpleTailFileToRPG.xml ---------------------------------------------------------------------- diff --git a/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/SimpleTailFileToRPG.xml b/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/SimpleTailFileToRPG.xml new file mode 100644 index 0000000..da88f2d --- /dev/null +++ b/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/SimpleTailFileToRPG.xml @@ -0,0 +1,213 @@ +<?xml version="1.0" ?> +<!-- +Licensed to the Apache Software Foundation (ASF) under one or more +contributor license agreements. See the NOTICE file distributed with +this work for additional information regarding copyright ownership. +The ASF licenses this file to You under the Apache License, Version 2.0 +(the "License"); you may not use this file except in compliance with +the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. + --> +<template encoding-version="1.0"> + <description></description> + <groupId>92d57ac5-0158-1000-aab7-42ca398aadea</groupId> + <name>Simple TailFile To RPG</name> + <snippet> + <connections> + <id>b0c0c3cc-0158-1000-0000-000000000000</id> + <parentGroupId>92d57ac5-0158-1000-0000-000000000000</parentGroupId> + <backPressureDataSizeThreshold>1 GB</backPressureDataSizeThreshold> + <backPressureObjectThreshold>10000</backPressureObjectThreshold> + <destination> + <groupId>b0c09ff0-0158-1000-0000-000000000000</groupId> + <id>ac0e798c-0158-1000-0588-cda9b944e011</id> + <type>REMOTE_INPUT_PORT</type> + </destination> + <flowFileExpiration>0 sec</flowFileExpiration> + <labelIndex>1</labelIndex> + <name></name> + <selectedRelationships>success</selectedRelationships> + <source> + <groupId>92d57ac5-0158-1000-0000-000000000000</groupId> + <id>b0c04f28-0158-1000-0000-000000000000</id> + <type>PROCESSOR</type> + </source> + <zIndex>0</zIndex> + </connections> + <processors> + <id>b0c04f28-0158-1000-0000-000000000000</id> + <parentGroupId>92d57ac5-0158-1000-0000-000000000000</parentGroupId> + <position> + <x>20.698639744598154</x> + <y>0.0</y> + </position> + <config> + <bulletinLevel>WARN</bulletinLevel> + <comments></comments> + <concurrentlySchedulableTaskCount>1</concurrentlySchedulableTaskCount> + <descriptors> + <entry> + <key>tail-mode</key> + <value> + <name>tail-mode</name> + </value> + </entry> + <entry> + <key>File to Tail</key> + <value> + <name>File to Tail</name> + </value> + </entry> + <entry> + <key>Rolling Filename Pattern</key> + <value> + <name>Rolling Filename Pattern</name> + </value> + </entry> + <entry> + <key>tail-base-directory</key> + <value> + <name>tail-base-directory</name> + </value> + </entry> + <entry> + <key>Initial Start Position</key> + <value> + <name>Initial Start Position</name> + </value> + </entry> + <entry> + <key>File Location</key> + <value> + <name>File Location</name> + </value> + </entry> + <entry> + <key>tailfile-recursive-lookup</key> + <value> + <name>tailfile-recursive-lookup</name> + </value> + </entry> + <entry> + <key>tailfile-rolling-strategy</key> + <value> + <name>tailfile-rolling-strategy</name> + </value> + </entry> + <entry> + <key>tailfile-lookup-frequency</key> + <value> + <name>tailfile-lookup-frequency</name> + </value> + </entry> + <entry> + <key>tailfile-maximum-age</key> + <value> + <name>tailfile-maximum-age</name> + </value> + </entry> + </descriptors> + <executionNode>ALL</executionNode> + <lossTolerant>false</lossTolerant> + <penaltyDuration>30 sec</penaltyDuration> + <properties> + <entry> + <key>tail-mode</key> + <value>Single file</value> + </entry> + <entry> + <key>File to Tail</key> + <value>./logs/minifi-app.log</value> + </entry> + <entry> + <key>Rolling Filename Pattern</key> + </entry> + <entry> + <key>tail-base-directory</key> + </entry> + <entry> + <key>Initial Start Position</key> + <value>Beginning of File</value> + </entry> + <entry> + <key>File Location</key> + <value>Local</value> + </entry> + <entry> + <key>tailfile-recursive-lookup</key> + <value>false</value> + </entry> + <entry> + <key>tailfile-rolling-strategy</key> + <value>Fixed name</value> + </entry> + <entry> + <key>tailfile-lookup-frequency</key> + <value>10 minutes</value> + </entry> + <entry> + <key>tailfile-maximum-age</key> + <value>24 hours</value> + </entry> + </properties> + <runDurationMillis>0</runDurationMillis> + <schedulingPeriod>1 sec</schedulingPeriod> + <schedulingStrategy>TIMER_DRIVEN</schedulingStrategy> + <yieldDuration>1 sec</yieldDuration> + </config> + <name>TailFile</name> + <relationships> + <autoTerminate>false</autoTerminate> + <name>success</name> + </relationships> + <style></style> + <type>org.apache.nifi.processors.standard.TailFile</type> + </processors> + <remoteProcessGroups> + <id>b0c09ff0-0158-1000-0000-000000000000</id> + <parentGroupId>92d57ac5-0158-1000-0000-000000000000</parentGroupId> + <position> + <x>0.0</x> + <y>255.68887264079288</y> + </position> + <communicationsTimeout>30 sec</communicationsTimeout> + <contents> + <inputPorts> + <comments></comments> + <concurrentlySchedulableTaskCount>1</concurrentlySchedulableTaskCount> + <connected>false</connected> + <exists>true</exists> + <id>aca664f8-0158-1000-a139-92485891d349</id> + <name>test2</name> + <targetRunning>false</targetRunning> + <transmitting>false</transmitting> + <useCompression>false</useCompression> + </inputPorts> + <inputPorts> + <comments></comments> + <concurrentlySchedulableTaskCount>1</concurrentlySchedulableTaskCount> + <connected>true</connected> + <exists>true</exists> + <id>ac0e798c-0158-1000-0588-cda9b944e011</id> + <name>test</name> + <targetRunning>false</targetRunning> + <transmitting>false</transmitting> + <useCompression>false</useCompression> + </inputPorts> + </contents> + <proxyHost></proxyHost> + <proxyUser></proxyUser> + <targetUri>http://localhost:8080/nifi</targetUri> + <transportProtocol>RAW</transportProtocol> + <yieldDuration>10 sec</yieldDuration> + </remoteProcessGroups> + </snippet> + <timestamp>11/29/2016 10:43:33 EST</timestamp> +</template> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/98877d67/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/SimpleTailFileToRPG.yml ---------------------------------------------------------------------- diff --git a/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/SimpleTailFileToRPG.yml b/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/SimpleTailFileToRPG.yml new file mode 100644 index 0000000..c70a018 --- /dev/null +++ b/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/SimpleTailFileToRPG.yml @@ -0,0 +1,113 @@ +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the \"License\"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an \"AS IS\" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +MiNiFi Config Version: 2 +Flow Controller: + name: Simple TailFile To RPG + comment: '' +Core Properties: + flow controller graceful shutdown period: 10 sec + flow service write delay interval: 500 ms + administrative yield duration: 30 sec + bored yield duration: 10 millis + max concurrent threads: 1 +FlowFile Repository: + partitions: 256 + checkpoint interval: 2 mins + always sync: false + Swap: + threshold: 20000 + in period: 5 sec + in threads: 1 + out period: 5 sec + out threads: 4 +Content Repository: + content claim max appendable size: 10 MB + content claim max flow files: 100 + always sync: false +Provenance Repository: + provenance rollover time: 1 min +Component Status Repository: + buffer size: 1440 + snapshot frequency: 1 min +Security Properties: + keystore: '' + keystore type: '' + keystore password: '' + key password: '' + truststore: '' + truststore type: '' + truststore password: '' + ssl protocol: '' + Sensitive Props: + key: + algorithm: PBEWITHMD5AND256BITAES-CBC-OPENSSL + provider: BC +Processors: +- id: b0c04f28-0158-1000-0000-000000000000 + name: TailFile + class: org.apache.nifi.processors.standard.TailFile + max concurrent tasks: 1 + scheduling strategy: TIMER_DRIVEN + scheduling period: 1 sec + penalization period: 30 sec + yield period: 1 sec + run duration nanos: 0 + auto-terminated relationships list: [] + Properties: + File Location: Local + File to Tail: ./logs/minifi-app.log + Initial Start Position: Beginning of File + Rolling Filename Pattern: + tail-base-directory: + tail-mode: Single file + tailfile-lookup-frequency: 10 minutes + tailfile-maximum-age: 24 hours + tailfile-recursive-lookup: 'false' + tailfile-rolling-strategy: Fixed name +Process Groups: [] +Input Ports: [] +Output Ports: [] +Funnels: [] +Connections: +- id: b0c0c3cc-0158-1000-0000-000000000000 + name: TailFile/success/ac0e798c-0158-1000-0588-cda9b944e011 + source id: b0c04f28-0158-1000-0000-000000000000 + source relationship names: + - success + destination id: ac0e798c-0158-1000-0588-cda9b944e011 + max work queue size: 10000 + max work queue data size: 1 GB + flowfile expiration: 0 sec + queue prioritizer class: '' +Remote Process Groups: +- id: b0c09ff0-0158-1000-0000-000000000000 + name: '' + url: http://localhost:8080/nifi + comment: '' + timeout: 30 sec + yield period: 10 sec + transport protocol: RAW + Input Ports: + - id: aca664f8-0158-1000-a139-92485891d349 + name: test2 + comment: '' + max concurrent tasks: 1 + use compression: false + - id: ac0e798c-0158-1000-0588-cda9b944e011 + name: test + comment: '' + max concurrent tasks: 1 + use compression: false http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/98877d67/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/StressTestFramework.yml ---------------------------------------------------------------------- diff --git a/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/StressTestFramework.yml b/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/StressTestFramework.yml index 2df4526..b510f97 100644 --- a/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/StressTestFramework.yml +++ b/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/StressTestFramework.yml @@ -123,4 +123,4 @@ Connections: max work queue data size: 0 MB flowfile expiration: 0 sec queue prioritizer class: org.apache.nifi.prioritizer.FirstInFirstOutPrioritizer -Remote Processing Groups: [] +Remote Process Groups: [] http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/98877d67/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/StressTestFrameworkFunnel.yml ---------------------------------------------------------------------- diff --git a/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/StressTestFrameworkFunnel.yml b/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/StressTestFrameworkFunnel.yml index bbbda3a..95e8f52 100644 --- a/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/StressTestFrameworkFunnel.yml +++ b/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/StressTestFrameworkFunnel.yml @@ -208,4 +208,4 @@ Connections: max work queue data size: 0 MB flowfile expiration: 0 sec queue prioritizer class: org.apache.nifi.prioritizer.FirstInFirstOutPrioritizer -Remote Processing Groups: [] \ No newline at end of file +Remote Process Groups: [] \ No newline at end of file http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/98877d67/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/config.yml ---------------------------------------------------------------------- diff --git a/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/config.yml b/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/config.yml index b6a4902..c1685af 100644 --- a/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/config.yml +++ b/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/config.yml @@ -81,7 +81,7 @@ Connections: max work queue data size: 1 MB flowfile expiration: 60 sec queue prioritizer class: org.apache.nifi.prioritizer.NewestFlowFileFirstPrioritizer -Remote Processing Groups: +Remote Process Groups: - id: 94b8e610-b4ed-3ec9-b26f-c839931bf3e3 name: NiFi Flow url: https://localhost:8090/nifi
