Skip to content

Commit 8de063e

Browse files
Merge pull request ReactiveX#723 from benjchristensen/deprecation
Deprecate multiple arity ‘from’
2 parents 7a75d4b + e36e717 commit 8de063e

File tree

1 file changed

+27
-0
lines changed

1 file changed

+27
-0
lines changed

rxjava-core/src/main/java/rx/Observable.java

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -849,7 +849,9 @@ public static <T> Observable<T> from(T t1) {
849849
* resulting Observable
850850
* @return an Observable that emits each item
851851
* @see <a href="https://github.com/Netflix/RxJava/wiki/Creating-Observables#from">RxJava Wiki: from()</a>
852+
* @deprecated Use {@link #from(Iterable)} instead such as {@code from(Arrays.asList(t1))}
852853
*/
854+
@Deprecated
853855
@SuppressWarnings("unchecked")
854856
// suppress unchecked because we are using varargs inside the method
855857
public static <T> Observable<T> from(T t1, T t2) {
@@ -873,7 +875,9 @@ public static <T> Observable<T> from(T t1, T t2) {
873875
* resulting Observable
874876
* @return an Observable that emits each item
875877
* @see <a href="https://github.com/Netflix/RxJava/wiki/Creating-Observables#from">RxJava Wiki: from()</a>
878+
* @deprecated Use {@link #from(Iterable)} instead such as {@code from(Arrays.asList(t1))}.
876879
*/
880+
@Deprecated
877881
@SuppressWarnings("unchecked")
878882
// suppress unchecked because we are using varargs inside the method
879883
public static <T> Observable<T> from(T t1, T t2, T t3) {
@@ -898,7 +902,9 @@ public static <T> Observable<T> from(T t1, T t2, T t3) {
898902
* resulting Observable
899903
* @return an Observable that emits each item
900904
* @see <a href="https://github.com/Netflix/RxJava/wiki/Creating-Observables#from">RxJava Wiki: from()</a>
905+
* @deprecated Use {@link #from(Iterable)} instead such as {@code from(Arrays.asList(t1))}.
901906
*/
907+
@Deprecated
902908
@SuppressWarnings("unchecked")
903909
// suppress unchecked because we are using varargs inside the method
904910
public static <T> Observable<T> from(T t1, T t2, T t3, T t4) {
@@ -924,7 +930,9 @@ public static <T> Observable<T> from(T t1, T t2, T t3, T t4) {
924930
* resulting Observable
925931
* @return an Observable that emits each item
926932
* @see <a href="https://github.com/Netflix/RxJava/wiki/Creating-Observables#from">RxJava Wiki: from()</a>
933+
* @deprecated Use {@link #from(Iterable)} instead such as {@code from(Arrays.asList(t1))}.
927934
*/
935+
@Deprecated
928936
@SuppressWarnings("unchecked")
929937
// suppress unchecked because we are using varargs inside the method
930938
public static <T> Observable<T> from(T t1, T t2, T t3, T t4, T t5) {
@@ -951,7 +959,9 @@ public static <T> Observable<T> from(T t1, T t2, T t3, T t4, T t5) {
951959
* resulting Observable
952960
* @return an Observable that emits each item
953961
* @see <a href="https://github.com/Netflix/RxJava/wiki/Creating-Observables#from">RxJava Wiki: from()</a>
962+
* @deprecated Use {@link #from(Iterable)} instead such as {@code from(Arrays.asList(t1))}.
954963
*/
964+
@Deprecated
955965
@SuppressWarnings("unchecked")
956966
// suppress unchecked because we are using varargs inside the method
957967
public static <T> Observable<T> from(T t1, T t2, T t3, T t4, T t5, T t6) {
@@ -979,7 +989,9 @@ public static <T> Observable<T> from(T t1, T t2, T t3, T t4, T t5, T t6) {
979989
* resulting Observable
980990
* @return an Observable that emits each item
981991
* @see <a href="https://github.com/Netflix/RxJava/wiki/Creating-Observables#from">RxJava Wiki: from()</a>
992+
* @deprecated Use {@link #from(Iterable)} instead such as {@code from(Arrays.asList(t1))}.
982993
*/
994+
@Deprecated
983995
@SuppressWarnings("unchecked")
984996
// suppress unchecked because we are using varargs inside the method
985997
public static <T> Observable<T> from(T t1, T t2, T t3, T t4, T t5, T t6, T t7) {
@@ -1008,7 +1020,9 @@ public static <T> Observable<T> from(T t1, T t2, T t3, T t4, T t5, T t6, T t7) {
10081020
* resulting Observable
10091021
* @return an Observable that emits each item
10101022
* @see <a href="https://github.com/Netflix/RxJava/wiki/Creating-Observables#from">RxJava Wiki: from()</a>
1023+
* @deprecated Use {@link #from(Iterable)} instead such as {@code from(Arrays.asList(t1))}.
10111024
*/
1025+
@Deprecated
10121026
@SuppressWarnings("unchecked")
10131027
// suppress unchecked because we are using varargs inside the method
10141028
public static <T> Observable<T> from(T t1, T t2, T t3, T t4, T t5, T t6, T t7, T t8) {
@@ -1038,7 +1052,9 @@ public static <T> Observable<T> from(T t1, T t2, T t3, T t4, T t5, T t6, T t7, T
10381052
* resulting Observable
10391053
* @return an Observable that emits each item
10401054
* @see <a href="https://github.com/Netflix/RxJava/wiki/Creating-Observables#from">RxJava Wiki: from()</a>
1055+
* @deprecated Use {@link #from(Iterable)} instead such as {@code from(Arrays.asList(t1))}.
10411056
*/
1057+
@Deprecated
10421058
@SuppressWarnings("unchecked")
10431059
// suppress unchecked because we are using varargs inside the method
10441060
public static <T> Observable<T> from(T t1, T t2, T t3, T t4, T t5, T t6, T t7, T t8, T t9) {
@@ -1064,7 +1080,9 @@ public static <T> Observable<T> from(T t1, T t2, T t3, T t4, T t5, T t6, T t7, T
10641080
* resulting Observable
10651081
* @return an Observable that emits each item
10661082
* @see <a href="https://github.com/Netflix/RxJava/wiki/Creating-Observables#from">RxJava Wiki: from()</a>
1083+
* @deprecated Use {@link #from(Iterable)} instead such as {@code from(Arrays.asList(t1))}.
10671084
*/
1085+
@Deprecated
10681086
@SuppressWarnings("unchecked")
10691087
// suppress unchecked because we are using varargs inside the method
10701088
public static <T> Observable<T> from(T t1, T t2, T t3, T t4, T t5, T t6, T t7, T t8, T t9, T t10) {
@@ -1175,7 +1193,9 @@ public static <T> Observable<T> defer(Func0<? extends Observable<? extends T>> o
11751193
* @param <T> the type of that item
11761194
* @return an Observable that emits a single item and then completes
11771195
* @see <a href="https://github.com/Netflix/RxJava/wiki/Creating-Observables#just">RxJava Wiki: just()</a>
1196+
* @deprecated Use {@link #from(T)}
11781197
*/
1198+
@Deprecated
11791199
public static <T> Observable<T> just(T value) {
11801200
return from(Arrays.asList((value)));
11811201
}
@@ -1194,7 +1214,9 @@ public static <T> Observable<T> just(T value) {
11941214
* @return an Observable that emits a single item and then completes, on a
11951215
* specified scheduler
11961216
* @see <a href="https://github.com/Netflix/RxJava/wiki/Creating-Observables#just">RxJava Wiki: just()</a>
1217+
* @deprecated Use {@link #from(T)}
11971218
*/
1219+
@Deprecated
11981220
public static <T> Observable<T> just(T value, Scheduler scheduler) {
11991221
return from(Arrays.asList((value)), scheduler);
12001222
}
@@ -3898,6 +3920,7 @@ public <R> Observable<R> switchMap(Func1<? super T, ? extends Observable<? exten
38983920
* @see <a href="https://github.com/Netflix/RxJava/wiki/Filtering-Observables#filter-or-where">RxJava Wiki: where()</a>
38993921
* @see #filter(Func1)
39003922
*/
3923+
@Deprecated
39013924
public Observable<T> where(Func1<? super T, Boolean> predicate) {
39023925
return filter(predicate);
39033926
}
@@ -3935,6 +3958,7 @@ public <R> Observable<R> map(Func1<? super T, ? extends R> func) {
39353958
* @see <a href="http://msdn.microsoft.com/en-us/library/hh244311.aspx">MSDN: Observable.Select</a>
39363959
* @deprecated just use zip with {@link Observable#range(int)}
39373960
*/
3961+
@Deprecated
39383962
public <R> Observable<R> mapWithIndex(Func2<? super T, Integer, ? extends R> func) {
39393963
return create(OperationMap.mapWithIndex(this, func));
39403964
}
@@ -3959,6 +3983,7 @@ public <R> Observable<R> mapWithIndex(Func2<? super T, Integer, ? extends R> fun
39593983
* @see #flatMap(Func1)
39603984
* @deprecated
39613985
*/
3986+
@Deprecated
39623987
public <R> Observable<R> mapMany(Func1<? super T, ? extends Observable<? extends R>> func) {
39633988
return mergeMap(func);
39643989
}
@@ -5237,6 +5262,7 @@ public ConnectableObservable<T> publishLast() {
52375262
* @see #reduce(Func2)
52385263
* @deprecated use #reduce(Func2)
52395264
*/
5265+
@Deprecated
52405266
public Observable<T> aggregate(Func2<T, T, T> accumulator) {
52415267
return reduce(accumulator);
52425268
}
@@ -5303,6 +5329,7 @@ public R call(R state, T value) {
53035329
* @see #reduce(Object, Func2)
53045330
* @deprecated use #reduce(Object, Func2)
53055331
*/
5332+
@Deprecated
53065333
public <R> Observable<R> aggregate(R initialValue, Func2<R, ? super T, R> accumulator) {
53075334
return reduce(initialValue, accumulator);
53085335
}

0 commit comments

Comments
 (0)