Skip to content

Commit 1531e21

Browse files
benjchristensenbenjchristensen
committed
Remove repetitive Scheduler overloads.
1 parent 2721ead commit 1531e21

File tree

3 files changed

+6
-161
lines changed

3 files changed

+6
-161
lines changed

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

Lines changed: 0 additions & 114 deletions
Original file line numberDiff line numberDiff line change
@@ -151,39 +151,6 @@ public <T> Subscription schedule(T state, Func2<Scheduler, T, Subscription> acti
151151
}
152152
}
153153

154-
/**
155-
* Schedules a cancelable action to be executed.
156-
*
157-
* @param action
158-
* Action to schedule.
159-
* @return a subscription to be able to unsubscribe from action.
160-
*/
161-
public Subscription schedule(final Func1<Scheduler, Subscription> action) {
162-
return schedule(null, new Func2<Scheduler, Void, Subscription>() {
163-
164-
@Override
165-
public Subscription call(Scheduler scheduler, @SuppressWarnings("unused") Void state) {
166-
return action.call(scheduler);
167-
}
168-
});
169-
}
170-
171-
/**
172-
* Schedules a cancelable action to be executed.
173-
*
174-
* @param action
175-
* action
176-
* @return a subscription to be able to unsubscribe from action.
177-
*/
178-
public Subscription schedule(final Func0<Subscription> action) {
179-
return schedule(null, new Func2<Scheduler, Void, Subscription>() {
180-
181-
@Override
182-
public Subscription call(@SuppressWarnings("unused") Scheduler scheduler, @SuppressWarnings("unused") Void state) {
183-
return action.call();
184-
}
185-
});
186-
}
187154

188155
/**
189156
* Schedules an action to be executed.
@@ -203,27 +170,6 @@ public Subscription call(@SuppressWarnings("unused") Scheduler scheduler, @Suppr
203170
});
204171
}
205172

206-
/**
207-
* Schedules a cancelable action to be executed in delayTime.
208-
*
209-
* @param action
210-
* Action to schedule.
211-
* @param delayTime
212-
* Time the action is to be delayed before executing.
213-
* @param unit
214-
* Time unit of the delay time.
215-
* @return a subscription to be able to unsubscribe from action.
216-
*/
217-
public Subscription schedule(final Func1<Scheduler, Subscription> action, long delayTime, TimeUnit unit) {
218-
return schedule(null, new Func2<Scheduler, Void, Subscription>() {
219-
220-
@Override
221-
public Subscription call(Scheduler scheduler, @SuppressWarnings("unused") Void state) {
222-
return action.call(scheduler);
223-
}
224-
}, delayTime, unit);
225-
}
226-
227173
/**
228174
* Schedules an action to be executed in delayTime.
229175
*
@@ -242,66 +188,6 @@ public Subscription call(@SuppressWarnings("unused") Scheduler scheduler, @Suppr
242188
}, delayTime, unit);
243189
}
244190

245-
/**
246-
* Schedules a cancelable action to be executed in delayTime.
247-
*
248-
* @param action
249-
* action
250-
* @return a subscription to be able to unsubscribe from action.
251-
*/
252-
public Subscription schedule(final Func0<Subscription> action, long delayTime, TimeUnit unit) {
253-
return schedule(null, new Func2<Scheduler, Void, Subscription>() {
254-
255-
@Override
256-
public Subscription call(@SuppressWarnings("unused") Scheduler scheduler, @SuppressWarnings("unused") Void state) {
257-
return action.call();
258-
}
259-
}, delayTime, unit);
260-
}
261-
262-
/**
263-
* Schedules a cancelable action to be executed periodically.
264-
*
265-
* @param action
266-
* The action to execute periodically.
267-
* @param initialDelay
268-
* Time to wait before executing the action for the first time.
269-
* @param period
270-
* The time interval to wait each time in between executing the action.
271-
* @param unit
272-
* The time unit the interval above is given in.
273-
* @return A subscription to be able to unsubscribe from action.
274-
*/
275-
public Subscription schedulePeriodically(final Func1<Scheduler, Subscription> action, long initialDelay, long period, TimeUnit unit) {
276-
return schedulePeriodically(null, new Func2<Scheduler, Void, Subscription>() {
277-
@Override
278-
public Subscription call(Scheduler scheduler, @SuppressWarnings("unused") Void state) {
279-
return action.call(scheduler);
280-
}
281-
}, initialDelay, period, unit);
282-
}
283-
284-
/**
285-
* Schedules a cancelable action to be executed periodically.
286-
*
287-
* @param action
288-
* The action to execute periodically.
289-
* @param initialDelay
290-
* Time to wait before executing the action for the first time.
291-
* @param period
292-
* The time interval to wait each time in between executing the action.
293-
* @param unit
294-
* The time unit the interval above is given in.
295-
* @return A subscription to be able to unsubscribe from action.
296-
*/
297-
public Subscription schedulePeriodically(final Func0<Subscription> action, long initialDelay, long period, TimeUnit unit) {
298-
return schedulePeriodically(null, new Func2<Scheduler, Void, Subscription>() {
299-
@Override
300-
public Subscription call(@SuppressWarnings("unused") Scheduler scheduler, @SuppressWarnings("unused") Void state) {
301-
return action.call();
302-
}
303-
}, initialDelay, period, unit);
304-
}
305191

306192
/**
307193
* Schedules an action to be executed periodically.

‎rxjava-core/src/main/java/rx/operators/OperationSubscribeOn.java

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
package rx.operators;
1717

1818
import org.junit.Test;
19+
import org.mockito.Matchers;
20+
1921
import rx.Observable;
2022
import rx.Observer;
2123
import rx.Scheduler;
@@ -24,6 +26,7 @@
2426
import rx.util.functions.Action0;
2527
import rx.util.functions.Func0;
2628
import rx.util.functions.Func1;
29+
import rx.util.functions.Func2;
2730

2831
import static org.mockito.Matchers.any;
2932
import static org.mockito.Mockito.*;
@@ -50,9 +53,9 @@ public SubscribeOn(Observable<T> source, Scheduler scheduler) {
5053

5154
@Override
5255
public Subscription call(final Observer<T> observer) {
53-
return scheduler.schedule(new Func0<Subscription>() {
56+
return scheduler.schedule(null, new Func2<Scheduler, T, Subscription>() {
5457
@Override
55-
public Subscription call() {
58+
public Subscription call(Scheduler s, T t) {
5659
return new ScheduledSubscription(source.subscribe(observer), scheduler);
5760
}
5861
});
@@ -91,7 +94,7 @@ public void testSubscribeOn() {
9194
Observer<Integer> observer = mock(Observer.class);
9295
Subscription subscription = Observable.create(subscribeOn(w, scheduler)).subscribe(observer);
9396

94-
verify(scheduler, times(1)).schedule(any(Func0.class));
97+
verify(scheduler, times(1)).schedule(isNull(), any(Func2.class));
9598
subscription.unsubscribe();
9699
verify(scheduler, times(1)).schedule(any(Action0.class));
97100
verifyNoMoreInteractions(scheduler);

‎rxjava-core/src/main/java/rx/operators/OperatorTester.java

Lines changed: 0 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -15,25 +15,11 @@
1515
*/
1616
package rx.operators;
1717

18-
import static org.junit.Assert.*;
19-
20-
import java.lang.Thread.UncaughtExceptionHandler;
21-
import java.util.ArrayList;
22-
import java.util.List;
2318
import java.util.concurrent.TimeUnit;
24-
import java.util.concurrent.atomic.AtomicBoolean;
25-
import java.util.concurrent.atomic.AtomicReference;
26-
27-
import org.junit.Test;
2819

29-
import rx.Observable;
30-
import rx.Observer;
3120
import rx.Scheduler;
3221
import rx.Subscription;
33-
import rx.subscriptions.Subscriptions;
3422
import rx.util.functions.Action0;
35-
import rx.util.functions.Func0;
36-
import rx.util.functions.Func1;
3723
import rx.util.functions.Func2;
3824

3925
/**
@@ -77,16 +63,6 @@ public Subscription schedule(Action0 action) {
7763
return underlying.schedule(action);
7864
}
7965

80-
@Override
81-
public Subscription schedule(Func0<Subscription> action) {
82-
return underlying.schedule(action);
83-
}
84-
85-
@Override
86-
public Subscription schedule(Func1<Scheduler, Subscription> action) {
87-
return underlying.schedule(action);
88-
}
89-
9066
@Override
9167
public <T> Subscription schedule(T state, Func2<Scheduler, T, Subscription> action) {
9268
return underlying.schedule(state, action);
@@ -97,16 +73,6 @@ public Subscription schedule(Action0 action, long dueTime, TimeUnit unit) {
9773
return underlying.schedule(action, dueTime, unit);
9874
}
9975

100-
@Override
101-
public Subscription schedule(Func0<Subscription> action, long dueTime, TimeUnit unit) {
102-
return underlying.schedule(action, dueTime, unit);
103-
}
104-
105-
@Override
106-
public Subscription schedule(Func1<Scheduler, Subscription> action, long dueTime, TimeUnit unit) {
107-
return underlying.schedule(action, dueTime, unit);
108-
}
109-
11076
@Override
11177
public <T> Subscription schedule(T state, Func2<Scheduler, T, Subscription> action, long dueTime, TimeUnit unit) {
11278
return underlying.schedule(state, action, dueTime, unit);
@@ -117,16 +83,6 @@ public Subscription schedulePeriodically(Action0 action, long initialDelay, long
11783
return underlying.schedulePeriodically(action, initialDelay, period, unit);
11884
}
11985

120-
@Override
121-
public Subscription schedulePeriodically(Func0<Subscription> action, long initialDelay, long period, TimeUnit unit) {
122-
return underlying.schedulePeriodically(action, initialDelay, period, unit);
123-
}
124-
125-
@Override
126-
public Subscription schedulePeriodically(Func1<Scheduler, Subscription> action, long initialDelay, long period, TimeUnit unit) {
127-
return underlying.schedulePeriodically(action, initialDelay, period, unit);
128-
}
129-
13086
@Override
13187
public <T> Subscription schedulePeriodically(T state, Func2<Scheduler, T, Subscription> action, long initialDelay, long period, TimeUnit unit) {
13288
return underlying.schedulePeriodically(state, action, initialDelay, period, unit);

0 commit comments

Comments
 (0)