This is an automated email from the ASF dual-hosted git repository.
mcgilman pushed a commit to branch NIFI-15343
in repository https://gitbox.apache.org/repos/asf/nifi-api.git
The following commit(s) were added to refs/heads/NIFI-15343 by this push:
new 2d53be4 NIFI-15343: Adding group name to SecretReference and
VersionedConnectorValueReference.
2d53be4 is described below
commit 2d53be4f449055aa2118b097eca54c906b3efa6c
Author: Matt Gilman <[email protected]>
AuthorDate: Tue Dec 16 14:40:08 2025 -0500
NIFI-15343: Adding group name to SecretReference and
VersionedConnectorValueReference.
---
.../nifi/components/connector/SecretReference.java | 19 +++++++++++++++----
.../nifi/flow/VersionedConnectorValueReference.java | 14 ++++++++++++--
2 files changed, 27 insertions(+), 6 deletions(-)
diff --git
a/src/main/java/org/apache/nifi/components/connector/SecretReference.java
b/src/main/java/org/apache/nifi/components/connector/SecretReference.java
index 8b5bd11..92a4605 100644
--- a/src/main/java/org/apache/nifi/components/connector/SecretReference.java
+++ b/src/main/java/org/apache/nifi/components/connector/SecretReference.java
@@ -26,11 +26,13 @@ public final class SecretReference implements
ConnectorValueReference {
private final String providerId;
private final String providerName;
+ private final String secretGroupName;
private final String secretName;
- public SecretReference(final String providerId, final String providerName,
final String secretName) {
+ public SecretReference(final String providerId, final String providerName,
final String secretGroupName, final String secretName) {
this.providerId = providerId;
this.providerName = providerName;
+ this.secretGroupName = secretGroupName;
this.secretName = secretName;
}
@@ -52,6 +54,15 @@ public final class SecretReference implements
ConnectorValueReference {
return providerName;
}
+ /**
+ * Returns the secret group name.
+ *
+ * @return the secret group name
+ */
+ public String getSecretGroupName() {
+ return secretGroupName;
+ }
+
/**
* Returns the secret name.
*
@@ -76,16 +87,16 @@ public final class SecretReference implements
ConnectorValueReference {
}
final SecretReference that = (SecretReference) object;
return Objects.equals(providerId, that.providerId) &&
Objects.equals(providerName, that.providerName)
- && Objects.equals(secretName, that.secretName);
+ && Objects.equals(secretGroupName, that.secretGroupName) &&
Objects.equals(secretName, that.secretName);
}
@Override
public int hashCode() {
- return Objects.hash(providerId, providerName, secretName);
+ return Objects.hash(providerId, providerName, secretGroupName,
secretName);
}
@Override
public String toString() {
- return "SecretReference[providerId=" + providerId + ", providerName="
+ providerName + ", secretName=" + secretName + "]";
+ return "SecretReference[providerId=" + providerId + ", providerName="
+ providerName + ", secretGroupName=" + secretGroupName + ", secretName=" +
secretName + "]";
}
}
diff --git
a/src/main/java/org/apache/nifi/flow/VersionedConnectorValueReference.java
b/src/main/java/org/apache/nifi/flow/VersionedConnectorValueReference.java
index 4748508..d9cd573 100644
--- a/src/main/java/org/apache/nifi/flow/VersionedConnectorValueReference.java
+++ b/src/main/java/org/apache/nifi/flow/VersionedConnectorValueReference.java
@@ -30,6 +30,7 @@ public class VersionedConnectorValueReference {
private String assetId;
private String providerId;
private String providerName;
+ private String secretGroupName;
private String secretName;
public String getValueType() {
@@ -72,6 +73,14 @@ public class VersionedConnectorValueReference {
this.providerName = providerName;
}
+ public String getSecretGroupName() {
+ return secretGroupName;
+ }
+
+ public void setSecretGroupName(final String secretGroupName) {
+ this.secretGroupName = secretGroupName;
+ }
+
public String getSecretName() {
return secretName;
}
@@ -92,17 +101,18 @@ public class VersionedConnectorValueReference {
&& Objects.equals(value, other.value)
&& Objects.equals(assetId, other.assetId)
&& Objects.equals(providerId, other.providerId)
+ && Objects.equals(secretGroupName, other.secretGroupName)
&& Objects.equals(secretName, other.secretName);
}
@Override
public int hashCode() {
- return Objects.hash(valueType, value, assetId, providerId, secretName);
+ return Objects.hash(valueType, value, assetId, providerId,
secretGroupName, secretName);
}
@Override
public String toString() {
return "VersionedConnectorValueReference[valueType=" + valueType + ",
value=" + value
- + ", assetId=" + assetId + ", providerId=" + providerId + ",
secretName=" + secretName + "]";
+ + ", assetId=" + assetId + ", providerId=" + providerId + ",
secretGroupName=" + secretGroupName + ", secretName=" + secretName + "]";
}
}