NIFI-4952 Add EL support for JettyWebSocketClient and JettyWebSocketS…#2572
Closed
claudiu-stanciu wants to merge 1 commit intoapache:masterfrom
Closed
Conversation
MikeThomsen
reviewed
Apr 11, 2018
Contributor
MikeThomsen
left a comment
There was a problem hiding this comment.
Needs a little refactoring on the use of EL.
|
|
||
| webSocketUri = new URI(context.getProperty(WS_URI).getValue()); | ||
| connectionTimeoutMillis = context.getProperty(CONNECTION_TIMEOUT).asTimePeriod(TimeUnit.MILLISECONDS); | ||
| webSocketUri = new URI(context.getProperty(WS_URI).evaluateAttributeExpressions().getValue()); |
Contributor
There was a problem hiding this comment.
It looks like you're still using expressionLanguageSupported(boolean) in this PR. Please rebase off of the latest master and add change it expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY).
Contributor
|
@claudiu-stanciu I think this will be ready to merge once you get that change in. |
Contributor
|
@claudiu-stanciu Looks like someone already made equivalent changes. When I rebased on master to bring it up to 1.7.0, the changes had already been added to master by another commit. So you can close this ticket. Thanks for the patch. |
Author
|
@MikeThomsen sure. Sorry, didn't have time to apply the changes in time. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
…erver properties
Thank you for submitting a contribution to Apache NiFi.
In order to streamline the review of the contribution we ask you
to ensure the following steps have been taken:
For all changes:
Is there a JIRA ticket associated with this PR? Is it referenced
in the commit message?
Does your PR title start with NIFI-XXXX where XXXX is the JIRA number you are trying to resolve? Pay particular attention to the hyphen "-" character.
Has your PR been rebased against the latest commit within the target branch (typically master)?
Is your initial contribution a single, squashed commit?
For code changes:
For documentation related changes:
Note:
Please ensure that once the PR is submitted, you check travis-ci for build issues and submit an update to your PR as soon as possible.