This is an automated email from the ASF dual-hosted git repository.
mcgilman pushed a commit to branch NIFI-15258
in repository https://gitbox.apache.org/repos/asf/nifi-api.git
The following commit(s) were added to refs/heads/NIFI-15258 by this push:
new e7000ae NIFI-15352: Added getFullyQualifiedName to secret, to
encapsulate the… (#35)
e7000ae is described below
commit e7000aecfab309037d23373fc90fd4555dda9967
Author: Mark Payne <[email protected]>
AuthorDate: Wed Dec 17 11:20:26 2025 -0500
NIFI-15352: Added getFullyQualifiedName to secret, to encapsulate the… (#35)
* NIFI-15352: Added getFullyQualifiedName to secret, to encapsulate the
combination of group and name
* NIFI-15352: Added getFullyQualifiedName to SecretReference
---
.../org/apache/nifi/components/connector/Secret.java | 2 ++
.../nifi/components/connector/SecretReference.java | 20 +++++++++++++++-----
.../nifi/flow/VersionedConnectorValueReference.java | 16 +++++++++++++---
.../org/apache/nifi/parameter/ParameterProvider.java | 2 +-
4 files changed, 31 insertions(+), 9 deletions(-)
diff --git a/src/main/java/org/apache/nifi/components/connector/Secret.java
b/src/main/java/org/apache/nifi/components/connector/Secret.java
index 6ac3f00..c11598a 100644
--- a/src/main/java/org/apache/nifi/components/connector/Secret.java
+++ b/src/main/java/org/apache/nifi/components/connector/Secret.java
@@ -31,4 +31,6 @@ public interface Secret {
String getValue();
+ String getFullyQualifiedName();
+
}
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..d4c29b4 100644
--- a/src/main/java/org/apache/nifi/components/connector/SecretReference.java
+++ b/src/main/java/org/apache/nifi/components/connector/SecretReference.java
@@ -27,11 +27,13 @@ public final class SecretReference implements
ConnectorValueReference {
private final String providerId;
private final String providerName;
private final String secretName;
+ private final String fullyQualifiedName;
- public SecretReference(final String providerId, final String providerName,
final String secretName) {
+ public SecretReference(final String providerId, final String providerName,
final String secretName, final String fullyQualifiedName) {
this.providerId = providerId;
this.providerName = providerName;
this.secretName = secretName;
+ this.fullyQualifiedName = fullyQualifiedName;
}
/**
@@ -53,14 +55,22 @@ public final class SecretReference implements
ConnectorValueReference {
}
/**
- * Returns the secret name.
+ * Returns the simple secret name.
*
- * @return the secret name
+ * @return the simple secret name
*/
public String getSecretName() {
return secretName;
}
+ /**
+ * Returns the fully qualified name of the secret.
+ * @return the fully qualified name
+ */
+ public String getFullyQualifiedName() {
+ return fullyQualifiedName;
+ }
+
@Override
public ConnectorValueType getValueType() {
return ConnectorValueType.SECRET_REFERENCE;
@@ -76,12 +86,12 @@ 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(secretName, that.secretName) &&
Objects.equals(fullyQualifiedName, that.fullyQualifiedName);
}
@Override
public int hashCode() {
- return Objects.hash(providerId, providerName, secretName);
+ return Objects.hash(providerId, providerName, secretName,
fullyQualifiedName);
}
@Override
diff --git
a/src/main/java/org/apache/nifi/flow/VersionedConnectorValueReference.java
b/src/main/java/org/apache/nifi/flow/VersionedConnectorValueReference.java
index 4748508..e9e881c 100644
--- a/src/main/java/org/apache/nifi/flow/VersionedConnectorValueReference.java
+++ b/src/main/java/org/apache/nifi/flow/VersionedConnectorValueReference.java
@@ -31,6 +31,7 @@ public class VersionedConnectorValueReference {
private String providerId;
private String providerName;
private String secretName;
+ private String fullyQualifiedSecretName;
public String getValueType() {
return valueType;
@@ -80,6 +81,14 @@ public class VersionedConnectorValueReference {
this.secretName = secretName;
}
+ public String getFullyQualifiedSecretName() {
+ return fullyQualifiedSecretName;
+ }
+
+ public void setFullyQualifiedSecretName(final String
fullyQualifiedSecretName) {
+ this.fullyQualifiedSecretName = fullyQualifiedSecretName;
+ }
+
@Override
public boolean equals(final Object obj) {
if (this == obj) {
@@ -92,17 +101,18 @@ public class VersionedConnectorValueReference {
&& Objects.equals(value, other.value)
&& Objects.equals(assetId, other.assetId)
&& Objects.equals(providerId, other.providerId)
- && Objects.equals(secretName, other.secretName);
+ && Objects.equals(secretName, other.secretName)
+ && Objects.equals(fullyQualifiedSecretName,
other.fullyQualifiedSecretName);
}
@Override
public int hashCode() {
- return Objects.hash(valueType, value, assetId, providerId, secretName);
+ return Objects.hash(valueType, value, assetId, providerId, secretName,
fullyQualifiedSecretName);
}
@Override
public String toString() {
return "VersionedConnectorValueReference[valueType=" + valueType + ",
value=" + value
- + ", assetId=" + assetId + ", providerId=" + providerId + ",
secretName=" + secretName + "]";
+ + ", assetId=" + assetId + ", providerId=" + providerId + ",
fullyQualifiedSecretName=" + fullyQualifiedSecretName + "]";
}
}
diff --git a/src/main/java/org/apache/nifi/parameter/ParameterProvider.java
b/src/main/java/org/apache/nifi/parameter/ParameterProvider.java
index c542e61..f61a92f 100644
--- a/src/main/java/org/apache/nifi/parameter/ParameterProvider.java
+++ b/src/main/java/org/apache/nifi/parameter/ParameterProvider.java
@@ -99,7 +99,7 @@ public interface ParameterProvider extends
ConfigurableComponent {
* @return A list of fetched Parameter groups containing only the
specified parameters
* @throws IOException if there is an I/O problem while fetching the
Parameters
*/
- default List<ParameterGroup> fetchParameters(ConfigurationContext context,
List<String> fullyQualifiedParameterNames) throws IOException {
+ default List<ParameterGroup> fetchParameters(final ConfigurationContext
context, final List<String> fullyQualifiedParameterNames) throws IOException {
final List<ParameterGroup> allGroups = fetchParameters(context);
final List<ParameterGroup> filteredGroups = new ArrayList<>();
