Skip to content

NIFI-4828: Fix MergeContent to process all ready bins#2444

Closed
ijokarumawak wants to merge 3 commits intoapache:masterfrom
ijokarumawak:nifi-4828
Closed

NIFI-4828: Fix MergeContent to process all ready bins#2444
ijokarumawak wants to merge 3 commits intoapache:masterfrom
ijokarumawak:nifi-4828

Conversation

@ijokarumawak
Copy link
Member

NOTE to reviewers

This pull request has 3 commits intentionally. The first one is sufficient to address NIFI-4828. The other two commits are further refactoring those are not required, but should be incorporated, too. I didn't create dedicated JIRAs for those since they're too trivial.

Please squash commits and merge if all of those look fine. Or remove the 2nd or 3rd commit if it looks over engineered. Thank you!


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.

Before this fix, MergeContent only processed the first bin even if there
were multiple bins.

There were two unit tests marked with Ignore those had been
failing because of this.
@asfgit asfgit closed this in e9af6c6 Feb 7, 2018
@markap14
Copy link
Contributor

markap14 commented Feb 7, 2018

@ijokarumawak thanks for addressing! Code review looks good. All unit tests pass (including the ones that were @ignored previously!) and some local testing all worked out exactly as expected. +1 merged to master.

zenfenan pushed a commit to zenfenan/nifi that referenced this pull request Feb 14, 2018
Before this fix, MergeContent only processed the first bin even if there
were multiple bins.

There were two unit tests marked with Ignore those had been
failing because of this.

This closes apache#2444.

Signed-off-by: Mark Payne <markap14@hotmail.com>
apiri pushed a commit to apiri/incubator-nifi that referenced this pull request May 10, 2018
Before this fix, MergeContent only processed the first bin even if there
were multiple bins.

There were two unit tests marked with Ignore those had been
failing because of this.

This closes apache#2444.

Signed-off-by: Mark Payne <markap14@hotmail.com>
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