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

use bounded wildcards for errorHandler (fixes #5045) #5049

Merged
merged 2 commits into from
Feb 3, 2017

Conversation

jschneider
Copy link
Contributor

Adding bound wildcards for error handler - fixes #5045

@codecov
Copy link

codecov bot commented Feb 2, 2017

Codecov Report

Merging #5049 into 2.x will increase coverage by 0.12%.

@@             Coverage Diff              @@
##                2.x    #5049      +/-   ##
============================================
+ Coverage     95.53%   95.65%   +0.12%     
- Complexity     5540     5547       +7     
============================================
  Files           612      612              
  Lines         39576    39576              
  Branches       5553     5553              
============================================
+ Hits          37807    37855      +48     
+ Misses          775      742      -33     
+ Partials        994      979      -15
Impacted Files Coverage Δ Complexity Δ
.../main/java/io/reactivex/plugins/RxJavaPlugins.java 100% <100%> (ø) 138 <3> (ø)
...vex/internal/operators/single/SingleTakeUntil.java 86.88% <ø> (-4.92%) 2% <ø> (ø)
...ternal/operators/flowable/FlowableSubscribeOn.java 94.54% <ø> (-3.64%) 2% <ø> (ø)
...reactivex/internal/operators/maybe/MaybeUsing.java 97.97% <ø> (-2.03%) 4% <ø> (ø)
...internal/operators/completable/CompletableAmb.java 94.44% <ø> (-1.86%) 10% <ø> (ø)
.../io/reactivex/disposables/CompositeDisposable.java 97.24% <ø> (-1.84%) 39% <ø> (-1%)
...tivex/internal/schedulers/TrampolineScheduler.java 94.44% <ø> (-1.39%) 6% <ø> (ø)
...ors/observable/ObservableSampleWithObservable.java 97.59% <ø> (-1.21%) 3% <ø> (ø)
...ternal/operators/completable/CompletableMerge.java 96.42% <ø> (-1.2%) 2% <ø> (ø)
...perators/single/SingleFlatMapIterableFlowable.java 97.5% <ø> (-0.84%) 2% <ø> (ø)
... and 28 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 00f53ae...d677bfc. Read the comment docs.

@akarnokd
Copy link
Member

akarnokd commented Feb 2, 2017

/cc @davidmoten

@davidmoten
Copy link
Collaborator

yep that looks fine. I can do the others.

@davidmoten
Copy link
Collaborator

@akarnokd do you want test coverage of the signature changes?

@akarnokd
Copy link
Member

akarnokd commented Feb 2, 2017

Yes, make sure the contravariant consumer now compiles.

@davidmoten
Copy link
Collaborator

davidmoten commented Feb 3, 2017

@jschneider can you add unit tests for this please?

@jschneider
Copy link
Contributor Author

I will add a test. Yes.

@akarnokd akarnokd added this to the 2.0 backlog milestone Feb 3, 2017
@jschneider
Copy link
Contributor Author

Added the test

@akarnokd
Copy link
Member

akarnokd commented Feb 3, 2017

Looks like this got a conflict due to changes to RxJavaPlugins by other PRs. Could you rebase this onto the head?

@jschneider
Copy link
Contributor Author

yep. I am on it

@jschneider
Copy link
Contributor Author

should be good now.

@Test
public void onErrorWithSuper() throws Exception {
try {
Consumer<? super Throwable> errorHandler = new Consumer<Throwable>() {
Copy link
Member

Choose a reason for hiding this comment

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

A better type would be Consumer<Object> errorHandler = ...

@akarnokd akarnokd merged commit 471d590 into ReactiveX:2.x Feb 3, 2017
@jschneider jschneider deleted the feature/#5045-generics branch February 17, 2017 08:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2.x: RxJavaPlugin.get/setXXX generics?
3 participants