[GitHub] nifi pull request #2698: NIFI-5077 ExtractGrok support for `keep empty captu...
Github user asfgit closed the pull request at: https://github.com/apache/nifi/pull/2698 ---
[GitHub] nifi pull request #2698: NIFI-5077 ExtractGrok support for `keep empty captu...
Github user ottobackwards commented on a diff in the pull request: https://github.com/apache/nifi/pull/2698#discussion_r188355650 --- Diff: nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ExtractGrok.java --- @@ -234,6 +247,11 @@ public void onStopped() { @OnScheduled public void onScheduled(final ProcessContext context) throws GrokException, IOException { + +if (context.getProperty(KEEP_EMPTY_CAPTURES).isSet()) { --- End diff -- done ---
[GitHub] nifi pull request #2698: NIFI-5077 ExtractGrok support for `keep empty captu...
Github user ottobackwards commented on a diff in the pull request: https://github.com/apache/nifi/pull/2698#discussion_r188355616 --- Diff: nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ExtractGrok.java --- @@ -102,6 +103,15 @@ .addValidator(StandardValidators.FILE_EXISTS_VALIDATOR) .build(); +public static final PropertyDescriptor KEEP_EMPTY_CAPTURES = new PropertyDescriptor.Builder() +.name("Keep Empty Captures") +.description("If true, then empty capture values will be included in the returned capture map.") +.required(false) --- End diff -- done ---
[GitHub] nifi pull request #2698: NIFI-5077 ExtractGrok support for `keep empty captu...
Github user ottobackwards commented on a diff in the pull request: https://github.com/apache/nifi/pull/2698#discussion_r188354997 --- Diff: nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ExtractGrok.java --- @@ -102,6 +103,15 @@ .addValidator(StandardValidators.FILE_EXISTS_VALIDATOR) .build(); +public static final PropertyDescriptor KEEP_EMPTY_CAPTURES = new PropertyDescriptor.Builder() +.name("Keep Empty Captures") +.description("If true, then empty capture values will be included in the returned capture map.") +.required(false) +.defaultValue("true") --- End diff -- No, currently the empties are returned, this maintains that ---
[GitHub] nifi pull request #2698: NIFI-5077 ExtractGrok support for `keep empty captu...
Github user pvillard31 commented on a diff in the pull request: https://github.com/apache/nifi/pull/2698#discussion_r188345339 --- Diff: nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ExtractGrok.java --- @@ -234,6 +247,11 @@ public void onStopped() { @OnScheduled public void onScheduled(final ProcessContext context) throws GrokException, IOException { + +if (context.getProperty(KEEP_EMPTY_CAPTURES).isSet()) { --- End diff -- with required=true, you would not need to check if the property is set anymore ---
[GitHub] nifi pull request #2698: NIFI-5077 ExtractGrok support for `keep empty captu...
Github user pvillard31 commented on a diff in the pull request: https://github.com/apache/nifi/pull/2698#discussion_r188345184 --- Diff: nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ExtractGrok.java --- @@ -102,6 +103,15 @@ .addValidator(StandardValidators.FILE_EXISTS_VALIDATOR) .build(); +public static final PropertyDescriptor KEEP_EMPTY_CAPTURES = new PropertyDescriptor.Builder() +.name("Keep Empty Captures") +.description("If true, then empty capture values will be included in the returned capture map.") +.required(false) +.defaultValue("true") --- End diff -- isn't defaulting to true a change of the current behavior? ---
[GitHub] nifi pull request #2698: NIFI-5077 ExtractGrok support for `keep empty captu...
Github user pvillard31 commented on a diff in the pull request: https://github.com/apache/nifi/pull/2698#discussion_r188344570 --- Diff: nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ExtractGrok.java --- @@ -102,6 +103,15 @@ .addValidator(StandardValidators.FILE_EXISTS_VALIDATOR) .build(); +public static final PropertyDescriptor KEEP_EMPTY_CAPTURES = new PropertyDescriptor.Builder() +.name("Keep Empty Captures") +.description("If true, then empty capture values will be included in the returned capture map.") +.required(false) --- End diff -- since it's an "allowable values"-type of property, we usually set required=true ---
[GitHub] nifi pull request #2698: NIFI-5077 ExtractGrok support for `keep empty captu...
GitHub user ottobackwards opened a pull request: https://github.com/apache/nifi/pull/2698 NIFI-5077 ExtractGrok support for `keep empty captures` Support for the new option to keep empty captures. I did not add to the GrokReader because I am not sure of the effect on the schema extraction. 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- where 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? - [x] 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? I did not, in keeping with the current file ### 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/ottobackwards/nifi grok-empty-captures Alternatively you can review and apply these changes as the patch at: https://github.com/apache/nifi/pull/2698.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 #2698 commit c5d44d56767effdbddeb66cc5c0ca89db670c6a1 Author: Otto FowlerDate: 2018-05-14T13:35:23Z NIFI-5077 ExtractGrok support for `keep empty captures` Support for the new option to keep empty captures. I did not add to the GrokReader because I am not sure of the effect on the schema extraction. ---