nifi-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From marka...@apache.org
Subject [1/2] incubator-nifi git commit: NIFI-460 using identifiesControllerService
Date Wed, 25 Mar 2015 19:10:22 GMT
Repository: incubator-nifi
Updated Branches:
  refs/heads/develop a7b826ae2 -> a5e140f10


NIFI-460 using identifiesControllerService


Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/06ee1291
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/06ee1291
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/06ee1291

Branch: refs/heads/develop
Commit: 06ee1291c2e4a9fbfc1d79d19e426ffff9ade232
Parents: a7b826a
Author: danbress <dbress@onyxconsults.com>
Authored: Tue Mar 24 11:56:02 2015 -0400
Committer: danbress <dbress@onyxconsults.com>
Committed: Tue Mar 24 11:56:02 2015 -0400

----------------------------------------------------------------------
 .../nifi/processors/standard/InvokeHTTP.java    | 29 +++++++-------------
 1 file changed, 10 insertions(+), 19 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/06ee1291/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/InvokeHTTP.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/InvokeHTTP.java
b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/InvokeHTTP.java
index 08384d9..c8345d2 100644
--- a/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/InvokeHTTP.java
+++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/InvokeHTTP.java
@@ -85,19 +85,10 @@ public final class InvokeHTTP extends AbstractProcessor {
     //-- properties --//
     @Override
     protected List<PropertyDescriptor> getSupportedPropertyDescriptors() {
-        Set<String> contextIdentifiers = getControllerServiceLookup().getControllerServiceIdentifiers(SSLContextService.class);
 
-        PropertyDescriptor contextServiceSelector = new PropertyDescriptor.Builder()
-                .fromPropertyDescriptor(Config.PROP_SSL_CONTEXT_SERVICE)
-                .allowableValues(contextIdentifiers)
-                .build();
-
-        List<PropertyDescriptor> list = new ArrayList<>(Config.PROPERTIES);
-        list.add(2, contextServiceSelector);
-
-        return Collections.unmodifiableList(list);
+        return Config.PROPERTIES;
     }
-
+    
     @Override
     protected PropertyDescriptor getSupportedDynamicPropertyDescriptor(String propertyDescriptorName)
{
         if (Config.PROP_TRUSTED_HOSTNAME.getName().equalsIgnoreCase(propertyDescriptorName))
{
@@ -248,9 +239,17 @@ public final class InvokeHTTP extends AbstractProcessor {
                 .addValidator(StandardValidators.REGULAR_EXPRESSION_VALIDATOR)
                 .build();
 
+        PropertyDescriptor PROP_SSL_CONTEXT_SERVICE = new PropertyDescriptor.Builder()
+                .name("SSL Context Service")
+                .description("The SSL Context Service used to provide client certificate
information for TLS/SSL (https) connections.")
+                .required(false)
+                .identifiesControllerService(SSLContextService.class)
+                .build();
+        
         List<PropertyDescriptor> PROPERTIES = Collections.unmodifiableList(Arrays.asList(
                 PROP_METHOD,
                 PROP_URL,
+                PROP_SSL_CONTEXT_SERVICE,
                 PROP_CONNECT_TIMEOUT,
                 PROP_READ_TIMEOUT,
                 PROP_DATE_HEADER,
@@ -258,14 +257,6 @@ public final class InvokeHTTP extends AbstractProcessor {
                 PROP_ATTRIBUTES_TO_SEND
         ));
 
-        // The allowableValues of the SSL Context Service property is dynamically populated
at run time.
-        PropertyDescriptor PROP_SSL_CONTEXT_SERVICE = new PropertyDescriptor.Builder()
-                .name("SSL Context Service")
-                .description("The SSL Context Service used to provide client certificate
information for TLS/SSL (https) connections.")
-                .required(false)
-                .addValidator(StandardValidators.createControllerServiceExistsValidator(SSLContextService.class))
-                .build();
-
         // property to allow the hostname verifier to be overridden
         // this is a "hidden" property - it's configured using a dynamic user property
         PropertyDescriptor PROP_TRUSTED_HOSTNAME = new PropertyDescriptor.Builder()


Mime
View raw message