Return-Path: X-Original-To: apmail-nifi-commits-archive@minotaur.apache.org Delivered-To: apmail-nifi-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 639D417872 for ; Wed, 25 Mar 2015 19:10:53 +0000 (UTC) Received: (qmail 41641 invoked by uid 500); 25 Mar 2015 19:10:43 -0000 Delivered-To: apmail-nifi-commits-archive@nifi.apache.org Received: (qmail 41608 invoked by uid 500); 25 Mar 2015 19:10:43 -0000 Mailing-List: contact commits-help@nifi.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@nifi.incubator.apache.org Delivered-To: mailing list commits@nifi.incubator.apache.org Received: (qmail 41590 invoked by uid 99); 25 Mar 2015 19:10:43 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 25 Mar 2015 19:10:43 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED,T_RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Wed, 25 Mar 2015 19:10:42 +0000 Received: (qmail 36737 invoked by uid 99); 25 Mar 2015 19:10:22 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 25 Mar 2015 19:10:22 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 4C892E18E1; Wed, 25 Mar 2015 19:10:22 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: markap14@apache.org To: commits@nifi.incubator.apache.org Date: Wed, 25 Mar 2015 19:10:22 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [1/2] incubator-nifi git commit: NIFI-460 using identifiesControllerService X-Virus-Checked: Checked by ClamAV on apache.org 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 Authored: Tue Mar 24 11:56:02 2015 -0400 Committer: danbress 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 getSupportedPropertyDescriptors() { - Set contextIdentifiers = getControllerServiceLookup().getControllerServiceIdentifiers(SSLContextService.class); - PropertyDescriptor contextServiceSelector = new PropertyDescriptor.Builder() - .fromPropertyDescriptor(Config.PROP_SSL_CONTEXT_SERVICE) - .allowableValues(contextIdentifiers) - .build(); - - List 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 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()