Apache
/
nifi
mirror of https://github.com/apache/nifi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

NIFI-460 using identifiesControllerService

This commit is contained in:
danbress 2015-03-24 11:56:02 -04:00
parent a7b826ae20
commit 06ee1291c2
1 changed files with 10 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/InvokeHTTP.java
View File

@ -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()