Skip to content

NIFI-4952 Add EL support for JettyWebSocketClient and JettyWebSocketS…#2572

Closed
claudiu-stanciu wants to merge 1 commit intoapache:masterfrom
claudiu-stanciu:feature/NIFI-4952_Add_EL_JettyWebSocketClient
Closed

NIFI-4952 Add EL support for JettyWebSocketClient and JettyWebSocketS…#2572
claudiu-stanciu wants to merge 1 commit intoapache:masterfrom
claudiu-stanciu:feature/NIFI-4952_Add_EL_JettyWebSocketClient

Conversation

@claudiu-stanciu
Copy link

…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:

  • 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?
  • 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.

Copy link
Contributor

@MikeThomsen MikeThomsen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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());
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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).

@MikeThomsen
Copy link
Contributor

@claudiu-stanciu I think this will be ready to merge once you get that change in.

@MikeThomsen
Copy link
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.

@claudiu-stanciu
Copy link
Author

@MikeThomsen sure. Sorry, didn't have time to apply the changes in time.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants