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.

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

Jump to bottom

OperatorBuffer #1073

Merged
merged 1 commit into from
Apr 24, 2014
Merged

OperatorBuffer #1073

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
29 changes: 16 additions & 13 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 @@ -48,7 +48,6 @@
import rx.observers.SafeSubscriber;
import rx.operators.OnSubscribeFromIterable;
import rx.operators.OnSubscribeRange;
import rx.operators.OperationBuffer;
import rx.operators.OperationCombineLatest;
import rx.operators.OperationConcat;
import rx.operators.OperationDebounce;
Expand Down Expand Up @@ -93,6 +92,10 @@
import rx.operators.OperatorAmb;
import rx.operators.OperatorAny;
import rx.operators.OperatorAsObservable;
import rx.operators.OperatorBufferWithSingleObservable;
import rx.operators.OperatorBufferWithSize;
import rx.operators.OperatorBufferWithStartEndObservable;
import rx.operators.OperatorBufferWithTime;
import rx.operators.OperatorCache;
import rx.operators.OperatorCast;
import rx.operators.OperatorDoOnEach;
Expand Down Expand Up @@ -2973,7 +2976,7 @@ public final Observable<T> asObservable() {
* @see <a href="https://github.com/Netflix/RxJava/wiki/Transforming-Observables#wiki-buffer">RxJava Wiki: buffer()</a>
*/
public final <TClosing> Observable<List<T>> buffer(Func0<? extends Observable<? extends TClosing>> bufferClosingSelector) {
return create(OperationBuffer.buffer(this, bufferClosingSelector));
return lift(new OperatorBufferWithSingleObservable<T, TClosing>(bufferClosingSelector, 16));
}

/**
Expand All @@ -2990,7 +2993,7 @@ public final <TClosing> Observable<List<T>> buffer(Func0<? extends Observable<?
* @see <a href="https://github.com/Netflix/RxJava/wiki/Transforming-Observables#wiki-buffer">RxJava Wiki: buffer()</a>
*/
public final Observable<List<T>> buffer(int count) {
return create(OperationBuffer.buffer(this, count));
return lift(new OperatorBufferWithSize<T>(count, count));
}

/**
Expand All @@ -3011,7 +3014,7 @@ public final Observable<List<T>> buffer(int count) {
* @see <a href="https://github.com/Netflix/RxJava/wiki/Transforming-Observables#wiki-buffer">RxJava Wiki: buffer()</a>
*/
public final Observable<List<T>> buffer(int count, int skip) {
return create(OperationBuffer.buffer(this, count, skip));
return lift(new OperatorBufferWithSize<T>(count, skip));
}

/**
Expand All @@ -3034,7 +3037,7 @@ public final Observable<List<T>> buffer(int count, int skip) {
* @see <a href="https://github.com/Netflix/RxJava/wiki/Transforming-Observables#wiki-buffer">RxJava Wiki: buffer()</a>
*/
public final Observable<List<T>> buffer(long timespan, long timeshift, TimeUnit unit) {
return create(OperationBuffer.buffer(this, timespan, timeshift, unit));
return lift(new OperatorBufferWithTime<T>(timespan, timeshift, unit, Integer.MAX_VALUE, Schedulers.computation()));
}

/**
Expand All @@ -3058,7 +3061,7 @@ public final Observable<List<T>> buffer(long timespan, long timeshift, TimeUnit
* @see <a href="https://github.com/Netflix/RxJava/wiki/Transforming-Observables#wiki-buffer">RxJava Wiki: buffer()</a>
*/
public final Observable<List<T>> buffer(long timespan, long timeshift, TimeUnit unit, Scheduler scheduler) {
return create(OperationBuffer.buffer(this, timespan, timeshift, unit, scheduler));
return lift(new OperatorBufferWithTime<T>(timespan, timeshift, unit, Integer.MAX_VALUE, scheduler));
}

/**
Expand All @@ -3079,7 +3082,7 @@ public final Observable<List<T>> buffer(long timespan, long timeshift, TimeUnit
* @see <a href="https://github.com/Netflix/RxJava/wiki/Transforming-Observables#wiki-buffer">RxJava Wiki: buffer()</a>
*/
public final Observable<List<T>> buffer(long timespan, TimeUnit unit) {
return create(OperationBuffer.buffer(this, timespan, unit));
return lift(new OperatorBufferWithTime<T>(timespan, timespan, unit, Integer.MAX_VALUE, Schedulers.computation()));
}

/**
Expand All @@ -3104,7 +3107,7 @@ public final Observable<List<T>> buffer(long timespan, TimeUnit unit) {
* @see <a href="https://github.com/Netflix/RxJava/wiki/Transforming-Observables#wiki-buffer">RxJava Wiki: buffer()</a>
*/
public final Observable<List<T>> buffer(long timespan, TimeUnit unit, int count) {
return create(OperationBuffer.buffer(this, timespan, unit, count));
return lift(new OperatorBufferWithTime<T>(timespan, timespan, unit, count, Schedulers.computation()));
}

/**
Expand Down Expand Up @@ -3132,7 +3135,7 @@ public final Observable<List<T>> buffer(long timespan, TimeUnit unit, int count)
* @see <a href="https://github.com/Netflix/RxJava/wiki/Transforming-Observables#wiki-buffer">RxJava Wiki: buffer()</a>
*/
public final Observable<List<T>> buffer(long timespan, TimeUnit unit, int count, Scheduler scheduler) {
return create(OperationBuffer.buffer(this, timespan, unit, count, scheduler));
return lift(new OperatorBufferWithTime<T>(timespan, timespan, unit, count, scheduler));
}

/**
Expand All @@ -3156,7 +3159,7 @@ public final Observable<List<T>> buffer(long timespan, TimeUnit unit, int count,
* @see <a href="https://github.com/Netflix/RxJava/wiki/Transforming-Observables#wiki-buffer">RxJava Wiki: buffer()</a>
*/
public final Observable<List<T>> buffer(long timespan, TimeUnit unit, Scheduler scheduler) {
return create(OperationBuffer.buffer(this, timespan, unit, scheduler));
return lift(new OperatorBufferWithTime<T>(timespan, timespan, unit, Integer.MAX_VALUE, scheduler));
}

/**
Expand All @@ -3176,7 +3179,7 @@ public final Observable<List<T>> buffer(long timespan, TimeUnit unit, Scheduler
* @see <a href="https://github.com/Netflix/RxJava/wiki/Transforming-Observables#wiki-buffer">RxJava Wiki: buffer()</a>
*/
public final <TOpening, TClosing> Observable<List<T>> buffer(Observable<? extends TOpening> bufferOpenings, Func1<? super TOpening, ? extends Observable<? extends TClosing>> bufferClosingSelector) {
return create(OperationBuffer.buffer(this, bufferOpenings, bufferClosingSelector));
return lift(new OperatorBufferWithStartEndObservable<T, TOpening, TClosing>(bufferOpenings, bufferClosingSelector));
}

/**
Expand All @@ -3198,7 +3201,7 @@ public final <TOpening, TClosing> Observable<List<T>> buffer(Observable<? extend
* @see <a href="https://github.com/Netflix/RxJava/wiki/Transforming-Observables#wiki-buffer">RxJava Wiki: buffer()</a>
*/
public final <B> Observable<List<T>> buffer(Observable<B> boundary) {
return create(OperationBuffer.bufferWithBoundaryObservable(this, boundary));
return lift(new OperatorBufferWithSingleObservable<T, B>(boundary, 16));
}

/**
Expand All @@ -3222,7 +3225,7 @@ public final <B> Observable<List<T>> buffer(Observable<B> boundary) {
* @see #buffer(rx.Observable, int)
*/
public final <B> Observable<List<T>> buffer(Observable<B> boundary, int initialCapacity) {
return create(OperationBuffer.bufferWithBoundaryObservable(this, boundary, initialCapacity));
return lift(new OperatorBufferWithSingleObservable<T, B>(boundary, initialCapacity));
}

/**
Expand Down
Loading