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

2.x: rename Observable and Single #doOnCancel to #doOnDispose #4458

Merged
merged 3 commits into from
Sep 1, 2016

Conversation

Mauin
Copy link
Contributor

@Mauin Mauin commented Sep 1, 2016

#4456

Completable already used .doOnDispose() however I renamed the arguments to match Observable and Single

public final Single<T> doOnCancel(final Action onCancel) {
ObjectHelper.requireNonNull(onCancel, "onCancel is null");
return RxJavaPlugins.onAssembly(new SingleDoOnCancel<T>(this, onCancel));
public final Single<T> doOnDispose(final Action onDispose) {
Copy link
Collaborator

Choose a reason for hiding this comment

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

should not we deprecate doOnCancel and then remove it with RC3?

Copy link
Member

Choose a reason for hiding this comment

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

I think the discussion #4451 came to a consensus that no need for going soft but delete what's no longer needed before releasing RC2, hence no deprecation.

Copy link
Collaborator

Choose a reason for hiding this comment

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

Alright works for me too

@akarnokd
Copy link
Member

akarnokd commented Sep 1, 2016

The diff for observable doesn't show but the offline-comparison only lists 30-40 lines changes. Did you run some whitespace cleanup?

@Mauin
Copy link
Contributor Author

Mauin commented Sep 1, 2016

@akarnokd Whoops, you're right. Sorry. Auto formatter seems to have changed some whitespaces. I'll revert that.

@akarnokd akarnokd added this to the 2.0 RC 2 milestone Sep 1, 2016
@codecov-io
Copy link

codecov-io commented Sep 1, 2016

Current coverage is 75.94% (diff: 100%)

Merging #4458 into 2.x will increase coverage by 0.03%

@@                2.x      #4458   diff @@
==========================================
  Files           485        485          
  Lines         33042      33042          
  Methods           0          0          
  Messages          0          0          
  Branches       5240       5240          
==========================================
+ Hits          25082      25093    +11   
+ Misses         5915       5909     -6   
+ Partials       2045       2040     -5   

Powered by Codecov. Last update 52dc050...04a61cb

@akarnokd
Copy link
Member

akarnokd commented Sep 1, 2016

👍

@akarnokd akarnokd merged commit 88fafd8 into ReactiveX:2.x Sep 1, 2016
@akarnokd akarnokd changed the title rename Observable and Single #doOnCancel to #doOnDispose 2.x: rename Observable and Single #doOnCancel to #doOnDispose Sep 2, 2016
@pwittchen
Copy link

pwittchen commented Oct 16, 2016

This update is missing in release notes on GitHub. Please, remember to mention such changes in the future.

@JorgeCastilloPrz JorgeCastilloPrz mentioned this pull request Nov 10, 2018
7 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants