[nifi] branch support/nifi-1.x updated: NIFI-12122 Corrected TestFlowController references

[exceptionfactory]

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

exceptionfactory pushed a commit to branch support/nifi-1.x
in repository https://gitbox.apache.org/repos/asf/nifi.git


The following commit(s) were added to refs/heads/support/nifi-1.x by this push:
     new 1cb7614b0b NIFI-12122 Corrected TestFlowController references
1cb7614b0b is described below

commit 1cb7614b0b5fe02ed883e3fcfaf7212aa5f20984
Author: Joe Gresock <jgres...@gmail.com>
AuthorDate: Fri Oct 6 13:33:23 2023 -0500

    NIFI-12122 Corrected TestFlowController references
    
    - Adjusted XmlFlowSynchronizer method invocation for backported changes
    
    Signed-off-by: David Handermann <exceptionfact...@apache.org>
---
 .../src/main/java/org/apache/nifi/controller/XmlFlowSynchronizer.java   | 2 +-
 .../src/test/java/org/apache/nifi/controller/TestFlowController.java    | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/XmlFlowSynchronizer.java
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/XmlFlowSynchronizer.java
index ddb86cfafb..1248688a25 100644
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/XmlFlowSynchronizer.java
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/XmlFlowSynchronizer.java
@@ -574,7 +574,7 @@ public class XmlFlowSynchronizer implements 
FlowSynchronizer {
             parameterProviderConfiguration = new 
StandardParameterProviderConfiguration(configurationDTO.getParameterProviderId(),
                     configurationDTO.getParameterGroupName(), 
configurationDTO.getSynchronized());
         }
-        final ParameterContext context = 
flowManager.createParameterContext(dto.getId(), dto.getName(), parameters, 
referencedIds, parameterProviderConfiguration);
+        final ParameterContext context = 
flowManager.createParameterContext(dto.getId(), dto.getName(), 
dto.getDescription(), parameters, referencedIds, 
parameterProviderConfiguration);
         context.setDescription(dto.getDescription());
         return context;
     }
diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/TestFlowController.java
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/TestFlowController.java
index fc0e4b7bd1..db281d5b7f 100644
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/TestFlowController.java
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/TestFlowController.java
@@ -513,6 +513,8 @@ public class TestFlowController {
         final String flow = IOUtils.toString(new FileInputStream(flowFile), 
StandardCharsets.UTF_8);
         final DataFlow proposedDataFlow = new 
StandardDataFlow(flow.getBytes(StandardCharsets.UTF_8), null, 
authFingerprint.getBytes(StandardCharsets.UTF_8), Collections.emptySet());
 
+        final VersionedFlowSynchronizer flowSynchronizer = new 
VersionedFlowSynchronizer(extensionManager,
+                nifiProperties.getFlowConfigurationFile(), new 
FlowConfigurationArchiveManager(nifiProperties));
         try {
             controller.synchronize(flowSynchronizer, proposedDataFlow, 
mock(FlowService.class), BundleUpdateStrategy.IGNORE_BUNDLE);
             controller.initializeFlow();