NIFI-4198: ElasticsearchHttp processors Proxy settings - Added Expression Language support with variable registry at proxy user and password
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/de1ad3eb Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/de1ad3eb Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/de1ad3eb Branch: refs/heads/master Commit: de1ad3eb6f68d060fc8584d2b1275a295b82078a Parents: 01a01a3 Author: Koji Kawamura <[email protected]> Authored: Wed May 16 14:02:28 2018 +0900 Committer: Koji Kawamura <[email protected]> Committed: Wed May 16 14:02:28 2018 +0900 ---------------------------------------------------------------------- .../elasticsearch/AbstractElasticsearchHttpProcessor.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/de1ad3eb/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/main/java/org/apache/nifi/processors/elasticsearch/AbstractElasticsearchHttpProcessor.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/main/java/org/apache/nifi/processors/elasticsearch/AbstractElasticsearchHttpProcessor.java b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/main/java/org/apache/nifi/processors/elasticsearch/AbstractElasticsearchHttpProcessor.java index 83f4560..b279346 100644 --- a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/main/java/org/apache/nifi/processors/elasticsearch/AbstractElasticsearchHttpProcessor.java +++ b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/src/main/java/org/apache/nifi/processors/elasticsearch/AbstractElasticsearchHttpProcessor.java @@ -91,6 +91,7 @@ public abstract class AbstractElasticsearchHttpProcessor extends AbstractElastic .description("Proxy Username") .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) .required(false) + .expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY) .build(); public static final PropertyDescriptor PROXY_PASSWORD = new PropertyDescriptor.Builder() .name("proxy-password") @@ -99,6 +100,7 @@ public abstract class AbstractElasticsearchHttpProcessor extends AbstractElastic .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) .required(false) .sensitive(true) + .expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY) .build(); public static final PropertyDescriptor CONNECT_TIMEOUT = new PropertyDescriptor.Builder() @@ -169,8 +171,8 @@ public abstract class AbstractElasticsearchHttpProcessor extends AbstractElastic okHttpClient.proxy(proxy); } - final String proxyUsername = context.getProperty(PROXY_USERNAME).getValue(); - final String proxyPassword = context.getProperty(PROXY_PASSWORD).getValue(); + final String proxyUsername = context.getProperty(PROXY_USERNAME).evaluateAttributeExpressions().getValue(); + final String proxyPassword = context.getProperty(PROXY_PASSWORD).evaluateAttributeExpressions().getValue(); if (proxyUsername != null && proxyPassword != null){ okHttpClient.proxyAuthenticator(new Authenticator() {
