Skip to content

NIFI-4434 Fixed recursive listing with a custom regex filter.#2937

Closed
jtstorck wants to merge 2 commits intoapache:masterfrom
jtstorck:NIFI-4434
Closed

NIFI-4434 Fixed recursive listing with a custom regex filter.#2937
jtstorck wants to merge 2 commits intoapache:masterfrom
jtstorck:NIFI-4434

Conversation

@jtstorck
Copy link
Contributor

@jtstorck jtstorck commented Aug 6, 2018

Filter modes are now supported to perform listings based on directory and file names, file-names only, and full path.

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.

Filter modes are now supported to perform listings based on directory and file names, file-names only, and full path.
@jtstorck
Copy link
Contributor Author

jtstorck commented Aug 6, 2018

PR 2930 was closed due to the branch in my fork being removed before adding the new filter-mode-based changes. @bbende @ottobackwards, this PR implements the use cases discussed in the previous PR:

  • filename only
  • filename and directory name
  • full path

@ottobackwards
Copy link
Contributor

@jtstorck will review.
First quick thing is to ask if you have considered adding an additionDetails talking about why you would choose one strategy over another, maybe with simple examples?

Copy link
Contributor

@zenfenan zenfenan left a comment

Choose a reason for hiding this comment

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

Reviewing...

Copy link
Contributor

@ottobackwards ottobackwards left a comment

Choose a reason for hiding this comment

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

This looks good to me, I have a question though

@@ -462,11 +523,15 @@ private String getPerms(final FsAction action) {

private PathFilter createPathFilter(final ProcessContext context) {
final Pattern filePattern = Pattern.compile(context.getProperty(FILE_FILTER).getValue());
Copy link
Contributor

Choose a reason for hiding this comment

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

Does this need to support expression language?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@ottobackwards The FILE_FILTER property does not currently support expression language. The processor could be updated to enable EL for the property, but that is outside the scope of this PR.

Copy link
Contributor

Choose a reason for hiding this comment

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

fair enough

@jtstorck
Copy link
Contributor Author

jtstorck commented Aug 7, 2018

@ottobackwards Regarding documentation for the filter modes, descriptions have been created for the allowable values. Do these descriptions not seem adequate for the functionality of each mode?

@ottobackwards
Copy link
Contributor

@jtstorck I think that examples would help the user get the right one the first time. Not a deal breaker though.

Copy link
Contributor

@zenfenan zenfenan left a comment

Choose a reason for hiding this comment

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

+1 LGTM. I think examples for the File Filter Mode can be useful though. If you don't want to cover this now, I would be happy to merge it.

@jtstorck
Copy link
Contributor Author

jtstorck commented Aug 7, 2018

@ottobackwards @zenfenan I'll break out my rusty HTML skills and try to write up some extra documentation with examples/usecases. Hopefully in an hour or two I'll have an update for the PR. Thanks for the reviews!

@jtstorck
Copy link
Contributor Author

jtstorck commented Aug 7, 2018

@ottobackwards @zenfenan I added additional details to give some examples on how to use the filters. Please let me know if you think more detail is needed. I appreciate the review!

@ottobackwards
Copy link
Contributor

Built with -Pcontrib-check, verified the documentation, +1 from me, nice work

Copy link
Contributor

@zenfenan zenfenan left a comment

Choose a reason for hiding this comment

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

@jtstorck The additional details cover pretty much what I expected. +1 Thanks for being quick.

@ottobackwards If you don't have any concerns with the new changes, I'll go ahead merge it.

@asfgit asfgit closed this in 451084e Aug 8, 2018
@zenfenan
Copy link
Contributor

zenfenan commented Aug 8, 2018

+1 Thanks @jtstorck. Merged to the master. Thanks @ottobackwards for reviewing.

@jtstorck jtstorck deleted the NIFI-4434 branch August 8, 2018 18:47
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.

3 participants