Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix #2186 Align MonoCollect and MonoCollectList #2193

Merged
merged 1 commit into from Jun 16, 2020

Conversation

rstoyanchev
Copy link
Contributor

This change aligns the implementation of MonoCollect to be directly comparable to that of MonoList in order to address #2186. MonoList seems better protected against competing upstream and downstream signals and the two should not be different as far as I can see. A MonoList is essentially a MonoCollect with an ArrayList as the container.

@rstoyanchev rstoyanchev linked an issue Jun 16, 2020 that may be closed by this pull request
@codecov-commenter
Copy link

codecov-commenter commented Jun 16, 2020

Codecov Report

Merging #2193 into 3.2.x will increase coverage by 0.03%.
The diff coverage is 100.00%.

Impacted file tree graph

@@             Coverage Diff              @@
##              3.2.x    #2193      +/-   ##
============================================
+ Coverage     84.91%   84.95%   +0.03%     
- Complexity     4014     4015       +1     
============================================
  Files           364      364              
  Lines         30488    30509      +21     
  Branches       5667     5671       +4     
============================================
+ Hits          25889    25919      +30     
+ Misses         3002     2997       -5     
+ Partials       1597     1593       -4     
Impacted Files Coverage Δ Complexity Δ
.../main/java/reactor/core/publisher/MonoCollect.java 94.87% <100.00%> (+10.66%) 2.00 <0.00> (ø)
...n/java/reactor/core/publisher/MonoCollectList.java 95.08% <100.00%> (ø) 2.00 <0.00> (ø)
...main/java/reactor/core/publisher/FluxGenerate.java 81.59% <0.00%> (-0.62%) 7.00% <0.00%> (ø%)
...eactor/core/publisher/ParallelMergeSequential.java 84.97% <0.00%> (-0.52%) 7.00% <0.00%> (ø%)
...va/reactor/core/publisher/FluxFlattenIterable.java 89.76% <0.00%> (-0.27%) 6.00% <0.00%> (ø%)
.../main/java/reactor/core/publisher/FluxFlatMap.java 94.38% <0.00%> (-0.19%) 19.00% <0.00%> (ø%)
...c/main/java/reactor/core/publisher/FluxReplay.java 84.78% <0.00%> (-0.16%) 25.00% <0.00%> (ø%)
...rc/main/java/reactor/core/publisher/Operators.java 84.21% <0.00%> (+0.13%) 134.00% <0.00%> (+1.00%)
...c/main/java/reactor/core/publisher/FluxCreate.java 86.26% <0.00%> (+0.24%) 8.00% <0.00%> (ø%)
...ain/java/reactor/core/publisher/FluxConcatMap.java 90.14% <0.00%> (+0.28%) 7.00% <0.00%> (ø%)
... and 4 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update f6fcae1...85feec9. Read the comment docs.

This change aligns the implementation of MonoCollect to be comparable
to MonoList. Effectively they're the same, a MonoList is but a
MonoCollect with an ArrayList as the container.

Fix reactor#2186
@simonbasle simonbasle changed the title Align MonoCollect and MonoList fix #2186 Align MonoCollect and MonoCollectList Jun 16, 2020
@simonbasle simonbasle merged commit cf63b5e into reactor:3.2.x Jun 16, 2020
@reactorbot
Copy link

@simonbasle this PR seems to have been merged on a maintenance branch, please ensure the change is merge-forwarded to intermediate maintenance branches and up to master 🙇

@simonbasle simonbasle added this to the 3.3.7.RELEASE milestone Jun 16, 2020
@rstoyanchev rstoyanchev deleted the 2186-monoCollect branch July 9, 2020 14:30
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.

Race condition in MonoCollect leads to NullPointerException
4 participants