You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@nifi.apache.org by markap14 <gi...@git.apache.org> on 2018/08/15 12:35:19 UTC
[GitHub] nifi pull request #2951: NIFI-5474: When using Regex Replace with ReplaceTex...
GitHub user markap14 opened a pull request:
https://github.com/apache/nifi/pull/2951
NIFI-5474: When using Regex Replace with ReplaceText, and there are capturing groups, ensure that we populate the 'additionalVariables' map for each match of the regex. This allows Expression Language to reference the back-references properly even when there are multiple matches
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](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/markap14/nifi NIFI-5474
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/nifi/pull/2951.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 #2951
----
commit 8f6a2680468efed5f059aa3ed249eef01c5cc07a
Author: Mark Payne <ma...@...>
Date: 2018-08-14T19:35:47Z
Revert "NIFI-4272 support multiple captures when EL is present in replacement value"
This reverts commit f7f809c3d3632eea5234b31740984b73de322464.
commit fc453c03b92695e6cd93b89e2147d84d854fe2c7
Author: Mark Payne <ma...@...>
Date: 2018-08-15T12:34:33Z
NIFI-5474, NIFI-4272: When using Regex Replace with ReplaceText, and there are capturing groups, ensure that we populate the 'additionalVariables' map for each match of the regex. This allows Expression Language to reference the back-references properly even when there are multiple matches
----
---
[GitHub] nifi issue #2951: NIFI-5474: When using Regex Replace with ReplaceText, and ...
Posted by markap14 <gi...@git.apache.org>.
Github user markap14 commented on the issue:
https://github.com/apache/nifi/pull/2951
@mosermw ha! It's *really* easy to miss these things when reviewing! @ottobackwards for what it's worth, I learned some new things about the Pattern/Matcher API as well, when looking into this. I wasn't aware that there was essentially an iterative alternative to "replaceAll". Pretty neat.
---
[GitHub] nifi issue #2951: NIFI-5474: When using Regex Replace with ReplaceText, and ...
Posted by mattyb149 <gi...@git.apache.org>.
Github user mattyb149 commented on the issue:
https://github.com/apache/nifi/pull/2951
+1 LGTM, ran unit tests and contrib-check, tried on a live NiFi instance. Thanks for the fix! Merging to master
---
[GitHub] nifi issue #2951: NIFI-5474: When using Regex Replace with ReplaceText, and ...
Posted by mosermw <gi...@git.apache.org>.
Github user mosermw commented on the issue:
https://github.com/apache/nifi/pull/2951
Well since I was the judge on the original NIFI-4272 case and didn't catch the side effects, perhaps I shouldn't be the one to hear the appeal.
---
[GitHub] nifi issue #2951: NIFI-5474: When using Regex Replace with ReplaceText, and ...
Posted by mattyb149 <gi...@git.apache.org>.
Github user mattyb149 commented on the issue:
https://github.com/apache/nifi/pull/2951
I'll take a look here too, and will merge after my +1 unless there are objections
---
[GitHub] nifi issue #2951: NIFI-5474: When using Regex Replace with ReplaceText, and ...
Posted by ottobackwards <gi...@git.apache.org>.
Github user ottobackwards commented on the issue:
https://github.com/apache/nifi/pull/2951
Ran with contrib-check, and stepped through.
@markap14 this is certainly a better fix for the issues than my other PR's. I learned something I didn't know about the el evaluation and the additional attributes. I certainly tackled this from the wrong angle.
I enthusiastically support this code's replacement of my initial PR and closing out my current one when this lands. +1
@mosermw, since you reviewed my other pr, can you take a look at this?
---
[GitHub] nifi pull request #2951: NIFI-5474: When using Regex Replace with ReplaceTex...
Posted by asfgit <gi...@git.apache.org>.
Github user asfgit closed the pull request at:
https://github.com/apache/nifi/pull/2951
---