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: Java 9 compatibility fixes (March 3) #5153

Merged
merged 1 commit into from
Mar 3, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@
import io.reactivex.internal.util.*;

public final class BlockingFlowableIterable<T> implements Iterable<T> {
final Flowable<? extends T> source;
final Flowable<T> source;

final int bufferSize;

public BlockingFlowableIterable(Flowable<? extends T> source, int bufferSize) {
public BlockingFlowableIterable(Flowable<T> source, int bufferSize) {
this.source = source;
this.bufferSize = bufferSize;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@
*/
public final class BlockingFlowableMostRecent<T> implements Iterable<T> {

final Flowable<? extends T> source;
final Flowable<T> source;

final T initialValue;

public BlockingFlowableMostRecent(Flowable<? extends T> source, T initialValue) {
public BlockingFlowableMostRecent(Flowable<T> source, T initialValue) {
this.source = source;
this.initialValue = initialValue;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ protected void subscribeActual(Subscriber<? super T> t) {
*/
static final class CacheState<T> extends LinkedArrayList implements FlowableSubscriber<T> {
/** The source observable to connect to. */
final Flowable<? extends T> source;
final Flowable<T> source;
/** Holds onto the subscriber connected to source. */
final AtomicReference<Subscription> connection = new AtomicReference<Subscription>();
/** Guarded by connection (not this). */
Expand All @@ -114,7 +114,7 @@ static final class CacheState<T> extends LinkedArrayList implements FlowableSubs
boolean sourceDone;

@SuppressWarnings("unchecked")
CacheState(Flowable<? extends T> source, int capacityHint) {
CacheState(Flowable<T> source, int capacityHint) {
super(capacityHint);
this.source = source;
this.subscribers = new AtomicReference<ReplaySubscription<T>[]>(EMPTY);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
* the value type
*/
public final class FlowableRefCount<T> extends AbstractFlowableWithUpstream<T, T> {
final ConnectableFlowable<? extends T> source;
final ConnectableFlowable<T> source;
volatile CompositeDisposable baseDisposable = new CompositeDisposable();
final AtomicInteger subscriptionCount = new AtomicInteger();

Expand Down
2 changes: 1 addition & 1 deletion src/test/java/io/reactivex/TestHelper.java
Original file line number Diff line number Diff line change
Expand Up @@ -644,7 +644,7 @@ public static void doubleOnSubscribe(MaybeObserver<?> subscriber) {
* isCancelled properly before and after calling dispose.
* @param source the source to test
*/
public static void checkDisposed(Flowable<?> source) {
public static <T> void checkDisposed(Flowable<T> source) {
final TestSubscriber<Object> ts = new TestSubscriber<Object>(0L);
source.subscribe(new FlowableSubscriber<Object>() {
@Override
Expand Down