[nifi] branch master updated: NIFI-6938 Fixing import-flow-version CLI command to correctly copy over fields

[markap14]

This is an automated email from the ASF dual-hosted git repository.

markap14 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nifi.git


The following commit(s) were added to refs/heads/master by this push:
     new 4428581  NIFI-6938 Fixing import-flow-version CLI command to correctly 
copy over fields
4428581 is described below

commit 442858127bedda992921953fc1943f1973803bb5
Author: Bryan Bende <bbe...@apache.org>
AuthorDate: Tue Dec 10 14:00:48 2019 -0500

    NIFI-6938 Fixing import-flow-version CLI command to correctly copy over 
fields
    
    This closes #3925.
    
    Signed-off-by: Mark Payne <marka...@hotmail.com>
---
 .../toolkit/cli/impl/command/registry/flow/ImportFlowVersion.java     | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git 
a/nifi-toolkit/nifi-toolkit-cli/src/main/java/org/apache/nifi/toolkit/cli/impl/command/registry/flow/ImportFlowVersion.java
 
b/nifi-toolkit/nifi-toolkit-cli/src/main/java/org/apache/nifi/toolkit/cli/impl/command/registry/flow/ImportFlowVersion.java
index 49e4dcd..d9a3530 100644
--- 
a/nifi-toolkit/nifi-toolkit-cli/src/main/java/org/apache/nifi/toolkit/cli/impl/command/registry/flow/ImportFlowVersion.java
+++ 
b/nifi-toolkit/nifi-toolkit-cli/src/main/java/org/apache/nifi/toolkit/cli/impl/command/registry/flow/ImportFlowVersion.java
@@ -95,7 +95,9 @@ public class ImportFlowVersion extends 
AbstractNiFiRegistryCommand<StringResult>
         final VersionedFlowSnapshot snapshot = new VersionedFlowSnapshot();
         snapshot.setSnapshotMetadata(metadata);
         snapshot.setFlowContents(deserializedSnapshot.getFlowContents());
-
+        
snapshot.setExternalControllerServices(deserializedSnapshot.getExternalControllerServices());
+        
snapshot.setParameterContexts(deserializedSnapshot.getParameterContexts());
+        
snapshot.setFlowEncodingVersion(deserializedSnapshot.getFlowEncodingVersion());
 
         final VersionedFlowSnapshot createdSnapshot = 
snapshotClient.create(snapshot);
         final VersionedFlowSnapshotMetadata createdMetadata = 
createdSnapshot.getSnapshotMetadata();