You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@nifi.apache.org by claudiu-stanciu <gi...@git.apache.org> on 2018/03/21 11:01:29 UTC
[GitHub] nifi pull request #2572: NIFI-4952 Add EL support for JettyWebSocketClient a...
GitHub user claudiu-stanciu opened a pull request:
https://github.com/apache/nifi/pull/2572
NIFI-4952 Add EL support for JettyWebSocketClient and JettyWebSocketS…
…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:
- [X] Is there a JIRA ticket associated with this PR? Is it referenced
in the commit message?
- [X] 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.
- [X] Has your PR been rebased against the latest commit within the target branch (typically master)?
- [X] Is your initial contribution a single, squashed commit?
### For code changes:
- [X] Have you ensured that the full suite of tests is executed via mvn -Pcontrib-check clean install at the root nifi folder?
- [ ] Have you written or updated unit tests to verify your changes?
- [ ] If adding new dependencies to the code, are these dependencies licensed in a way that is compatible for inclusion under [ASF 2.0](http://www.apache.org/legal/resolved.html#category-a)?
- [ ] If applicable, have you updated the LICENSE file, including the main LICENSE file under nifi-assembly?
- [ ] If applicable, have you updated the NOTICE file, including the main NOTICE file found under nifi-assembly?
- [ ] If adding new Properties, have you added .displayName in addition to .name (programmatic access) for each of the new properties?
### For documentation related changes:
- [ ] Have you ensured that format looks appropriate for the output in which it is rendered?
### 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.
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/claudiu-stanciu/nifi feature/NIFI-4952_Add_EL_JettyWebSocketClient
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/nifi/pull/2572.patch
To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:
This closes #2572
----
commit 4ba5936eaad84975b4d9fbe08c6444f10edfdc37
Author: claudiu stanciu <cl...@...>
Date: 2018-03-20T16:20:48Z
NIFI-4952 Add EL support for JettyWebSocketClient and JettyWebSocketServer properties
----
---
[GitHub] nifi pull request #2572: NIFI-4952 Add EL support for JettyWebSocketClient a...
Posted by claudiu-stanciu <gi...@git.apache.org>.
Github user claudiu-stanciu closed the pull request at:
https://github.com/apache/nifi/pull/2572
---
[GitHub] nifi issue #2572: NIFI-4952 Add EL support for JettyWebSocketClient and Jett...
Posted by MikeThomsen <gi...@git.apache.org>.
Github user MikeThomsen commented on the issue:
https://github.com/apache/nifi/pull/2572
@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.
---
[GitHub] nifi issue #2572: NIFI-4952 Add EL support for JettyWebSocketClient and Jett...
Posted by claudiu-stanciu <gi...@git.apache.org>.
Github user claudiu-stanciu commented on the issue:
https://github.com/apache/nifi/pull/2572
@MikeThomsen sure. Sorry, didn't have time to apply the changes in time.
---
[GitHub] nifi pull request #2572: NIFI-4952 Add EL support for JettyWebSocketClient a...
Posted by MikeThomsen <gi...@git.apache.org>.
Github user MikeThomsen commented on a diff in the pull request:
https://github.com/apache/nifi/pull/2572#discussion_r180735170
--- Diff: nifi-nar-bundles/nifi-websocket-bundle/nifi-websocket-services-jetty/src/main/java/org/apache/nifi/websocket/jetty/JettyWebSocketClient.java ---
@@ -142,10 +142,10 @@ public void startClient(final ConfigurationContext context) throws Exception{
client.start();
activeSessions.clear();
- 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());
--- End diff --
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)`.
---
[GitHub] nifi issue #2572: NIFI-4952 Add EL support for JettyWebSocketClient and Jett...
Posted by MikeThomsen <gi...@git.apache.org>.
Github user MikeThomsen commented on the issue:
https://github.com/apache/nifi/pull/2572
@claudiu-stanciu I think this will be ready to merge once you get that change in.
---