This is an automated email from the ASF dual-hosted git repository.
markap14 pushed a commit to branch NIFI-15258
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/NIFI-15258 by this push:
new aab0c69ac7 NIFI-15258: Addressed PMD findings
aab0c69ac7 is described below
commit aab0c69ac7a2da33693e3f421ca51b43f16537c4
Author: Mark Payne <[email protected]>
AuthorDate: Tue Dec 9 12:36:08 2025 -0500
NIFI-15258: Addressed PMD findings
---
.../server/MockConnectorInitializationContext.java | 6 ++
.../server/StandardConnectorMockServer.java | 2 +-
.../nifi/controller/StandardProcessorNode.java | 1 +
.../apache/nifi/groups/StandardProcessGroup.java | 2 +-
.../components/connector/FrameworkFlowContext.java | 1 +
.../MutableConnectorConfigurationContext.java | 2 +
.../org/apache/nifi/events/BulletinFactory.java | 1 -
.../StandardConnectorInitializationContext.java | 6 ++
.../connector/StandardConnectorNode.java | 21 ++---
.../flow/FlowControllerFlowContextFactory.java | 4 -
.../nifi/controller/flow/StandardFlowManager.java | 1 -
.../connector/StandardConnectorNodeIT.java | 96 ++++++++++------------
.../components/connector/processors/Sleep.java | 2 +-
.../nifi/controller/MockStateManagerProvider.java | 2 +
14 files changed, 74 insertions(+), 73 deletions(-)
diff --git
a/nifi-connector-mock-bundle/nifi-connector-mock-server/src/main/java/org/apache/nifi/mock/connector/server/MockConnectorInitializationContext.java
b/nifi-connector-mock-bundle/nifi-connector-mock-server/src/main/java/org/apache/nifi/mock/connector/server/MockConnectorInitializationContext.java
index 38dcec3474..939035bc5e 100644
---
a/nifi-connector-mock-bundle/nifi-connector-mock-server/src/main/java/org/apache/nifi/mock/connector/server/MockConnectorInitializationContext.java
+++
b/nifi-connector-mock-bundle/nifi-connector-mock-server/src/main/java/org/apache/nifi/mock/connector/server/MockConnectorInitializationContext.java
@@ -123,31 +123,37 @@ public class MockConnectorInitializationContext
implements FrameworkConnectorIni
this.mockExtensionMapper = mockExtensionMapper;
}
+ @Override
public Builder identifier(final String identifier) {
this.identifier = identifier;
return this;
}
+ @Override
public Builder name(final String name) {
this.name = name;
return this;
}
+ @Override
public Builder componentLog(final ComponentLog componentLog) {
this.componentLog = componentLog;
return this;
}
+ @Override
public Builder secretsManager(final SecretsManager secretsManager) {
this.secretsManager = secretsManager;
return this;
}
+ @Override
public Builder assetManager(final AssetManager assetManager) {
this.assetManager = assetManager;
return this;
}
+ @Override
public MockConnectorInitializationContext build() {
return new MockConnectorInitializationContext(this);
}
diff --git
a/nifi-connector-mock-bundle/nifi-connector-mock-server/src/main/java/org/apache/nifi/mock/connector/server/StandardConnectorMockServer.java
b/nifi-connector-mock-bundle/nifi-connector-mock-server/src/main/java/org/apache/nifi/mock/connector/server/StandardConnectorMockServer.java
index 1b8034c9ff..54af7b0da6 100644
---
a/nifi-connector-mock-bundle/nifi-connector-mock-server/src/main/java/org/apache/nifi/mock/connector/server/StandardConnectorMockServer.java
+++
b/nifi-connector-mock-bundle/nifi-connector-mock-server/src/main/java/org/apache/nifi/mock/connector/server/StandardConnectorMockServer.java
@@ -179,7 +179,7 @@ public class StandardConnectorMockServer implements
ConnectorMockServer {
@Override
public void registerMockBundle(final ClassLoader classLoader, final File
workingDirectory) {
- final BundleDetails mockBundleDetails = new BundleDetails.Builder()
+ new BundleDetails.Builder()
.workingDir(workingDirectory)
.coordinate(new BundleCoordinate("org.apache.nifi.mock",
"nifi-connector-mock-bundle", "1.0.0"))
.build();
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/controller/StandardProcessorNode.java
b/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/controller/StandardProcessorNode.java
index 6e95624832..9e9b7a02e8 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/controller/StandardProcessorNode.java
+++
b/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/controller/StandardProcessorNode.java
@@ -1940,6 +1940,7 @@ public class StandardProcessorNode extends ProcessorNode
implements Connectable
return getConnectorMethods(getProcessor().getClass());
}
+ @Override
public Object invokeConnectorMethod(final String methodName, final
Map<String, Object> arguments, final ProcessContext processContext) throws
InvocationFailedException {
final ConfigurableComponent component = getComponent();
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/groups/StandardProcessGroup.java
b/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/groups/StandardProcessGroup.java
index 9fbfde6f0a..658ee0cc9d 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/groups/StandardProcessGroup.java
+++
b/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/groups/StandardProcessGroup.java
@@ -4570,7 +4570,7 @@ public final class StandardProcessGroup implements
ProcessGroup {
public CompletableFuture<Void> purge() {
final CompletableFuture<Void> purgeFuture = new CompletableFuture<>();
- final Thread purgeThread = Thread.ofVirtual().name("Purge " +
this).start(() -> {
+ Thread.ofVirtual().name("Purge " + this).start(() -> {
try {
stopProcessing().get();
controllerServiceProvider.disableControllerServicesAsync(getControllerServices(true)).get();
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/components/connector/FrameworkFlowContext.java
b/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/components/connector/FrameworkFlowContext.java
index 8880606df0..2c05207bf8 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/components/connector/FrameworkFlowContext.java
+++
b/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/components/connector/FrameworkFlowContext.java
@@ -25,6 +25,7 @@ import org.apache.nifi.groups.ProcessGroup;
public interface FrameworkFlowContext extends FlowContext {
ProcessGroup getManagedProcessGroup();
+ @Override
MutableConnectorConfigurationContext getConfigurationContext();
void updateFlow(VersionedExternalFlow versionedExternalFlow, AssetManager
assetManager) throws FlowUpdateException;
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/components/connector/MutableConnectorConfigurationContext.java
b/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/components/connector/MutableConnectorConfigurationContext.java
index 2a3e804551..fd428b6882 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/components/connector/MutableConnectorConfigurationContext.java
+++
b/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/components/connector/MutableConnectorConfigurationContext.java
@@ -47,11 +47,13 @@ public interface MutableConnectorConfigurationContext
extends ConnectorConfigura
*/
ConnectorConfiguration toConnectorConfiguration();
+ @Override
MutableConnectorConfigurationContext createWithOverrides(String stepName,
List<PropertyGroupConfiguration> propertyGroupConfigurations);
/**
* Creates a clone of this MutableConnectorConfigurationContext.
* @return the cloned context
*/
+ @Override
MutableConnectorConfigurationContext clone();
}
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/events/BulletinFactory.java
b/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/events/BulletinFactory.java
index b439ef367b..86c80ce986 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/events/BulletinFactory.java
+++
b/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/events/BulletinFactory.java
@@ -70,7 +70,6 @@ public final class BulletinFactory {
}
public static Bulletin createBulletin(final ConnectorNode connector, final
String category, final String severity, final String message) {
- final String groupId = connector.getProcessGroupIdentifier();
final String connectorName = connector.getName();
return createBulletin(null, connectorName, connector.getIdentifier(),
ComponentType.CONNECTOR, connector.getName(), category, severity, message,
null, null);
}
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/components/connector/StandardConnectorInitializationContext.java
b/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/components/connector/StandardConnectorInitializationContext.java
index 1eb746ee1a..89730a5bac 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/components/connector/StandardConnectorInitializationContext.java
+++
b/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/components/connector/StandardConnectorInitializationContext.java
@@ -90,31 +90,37 @@ public class StandardConnectorInitializationContext
implements FrameworkConnecto
private SecretsManager secretsManager;
private AssetManager assetManager;
+ @Override
public Builder identifier(final String identifier) {
this.identifier = identifier;
return this;
}
+ @Override
public Builder name(final String name) {
this.name = name;
return this;
}
+ @Override
public Builder componentLog(final ComponentLog componentLog) {
this.componentLog = componentLog;
return this;
}
+ @Override
public Builder secretsManager(final SecretsManager secretsManager) {
this.secretsManager = secretsManager;
return this;
}
+ @Override
public Builder assetManager(final AssetManager assetManager) {
this.assetManager = assetManager;
return this;
}
+ @Override
public StandardConnectorInitializationContext build() {
return new StandardConnectorInitializationContext(this);
}
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/components/connector/StandardConnectorNode.java
b/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/components/connector/StandardConnectorNode.java
index 75f7f5828b..d7457d0a59 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/components/connector/StandardConnectorNode.java
+++
b/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/components/connector/StandardConnectorNode.java
@@ -80,7 +80,6 @@ public class StandardConnectorNode implements ConnectorNode {
private volatile FrameworkFlowContext workingFlowContext;
private volatile String name;
- private volatile boolean performValidation = true;
private volatile FrameworkConnectorInitializationContext
initializationContext;
@@ -494,7 +493,7 @@ public class StandardConnectorNode implements ConnectorNode
{
stepName, groupName, propertyName, this));
}
- try (final NarCloseable narCloseable =
NarCloseable.withComponentNarLoader(extensionManager,
getConnector().getClass(), getIdentifier())) {
+ try (NarCloseable ignored =
NarCloseable.withComponentNarLoader(extensionManager,
getConnector().getClass(), getIdentifier())) {
return getConnector().fetchAllowableValues(stepName, groupName,
propertyName, workingFlowContext);
}
}
@@ -506,7 +505,7 @@ public class StandardConnectorNode implements ConnectorNode
{
stepName, groupName, propertyName, this));
}
- try (final NarCloseable narCloseable =
NarCloseable.withComponentNarLoader(extensionManager,
getConnector().getClass(), getIdentifier())) {
+ try (NarCloseable ignored =
NarCloseable.withComponentNarLoader(extensionManager,
getConnector().getClass(), getIdentifier())) {
return getConnector().fetchAllowableValues(stepName, groupName,
propertyName, workingFlowContext, filter);
}
}
@@ -515,7 +514,7 @@ public class StandardConnectorNode implements ConnectorNode
{
public void initializeConnector(final
FrameworkConnectorInitializationContext initializationContext) {
this.initializationContext = initializationContext;
- try (final NarCloseable narCloseable =
NarCloseable.withComponentNarLoader(extensionManager,
getConnector().getClass(), getIdentifier())) {
+ try (NarCloseable ignored =
NarCloseable.withComponentNarLoader(extensionManager,
getConnector().getClass(), getIdentifier())) {
getConnector().initialize(initializationContext);
}
@@ -529,7 +528,7 @@ public class StandardConnectorNode implements ConnectorNode
{
}
final VersionedExternalFlow initialFlow;
- try (final NarCloseable narCloseable =
NarCloseable.withComponentNarLoader(extensionManager,
getConnector().getClass(), getIdentifier())) {
+ try (NarCloseable ignored =
NarCloseable.withComponentNarLoader(extensionManager,
getConnector().getClass(), getIdentifier())) {
initialFlow = getConnector().getInitialFlow();
}
@@ -551,13 +550,11 @@ public class StandardConnectorNode implements
ConnectorNode {
@Override
public void pauseValidationTrigger() {
- performValidation = false;
+ // No-op for ConnectorNode
}
@Override
public void resumeValidationTrigger() {
- performValidation = true;
-
logger.debug("Resuming Triggering of Validation State for {};
Resetting validation state", this);
resetValidationState();
}
@@ -566,7 +563,7 @@ public class StandardConnectorNode implements ConnectorNode
{
public List<ConfigVerificationResult> verifyConfigurationStep(final String
stepName, final List<PropertyGroupConfiguration> groupConfigurations) {
final List<ConfigVerificationResult> results = new ArrayList<>();
- try (final NarCloseable narCloseable =
NarCloseable.withComponentNarLoader(extensionManager,
getConnector().getClass(), getIdentifier())) {
+ try (NarCloseable ignored =
NarCloseable.withComponentNarLoader(extensionManager,
getConnector().getClass(), getIdentifier())) {
final DescribedValueProvider allowableValueProvider = (step,
groupName, propertyName) ->
fetchAllowableValues(step, groupName, propertyName,
workingFlowContext);
@@ -644,7 +641,7 @@ public class StandardConnectorNode implements ConnectorNode
{
return results;
}
- try (final NarCloseable narCloseable =
NarCloseable.withComponentNarLoader(extensionManager,
getConnector().getClass(), getIdentifier())) {
+ try (NarCloseable ignored =
NarCloseable.withComponentNarLoader(extensionManager,
getConnector().getClass(), getIdentifier())) {
results.addAll(getConnector().verify(workingFlowContext));
}
@@ -669,7 +666,7 @@ public class StandardConnectorNode implements ConnectorNode
{
@Override
public List<ConfigurationStep> getConfigurationSteps() {
- try (final NarCloseable narCloseable =
NarCloseable.withComponentNarLoader(extensionManager,
getConnector().getClass(), getIdentifier())) {
+ try (NarCloseable ignored =
NarCloseable.withComponentNarLoader(extensionManager,
getConnector().getClass(), getIdentifier())) {
return getConnector().getConfigurationSteps(workingFlowContext);
}
}
@@ -771,7 +768,7 @@ public class StandardConnectorNode implements ConnectorNode
{
private List<DescribedValue> fetchAllowableValues(final String stepName,
final String groupName, final String propertyName, final FlowContext context) {
final List<AllowableValue> allowableValues;
- try (final NarCloseable narCloseable =
NarCloseable.withComponentNarLoader(extensionManager,
getConnector().getClass(), getIdentifier())) {
+ try (NarCloseable ignored =
NarCloseable.withComponentNarLoader(extensionManager,
getConnector().getClass(), getIdentifier())) {
allowableValues = getConnector().fetchAllowableValues(stepName,
groupName, propertyName, activeFlowContext);
}
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/flow/FlowControllerFlowContextFactory.java
b/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/flow/FlowControllerFlowContextFactory.java
index 651672274d..c488caf03d 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/flow/FlowControllerFlowContextFactory.java
+++
b/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/flow/FlowControllerFlowContextFactory.java
@@ -25,8 +25,6 @@ import
org.apache.nifi.components.connector.ProcessGroupFacadeFactory;
import org.apache.nifi.components.connector.ProcessGroupFactory;
import org.apache.nifi.components.connector.StandardFlowContext;
import org.apache.nifi.components.connector.components.FlowContextType;
-import org.apache.nifi.components.connector.components.ParameterContextFacade;
-import org.apache.nifi.components.connector.components.ProcessGroupFacade;
import
org.apache.nifi.components.connector.facades.standalone.StandaloneParameterContextFacade;
import org.apache.nifi.controller.FlowController;
import org.apache.nifi.flow.Bundle;
@@ -78,8 +76,6 @@ public class FlowControllerFlowContextFactory implements
FlowContextFactory {
final ProcessGroup processGroup =
processGroupFactory.create(workingGroupId);
copyGroupContents(activeManagedProcessGroup, processGroup, connectorId
+ "-working-context");
- final ProcessGroupFacade processGroupFacade =
processGroupFacadeFactory.create(processGroup, connectorLogger);
- final ParameterContextFacade parameterContextFacade = new
StandaloneParameterContextFacade(flowController, processGroup);
final MutableConnectorConfigurationContext workingConfigurationContext
= activeConfigurationContext.clone();
return new StandardFlowContext(processGroup,
workingConfigurationContext, processGroupFacadeFactory,
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/flow/StandardFlowManager.java
b/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/flow/StandardFlowManager.java
index 32be852ce7..d4e5fd6e87 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/flow/StandardFlowManager.java
+++
b/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/flow/StandardFlowManager.java
@@ -753,7 +753,6 @@ public class StandardFlowManager extends
AbstractFlowManager implements FlowMana
final ExtensionManager extensionManager =
flowController.getExtensionManager();
final String managedGroupId = UUID.nameUUIDFromBytes((id +
"-root").getBytes(StandardCharsets.UTF_8)).toString();
- final String workingGroupId = UUID.nameUUIDFromBytes((id +
"-working").getBytes(StandardCharsets.UTF_8)).toString();
final ProcessGroup managedRootGroup =
createProcessGroup(managedGroupId);
final String paramContextId = UUID.nameUUIDFromBytes((id +
"-parameter-context").getBytes(StandardCharsets.UTF_8)).toString();
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/components/connector/StandardConnectorNodeIT.java
b/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/components/connector/StandardConnectorNodeIT.java
index 275b50fcd5..60d2f0dd90 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/components/connector/StandardConnectorNodeIT.java
+++
b/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/components/connector/StandardConnectorNodeIT.java
@@ -226,13 +226,11 @@ public class StandardConnectorNodeIT {
}
private void configure(final ConnectorNode connectorNode, final
ConnectorConfiguration configuration) throws FlowUpdateException {
- try (final FlowEngine flowEngine = new FlowEngine(1, "flow-engine")) {
- connectorNode.prepareForUpdate();
- for (final ConfigurationStepConfiguration stepConfig :
configuration.getConfigurationStepConfigurations()) {
- connectorNode.setConfiguration(stepConfig.stepName(),
stepConfig.propertyGroupConfigurations());
- }
- connectorNode.applyUpdate();
+ connectorNode.prepareForUpdate();
+ for (final ConfigurationStepConfiguration stepConfig :
configuration.getConfigurationStepConfigurations()) {
+ connectorNode.setConfiguration(stepConfig.stepName(),
stepConfig.propertyGroupConfigurations());
}
+ connectorNode.applyUpdate();
}
private ConnectorNode initializeDynamicFlowConnector() {
@@ -350,14 +348,12 @@ public class StandardConnectorNodeIT {
// Because the component is being removed and there's data queued in
its incoming connection, it should fail.
final ConnectorConfiguration removeLogConfiguration =
createConnectorConfiguration("Second Iteration", 5, false, false);
- try (final FlowEngine flowEngine = new FlowEngine(1, "flow-engine")) {
- connectorNode.prepareForUpdate();
- final Throwable cause = assertThrows(FlowUpdateException.class, ()
-> configure(connectorNode, removeLogConfiguration));
- connectorNode.abortUpdate(cause);
+ connectorNode.prepareForUpdate();
+ final Throwable cause = assertThrows(FlowUpdateException.class, () ->
configure(connectorNode, removeLogConfiguration));
+ connectorNode.abortUpdate(cause);
- rootGroup.findAllConnections().contains(connection);
- assertFalse(connection.getFlowFileQueue().isEmpty());
- }
+ rootGroup.findAllConnections().contains(connection);
+ assertFalse(connection.getFlowFileQueue().isEmpty());
}
@@ -367,33 +363,31 @@ public class StandardConnectorNodeIT {
SystemBundle.SYSTEM_BUNDLE_COORDINATE, true, true);
assertNotNull(connectorNode);
- try (final FlowEngine flowEngine = new FlowEngine(1, "flow-engine")) {
- connectorNode.prepareForUpdate();
- assertEquals(List.of("File"),
getConfigurationStepNames(connectorNode));
+ connectorNode.prepareForUpdate();
+ assertEquals(List.of("File"),
getConfigurationStepNames(connectorNode));
- final Path tempFile =
Files.createTempFile("StandardConnectorNodeIT", ".txt");
- Files.writeString(tempFile, String.join("\n", "red", "blue",
"yellow"));
+ final Path tempFile = Files.createTempFile("StandardConnectorNodeIT",
".txt");
+ Files.writeString(tempFile, String.join("\n", "red", "blue",
"yellow"));
- final ConnectorConfiguration configuration =
createFileConfiguration(tempFile.toFile().getAbsolutePath());
- configure(connectorNode, configuration);
+ final ConnectorConfiguration configuration =
createFileConfiguration(tempFile.toFile().getAbsolutePath());
+ configure(connectorNode, configuration);
- connectorNode.prepareForUpdate();
- assertEquals(List.of("File", "Colors"),
getConfigurationStepNames(connectorNode));
+ connectorNode.prepareForUpdate();
+ assertEquals(List.of("File", "Colors"),
getConfigurationStepNames(connectorNode));
- final ConfigurationStep colorConfigurationStep =
connectorNode.getConfigurationSteps().stream()
- .filter(step -> step.getName().equals("Colors"))
- .findFirst()
- .orElseThrow();
+ final ConfigurationStep colorConfigurationStep =
connectorNode.getConfigurationSteps().stream()
+ .filter(step -> step.getName().equals("Colors"))
+ .findFirst()
+ .orElseThrow();
- assertNotNull(colorConfigurationStep);
- assertEquals(1, colorConfigurationStep.getPropertyGroups().size());
- final ConnectorPropertyGroup primaryColorsPropertyGroup =
colorConfigurationStep.getPropertyGroups().getFirst();
+ assertNotNull(colorConfigurationStep);
+ assertEquals(1, colorConfigurationStep.getPropertyGroups().size());
+ final ConnectorPropertyGroup primaryColorsPropertyGroup =
colorConfigurationStep.getPropertyGroups().getFirst();
- final List<String> allowableValues =
primaryColorsPropertyGroup.getProperties().getFirst().getAllowableValues().stream()
- .map(DescribedValue::getValue)
- .toList();
- assertEquals(List.of("red", "blue", "yellow"), allowableValues);
- }
+ final List<String> allowableValues =
primaryColorsPropertyGroup.getProperties().getFirst().getAllowableValues().stream()
+ .map(DescribedValue::getValue)
+ .toList();
+ assertEquals(List.of("red", "blue", "yellow"), allowableValues);
}
@Test
@@ -402,29 +396,27 @@ public class StandardConnectorNodeIT {
SystemBundle.SYSTEM_BUNDLE_COORDINATE, true, true);
assertNotNull(connectorNode);
- try (final FlowEngine flowEngine = new FlowEngine(1,
"testSimpleValidation")) {
- connectorNode.prepareForUpdate();
- assertEquals(List.of("File"),
getConfigurationStepNames(connectorNode));
+ connectorNode.prepareForUpdate();
+ assertEquals(List.of("File"),
getConfigurationStepNames(connectorNode));
- final ConnectorConfiguration configuration =
createFileConfiguration("/non/existent/file");
- configure(connectorNode, configuration);
+ final ConnectorConfiguration configuration =
createFileConfiguration("/non/existent/file");
+ configure(connectorNode, configuration);
- final ValidationState validationState =
connectorNode.performValidation();
- assertNotNull(validationState);
- assertEquals(ValidationStatus.INVALID,
validationState.getStatus());
- assertEquals(1, validationState.getValidationErrors().size());
+ final ValidationState validationState =
connectorNode.performValidation();
+ assertNotNull(validationState);
+ assertEquals(ValidationStatus.INVALID, validationState.getStatus());
+ assertEquals(1, validationState.getValidationErrors().size());
- final ValidationResult result =
validationState.getValidationErrors().iterator().next();
- result.getExplanation().contains("/non/existent/file");
+ final ValidationResult result =
validationState.getValidationErrors().iterator().next();
+ result.getExplanation().contains("/non/existent/file");
- final ConnectorConfiguration validConfig =
createFileConfiguration(".");
- configure(connectorNode, validConfig);
+ final ConnectorConfiguration validConfig =
createFileConfiguration(".");
+ configure(connectorNode, validConfig);
- final ValidationState updatedValidationState =
connectorNode.performValidation();
- assertEquals(ValidationStatus.VALID,
updatedValidationState.getStatus(),
- "Expected valid state but invalid due to " +
updatedValidationState.getValidationErrors());
- assertEquals(List.of(),
updatedValidationState.getValidationErrors());
- }
+ final ValidationState updatedValidationState =
connectorNode.performValidation();
+ assertEquals(ValidationStatus.VALID,
updatedValidationState.getStatus(),
+ "Expected valid state but invalid due to " +
updatedValidationState.getValidationErrors());
+ assertEquals(List.of(), updatedValidationState.getValidationErrors());
}
@Test
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/components/connector/processors/Sleep.java
b/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/components/connector/processors/Sleep.java
index 76e6c51c90..f936ece3f2 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/components/connector/processors/Sleep.java
+++
b/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/components/connector/processors/Sleep.java
@@ -145,7 +145,7 @@ public class Sleep extends AbstractProcessor {
}
} catch (final InterruptedException interruptedException) {
Thread.currentThread().interrupt();
- logger.warn("Sleep processor interrupted while sleeping for {}
ms", new Object[] {durationMillis});
+ logger.warn("Sleep processor interrupted while sleeping for {}
ms", durationMillis);
}
}
}
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/MockStateManagerProvider.java
b/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/MockStateManagerProvider.java
index 474b5b5464..e0766c2b3e 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/MockStateManagerProvider.java
+++
b/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/MockStateManagerProvider.java
@@ -44,6 +44,7 @@ public class MockStateManagerProvider implements
StateManagerProvider {
return stateManager;
}
+ @Override
public StateManager getStateManager(final String componentId, final
boolean dropStateKeySupported) {
return getStateManager(componentId);
}
@@ -60,6 +61,7 @@ public class MockStateManagerProvider implements
StateManagerProvider {
public void disableClusterProvider() {
}
+ @Override
public boolean isClusterProviderEnabled() {
return false;
}
