Skip to content

Commit 2afbe5c

Browse files
author
Joachim Hofer
committed
a few warnings, javadoc, and one missing scheduler parameter
1 parent 4bda940 commit 2afbe5c

File tree

7 files changed

+2
-23
lines changed

7 files changed

+2
-23
lines changed

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1863,7 +1863,7 @@ public Observable<T> debounce(long timeout, TimeUnit unit) {
18631863
* @see {@link #throttleWithTimeout};
18641864
*/
18651865
public Observable<T> debounce(long timeout, TimeUnit unit, Scheduler scheduler) {
1866-
return create(OperationDebounce.debounce(this, timeout, unit));
1866+
return create(OperationDebounce.debounce(this, timeout, unit, scheduler));
18671867
}
18681868

18691869
/**
@@ -1924,8 +1924,6 @@ public Observable<T> throttleWithTimeout(long timeout, TimeUnit unit, Scheduler
19241924
* Time to wait before sending another value after emitting last value.
19251925
* @param unit
19261926
* The unit of time for the specified timeout.
1927-
* @param scheduler
1928-
* The {@link Scheduler} to use internally to manage the timers which handle timeout for each event.
19291927
* @return Observable which performs the throttle operation.
19301928
*/
19311929
public Observable<T> throttleFirst(long windowDuration, TimeUnit unit) {

rxjava-core/src/main/java/rx/operators/OperationGroupBy.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,6 @@ public void testEmpty() {
287287
public void testError() {
288288
Observable<String> sourceStrings = Observable.from("one", "two", "three", "four", "five", "six");
289289
Observable<String> errorSource = Observable.error(new RuntimeException("forced failure"));
290-
@SuppressWarnings("unchecked")
291290
Observable<String> source = Observable.concat(sourceStrings, errorSource);
292291

293292
Observable<GroupedObservable<Integer, String>> grouped = Observable.create(groupBy(source, length));

rxjava-core/src/main/java/rx/operators/OperationMap.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,6 @@ public void before() {
148148
public void testMap() {
149149
Map<String, String> m1 = getMap("One");
150150
Map<String, String> m2 = getMap("Two");
151-
@SuppressWarnings("unchecked")
152151
Observable<Map<String, String>> observable = Observable.from(m1, m2);
153152

154153
Observable<String> m = Observable.create(map(observable, new Func1<Map<String, String>, String>() {
@@ -176,7 +175,6 @@ public void testMapMany() {
176175
/* now simulate the behavior to take those IDs and perform nested async calls based on them */
177176
Observable<String> m = Observable.create(mapMany(ids, new Func1<Integer, Observable<String>>() {
178177

179-
@SuppressWarnings("unchecked")
180178
@Override
181179
public Observable<String> call(Integer id) {
182180
/* simulate making a nested async call which creates another Observable */
@@ -215,15 +213,12 @@ public String call(Map<String, String> map) {
215213
public void testMapMany2() {
216214
Map<String, String> m1 = getMap("One");
217215
Map<String, String> m2 = getMap("Two");
218-
@SuppressWarnings("unchecked")
219216
Observable<Map<String, String>> observable1 = Observable.from(m1, m2);
220217

221218
Map<String, String> m3 = getMap("Three");
222219
Map<String, String> m4 = getMap("Four");
223-
@SuppressWarnings("unchecked")
224220
Observable<Map<String, String>> observable2 = Observable.from(m3, m4);
225221

226-
@SuppressWarnings("unchecked")
227222
Observable<Observable<Map<String, String>>> observable = Observable.from(observable1, observable2);
228223

229224
Observable<String> m = Observable.create(mapMany(observable, new Func1<Observable<Map<String, String>>, Observable<String>>() {

rxjava-core/src/main/java/rx/operators/OperationRetry.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,6 @@ public Subscription onSubscribe(Observer<? super String> o) {
198198
}
199199
return Subscriptions.empty();
200200
}
201-
};
201+
}
202202
}
203203
}

rxjava-core/src/main/java/rx/operators/OperationTakeUntil.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,6 @@ public static <T, E> Observable<T> takeUntil(final Observable<? extends T> sourc
5050
Observable<Notification<T>> s = Observable.create(new SourceObservable<T>(source));
5151
Observable<Notification<T>> o = Observable.create(new OtherObservable<T, E>(other));
5252

53-
@SuppressWarnings("unchecked")
54-
/**
55-
* In JDK 7 we could use 'varargs' instead of 'unchecked'.
56-
* See http://stackoverflow.com/questions/1445233/is-it-possible-to-solve-the-a-generic-array-of-t-is-created-for-a-varargs-param
57-
* and http://hg.openjdk.java.net/jdk7/tl/langtools/rev/46cf751559ae
58-
*/
5953
Observable<Notification<T>> result = Observable.merge(s, o);
6054

6155
return result.takeWhile(new Func1<Notification<T>, Boolean>() {

rxjava-core/src/test/java/rx/concurrency/TestSchedulers.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ public void testComputationThreadPool1() {
4444

4545
Observable<Integer> o1 = Observable.<Integer> from(1, 2, 3, 4, 5);
4646
Observable<Integer> o2 = Observable.<Integer> from(6, 7, 8, 9, 10);
47-
@SuppressWarnings("unchecked")
4847
Observable<String> o = Observable.<Integer> merge(o1, o2).map(new Func1<Integer, String>() {
4948

5049
@Override
@@ -68,7 +67,6 @@ public void testIOThreadPool1() {
6867

6968
Observable<Integer> o1 = Observable.<Integer> from(1, 2, 3, 4, 5);
7069
Observable<Integer> o2 = Observable.<Integer> from(6, 7, 8, 9, 10);
71-
@SuppressWarnings("unchecked")
7270
Observable<String> o = Observable.<Integer> merge(o1, o2).map(new Func1<Integer, String>() {
7371

7472
@Override
@@ -94,7 +92,6 @@ public void testMergeWithoutScheduler1() {
9492

9593
Observable<Integer> o1 = Observable.<Integer> from(1, 2, 3, 4, 5);
9694
Observable<Integer> o2 = Observable.<Integer> from(6, 7, 8, 9, 10);
97-
@SuppressWarnings("unchecked")
9895
Observable<String> o = Observable.<Integer> merge(o1, o2).map(new Func1<Integer, String>() {
9996

10097
@Override
@@ -120,7 +117,6 @@ public void testMergeWithImmediateScheduler1() {
120117

121118
Observable<Integer> o1 = Observable.<Integer> from(1, 2, 3, 4, 5);
122119
Observable<Integer> o2 = Observable.<Integer> from(6, 7, 8, 9, 10);
123-
@SuppressWarnings("unchecked")
124120
Observable<String> o = Observable.<Integer> merge(o1, o2).subscribeOn(Schedulers.immediate()).map(new Func1<Integer, String>() {
125121

126122
@Override
@@ -146,7 +142,6 @@ public void testMergeWithCurrentThreadScheduler1() {
146142

147143
Observable<Integer> o1 = Observable.<Integer> from(1, 2, 3, 4, 5);
148144
Observable<Integer> o2 = Observable.<Integer> from(6, 7, 8, 9, 10);
149-
@SuppressWarnings("unchecked")
150145
Observable<String> o = Observable.<Integer> merge(o1, o2).subscribeOn(Schedulers.currentThread()).map(new Func1<Integer, String>() {
151146

152147
@Override
@@ -172,7 +167,6 @@ public void testMergeWithScheduler1() {
172167

173168
Observable<Integer> o1 = Observable.<Integer> from(1, 2, 3, 4, 5);
174169
Observable<Integer> o2 = Observable.<Integer> from(6, 7, 8, 9, 10);
175-
@SuppressWarnings("unchecked")
176170
Observable<String> o = Observable.<Integer> merge(o1, o2).subscribeOn(Schedulers.threadPoolForComputation()).map(new Func1<Integer, String>() {
177171

178172
@Override

rxjava-core/src/test/java/rx/performance/PerformanceTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,6 @@ public static void main(String[] args) {
122122
System.out.println("nonCompositionalTestWithArrayOfFunctionsTotalTime: " + nonCompositionalTestWithArrayOfFunctionsTotalTime.get());
123123
}
124124

125-
@SuppressWarnings("unchecked")
126125
public void runCompositionTestWithMultipleOperations(AtomicLong aggregateTime, Integer[] values) {
127126
System.out.println("runCompositionTestWithMultipleOperations");
128127

0 commit comments

Comments
 (0)