Skip to content

Refactored BoundedReplaySubject, concurrency enhancements. #649

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.

Sign up for GitHub

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

Closed
wants to merge 1 commit into from
Closed

Refactored BoundedReplaySubject, concurrency enhancements. #649

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 9 additions & 8 deletions rxjava-core/src/main/java/rx/Observable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@
import rx.plugins.RxJavaPlugins;
import rx.schedulers.Schedulers;
import rx.subjects.AsyncSubject;
import rx.subjects.BoundedReplaySubject;
import rx.subjects.PublishSubject;
import rx.subjects.ReplaySubject;
import rx.subjects.Subject;
Expand Down Expand Up @@ -4377,7 +4378,7 @@ public ConnectableObservable<T> replay(Scheduler scheduler) {
* @see <a href="http://msdn.microsoft.com/en-us/library/hh211976.aspx">MSDN: Observable.Replay</a>
*/
public ConnectableObservable<T> replay(int bufferSize) {
return OperationMulticast.multicast(this, OperationReplay.<T>replayBuffered(bufferSize));
return OperationMulticast.multicast(this, BoundedReplaySubject.<T>createBuffered(bufferSize));
}

/**
Expand All @@ -4399,7 +4400,7 @@ public ConnectableObservable<T> replay(int bufferSize) {
public ConnectableObservable<T> replay(int bufferSize, Scheduler scheduler) {
return OperationMulticast.multicast(this,
OperationReplay.createScheduledSubject(
OperationReplay.<T>replayBuffered(bufferSize), scheduler));
BoundedReplaySubject.<T>createBuffered(bufferSize), scheduler));
}

/**
Expand Down Expand Up @@ -4441,7 +4442,7 @@ public ConnectableObservable<T> replay(long time, TimeUnit unit) {
* @see <a href="http://msdn.microsoft.com/en-us/library/hh211811.aspx">MSDN: Observable.Replay</a>
*/
public ConnectableObservable<T> replay(long time, TimeUnit unit, Scheduler scheduler) {
return OperationMulticast.multicast(this, OperationReplay.<T>replayWindowed(time, unit, -1, scheduler));
return OperationMulticast.multicast(this, BoundedReplaySubject.<T>createWindowed(time, unit, scheduler));
}

/**
Expand Down Expand Up @@ -4487,7 +4488,7 @@ public ConnectableObservable<T> replay(int bufferSize, long time, TimeUnit unit,
if (bufferSize < 0) {
throw new IllegalArgumentException("bufferSize < 0");
}
return OperationMulticast.multicast(this, OperationReplay.<T>replayWindowed(time, unit, bufferSize, scheduler));
return OperationMulticast.multicast(this, BoundedReplaySubject.<T>createWindowedAndBuffered(time, unit, bufferSize, scheduler));
}

/**
Expand Down Expand Up @@ -4563,7 +4564,7 @@ public <R> Observable<R> replay(Func1<? super Observable<T>, ? extends Observabl
return OperationMulticast.multicast(this, new Func0<Subject<T, T>>() {
@Override
public Subject<T, T> call() {
return OperationReplay.replayBuffered(bufferSize);
return BoundedReplaySubject.createBuffered(bufferSize);
}
}, selector);
}
Expand Down Expand Up @@ -4591,7 +4592,7 @@ public <R> Observable<R> replay(Func1<? super Observable<T>, ? extends Observabl
return OperationMulticast.multicast(this, new Func0<Subject<T, T>>() {
@Override
public Subject<T, T> call() {
return OperationReplay.<T>createScheduledSubject(OperationReplay.<T>replayBuffered(bufferSize), scheduler);
return OperationReplay.<T>createScheduledSubject(BoundedReplaySubject.<T>createBuffered(bufferSize), scheduler);
}
}, selector);
}
Expand Down Expand Up @@ -4644,7 +4645,7 @@ public <R> Observable<R> replay(Func1<? super Observable<T>, ? extends Observabl
return OperationMulticast.multicast(this, new Func0<Subject<T, T>>() {
@Override
public Subject<T, T> call() {
return OperationReplay.replayWindowed(time, unit, -1, scheduler);
return BoundedReplaySubject.<T>createWindowed(time, unit, scheduler);
}
}, selector);
}
Expand Down Expand Up @@ -4703,7 +4704,7 @@ public <R> Observable<R> replay(Func1<? super Observable<T>, ? extends Observabl
return OperationMulticast.multicast(this, new Func0<Subject<T, T>>() {
@Override
public Subject<T, T> call() {
return OperationReplay.replayWindowed(time, unit, bufferSize, scheduler);
return BoundedReplaySubject.<T>createWindowedAndBuffered(time, unit, bufferSize, scheduler);
}
}, selector);
}
Expand Down
Loading