Skip to content

Commit f8fc1cb

Browse files
Standardize Naming of average/sum methods
See ReactiveX#698 (comment)
1 parent d107eba commit f8fc1cb

File tree

1 file changed

+16
-6
lines changed

1 file changed

+16
-6
lines changed

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

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4378,6 +4378,11 @@ public Integer call(Integer t1, T t2) {
43784378
* @see <a href="https://github.com/Netflix/RxJava/wiki/Mathematical-and-Aggregate-Operators#sum">RxJava Wiki: sum()</a>
43794379
* @see <a href="http://msdn.microsoft.com/en-us/library/system.reactive.linq.observable.sum.aspx">MSDN: Observable.Sum</a>
43804380
*/
4381+
public static Observable<Integer> sumInteger(Observable<Integer> source) {
4382+
return OperationSum.sum(source);
4383+
}
4384+
4385+
@Deprecated
43814386
public static Observable<Integer> sum(Observable<Integer> source) {
43824387
return OperationSum.sum(source);
43834388
}
@@ -4394,7 +4399,7 @@ public static Observable<Integer> sum(Observable<Integer> source) {
43944399
* @see <a href="https://github.com/Netflix/RxJava/wiki/Mathematical-and-Aggregate-Operators#sum">RxJava Wiki: sumLongs()</a>
43954400
* @see <a href="http://msdn.microsoft.com/en-us/library/system.reactive.linq.observable.sum.aspx">MSDN: Observable.Sum</a>
43964401
*/
4397-
public static Observable<Long> sumLongs(Observable<Long> source) {
4402+
public static Observable<Long> sumLong(Observable<Long> source) {
43984403
return OperationSum.sumLongs(source);
43994404
}
44004405

@@ -4410,7 +4415,7 @@ public static Observable<Long> sumLongs(Observable<Long> source) {
44104415
* @see <a href="https://github.com/Netflix/RxJava/wiki/Mathematical-and-Aggregate-Operators#sum">RxJava Wiki: sumFloats()</a>
44114416
* @see <a href="http://msdn.microsoft.com/en-us/library/system.reactive.linq.observable.sum.aspx">MSDN: Observable.Sum</a>
44124417
*/
4413-
public static Observable<Float> sumFloats(Observable<Float> source) {
4418+
public static Observable<Float> sumFloat(Observable<Float> source) {
44144419
return OperationSum.sumFloats(source);
44154420
}
44164421

@@ -4426,7 +4431,7 @@ public static Observable<Float> sumFloats(Observable<Float> source) {
44264431
* @see <a href="https://github.com/Netflix/RxJava/wiki/Mathematical-and-Aggregate-Operators#sum">RxJava Wiki: sumDoubles()</a>
44274432
* @see <a href="http://msdn.microsoft.com/en-us/library/system.reactive.linq.observable.sum.aspx">MSDN: Observable.Sum</a>
44284433
*/
4429-
public static Observable<Double> sumDoubles(Observable<Double> source) {
4434+
public static Observable<Double> sumDouble(Observable<Double> source) {
44304435
return OperationSum.sumDoubles(source);
44314436
}
44324437

@@ -4491,6 +4496,11 @@ public Observable<Double> sumDouble(Func1<? super T, Double> valueExtractor) {
44914496
* @see <a href="https://github.com/Netflix/RxJava/wiki/Mathematical-and-Aggregate-Operators#average">RxJava Wiki: average()</a>
44924497
* @see <a href="http://msdn.microsoft.com/en-us/library/system.reactive.linq.observable.average.aspx">MSDN: Observable.Average</a>
44934498
*/
4499+
public static Observable<Integer> averageInteger(Observable<Integer> source) {
4500+
return OperationAverage.average(source);
4501+
}
4502+
4503+
@Deprecated
44944504
public static Observable<Integer> average(Observable<Integer> source) {
44954505
return OperationAverage.average(source);
44964506
}
@@ -4507,7 +4517,7 @@ public static Observable<Integer> average(Observable<Integer> source) {
45074517
* @see <a href="https://github.com/Netflix/RxJava/wiki/Mathematical-and-Aggregate-Operators#average">RxJava Wiki: averageLongs()</a>
45084518
* @see <a href="http://msdn.microsoft.com/en-us/library/system.reactive.linq.observable.average.aspx">MSDN: Observable.Average</a>
45094519
*/
4510-
public static Observable<Long> averageLongs(Observable<Long> source) {
4520+
public static Observable<Long> averageLong(Observable<Long> source) {
45114521
return OperationAverage.averageLongs(source);
45124522
}
45134523

@@ -4523,7 +4533,7 @@ public static Observable<Long> averageLongs(Observable<Long> source) {
45234533
* @see <a href="https://github.com/Netflix/RxJava/wiki/Mathematical-and-Aggregate-Operators#average">RxJava Wiki: averageFloats()</a>
45244534
* @see <a href="http://msdn.microsoft.com/en-us/library/system.reactive.linq.observable.average.aspx">MSDN: Observable.Average</a>
45254535
*/
4526-
public static Observable<Float> averageFloats(Observable<Float> source) {
4536+
public static Observable<Float> averageFloat(Observable<Float> source) {
45274537
return OperationAverage.averageFloats(source);
45284538
}
45294539

@@ -4539,7 +4549,7 @@ public static Observable<Float> averageFloats(Observable<Float> source) {
45394549
* @see <a href="https://github.com/Netflix/RxJava/wiki/Mathematical-and-Aggregate-Operators#average">RxJava Wiki: averageDoubles()</a>
45404550
* @see <a href="http://msdn.microsoft.com/en-us/library/system.reactive.linq.observable.average.aspx">MSDN: Observable.Average</a>
45414551
*/
4542-
public static Observable<Double> averageDoubles(Observable<Double> source) {
4552+
public static Observable<Double> averageDouble(Observable<Double> source) {
45434553
return OperationAverage.averageDoubles(source);
45444554
}
45454555

0 commit comments

Comments
 (0)