You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by ma...@apache.org on 2015/03/25 20:10:22 UTC
[1/2] incubator-nifi git commit: NIFI-460 using
identifiesControllerService
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 <db...@onyxconsults.com>
Authored: Tue Mar 24 11:56:02 2015 -0400
Committer: danbress <db...@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()
[2/2] incubator-nifi git commit: NIFI-460 deprecating
StandardValidators.createControllerServiceExistsValidator
Posted by ma...@apache.org.
NIFI-460 deprecating StandardValidators.createControllerServiceExistsValidator
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/a5e140f1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/a5e140f1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/a5e140f1
Branch: refs/heads/develop
Commit: a5e140f10705e119c6aa7d52be03f01b94b75709
Parents: 06ee129
Author: danbress <db...@onyxconsults.com>
Authored: Tue Mar 24 14:18:56 2015 -0400
Committer: danbress <db...@onyxconsults.com>
Committed: Tue Mar 24 14:18:56 2015 -0400
----------------------------------------------------------------------
.../org/apache/nifi/processor/util/StandardValidators.java | 8 ++++++++
1 file changed, 8 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/a5e140f1/nifi/nifi-commons/nifi-processor-utilities/src/main/java/org/apache/nifi/processor/util/StandardValidators.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-commons/nifi-processor-utilities/src/main/java/org/apache/nifi/processor/util/StandardValidators.java b/nifi/nifi-commons/nifi-processor-utilities/src/main/java/org/apache/nifi/processor/util/StandardValidators.java
index 62fecf2..a22e7bb 100644
--- a/nifi/nifi-commons/nifi-processor-utilities/src/main/java/org/apache/nifi/processor/util/StandardValidators.java
+++ b/nifi/nifi-commons/nifi-processor-utilities/src/main/java/org/apache/nifi/processor/util/StandardValidators.java
@@ -615,6 +615,14 @@ public class StandardValidators {
}
}
+ /**
+ * Creates a validator based on existence of a {@link ControllerService}.
+ *
+ * @param serviceClass the controller service API your {@link ConfigurableComponent} depends on
+ * @return a Validator
+ * @deprecated As of release 0.1.0-incubating, replaced by {@link org.apache.nifi.components.PropertyDescriptor.Builder#identifiesControllerService(Class)}
+ */
+ @Deprecated
public static Validator createControllerServiceExistsValidator(final Class<? extends ControllerService> serviceClass) {
return new Validator() {
@Override