Skip to content

Commit 43c16bb

Browse files
benjchristensenbenjchristensen
committed
Merge pull request ReactiveX#705 from Netflix/docs
adjust javadocs for new sumFoo()/averageFoo() method names
2 parents 5b2227c + 9dc3f22 commit 43c16bb

File tree

1 file changed

+16
-16
lines changed

1 file changed

+16
-16
lines changed

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

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4389,7 +4389,7 @@ public Integer call(Integer t1, T t2) {
43894389
* @param source source Observable to compute the sum of
43904390
* @return an Observable that emits the sum of all the Integers emitted by
43914391
* the source Observable as its single item
4392-
* @see <a href="https://github.com/Netflix/RxJava/wiki/Mathematical-and-Aggregate-Operators#%3Cspan%20class="x x-first x-last">sum">RxJava Wiki: sum()</a>
4392+
* @see <a href="https://github.com/Netflix/RxJava/wiki/Mathematical-and-Aggregate-Operators#%3Cspan%20class="x x-first x-last">suminteger-sumlong-sumfloat-and-sumdouble">RxJava Wiki: sumInteger()</a>
43934393
* @see <a href="http://msdn.microsoft.com/en-us/library/system.reactive.linq.observable.sum.aspx">MSDN: Observable.Sum</a>
43944394
*/
43954395
public static Observable<Integer> sumInteger(Observable<Integer> source) {
@@ -4410,7 +4410,7 @@ public static Observable<Integer> sum(Observable<Integer> source) {
44104410
* @param source source Observable to compute the sum of
44114411
* @return an Observable that emits the sum of all the Longs emitted by the
44124412
* source Observable as its single item
4413-
* @see <a href="https://github.com/Netflix/RxJava/wiki/Mathematical-and-Aggregate-Operators#%3Cspan%20class="x x-first x-last">sum">RxJava Wiki: sumLongs()</a>
4413+
* @see <a href="https://github.com/Netflix/RxJava/wiki/Mathematical-and-Aggregate-Operators#%3Cspan%20class="x x-first x-last">suminteger-sumlong-sumfloat-and-sumdouble">RxJava Wiki: sumLong()</a>
44144414
* @see <a href="http://msdn.microsoft.com/en-us/library/system.reactive.linq.observable.sum.aspx">MSDN: Observable.Sum</a>
44154415
*/
44164416
public static Observable<Long> sumLong(Observable<Long> source) {
@@ -4426,7 +4426,7 @@ public static Observable<Long> sumLong(Observable<Long> source) {
44264426
* @param source source Observable to compute the sum of
44274427
* @return an Observable that emits the sum of all the Floats emitted by the
44284428
* source Observable as its single item
4429-
* @see <a href="https://github.com/Netflix/RxJava/wiki/Mathematical-and-Aggregate-Operators#%3Cspan%20class="x x-first x-last">sum">RxJava Wiki: sumFloats()</a>
4429+
* @see <a href="https://github.com/Netflix/RxJava/wiki/Mathematical-and-Aggregate-Operators#%3Cspan%20class="x x-first x-last">suminteger-sumlong-sumfloat-and-sumdouble">RxJava Wiki: sumFloat()</a>
44304430
* @see <a href="http://msdn.microsoft.com/en-us/library/system.reactive.linq.observable.sum.aspx">MSDN: Observable.Sum</a>
44314431
*/
44324432
public static Observable<Float> sumFloat(Observable<Float> source) {
@@ -4442,7 +4442,7 @@ public static Observable<Float> sumFloat(Observable<Float> source) {
44424442
* @param source source Observable to compute the sum of
44434443
* @return an Observable that emits the sum of all the Doubles emitted by
44444444
* the source Observable as its single item
4445-
* @see <a href="https://github.com/Netflix/RxJava/wiki/Mathematical-and-Aggregate-Operators#%3Cspan%20class="x x-first x-last">sum">RxJava Wiki: sumDoubles()</a>
4445+
* @see <a href="https://github.com/Netflix/RxJava/wiki/Mathematical-and-Aggregate-Operators#%3Cspan%20class="x x-first x-last">suminteger-sumlong-sumfloat-and-sumdouble">RxJava Wiki: sumDouble()</a>
44464446
* @see <a href="http://msdn.microsoft.com/en-us/library/system.reactive.linq.observable.sum.aspx">MSDN: Observable.Sum</a>
44474447
*/
44484448
public static Observable<Double> sumDouble(Observable<Double> source) {
@@ -4461,7 +4461,7 @@ public static Observable<Double> sumDouble(Observable<Double> source) {
44614461
* @return an Observable that emits the integer sum of the integer values
44624462
* corresponding to the items emitted by the source Observable
44634463
* transformed by the provided function
4464-
* @see <a href="https://github.com/Netflix/RxJava/wiki/Mathematical-and-Aggregate-Operators#%3Cspan%20class="x x-first x-last">sum">RxJava Wiki: sumInteger()</a>
4464+
* @see <a href="https://github.com/Netflix/RxJava/wiki/Mathematical-and-Aggregate-Operators#%3Cspan%20class="x x-first x-last">suminteger-sumlong-sumfloat-and-sumdouble">RxJava Wiki: sumInteger()</a>
44654465
* @see <a href="http://msdn.microsoft.com/en-us/library/system.reactive.linq.observable.sum.aspx">MSDN: Observable.Sum</a>
44664466
*/
44674467
public Observable<Integer> sumInteger(Func1<? super T, Integer> valueExtractor) {
@@ -4480,7 +4480,7 @@ public Observable<Integer> sumInteger(Func1<? super T, Integer> valueExtractor)
44804480
* @return an Observable that emits the long sum of the integer values
44814481
* corresponding to the items emitted by the source Observable
44824482
* transformed by the provided function
4483-
* @see <a href="https://github.com/Netflix/RxJava/wiki/Mathematical-and-Aggregate-Operators#%3Cspan%20class="x x-first x-last">sum">RxJava Wiki: sumLong()</a>
4483+
* @see <a href="https://github.com/Netflix/RxJava/wiki/Mathematical-and-Aggregate-Operators#%3Cspan%20class="x x-first x-last">suminteger-sumlong-sumfloat-and-sumdouble">RxJava Wiki: sumLong()</a>
44844484
* @see <a href="http://msdn.microsoft.com/en-us/library/system.reactive.linq.observable.sum.aspx">MSDN: Observable.Sum</a>
44854485
*/
44864486
public Observable<Long> sumLong(Func1<? super T, Long> valueExtractor) {
@@ -4499,7 +4499,7 @@ public Observable<Long> sumLong(Func1<? super T, Long> valueExtractor) {
44994499
* @return an Observable that emits the float sum of the integer values
45004500
* corresponding to the items emitted by the source Observable
45014501
* transformed by the provided function
4502-
* @see <a href="https://github.com/Netflix/RxJava/wiki/Mathematical-and-Aggregate-Operators#%3Cspan%20class="x x-first x-last">sum">RxJava Wiki: sumFloat()</a>
4502+
* @see <a href="https://github.com/Netflix/RxJava/wiki/Mathematical-and-Aggregate-Operators#%3Cspan%20class="x x-first x-last">suminteger-sumlong-sumfloat-and-sumdouble">RxJava Wiki: sumFloat()</a>
45034503
* @see <a href="http://msdn.microsoft.com/en-us/library/system.reactive.linq.observable.sum.aspx">MSDN: Observable.Sum</a>
45044504
*/
45054505
public Observable<Float> sumFloat(Func1<? super T, Float> valueExtractor) {
@@ -4518,7 +4518,7 @@ public Observable<Float> sumFloat(Func1<? super T, Float> valueExtractor) {
45184518
* @return an Observable that emits the double sum of the integer values
45194519
* corresponding to the items emitted by the source Observable
45204520
* transformed by the provided function
4521-
* @see <a href="https://github.com/Netflix/RxJava/wiki/Mathematical-and-Aggregate-Operators#%3Cspan%20class="x x-first x-last">sum">RxJava Wiki: sumDouble()</a>
4521+
* @see <a href="https://github.com/Netflix/RxJava/wiki/Mathematical-and-Aggregate-Operators#%3Cspan%20class="x x-first x-last">suminteger-sumlong-sumfloat-and-sumdouble">RxJava Wiki: sumDouble()</a>
45224522
* @see <a href="http://msdn.microsoft.com/en-us/library/system.reactive.linq.observable.sum.aspx">MSDN: Observable.Sum</a>
45234523
*/
45244524
public Observable<Double> sumDouble(Func1<? super T, Double> valueExtractor) {
@@ -4535,7 +4535,7 @@ public Observable<Double> sumDouble(Func1<? super T, Double> valueExtractor) {
45354535
* @return an Observable that emits the average of all the Integers emitted
45364536
* by the source Observable as its single item
45374537
* @throws IllegalArgumentException if the source Observable emits no items
4538-
* @see <a href="https://github.com/Netflix/RxJava/wiki/Mathematical-and-Aggregate-Operators#%3Cspan%20class="x x-first x-last">average">RxJava Wiki: average()</a>
4538+
* @see <a href="https://github.com/Netflix/RxJava/wiki/Mathematical-and-Aggregate-Operators#%3Cspan%20class="x x-first x-last">averageinteger-averagelong-averagefloat-and-averagedouble">RxJava Wiki: averageInteger()</a>
45394539
* @see <a href="http://msdn.microsoft.com/en-us/library/system.reactive.linq.observable.average.aspx">MSDN: Observable.Average</a>
45404540
*/
45414541
public static Observable<Integer> averageInteger(Observable<Integer> source) {
@@ -4556,7 +4556,7 @@ public static Observable<Integer> average(Observable<Integer> source) {
45564556
* @param source source Observable to compute the average of
45574557
* @return an Observable that emits the average of all the Longs emitted by
45584558
* the source Observable as its single item
4559-
* @see <a href="https://github.com/Netflix/RxJava/wiki/Mathematical-and-Aggregate-Operators#%3Cspan%20class="x x-first x-last">average">RxJava Wiki: averageLongs()</a>
4559+
* @see <a href="https://github.com/Netflix/RxJava/wiki/Mathematical-and-Aggregate-Operators#%3Cspan%20class="x x-first x-last">averageinteger-averagelong-averagefloat-and-averagedouble">RxJava Wiki: averageLong()</a>
45604560
* @see <a href="http://msdn.microsoft.com/en-us/library/system.reactive.linq.observable.average.aspx">MSDN: Observable.Average</a>
45614561
*/
45624562
public static Observable<Long> averageLong(Observable<Long> source) {
@@ -4572,7 +4572,7 @@ public static Observable<Long> averageLong(Observable<Long> source) {
45724572
* @param source source Observable to compute the average of
45734573
* @return an Observable that emits the average of all the Floats emitted by
45744574
* the source Observable as its single item
4575-
* @see <a href="https://github.com/Netflix/RxJava/wiki/Mathematical-and-Aggregate-Operators#%3Cspan%20class="x x-first x-last">average">RxJava Wiki: averageFloats()</a>
4575+
* @see <a href="https://github.com/Netflix/RxJava/wiki/Mathematical-and-Aggregate-Operators#%3Cspan%20class="x x-first x-last">averageinteger-averagelong-averagefloat-and-averagedouble">RxJava Wiki: averageFloat()</a>
45764576
* @see <a href="http://msdn.microsoft.com/en-us/library/system.reactive.linq.observable.average.aspx">MSDN: Observable.Average</a>
45774577
*/
45784578
public static Observable<Float> averageFloat(Observable<Float> source) {
@@ -4588,7 +4588,7 @@ public static Observable<Float> averageFloat(Observable<Float> source) {
45884588
* @param source source Observable to compute the average of
45894589
* @return an Observable that emits the average of all the Doubles emitted
45904590
* by the source Observable as its single item
4591-
* @see <a href="https://github.com/Netflix/RxJava/wiki/Mathematical-and-Aggregate-Operators#%3Cspan%20class="x x-first x-last">average">RxJava Wiki: averageDoubles()</a>
4591+
* @see <a href="https://github.com/Netflix/RxJava/wiki/Mathematical-and-Aggregate-Operators#%3Cspan%20class="x x-first x-last">averageinteger-averagelong-averagefloat-and-averagedouble">RxJava Wiki: averageDouble()</a>
45924592
* @see <a href="http://msdn.microsoft.com/en-us/library/system.reactive.linq.observable.average.aspx">MSDN: Observable.Average</a>
45934593
*/
45944594
public static Observable<Double> averageDouble(Observable<Double> source) {
@@ -4607,7 +4607,7 @@ public static Observable<Double> averageDouble(Observable<Double> source) {
46074607
* @return an Observable that emits the integer average of the complete
46084608
* sequence of items emitted by the source Observable when
46094609
* transformed into integers by the specified function
4610-
* @see <a href="https://github.com/Netflix/RxJava/wiki/Mathematical-and-Aggregate-Operators#%3Cspan%20class="x x-first x-last">average">RxJava Wiki: averageInteger()</a>
4610+
* @see <a href="https://github.com/Netflix/RxJava/wiki/Mathematical-and-Aggregate-Operators#%3Cspan%20class="x x-first x-last">averageinteger-averagelong-averagefloat-and-averagedouble">RxJava Wiki: averageInteger()</a>
46114611
* @see <a href="http://msdn.microsoft.com/en-us/library/system.reactive.linq.observable.average.aspx">MSDN: Observable.Average</a>
46124612
*/
46134613
public Observable<Integer> averageInteger(Func1<? super T, Integer> valueExtractor) {
@@ -4626,7 +4626,7 @@ public Observable<Integer> averageInteger(Func1<? super T, Integer> valueExtract
46264626
* @return an Observable that emits the long average of the complete
46274627
* sequence of items emitted by the source Observable when
46284628
* transformed into longs by the specified function
4629-
* @see <a href="https://github.com/Netflix/RxJava/wiki/Mathematical-and-Aggregate-Operators#%3Cspan%20class="x x-first x-last">average">RxJava Wiki: averageLong()</a>
4629+
* @see <a href="https://github.com/Netflix/RxJava/wiki/Mathematical-and-Aggregate-Operators#%3Cspan%20class="x x-first x-last">averageinteger-averagelong-averagefloat-and-averagedouble">RxJava Wiki: averageLong()</a>
46304630
* @see <a href="http://msdn.microsoft.com/en-us/library/system.reactive.linq.observable.average.aspx">MSDN: Observable.Average</a>
46314631
*/
46324632
public Observable<Long> averageLong(Func1<? super T, Long> valueExtractor) {
@@ -4645,7 +4645,7 @@ public Observable<Long> averageLong(Func1<? super T, Long> valueExtractor) {
46454645
* @return an Observable that emits the float average of the complete
46464646
* sequence of items emitted by the source Observable when
46474647
* transformed into floats by the specified function
4648-
* @see <a href="https://github.com/Netflix/RxJava/wiki/Mathematical-and-Aggregate-Operators#%3Cspan%20class="x x-first x-last">average">RxJava Wiki: averageFloat()</a>
4648+
* @see <a href="https://github.com/Netflix/RxJava/wiki/Mathematical-and-Aggregate-Operators#%3Cspan%20class="x x-first x-last">averageinteger-averagelong-averagefloat-and-averagedouble">RxJava Wiki: averageFloat()</a>
46494649
* @see <a href="http://msdn.microsoft.com/en-us/library/system.reactive.linq.observable.average.aspx">MSDN: Observable.Average</a>
46504650
*/
46514651
public Observable<Float> averageFloat(Func1<? super T, Float> valueExtractor) {
@@ -4664,7 +4664,7 @@ public Observable<Float> averageFloat(Func1<? super T, Float> valueExtractor) {
46644664
* @return an Observable that emits the double average of the complete
46654665
* sequence of items emitted by the source Observable when
46664666
* transformed into doubles by the specified function
4667-
* @see <a href="https://github.com/Netflix/RxJava/wiki/Mathematical-and-Aggregate-Operators#%3Cspan%20class="x x-first x-last">average">RxJava Wiki: averageDouble()</a>
4667+
* @see <a href="https://github.com/Netflix/RxJava/wiki/Mathematical-and-Aggregate-Operators#%3Cspan%20class="x x-first x-last">averageinteger-averagelong-averagefloat-and-averagedouble">RxJava Wiki: averageDouble()</a>
46684668
* @see <a href="http://msdn.microsoft.com/en-us/library/system.reactive.linq.observable.average.aspx">MSDN: Observable.Average</a>
46694669
*/
46704670
public Observable<Double> averageDouble(Func1<? super T, Double> valueExtractor) {

0 commit comments

Comments
 (0)