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 Base Interface Types for consistency #4300

Merged
merged 1 commit into from
Aug 7, 2016
Merged

2.x: Rename Observable Base Interface Types for consistency #4300

merged 1 commit into from
Aug 7, 2016

Conversation

vanniktech
Copy link
Collaborator

Addresses #4044.

@@ -17,6 +17,7 @@
import java.util.concurrent.Callable;

import io.reactivex.*;
import io.reactivex.ObservableSource;
Copy link
Contributor

Choose a reason for hiding this comment

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

There's superfluous imports like this throughout this PR and your other one, but I don't think it's a big deal.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Yup IntelliJ is not smart here and automatically inserts the import. Could also be because I've configured it to avoid * imports ...

Once I'm done with all of the renaming I could fix all of the imports if this is wanted.

@akarnokd
Copy link
Member

akarnokd commented Aug 7, 2016

There are a large amount of compilation errors.

@@ -18,9 +18,9 @@
import io.reactivex.internal.disposables.DisposableHelper;
import io.reactivex.plugins.RxJavaPlugins;

public final class ObservableDematerialize<T> extends ObservableSource<Try<Optional<T>>, T> {
public final class ObservableDematerialize<T> extends ObservableSource {
Copy link
Contributor

Choose a reason for hiding this comment

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

Looks like there already was an ObservableSource class that we're now clashing with. I'm tempted to just inline it since all it does is hold a value in a field. As an actual type in the hierarchy it's not used in any special way. Either that or just rename it ObservableFromUpstream for now and delete it later.

Copy link
Contributor

Choose a reason for hiding this comment

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

It's probably worth doing these as separate PRs. Rename/delete the existing ObservableSource and then do this rename. Otherwise it's likely to be extra confusing because of the name conflict.

Copy link
Member

Choose a reason for hiding this comment

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

The original ObservableSource has its use by mandating a constructor with an upstream source and may later support some graph discovery by providing a standard way of getting the upstream.

Copy link
Contributor

Choose a reason for hiding this comment

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

Makes sense. Does ObservableFromUpstream or ObservableWithUpstream for that sound good?

Copy link
Member

Choose a reason for hiding this comment

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

ObservableWithUpstream is okay.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Created #4031 to do this.

@vanniktech
Copy link
Collaborator Author

Rebased against 2.x and re-did the last changes.

@akarnokd akarnokd added this to the 2.0 RC 1 milestone Aug 7, 2016
@JakeWharton
Copy link
Contributor

looks good this time 👍

@codecov-io
Copy link

codecov-io commented Aug 7, 2016

Current coverage is 69.42% (diff: 98.00%)

Merging #4300 into 2.x will decrease coverage by <.01%

@@                2.x      #4300   diff @@
==========================================
  Files           420        420          
  Lines         30762      30761     -1   
  Methods           0          0          
  Messages          0          0          
  Branches       4937       4937          
==========================================
- Hits          21358      21357     -1   
- Misses         7319       7322     +3   
+ Partials       2085       2082     -3   

Powered by Codecov. Last update e81d399...59f3a25

@akarnokd
Copy link
Member

akarnokd commented Aug 7, 2016

👍

@akarnokd akarnokd merged commit 2de974a into ReactiveX:2.x Aug 7, 2016
@vanniktech vanniktech deleted the 2.x_observable_base_interface_type branch August 7, 2016 21:35
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.

4 participants