This is an automated email from the ASF dual-hosted git repository.
pvillard pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new 343fd3e9df9 Revert "NIFI-15727 Fix ConnectorRepository
syncFromProvider bug" (#11065)
343fd3e9df9 is described below
commit 343fd3e9df99a5abc0d33b929bc7040f3712f857
Author: Kevin Doran <[email protected]>
AuthorDate: Sun Mar 29 08:14:38 2026 -0400
Revert "NIFI-15727 Fix ConnectorRepository syncFromProvider bug" (#11065)
This reverts commit 9ac1d810351a91c5795f4029deb507e68cf83b77.
---
.../connector/StandardConnectorRepository.java | 7 ++---
.../connector/TestStandardConnectorRepository.java | 34 +++++-----------------
2 files changed, 10 insertions(+), 31 deletions(-)
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/components/connector/StandardConnectorRepository.java
b/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/components/connector/StandardConnectorRepository.java
index e4c39cf60a2..2df018c6382 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/components/connector/StandardConnectorRepository.java
+++
b/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/components/connector/StandardConnectorRepository.java
@@ -463,13 +463,10 @@ public class StandardConnectorRepository implements
ConnectorRepository {
final List<VersionedConfigurationStep> workingFlowConfiguration =
config.getWorkingFlowConfiguration();
if (workingFlowConfiguration != null) {
+ final MutableConnectorConfigurationContext workingConfigContext =
connector.getWorkingFlowContext().getConfigurationContext();
for (final VersionedConfigurationStep step :
workingFlowConfiguration) {
final StepConfiguration stepConfiguration =
toStepConfiguration(step);
- try {
- connector.setConfiguration(step.getName(),
stepConfiguration);
- } catch (final FlowUpdateException e) {
- logger.warn("Failed to apply configuration step [{}] from
provider for connector [{}]", step.getName(), connectorId, e);
- }
+ workingConfigContext.replaceProperties(step.getName(),
stepConfiguration);
}
}
}
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/components/connector/TestStandardConnectorRepository.java
b/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/components/connector/TestStandardConnectorRepository.java
index b833d74c6a1..4089b274819 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/components/connector/TestStandardConnectorRepository.java
+++
b/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/components/connector/TestStandardConnectorRepository.java
@@ -211,11 +211,12 @@ public class TestStandardConnectorRepository {
}
@Test
- public void testGetConnectorWithProviderOverridesWorkingConfig() throws
FlowUpdateException {
+ public void testGetConnectorWithProviderOverridesWorkingConfig() {
final ConnectorConfigurationProvider provider =
mock(ConnectorConfigurationProvider.class);
final StandardConnectorRepository repository =
createRepositoryWithProvider(provider);
- final ConnectorNode connector =
createSimpleConnectorNode("connector-1", "Original Name");
+ final MutableConnectorConfigurationContext workingConfigContext =
mock(MutableConnectorConfigurationContext.class);
+ final ConnectorNode connector =
createConnectorNodeWithWorkingConfig("connector-1", "Original Name",
workingConfigContext);
repository.addConnector(connector);
final ConnectorWorkingConfiguration externalConfig = new
ConnectorWorkingConfiguration();
@@ -228,7 +229,7 @@ public class TestStandardConnectorRepository {
assertNotNull(result);
verify(connector).setName("External Name");
- verify(connector).setConfiguration(eq("step1"),
any(StepConfiguration.class));
+ verify(workingConfigContext).replaceProperties(eq("step1"),
any(StepConfiguration.class));
}
@Test
@@ -647,11 +648,12 @@ public class TestStandardConnectorRepository {
}
@Test
- public void testSyncFromProviderAppliesNifiUuidsDirectly() throws
FlowUpdateException {
+ public void testSyncFromProviderAppliesNifiUuidsDirectly() {
final ConnectorConfigurationProvider provider =
mock(ConnectorConfigurationProvider.class);
final StandardConnectorRepository repository =
createRepositoryWithProvider(provider);
- final ConnectorNode connector =
createSimpleConnectorNode("connector-1", "Test Connector");
+ final MutableConnectorConfigurationContext workingConfigContext =
mock(MutableConnectorConfigurationContext.class);
+ final ConnectorNode connector =
createConnectorNodeWithWorkingConfig("connector-1", "Test Connector",
workingConfigContext);
repository.addConnector(connector);
// Provider returns config with NiFi UUIDs (no translation needed in
framework)
@@ -668,27 +670,7 @@ public class TestStandardConnectorRepository {
repository.getConnector("connector-1");
// Working config is updated with NiFi UUIDs as-is -- no translation
in the repository
- verify(connector).setConfiguration(eq("step1"),
any(StepConfiguration.class));
- }
-
- @Test
- public void testSyncFromProviderSkipsSetConfigurationWhenNoSteps() throws
FlowUpdateException {
- final ConnectorConfigurationProvider provider =
mock(ConnectorConfigurationProvider.class);
- final StandardConnectorRepository repository =
createRepositoryWithProvider(provider);
-
- final ConnectorNode connector =
createSimpleConnectorNode("connector-1", "Test Connector");
- repository.addConnector(connector);
-
- final ConnectorWorkingConfiguration externalConfig = new
ConnectorWorkingConfiguration();
- externalConfig.setName("External Name");
- externalConfig.setWorkingFlowConfiguration(null);
-
when(provider.load("connector-1")).thenReturn(Optional.of(externalConfig));
-
- final ConnectorNode result = repository.getConnector("connector-1");
-
- assertNotNull(result);
- verify(connector).setName("External Name");
- verify(connector, never()).setConfiguration(anyString(),
any(StepConfiguration.class));
+ verify(workingConfigContext).replaceProperties(eq("step1"),
any(StepConfiguration.class));
}
@Test
