From e54190ba00c52999d86caa752ef10e76b6db7432 Mon Sep 17 00:00:00 2001 From: Mark Payne Date: Sun, 8 Feb 2026 11:38:24 -0500 Subject: [PATCH] NIFI-15565: Code cleanup --- .../connector/ConfigurationStep.java | 23 +++++++++++++++++ .../ConnectorPropertyDependency.java | 23 +++++++++++++++++ .../connector/components/ParameterValue.java | 25 ++++++++++++++----- .../nifi/flow/VersionedConfigurationStep.java | 5 ++++ 4 files changed, 70 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/apache/nifi/components/connector/ConfigurationStep.java b/src/main/java/org/apache/nifi/components/connector/ConfigurationStep.java index d840b12..abbd84d 100644 --- a/src/main/java/org/apache/nifi/components/connector/ConfigurationStep.java +++ b/src/main/java/org/apache/nifi/components/connector/ConfigurationStep.java @@ -25,6 +25,7 @@ import java.util.Collections; import java.util.HashSet; import java.util.List; +import java.util.Objects; import java.util.Set; import java.util.stream.Collectors; @@ -60,6 +61,28 @@ public Set getDependencies() { return dependencies; } + @Override + public String toString() { + return "ConfigurationStep[name=" + name + "]"; + } + + @Override + public boolean equals(final Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + final ConfigurationStep that = (ConfigurationStep) o; + return Objects.equals(name, that.name); + } + + @Override + public int hashCode() { + return Objects.hashCode(name); + } + public static final class Builder { private String name; private String description; diff --git a/src/main/java/org/apache/nifi/components/connector/ConnectorPropertyDependency.java b/src/main/java/org/apache/nifi/components/connector/ConnectorPropertyDependency.java index 0f2d1e2..d2ecb79 100644 --- a/src/main/java/org/apache/nifi/components/connector/ConnectorPropertyDependency.java +++ b/src/main/java/org/apache/nifi/components/connector/ConnectorPropertyDependency.java @@ -17,6 +17,7 @@ package org.apache.nifi.components.connector; +import java.util.Objects; import java.util.Set; public final class ConnectorPropertyDependency { @@ -40,4 +41,26 @@ public String getPropertyName() { public Set getDependentValues() { return dependentValues; } + + @Override + public String toString() { + return "ConnectorPropertyDependency[propertyName=" + propertyName + ", dependentValues=" + dependentValues + "]"; + } + + @Override + public boolean equals(final Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + final ConnectorPropertyDependency that = (ConnectorPropertyDependency) o; + return Objects.equals(propertyName, that.propertyName) && Objects.equals(dependentValues, that.dependentValues); + } + + @Override + public int hashCode() { + return Objects.hash(propertyName, dependentValues); + } } diff --git a/src/main/java/org/apache/nifi/components/connector/components/ParameterValue.java b/src/main/java/org/apache/nifi/components/connector/components/ParameterValue.java index 6a77467..0671af0 100644 --- a/src/main/java/org/apache/nifi/components/connector/components/ParameterValue.java +++ b/src/main/java/org/apache/nifi/components/connector/components/ParameterValue.java @@ -22,6 +22,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; +import java.util.Objects; public class ParameterValue { private final String name; @@ -54,12 +55,24 @@ public List getAssets() { @Override public String toString() { - return "ParameterValue{" + - "name=" + name + - ", value=" + (sensitive ? "****" : value) + - ", sensitive=" + sensitive + - ", assets=" + assets + - '}'; + return "ParameterValue[name=" + name + ", value=" + (sensitive ? "****" : value) + ", sensitive=" + sensitive + ", assets=" + assets + "]"; + } + + @Override + public boolean equals(final Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + final ParameterValue that = (ParameterValue) o; + return Objects.equals(name, that.name); + } + + @Override + public int hashCode() { + return Objects.hashCode(name); } public static class Builder { diff --git a/src/main/java/org/apache/nifi/flow/VersionedConfigurationStep.java b/src/main/java/org/apache/nifi/flow/VersionedConfigurationStep.java index f2c6bac..ac9a824 100644 --- a/src/main/java/org/apache/nifi/flow/VersionedConfigurationStep.java +++ b/src/main/java/org/apache/nifi/flow/VersionedConfigurationStep.java @@ -38,4 +38,9 @@ public Map getProperties() { public void setProperties(final Map properties) { this.properties = properties; } + + @Override + public String toString() { + return "VersionedConfigurationStep[name=" + name + "]"; + } }