NIFI-15485: Include provider name when providing fqn for secrets

checkstyle.xml

@@ -60,7 +60,6 @@
         <module name="SimplifyBooleanReturn"/>
         <module name="InterfaceIsType"/>
         <module name="ArrayTypeStyle"/>
-        <module name="TodoComment"/>
         <module name="UpperEll"/>
         <module name="UnusedLocalVariable"/>
     </module>

src/main/java/org/apache/nifi/action/Component.java

@@ -38,5 +38,7 @@ public enum Component {
     AccessPolicy,
     User,
     UserGroup,
-    Label;
+    Label,
+    Connector;
+
 }

src/main/java/org/apache/nifi/annotation/lifecycle/OnAdded.java

@@ -29,9 +29,10 @@
  * {@link org.apache.nifi.controller.ControllerService ControllerService},
  * {@link org.apache.nifi.registry.flow.FlowRegistryClient FlowRegistryClient},
  * {@link org.apache.nifi.parameter.ParameterProvider ParameterProvider},
- * {@link org.apache.nifi.flowanalysis.FlowAnalysisRule FlowAnalysisRule}, or
- * {@link org.apache.nifi.reporting.ReportingTask ReportingTask} implementation
- * can use to indicate a method should be called whenever the component is added
+ * {@link org.apache.nifi.flowanalysis.FlowAnalysisRule FlowAnalysisRule},
+ * {@link org.apache.nifi.reporting.ReportingTask ReportingTask}, or
+ * {@link org.apache.nifi.components.connector.Connector Connector}
+ * implementation can use to indicate a method should be called whenever the component is added
  * to the flow. This method will be called once for the entire life of a
  * component instance.
  * </p>

src/main/java/org/apache/nifi/asset/Asset.java

@@ -37,9 +37,18 @@ public interface Asset {
      * Returns the identifier of the parameter context the Asset belongs to
      *
      * @return Parameter Context Identifier
+     * @deprecated Use {@link #getOwnerIdentifier()} instead
      */
+    @Deprecated
     String getParameterContextIdentifier();
 
+    /**
+     * Returns the identifier of the resource the Asset belongs to
+     *
+     * @return Owner Identifier
+     */
+    String getOwnerIdentifier();
+
     /**
      * Returns the name of the Asset
      *

src/main/java/org/apache/nifi/components/ConfigVerificationResult.java

@@ -20,11 +20,13 @@
 public class ConfigVerificationResult {
     private final Outcome outcome;
     private final String verificationStepName;
+    private final String subject;
     private final String explanation;
 
     private ConfigVerificationResult(final Builder builder) {
         outcome = builder.outcome;
         verificationStepName = builder.verificationStepName;
+        subject = builder.subject;
         explanation = builder.explanation;
     }
 
@@ -36,6 +38,10 @@ public String getVerificationStepName() {
         return verificationStepName;
     }
 
+    public String getSubject() {
+        return subject;
+    }
+
     public String getExplanation() {
         return explanation;
     }
@@ -44,13 +50,15 @@ public String getExplanation() {
     public String toString() {
         return "ConfigVerificationResult[" +
             "outcome=" + outcome +
+            ", subject=" + (subject == null ? "null" : "'" + subject + "'") +
             ", verificationStepName='" + verificationStepName + "'" +
             ", explanation='" + explanation + "']";
     }
 
     public static class Builder {
         private Outcome outcome = Outcome.SKIPPED;
         private String verificationStepName = "Unknown Step Name";
+        private String subject;
         private String explanation;
 
         public Builder outcome(final Outcome outcome) {
@@ -63,6 +71,11 @@ public Builder verificationStepName(final String verificationStepName) {
             return this;
         }
 
+        public Builder subject(final String subject) {
+            this.subject = subject;
+            return this;
+        }
+
         public Builder explanation(final String explanation) {
             this.explanation = explanation;
             return this;

src/main/java/org/apache/nifi/components/DescribedValue.java

@@ -32,7 +32,24 @@ public interface DescribedValue {
     String getDisplayName();
 
     /**
-     * @return the proeprty description as a string
+     * @return the property description as a string
      */
     String getDescription();
+
+    DescribedValue NULL = new DescribedValue() {
+        @Override
+        public String getValue() {
+            return null;
+        }
+
+        @Override
+        public String getDisplayName() {
+            return "NULL";
+        }
+
+        @Override
+        public String getDescription() {
+            return "A null value";
+        }
+    };
 }