Repository: nifi-minifi
Updated Branches:
  refs/heads/master 8431750dc -> 93af87dd8


http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/93af87dd/minifi-toolkit/minifi-toolkit-configuration/src/test/java/org/apache/nifi/minifi/toolkit/configuration/dto/ProcessorSchemaTest.java
----------------------------------------------------------------------
diff --git 
a/minifi-toolkit/minifi-toolkit-configuration/src/test/java/org/apache/nifi/minifi/toolkit/configuration/dto/ProcessorSchemaTest.java
 
b/minifi-toolkit/minifi-toolkit-configuration/src/test/java/org/apache/nifi/minifi/toolkit/configuration/dto/ProcessorSchemaTest.java
index 915fd83..bf072d2 100644
--- 
a/minifi-toolkit/minifi-toolkit-configuration/src/test/java/org/apache/nifi/minifi/toolkit/configuration/dto/ProcessorSchemaTest.java
+++ 
b/minifi-toolkit/minifi-toolkit-configuration/src/test/java/org/apache/nifi/minifi/toolkit/configuration/dto/ProcessorSchemaTest.java
@@ -33,17 +33,18 @@ import java.util.Map;
 import static org.junit.Assert.assertEquals;
 
 public class ProcessorSchemaTest extends BaseSchemaTester<ProcessorSchema, 
ProcessorDTO> {
-    private String testName = "testName";
-    private String testProcessorClass = "testProcessorClass";
-    private String testSchedulingStrategy = 
SchedulingStrategy.PRIMARY_NODE_ONLY.name();
-    private String testSchedulingPeriod = "10 s";
-    private int testMaxConcurrentTasks = 101;
-    private String testYieldDuration = "5 s";
-    private long testRunDurationNanos = 1111000L;
-    private String testRelationship = "testRelationship";
-    private String testKey = "testKey";
-    private String testValue = "testValue";
-    private String testPenalizationPeriod = "55 s";
+    private final String testName = "testName";
+    private final String testId = "testId";
+    private final String testProcessorClass = "testProcessorClass";
+    private final String testSchedulingStrategy = 
SchedulingStrategy.PRIMARY_NODE_ONLY.name();
+    private final String testSchedulingPeriod = "10 s";
+    private final int testMaxConcurrentTasks = 101;
+    private final String testYieldDuration = "5 s";
+    private final long testRunDurationNanos = 1111000L;
+    private final String testRelationship = "testRelationship";
+    private final String testKey = "testKey";
+    private final String testValue = "testValue";
+    private final String testPenalizationPeriod = "55 s";
     private ProcessorConfigDTO config;
 
     public ProcessorSchemaTest() {
@@ -61,6 +62,7 @@ public class ProcessorSchemaTest extends 
BaseSchemaTester<ProcessorSchema, Proce
         dto = new ProcessorDTO();
         dto.setConfig(config);
         dto.setName(testName);
+        dto.setId(testId);
         dto.setType(testProcessorClass);
         config.setSchedulingStrategy(testSchedulingStrategy);
         config.setSchedulingPeriod(testSchedulingPeriod);
@@ -75,6 +77,7 @@ public class ProcessorSchemaTest extends 
BaseSchemaTester<ProcessorSchema, Proce
 
         map = new HashMap<>();
         map.put(CommonPropertyKeys.NAME_KEY, testName);
+        map.put(CommonPropertyKeys.ID_KEY, testId);
         map.put(ProcessorSchema.CLASS_KEY, testProcessorClass);
         map.put(CommonPropertyKeys.SCHEDULING_STRATEGY_KEY, 
testSchedulingStrategy);
         map.put(CommonPropertyKeys.SCHEDULING_PERIOD_KEY, 
testSchedulingPeriod);
@@ -90,6 +93,13 @@ public class ProcessorSchemaTest extends 
BaseSchemaTester<ProcessorSchema, Proce
     public void testNoName() {
         dto.setName(null);
         map.remove(CommonPropertyKeys.NAME_KEY);
+        assertDtoAndMapConstructorAreSame(0);
+    }
+
+    @Test
+    public void testNoId() {
+        dto.setId(null);
+        map.remove(CommonPropertyKeys.ID_KEY);
         assertDtoAndMapConstructorAreSame(1);
     }
 

http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/93af87dd/minifi-toolkit/minifi-toolkit-configuration/src/test/java/org/apache/nifi/minifi/toolkit/configuration/dto/RemoteInputPortSchemaTest.java
----------------------------------------------------------------------
diff --git 
a/minifi-toolkit/minifi-toolkit-configuration/src/test/java/org/apache/nifi/minifi/toolkit/configuration/dto/RemoteInputPortSchemaTest.java
 
b/minifi-toolkit/minifi-toolkit-configuration/src/test/java/org/apache/nifi/minifi/toolkit/configuration/dto/RemoteInputPortSchemaTest.java
index e21554a..00f3348 100644
--- 
a/minifi-toolkit/minifi-toolkit-configuration/src/test/java/org/apache/nifi/minifi/toolkit/configuration/dto/RemoteInputPortSchemaTest.java
+++ 
b/minifi-toolkit/minifi-toolkit-configuration/src/test/java/org/apache/nifi/minifi/toolkit/configuration/dto/RemoteInputPortSchemaTest.java
@@ -67,7 +67,7 @@ public class RemoteInputPortSchemaTest extends 
BaseSchemaTester<RemoteInputPortS
     public void testNoName() {
         dto.setName(null);
         map.remove(CommonPropertyKeys.NAME_KEY);
-        assertDtoAndMapConstructorAreSame(1);
+        assertDtoAndMapConstructorAreSame(0);
     }
 
     @Test

http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/93af87dd/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 cee775a..48d2ad2 100644
--- 
a/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/CsvToJson.yml
+++ 
b/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/CsvToJson.yml
@@ -13,6 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+MiNiFi Config Version: 1
 Flow Controller:
   name: CsvToJsonWorking
   comment: ''
@@ -56,6 +57,7 @@ Security Properties:
     provider: BC
 Processors:
 - name: ExtractText
+  id: 5f0ec33c-0a07-4305-a3a9-9a3ba0548ac6
   class: org.apache.nifi.processors.standard.ExtractText
   max concurrent tasks: 1
   scheduling strategy: TIMER_DRIVEN
@@ -81,6 +83,7 @@ Processors:
     Permit Whitespace and Comments in Pattern: 'false'
     csv: (.+),(.+),(.+),(.+)
 - name: GenerateFlowFile
+  id: ffb6d4e9-9d6c-4fbe-ab8a-52bad90ce2e5
   class: org.apache.nifi.processors.standard.GenerateFlowFile
   max concurrent tasks: 1
   scheduling strategy: TIMER_DRIVEN
@@ -95,6 +98,7 @@ Processors:
     File Size: 1 b
     Unique FlowFiles: 'false'
 - name: ReplaceText
+  id: cdcc2028-238b-42b7-bf95-dd4f301b91fc
   class: org.apache.nifi.processors.standard.ReplaceText
   max concurrent tasks: 1
   scheduling strategy: TIMER_DRIVEN
@@ -112,6 +116,7 @@ Processors:
     Replacement Strategy:
     Replacement Value: a,b,c,d
 - name: ReplaceText2
+  id: 8db2ebc8-12c8-4396-89b6-479d907fbc6b
   class: org.apache.nifi.processors.standard.ReplaceText
   max concurrent tasks: 1
   scheduling strategy: TIMER_DRIVEN
@@ -131,6 +136,7 @@ Processors:
       \                            \"field3\" : \"${csv.3}\", \"field4\" : 
\"${csv.4}\"\
       \ }\n                        "
 - name: UpdateAttribute
+  id: 1d00089c-78cd-467f-9aa6-31e3bdf90cb0
   class: org.apache.nifi.processors.attributes.UpdateAttribute
   max concurrent tasks: 1
   scheduling strategy: TIMER_DRIVEN
@@ -144,33 +150,37 @@ Processors:
     Delete Attributes Expression:
 Connections:
 - name: ExtractText/matched/ReplaceText2
-  source name: ExtractText
+  id: 56ef3e2e-ee35-4598-9fbe-ae86050960b0
+  source id: 5f0ec33c-0a07-4305-a3a9-9a3ba0548ac6
   source relationship name: matched
-  destination name: ReplaceText2
+  destination id: 8db2ebc8-12c8-4396-89b6-479d907fbc6b
   max work queue size: 0
   max work queue data size: 0 MB
   flowfile expiration: 0 sec
   queue prioritizer class: 
org.apache.nifi.prioritizer.FirstInFirstOutPrioritizer
 - name: GenerateFlowFile/success/ReplaceText
-  source name: GenerateFlowFile
+  id: 0cc34e0a-0ae9-44ba-838f-792ed393a301
+  source id: ffb6d4e9-9d6c-4fbe-ab8a-52bad90ce2e5
   source relationship name: success
-  destination name: ReplaceText
+  destination id: cdcc2028-238b-42b7-bf95-dd4f301b91fc
   max work queue size: 0
   max work queue data size: 0 MB
   flowfile expiration: 0 sec
   queue prioritizer class: 
org.apache.nifi.prioritizer.FirstInFirstOutPrioritizer
 - name: ReplaceText/success/ExtractText
-  source name: ReplaceText
+  id: e32e19cb-6c4c-4c6c-a8db-408447ba2ca2
+  source id: cdcc2028-238b-42b7-bf95-dd4f301b91fc
   source relationship name: success
-  destination name: ExtractText
+  destination id: 5f0ec33c-0a07-4305-a3a9-9a3ba0548ac6
   max work queue size: 0
   max work queue data size: 0 MB
   flowfile expiration: 0 sec
   queue prioritizer class: 
org.apache.nifi.prioritizer.FirstInFirstOutPrioritizer
 - name: ReplaceText2/success/UpdateAttribute
-  source name: ReplaceText2
+  id: b061c170-19da-4e84-9709-327303fef579
+  source id: 8db2ebc8-12c8-4396-89b6-479d907fbc6b
   source relationship name: success
-  destination name: UpdateAttribute
+  destination id: 1d00089c-78cd-467f-9aa6-31e3bdf90cb0
   max work queue size: 0
   max work queue data size: 0 MB
   flowfile expiration: 0 sec

http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/93af87dd/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 743fdf6..86c7847 100644
--- 
a/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/DecompressionCircularFlow.yml
+++ 
b/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/DecompressionCircularFlow.yml
@@ -13,6 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+MiNiFi Config Version: 1
 Flow Controller:
   name: DecompressionCircularFlow2
   comment: ''
@@ -56,6 +57,7 @@ Security Properties:
     provider: BC
 Processors:
 - name: Compressed?
+  id: 1377e3cc-db4e-4832-8a90-c8dc9e08f603
   class: org.apache.nifi.processors.standard.RouteOnAttribute
   max concurrent tasks: 1
   scheduling strategy: TIMER_DRIVEN
@@ -68,6 +70,7 @@ Processors:
     Routing Strategy:
     gzip: ${mime.type:toUpper():contains("GZIP")}
 - name: GZIP CompressContent
+  id: 9e28dd28-8116-4199-aeab-bc7a1002aec5
   class: org.apache.nifi.processors.standard.CompressContent
   max concurrent tasks: 1
   scheduling strategy: TIMER_DRIVEN
@@ -82,6 +85,7 @@ Processors:
     Mode:
     Update Filename:
 - name: GZIP CompressContent2
+  id: e227167f-62af-49cc-8fb5-a5b5e5251066
   class: org.apache.nifi.processors.standard.CompressContent
   max concurrent tasks: 1
   scheduling strategy: TIMER_DRIVEN
@@ -96,6 +100,7 @@ Processors:
     Mode:
     Update Filename:
 - name: GZIP CompressContent3
+  id: defa6d98-3e98-41dd-82ac-1bdfd39eacfc
   class: org.apache.nifi.processors.standard.CompressContent
   max concurrent tasks: 1
   scheduling strategy: TIMER_DRIVEN
@@ -110,6 +115,7 @@ Processors:
     Mode:
     Update Filename:
 - name: GZIP CompressContent4
+  id: 9d33bbc9-2f51-43c8-aa8a-94dcc367b371
   class: org.apache.nifi.processors.standard.CompressContent
   max concurrent tasks: 1
   scheduling strategy: TIMER_DRIVEN
@@ -124,6 +130,7 @@ Processors:
     Mode:
     Update Filename:
 - name: GenerateFlowFile
+  id: ad8ff6a3-ba60-4b9b-af9e-0773c8afc1c9
   class: org.apache.nifi.processors.standard.GenerateFlowFile
   max concurrent tasks: 1
   scheduling strategy: TIMER_DRIVEN
@@ -138,6 +145,7 @@ Processors:
     File Size: 10kb
     Unique FlowFiles:
 - name: IdentifyMimeType
+  id: 212097d4-2ea8-497b-b574-b1354fae40f2
   class: org.apache.nifi.processors.standard.IdentifyMimeType
   max concurrent tasks: 1
   scheduling strategy: TIMER_DRIVEN
@@ -148,6 +156,7 @@ Processors:
   auto-terminated relationships list: []
   Properties: {}
 - name: LogAttribute
+  id: 7209cf79-23ba-421c-b1c3-925ed86c302d
   class: org.apache.nifi.processors.standard.LogAttribute
   max concurrent tasks: 1
   scheduling strategy: TIMER_DRIVEN
@@ -164,6 +173,7 @@ Processors:
     Log Payload:
     Log prefix:
 - name: Uncompress GZIP
+  id: 0bdda776-0c7e-4723-b3ce-969b7d10a922
   class: org.apache.nifi.processors.standard.CompressContent
   max concurrent tasks: 1
   scheduling strategy: TIMER_DRIVEN
@@ -179,113 +189,127 @@ Processors:
     Update Filename:
 Connections:
 - name: Compressed?/gzip/Uncompress GZIP
-  source name: Compressed?
+  id: 5de215d5-9f7e-414b-98aa-2edaa0514d99
+  source id: 1377e3cc-db4e-4832-8a90-c8dc9e08f603
   source relationship name: gzip
-  destination name: Uncompress GZIP
+  destination id: 0bdda776-0c7e-4723-b3ce-969b7d10a922
   max work queue size: 0
   max work queue data size: 0 MB
   flowfile expiration: 0 sec
   queue prioritizer class: 
org.apache.nifi.prioritizer.FirstInFirstOutPrioritizer
 - name: Compressed?/unmatched/LogAttribute
-  source name: Compressed?
+  id: a72e8727-9a5c-44dd-a4f5-cf94b3422c1a
+  source id: 1377e3cc-db4e-4832-8a90-c8dc9e08f603
   source relationship name: unmatched
-  destination name: LogAttribute
+  destination id: 7209cf79-23ba-421c-b1c3-925ed86c302d
   max work queue size: 0
   max work queue data size: 0 MB
   flowfile expiration: 0 sec
   queue prioritizer class: 
org.apache.nifi.prioritizer.FirstInFirstOutPrioritizer
 - name: GZIP CompressContent/failure/GZIP CompressContent
-  source name: GZIP CompressContent
+  id: 4f98618d-2443-465d-9856-bbf7c1ee49e1
+  source id: 9e28dd28-8116-4199-aeab-bc7a1002aec5
   source relationship name: failure
-  destination name: GZIP CompressContent
+  destination id: 9e28dd28-8116-4199-aeab-bc7a1002aec5
   max work queue size: 0
   max work queue data size: 0 MB
   flowfile expiration: 0 sec
   queue prioritizer class: 
org.apache.nifi.prioritizer.FirstInFirstOutPrioritizer
 - name: GZIP CompressContent/success/GZIP CompressContent2
-  source name: GZIP CompressContent
+  id: 5cdc2e79-ec8c-4f7d-a3ab-d284c80e3afe
+  source id: 9e28dd28-8116-4199-aeab-bc7a1002aec5
   source relationship name: success
-  destination name: GZIP CompressContent2
+  destination id: e227167f-62af-49cc-8fb5-a5b5e5251066
   max work queue size: 0
   max work queue data size: 0 MB
   flowfile expiration: 0 sec
   queue prioritizer class: 
org.apache.nifi.prioritizer.FirstInFirstOutPrioritizer
 - name: GZIP CompressContent2/failure/GZIP CompressContent2
-  source name: GZIP CompressContent2
+  id: f6ff74cf-a30b-4916-86b3-e269266666ff
+  source id: e227167f-62af-49cc-8fb5-a5b5e5251066
   source relationship name: failure
-  destination name: GZIP CompressContent2
+  destination id: e227167f-62af-49cc-8fb5-a5b5e5251066
   max work queue size: 0
   max work queue data size: 0 MB
   flowfile expiration: 0 sec
   queue prioritizer class: 
org.apache.nifi.prioritizer.FirstInFirstOutPrioritizer
 - name: GZIP CompressContent2/success/GZIP CompressContent3
-  source name: GZIP CompressContent2
+  id: ac822b4f-7d0d-462a-8ac0-03e9032ebefb
+  source id: e227167f-62af-49cc-8fb5-a5b5e5251066
   source relationship name: success
-  destination name: GZIP CompressContent3
+  destination id: defa6d98-3e98-41dd-82ac-1bdfd39eacfc
   max work queue size: 0
   max work queue data size: 0 MB
   flowfile expiration: 0 sec
   queue prioritizer class: 
org.apache.nifi.prioritizer.FirstInFirstOutPrioritizer
 - name: GZIP CompressContent3/failure/GZIP CompressContent3
-  source name: GZIP CompressContent3
+  id: bdfdb568-682d-4d3b-b87b-99199c15505c
+  source id: defa6d98-3e98-41dd-82ac-1bdfd39eacfc
   source relationship name: failure
-  destination name: GZIP CompressContent3
+  destination id: defa6d98-3e98-41dd-82ac-1bdfd39eacfc
   max work queue size: 0
   max work queue data size: 0 MB
   flowfile expiration: 0 sec
   queue prioritizer class: 
org.apache.nifi.prioritizer.FirstInFirstOutPrioritizer
 - name: GZIP CompressContent3/success/GZIP CompressContent4
-  source name: GZIP CompressContent3
+  id: 645ec08f-3d6d-4255-b4d9-0f6d61708974
+  source id: defa6d98-3e98-41dd-82ac-1bdfd39eacfc
   source relationship name: success
-  destination name: GZIP CompressContent4
+  destination id: 9d33bbc9-2f51-43c8-aa8a-94dcc367b371
   max work queue size: 0
   max work queue data size: 0 MB
   flowfile expiration: 0 sec
   queue prioritizer class: 
org.apache.nifi.prioritizer.FirstInFirstOutPrioritizer
 - name: GZIP CompressContent4/failure/GZIP CompressContent4
-  source name: GZIP CompressContent4
+  id: 42bd2967-d74a-4e22-9b16-9e0a51024658
+  source id: 9d33bbc9-2f51-43c8-aa8a-94dcc367b371
   source relationship name: failure
-  destination name: GZIP CompressContent4
+  destination id: 9d33bbc9-2f51-43c8-aa8a-94dcc367b371
   max work queue size: 0
   max work queue data size: 0 MB
   flowfile expiration: 0 sec
   queue prioritizer class: 
org.apache.nifi.prioritizer.FirstInFirstOutPrioritizer
 - name: GZIP CompressContent4/success/Uncompress GZIP
-  source name: GZIP CompressContent4
+  id: 6eeca4aa-04c7-4774-aee5-bb6340c3a7b6
+  source id: 9d33bbc9-2f51-43c8-aa8a-94dcc367b371
   source relationship name: success
-  destination name: Uncompress GZIP
+  destination id: 0bdda776-0c7e-4723-b3ce-969b7d10a922
   max work queue size: 0
   max work queue data size: 0 MB
   flowfile expiration: 0 sec
   queue prioritizer class: 
org.apache.nifi.prioritizer.FirstInFirstOutPrioritizer
 - name: GenerateFlowFile/success/GZIP CompressContent
-  source name: GenerateFlowFile
+  id: 299f7d1f-e216-43a3-ad0b-7a6d6680dacc
+  source id: ad8ff6a3-ba60-4b9b-af9e-0773c8afc1c9
   source relationship name: success
-  destination name: GZIP CompressContent
+  destination id: 9e28dd28-8116-4199-aeab-bc7a1002aec5
   max work queue size: 0
   max work queue data size: 0 MB
   flowfile expiration: 0 sec
   queue prioritizer class: 
org.apache.nifi.prioritizer.FirstInFirstOutPrioritizer
 - name: IdentifyMimeType/success/Compressed?
-  source name: IdentifyMimeType
+  id: ded9891b-4433-4f56-9fc0-1a240146835f
+  source id: 212097d4-2ea8-497b-b574-b1354fae40f2
   source relationship name: success
-  destination name: Compressed?
+  destination id: 1377e3cc-db4e-4832-8a90-c8dc9e08f603
   max work queue size: 0
   max work queue data size: 0 MB
   flowfile expiration: 0 sec
   queue prioritizer class: 
org.apache.nifi.prioritizer.FirstInFirstOutPrioritizer
 - name: Uncompress GZIP/failure/Uncompress GZIP
-  source name: Uncompress GZIP
+  id: 37f15fde-d463-41b1-9fe7-28c72cd6c871
+  source id: 0bdda776-0c7e-4723-b3ce-969b7d10a922
   source relationship name: failure
-  destination name: Uncompress GZIP
+  destination id: 0bdda776-0c7e-4723-b3ce-969b7d10a922
   max work queue size: 0
   max work queue data size: 0 MB
   flowfile expiration: 5 sec
   queue prioritizer class: 
org.apache.nifi.prioritizer.FirstInFirstOutPrioritizer
 - name: Uncompress GZIP/success/IdentifyMimeType
-  source name: Uncompress GZIP
+  id: bb250fb4-0b15-418f-83f9-83a43bd3de9c
+  source id: 0bdda776-0c7e-4723-b3ce-969b7d10a922
   source relationship name: success
-  destination name: IdentifyMimeType
+  destination id: 212097d4-2ea8-497b-b574-b1354fae40f2
   max work queue size: 0
   max work queue data size: 0 MB
   flowfile expiration: 0 sec

http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/93af87dd/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 6a07ae4..90ed378 100644
--- 
a/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/InvokeHttpMiNiFiTemplateTest.yml
+++ 
b/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/InvokeHttpMiNiFiTemplateTest.yml
@@ -13,6 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+MiNiFi Config Version: 1
 Flow Controller:
   name: InvokeHttpMiNiFiTemplateTest2
   comment: ''
@@ -56,6 +57,7 @@ Security Properties:
     provider: BC
 Processors:
 - name: LogAttribute
+  id: 0a73c5e4-7216-4cdf-9008-ace353478d55
   class: org.apache.nifi.processors.standard.LogAttribute
   max concurrent tasks: 1
   scheduling strategy: TIMER_DRIVEN
@@ -72,6 +74,7 @@ Processors:
     Log Payload: 'false'
     Log prefix:
 - name: LogAttribute2
+  id: 0bda7282-7a4f-4d39-83e5-ea86aa63f1dc
   class: org.apache.nifi.processors.standard.LogAttribute
   max concurrent tasks: 1
   scheduling strategy: TIMER_DRIVEN
@@ -88,6 +91,7 @@ Processors:
     Log Payload: 'false'
     Log prefix:
 - name: Route On Status Code
+  id: dcff217a-a25c-424f-b9f1-d82c55bfa61b
   class: org.apache.nifi.processors.standard.RouteOnAttribute
   max concurrent tasks: 1
   scheduling strategy: TIMER_DRIVEN
@@ -100,6 +104,7 @@ Processors:
     '200': ${invokehttp.status.code:equals(200)}
     Routing Strategy: Route to Property name
 - name: Search Google
+  id: 66649998-3b08-4b41-9f07-a51d999743f6
   class: org.apache.nifi.processors.standard.InvokeHTTP
   max concurrent tasks: 1
   scheduling strategy: TIMER_DRIVEN
@@ -134,6 +139,7 @@ Processors:
     invokehttp-proxy-user:
     send-message-body: 'true'
 - name: Source
+  id: fcb378d7-6438-41d3-8485-7da85e870ca4
   class: org.apache.nifi.processors.standard.GenerateFlowFile
   max concurrent tasks: 1
   scheduling strategy: TIMER_DRIVEN
@@ -148,6 +154,7 @@ Processors:
     File Size: 10 b
     Unique FlowFiles: 'false'
 - name: q=nifi
+  id: 6638cd15-0aaf-4bba-a18a-722cf85038b6
   class: org.apache.nifi.processors.attributes.UpdateAttribute
   max concurrent tasks: 1
   scheduling strategy: TIMER_DRIVEN
@@ -161,89 +168,100 @@ Processors:
     q: nifi
 Connections:
 - name: Route On Status Code/200/LogAttribute
-  source name: Route On Status Code
+  id: 3039718a-bb40-4811-9b74-ecbe926daae8
+  source id: dcff217a-a25c-424f-b9f1-d82c55bfa61b
   source relationship name: '200'
-  destination name: LogAttribute
+  destination id: 0a73c5e4-7216-4cdf-9008-ace353478d55
   max work queue size: 0
   max work queue data size: 0 MB
   flowfile expiration: 0 sec
   queue prioritizer class: 
org.apache.nifi.prioritizer.FirstInFirstOutPrioritizer
 - name: Route On Status Code/200/b23a4621-cf19-42e6-967c-ffd3716e6a24
-  source name: Route On Status Code
+  id: 4a7bdaf1-eba0-4317-92f2-93cef6240c28
+  source id: dcff217a-a25c-424f-b9f1-d82c55bfa61b
   source relationship name: '200'
-  destination name: b23a4621-cf19-42e6-967c-ffd3716e6a24
+  destination id: b23a4621-cf19-42e6-967c-ffd3716e6a24
   max work queue size: 10000
   max work queue data size: 1 GB
   flowfile expiration: 0 sec
   queue prioritizer class: 
org.apache.nifi.prioritizer.FirstInFirstOutPrioritizer
 - name: Route On Status Code/unmatched/LogAttribute2
-  source name: Route On Status Code
+  id: 9f948a25-afb4-4598-9a01-cfb7e3aa5920
+  source id: dcff217a-a25c-424f-b9f1-d82c55bfa61b
   source relationship name: unmatched
-  destination name: LogAttribute2
+  destination id: 0bda7282-7a4f-4d39-83e5-ea86aa63f1dc
   max work queue size: 10000
   max work queue data size: 1 GB
   flowfile expiration: 0 sec
   queue prioritizer class: 
org.apache.nifi.prioritizer.FirstInFirstOutPrioritizer
 - name: Route On Status Code/unmatched/b23a4621-cf19-42e6-967c-ffd3716e6a24
-  source name: Route On Status Code
+  id: 7299c143-46f6-4a94-aa24-ec47db16f73e
+  source id: dcff217a-a25c-424f-b9f1-d82c55bfa61b
   source relationship name: unmatched
-  destination name: b23a4621-cf19-42e6-967c-ffd3716e6a24
+  destination id: b23a4621-cf19-42e6-967c-ffd3716e6a24
   max work queue size: 10000
   max work queue data size: 1 GB
   flowfile expiration: 0 sec
   queue prioritizer class: 
org.apache.nifi.prioritizer.FirstInFirstOutPrioritizer
 - name: Search Google/Failure/Route On Status Code
-  source name: Search Google
+  id: 451b153a-8a4e-4bed-99ab-5159e499bcf1
+  source id: 66649998-3b08-4b41-9f07-a51d999743f6
   source relationship name: Failure
-  destination name: Route On Status Code
+  destination id: dcff217a-a25c-424f-b9f1-d82c55bfa61b
   max work queue size: 10000
   max work queue data size: 1 GB
   flowfile expiration: 0 sec
   queue prioritizer class: 
org.apache.nifi.prioritizer.FirstInFirstOutPrioritizer
 - name: Search Google/No Retry/Route On Status Code
-  source name: Search Google
+  id: ddbc1711-8cda-4418-b6ee-895763ef1a97
+  source id: 66649998-3b08-4b41-9f07-a51d999743f6
   source relationship name: No Retry
-  destination name: Route On Status Code
+  destination id: dcff217a-a25c-424f-b9f1-d82c55bfa61b
   max work queue size: 10000
   max work queue data size: 1 GB
   flowfile expiration: 0 sec
   queue prioritizer class: 
org.apache.nifi.prioritizer.FirstInFirstOutPrioritizer
 - name: Search Google/Original/Route On Status Code
-  source name: Search Google
+  id: b97044aa-3401-49df-86ab-bc440cd8f6c8
+  source id: 66649998-3b08-4b41-9f07-a51d999743f6
   source relationship name: Original
-  destination name: Route On Status Code
+  destination id: dcff217a-a25c-424f-b9f1-d82c55bfa61b
   max work queue size: 10000
   max work queue data size: 1 GB
   flowfile expiration: 0 sec
   queue prioritizer class: 
org.apache.nifi.prioritizer.FirstInFirstOutPrioritizer
 - name: Search Google/Response/Route On Status Code
-  source name: Search Google
+  id: c6a06d31-51fb-488f-bcde-495102f8c93f
+  source id: 66649998-3b08-4b41-9f07-a51d999743f6
   source relationship name: Response
-  destination name: Route On Status Code
+  destination id: dcff217a-a25c-424f-b9f1-d82c55bfa61b
   max work queue size: 10000
   max work queue data size: 1 GB
   flowfile expiration: 0 sec
   queue prioritizer class: 
org.apache.nifi.prioritizer.FirstInFirstOutPrioritizer
 - name: Search Google/Retry/Route On Status Code
-  source name: Search Google
+  id: 3172a4b6-c35b-4d2f-a7c1-68eb16cc1b37
+  source id: 66649998-3b08-4b41-9f07-a51d999743f6
   source relationship name: Retry
-  destination name: Route On Status Code
+  destination id: dcff217a-a25c-424f-b9f1-d82c55bfa61b
   max work queue size: 10000
   max work queue data size: 1 GB
   flowfile expiration: 0 sec
   queue prioritizer class: 
org.apache.nifi.prioritizer.FirstInFirstOutPrioritizer
 - name: Source/success/q=nifi
-  source name: Source
+  id: 2ef71cd8-eb24-4653-8526-34ab84e79328
+  source id: fcb378d7-6438-41d3-8485-7da85e870ca4
   source relationship name: success
-  destination name: q=nifi
+  destination id: 6638cd15-0aaf-4bba-a18a-722cf85038b6
   max work queue size: 0
   max work queue data size: 0 MB
   flowfile expiration: 0 sec
   queue prioritizer class: 
org.apache.nifi.prioritizer.FirstInFirstOutPrioritizer
 - name: q=nifi/success/Search Google
-  source name: q=nifi
+  id: ee5ee5bf-a552-43cf-9514-c14d40350bff
+  source id: 6638cd15-0aaf-4bba-a18a-722cf85038b6
   source relationship name: success
-  destination name: Search Google
+  destination id: 66649998-3b08-4b41-9f07-a51d999743f6
   max work queue size: 0
   max work queue data size: 0 MB
   flowfile expiration: 0 sec
@@ -255,8 +273,8 @@ Remote Processing Groups:
   timeout: 30 sec
   yield period: 10 sec
   Input Ports:
-  - id: b23a4621-cf19-42e6-967c-ffd3716e6a24
-    name: response
+  - name: response
+    id: b23a4621-cf19-42e6-967c-ffd3716e6a24
     comment: ''
     max concurrent tasks: 1
     use compression: false

http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/93af87dd/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 d0f1d66..93a6281 100644
--- 
a/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/ReplaceTextExpressionLanguageCSVReformatting.yml
+++ 
b/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/ReplaceTextExpressionLanguageCSVReformatting.yml
@@ -13,6 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+MiNiFi Config Version: 1
 Flow Controller:
   name: ReplaceTextExpressionLanguageCSVReformatting
   comment: ''
@@ -56,6 +57,7 @@ Security Properties:
     provider: BC
 Processors:
 - name: Generate Empty File
+  id: e626f756-f018-4670-8802-c8f8e459e15d
   class: org.apache.nifi.processors.standard.GenerateFlowFile
   max concurrent tasks: 1
   scheduling strategy: TIMER_DRIVEN
@@ -70,6 +72,7 @@ Processors:
     File Size: 0b
     Unique FlowFiles:
 - name: No-Op Termination
+  id: bfa4fb38-096b-455d-a10f-2a1ed044bd49
   class: org.apache.nifi.processors.attributes.UpdateAttribute
   max concurrent tasks: 1
   scheduling strategy: TIMER_DRIVEN
@@ -82,6 +85,7 @@ Processors:
   Properties:
     Delete Attributes Expression:
 - name: Reformat Date Column
+  id: a25f67cb-029c-466f-b040-9339ba64a4b5
   class: org.apache.nifi.processors.standard.ReplaceText
   max concurrent tasks: 1
   scheduling strategy: TIMER_DRIVEN
@@ -99,6 +103,7 @@ Processors:
     Replacement Strategy:
     Replacement Value: $1,$2,${ '$3':toDate('ddMMMyyyy'):format('yyyy/MM/dd') }
 - name: Set CSV Content
+  id: 7ba79381-4317-4c99-bcc0-256ee7ad44e9
   class: org.apache.nifi.processors.standard.ReplaceText
   max concurrent tasks: 1
   scheduling strategy: TIMER_DRIVEN
@@ -120,25 +125,28 @@ Processors:
       2009,8-8-2008,10aug2008
 Connections:
 - name: Generate Empty File/success/Set CSV Content
-  source name: Generate Empty File
+  id: ca71a875-0ff5-41ef-bbe0-da5de0ca1e08
+  source id: e626f756-f018-4670-8802-c8f8e459e15d
   source relationship name: success
-  destination name: Set CSV Content
+  destination id: 7ba79381-4317-4c99-bcc0-256ee7ad44e9
   max work queue size: 0
   max work queue data size: 0 MB
   flowfile expiration: 0 sec
   queue prioritizer class: 
org.apache.nifi.prioritizer.FirstInFirstOutPrioritizer
 - name: Reformat Date Column/success/No-Op Termination
-  source name: Reformat Date Column
+  id: 7fe8e5c6-6d9b-4b8f-af89-5d543bcc0199
+  source id: a25f67cb-029c-466f-b040-9339ba64a4b5
   source relationship name: success
-  destination name: No-Op Termination
+  destination id: bfa4fb38-096b-455d-a10f-2a1ed044bd49
   max work queue size: 0
   max work queue data size: 0 MB
   flowfile expiration: 0 sec
   queue prioritizer class: 
org.apache.nifi.prioritizer.FirstInFirstOutPrioritizer
 - name: Set CSV Content/success/Reformat Date Column
-  source name: Set CSV Content
+  id: 1b327d4e-918f-43bc-97cf-043efed7ffbc
+  source id: 7ba79381-4317-4c99-bcc0-256ee7ad44e9
   source relationship name: success
-  destination name: Reformat Date Column
+  destination id: a25f67cb-029c-466f-b040-9339ba64a4b5
   max work queue size: 0
   max work queue data size: 0 MB
   flowfile expiration: 0 sec

http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/93af87dd/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 970552b..a9796bc 100644
--- 
a/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/StressTestFramework.yml
+++ 
b/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/StressTestFramework.yml
@@ -13,6 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+MiNiFi Config Version: 1
 Flow Controller:
   name: StressTestFramework
   comment: ''
@@ -56,6 +57,7 @@ Security Properties:
     provider: BC
 Processors:
 - name: GenerateFlowFile
+  id: 16a47794-5391-4ad2-8d7b-be7ef83b8fee
   class: org.apache.nifi.processors.standard.GenerateFlowFile
   max concurrent tasks: 1
   scheduling strategy: TIMER_DRIVEN
@@ -70,6 +72,7 @@ Processors:
     File Size: 0 KB
     Unique FlowFiles:
 - name: RouteOnAttribute
+  id: 397a4910-cc01-4c6b-88c9-e99b17b094e8
   class: org.apache.nifi.processors.standard.RouteOnAttribute
   max concurrent tasks: 2
   scheduling strategy: TIMER_DRIVEN
@@ -82,6 +85,7 @@ Processors:
   Properties:
     Routing Strategy:
 - name: UpdateAttribute
+  id: 92557c76-f251-45a4-96a4-79057b24e832
   class: org.apache.nifi.processors.attributes.UpdateAttribute
   max concurrent tasks: 2
   scheduling strategy: TIMER_DRIVEN
@@ -96,17 +100,19 @@ Processors:
     property 2: value 2 ${nextInt()}
 Connections:
 - name: GenerateFlowFile/success/UpdateAttribute
-  source name: GenerateFlowFile
+  id: 0e6873cc-cb9d-4e98-92aa-a3319f4c1b02
+  source id: 16a47794-5391-4ad2-8d7b-be7ef83b8fee
   source relationship name: success
-  destination name: UpdateAttribute
+  destination id: 92557c76-f251-45a4-96a4-79057b24e832
   max work queue size: 200
   max work queue data size: 0 MB
   flowfile expiration: 0 sec
   queue prioritizer class: 
org.apache.nifi.prioritizer.FirstInFirstOutPrioritizer
 - name: UpdateAttribute/success/RouteOnAttribute
-  source name: UpdateAttribute
+  id: 4c53556e-eb46-458c-9e98-8329a8cf70fd
+  source id: 92557c76-f251-45a4-96a4-79057b24e832
   source relationship name: success
-  destination name: RouteOnAttribute
+  destination id: 397a4910-cc01-4c6b-88c9-e99b17b094e8
   max work queue size: 2000
   max work queue data size: 0 MB
   flowfile expiration: 0 sec

Reply via email to