Repository: nifi Updated Branches: refs/heads/master 830f7aa84 -> 878a0b8b7
NIFI-5810 Add UserName EL support to JMS processors Signed-off-by: Pierre Villard <[email protected]> This closes #3164. Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/878a0b8b Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/878a0b8b Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/878a0b8b Branch: refs/heads/master Commit: 878a0b8b74e89763ee59106e4f62c19896adafee Parents: 830f7aa Author: Ed B <[email protected]> Authored: Fri Nov 9 19:27:10 2018 -0500 Committer: Pierre Villard <[email protected]> Committed: Sat Nov 10 10:33:40 2018 +0100 ---------------------------------------------------------------------- .../org/apache/nifi/jms/processors/AbstractJMSProcessor.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/878a0b8b/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/java/org/apache/nifi/jms/processors/AbstractJMSProcessor.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/java/org/apache/nifi/jms/processors/AbstractJMSProcessor.java b/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/java/org/apache/nifi/jms/processors/AbstractJMSProcessor.java index 193e72a..95a7103 100644 --- a/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/java/org/apache/nifi/jms/processors/AbstractJMSProcessor.java +++ b/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/src/main/java/org/apache/nifi/jms/processors/AbstractJMSProcessor.java @@ -59,7 +59,8 @@ abstract class AbstractJMSProcessor<T extends JMSWorker> extends AbstractProcess .name("User Name") .description("User Name used for authentication and authorization.") .required(false) - .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) + .expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY) + .addValidator(StandardValidators.NON_EMPTY_EL_VALIDATOR) .build(); static final PropertyDescriptor PASSWORD = new PropertyDescriptor.Builder() .name("Password") @@ -205,7 +206,7 @@ abstract class AbstractJMSProcessor<T extends JMSWorker> extends AbstractProcess final UserCredentialsConnectionFactoryAdapter cfCredentialsAdapter = new UserCredentialsConnectionFactoryAdapter(); cfCredentialsAdapter.setTargetConnectionFactory(connectionFactory); - cfCredentialsAdapter.setUsername(context.getProperty(USER).getValue()); + cfCredentialsAdapter.setUsername(context.getProperty(USER).evaluateAttributeExpressions().getValue()); cfCredentialsAdapter.setPassword(context.getProperty(PASSWORD).getValue()); final CachingConnectionFactory cachingFactory = new CachingConnectionFactory(cfCredentialsAdapter);
