Skip to content

Commit 9b903ab

Browse files
benjchristensenbenjchristensen
committed
Merge pull request #1072 from benjchristensen/scheduler.worker
Scheduler.Inner -> Scheduler.Worker
2 parents ed26962 + 598afbb commit 9b903ab

File tree

52 files changed

+158
-156
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+158
-156
lines changed

Diff for: ‎language-adaptors/rxjava-scala/src/main/scala/rx/lang/scala/JavaConversions.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ object JavaConversions {
3939
implicit def scalaSchedulerToJavaScheduler(s: Scheduler): rx.Scheduler = s.asJavaScheduler
4040
implicit def javaSchedulerToScalaScheduler(s: rx.Scheduler): Scheduler = Scheduler(s)
4141

42-
implicit def scalaInnerToJavaInner(s: Inner): rx.Scheduler.Inner = s.asJavaInner
43-
implicit def javaInnerToScalaInner(s: rx.Scheduler.Inner): Inner = Inner(s)
42+
implicit def scalaWorkerToJavaWorker(s: Worker): rx.Scheduler.Worker = s.asJavaWorker
43+
implicit def javaWorkerToScalaWorker(s: rx.Scheduler.Worker): Worker = Worker(s)
4444

4545

4646
implicit def toJavaObserver[T](s: Observer[T]): rx.Observer[_ >: T] = s.asJavaObserver

Diff for: ‎language-adaptors/rxjava-scala/src/main/scala/rx/lang/scala/Scheduler.scala

+8-8
Original file line numberDiff line numberDiff line change
@@ -42,22 +42,22 @@ trait Scheduler {
4242
*/
4343
def now: Long = this.asJavaScheduler.now()
4444

45-
def createInner: Inner = this.asJavaScheduler.createInner()
45+
def createWorker: Worker = this.asJavaScheduler.createWorker()
4646

4747
}
4848

49-
object Inner {
50-
def apply(inner: rx.Scheduler.Inner): Inner = new Inner { private[scala] val asJavaInner = inner }
49+
object Worker {
50+
def apply(worker: rx.Scheduler.Worker): Worker = new Worker { private[scala] val asJavaWorker = worker }
5151
}
5252

53-
trait Inner extends Subscription {
54-
private [scala] val asJavaInner: rx.Scheduler.Inner
53+
trait Worker extends Subscription {
54+
private [scala] val asJavaWorker: rx.Scheduler.Worker
5555

5656
/**
5757
* Schedules a cancelable action to be executed in delayTime.
5858
*/
5959
def schedule(action: Unit => Unit, delayTime: Duration): Subscription =
60-
this.asJavaInner.schedule(
60+
this.asJavaWorker.schedule(
6161
new Action0 {
6262
override def call(): Unit = action()
6363
},
@@ -67,7 +67,7 @@ trait Inner extends Subscription {
6767
/**
6868
* Schedules a cancelable action to be executed immediately.
6969
*/
70-
def schedule(action: Unit => Unit): Subscription = this.asJavaInner.schedule(
70+
def schedule(action: Unit => Unit): Subscription = this.asJavaWorker.schedule(
7171
new Action0 {
7272
override def call(): Unit = action()
7373
}
@@ -76,7 +76,7 @@ trait Inner extends Subscription {
7676
/**
7777
* @return the scheduler's notion of current absolute time in milliseconds.
7878
*/
79-
def now: Long = this.asJavaInner.now()
79+
def now: Long = this.asJavaWorker.now()
8080
}
8181

8282

Diff for: ‎rxjava-contrib/rxjava-android/src/main/java/rx/android/schedulers/HandlerThreadScheduler.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,11 @@ public HandlerThreadScheduler(Handler handler) {
4343
}
4444

4545
@Override
46-
public Inner createInner() {
46+
public Worker createWorker() {
4747
return new InnerHandlerThreadScheduler(handler);
4848
}
4949

50-
private static class InnerHandlerThreadScheduler extends Inner {
50+
private static class InnerHandlerThreadScheduler extends Worker {
5151

5252
private final Handler handler;
5353
private BooleanSubscription innerSubscription = new BooleanSubscription();

Diff for: ‎rxjava-contrib/rxjava-android/src/main/java/rx/android/subscriptions/AndroidSubscriptions.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616
package rx.android.subscriptions;
1717

18-
import rx.Scheduler.Inner;
18+
import rx.Scheduler.Worker;
1919
import rx.Subscription;
2020
import rx.android.schedulers.AndroidSchedulers;
2121
import rx.functions.Action0;
@@ -42,7 +42,7 @@ public void call() {
4242
if (Looper.getMainLooper() == Looper.myLooper()) {
4343
unsubscribe.call();
4444
} else {
45-
final Inner inner = AndroidSchedulers.mainThread().createInner();
45+
final Worker inner = AndroidSchedulers.mainThread().createWorker();
4646
inner.schedule(new Action0() {
4747
@Override
4848
public void call() {

Diff for: ‎rxjava-contrib/rxjava-android/src/test/java/rx/android/schedulers/HandlerThreadSchedulerTest.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
import org.robolectric.annotation.Config;
3030

3131
import rx.Scheduler;
32-
import rx.Scheduler.Inner;
32+
import rx.Scheduler.Worker;
3333
import rx.functions.Action0;
3434
import rx.functions.Action1;
3535
import android.os.Handler;
@@ -45,7 +45,7 @@ public void shouldScheduleImmediateActionOnHandlerThread() {
4545
final Action0 action = mock(Action0.class);
4646

4747
Scheduler scheduler = new HandlerThreadScheduler(handler);
48-
Inner inner = scheduler.createInner();
48+
Worker inner = scheduler.createWorker();
4949
inner.schedule(action);
5050

5151
// verify that we post to the given Handler
@@ -64,7 +64,7 @@ public void shouldScheduleDelayedActionOnHandlerThread() {
6464
final Action0 action = mock(Action0.class);
6565

6666
Scheduler scheduler = new HandlerThreadScheduler(handler);
67-
Inner inner = scheduler.createInner();
67+
Worker inner = scheduler.createWorker();
6868
inner.schedule(action, 1L, TimeUnit.SECONDS);
6969

7070
// verify that we post to the given Handler

Diff for: ‎rxjava-contrib/rxjava-async-util/src/main/java/rx/util/async/Async.java

+16-16
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import rx.Observable;
2323
import rx.Observer;
2424
import rx.Scheduler;
25-
import rx.Scheduler.Inner;
25+
import rx.Scheduler.Worker;
2626
import rx.Subscriber;
2727
import rx.Subscription;
2828
import rx.functions.Action0;
@@ -599,7 +599,7 @@ public static <R> Func0<Observable<R>> toAsync(final Func0<? extends R> func, fi
599599
@Override
600600
public Observable<R> call() {
601601
final AsyncSubject<R> subject = AsyncSubject.create();
602-
final Inner inner = scheduler.createInner();
602+
final Worker inner = scheduler.createWorker();
603603
inner.schedule(new Action0() {
604604
@Override
605605
public void call() {
@@ -659,7 +659,7 @@ public static <T1, R> Func1<T1, Observable<R>> toAsync(final Func1<? super T1, ?
659659
@Override
660660
public Observable<R> call(final T1 t1) {
661661
final AsyncSubject<R> subject = AsyncSubject.create();
662-
final Inner inner = scheduler.createInner();
662+
final Worker inner = scheduler.createWorker();
663663
inner.schedule(new Action0() {
664664
@Override
665665
public void call() {
@@ -721,7 +721,7 @@ public static <T1, T2, R> Func2<T1, T2, Observable<R>> toAsync(final Func2<? sup
721721
@Override
722722
public Observable<R> call(final T1 t1, final T2 t2) {
723723
final AsyncSubject<R> subject = AsyncSubject.create();
724-
final Inner inner = scheduler.createInner();
724+
final Worker inner = scheduler.createWorker();
725725
inner.schedule(new Action0() {
726726
@Override
727727
public void call() {
@@ -785,7 +785,7 @@ public static <T1, T2, T3, R> Func3<T1, T2, T3, Observable<R>> toAsync(final Fun
785785
@Override
786786
public Observable<R> call(final T1 t1, final T2 t2, final T3 t3) {
787787
final AsyncSubject<R> subject = AsyncSubject.create();
788-
final Inner inner = scheduler.createInner();
788+
final Worker inner = scheduler.createWorker();
789789
inner.schedule(new Action0() {
790790
@Override
791791
public void call() {
@@ -851,7 +851,7 @@ public static <T1, T2, T3, T4, R> Func4<T1, T2, T3, T4, Observable<R>> toAsync(f
851851
@Override
852852
public Observable<R> call(final T1 t1, final T2 t2, final T3 t3, final T4 t4) {
853853
final AsyncSubject<R> subject = AsyncSubject.create();
854-
final Inner inner = scheduler.createInner();
854+
final Worker inner = scheduler.createWorker();
855855
inner.schedule(new Action0() {
856856
@Override
857857
public void call() {
@@ -919,7 +919,7 @@ public static <T1, T2, T3, T4, T5, R> Func5<T1, T2, T3, T4, T5, Observable<R>> t
919919
@Override
920920
public Observable<R> call(final T1 t1, final T2 t2, final T3 t3, final T4 t4, final T5 t5) {
921921
final AsyncSubject<R> subject = AsyncSubject.create();
922-
final Inner inner = scheduler.createInner();
922+
final Worker inner = scheduler.createWorker();
923923
inner.schedule(new Action0() {
924924
@Override
925925
public void call() {
@@ -989,7 +989,7 @@ public static <T1, T2, T3, T4, T5, T6, R> Func6<T1, T2, T3, T4, T5, T6, Observab
989989
@Override
990990
public Observable<R> call(final T1 t1, final T2 t2, final T3 t3, final T4 t4, final T5 t5, final T6 t6) {
991991
final AsyncSubject<R> subject = AsyncSubject.create();
992-
final Inner inner = scheduler.createInner();
992+
final Worker inner = scheduler.createWorker();
993993
inner.schedule(new Action0() {
994994
@Override
995995
public void call() {
@@ -1061,7 +1061,7 @@ public static <T1, T2, T3, T4, T5, T6, T7, R> Func7<T1, T2, T3, T4, T5, T6, T7,
10611061
@Override
10621062
public Observable<R> call(final T1 t1, final T2 t2, final T3 t3, final T4 t4, final T5 t5, final T6 t6, final T7 t7) {
10631063
final AsyncSubject<R> subject = AsyncSubject.create();
1064-
final Inner inner = scheduler.createInner();
1064+
final Worker inner = scheduler.createWorker();
10651065
inner.schedule(new Action0() {
10661066
@Override
10671067
public void call() {
@@ -1135,7 +1135,7 @@ public static <T1, T2, T3, T4, T5, T6, T7, T8, R> Func8<T1, T2, T3, T4, T5, T6,
11351135
@Override
11361136
public Observable<R> call(final T1 t1, final T2 t2, final T3 t3, final T4 t4, final T5 t5, final T6 t6, final T7 t7, final T8 t8) {
11371137
final AsyncSubject<R> subject = AsyncSubject.create();
1138-
final Inner inner = scheduler.createInner();
1138+
final Worker inner = scheduler.createWorker();
11391139
inner.schedule(new Action0() {
11401140
@Override
11411141
public void call() {
@@ -1211,7 +1211,7 @@ public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, R> Func9<T1, T2, T3, T4, T5,
12111211
@Override
12121212
public Observable<R> call(final T1 t1, final T2 t2, final T3 t3, final T4 t4, final T5 t5, final T6 t6, final T7 t7, final T8 t8, final T9 t9) {
12131213
final AsyncSubject<R> subject = AsyncSubject.create();
1214-
final Inner inner = scheduler.createInner();
1214+
final Worker inner = scheduler.createWorker();
12151215
inner.schedule(new Action0() {
12161216
@Override
12171217
public void call() {
@@ -1267,7 +1267,7 @@ public static <R> FuncN<Observable<R>> toAsync(final FuncN<? extends R> func, fi
12671267
@Override
12681268
public Observable<R> call(final Object... args) {
12691269
final AsyncSubject<R> subject = AsyncSubject.create();
1270-
final Inner inner = scheduler.createInner();
1270+
final Worker inner = scheduler.createWorker();
12711271
inner.schedule(new Action0() {
12721272
@Override
12731273
public void call() {
@@ -1535,7 +1535,7 @@ public static <T> FutureTask<Void> forEachFuture(
15351535
Action1<? super T> onNext,
15361536
Scheduler scheduler) {
15371537
FutureTask<Void> task = OperationForEachFuture.forEachFuture(source, onNext);
1538-
final Inner inner = scheduler.createInner();
1538+
final Worker inner = scheduler.createWorker();
15391539
inner.schedule(Functionals.fromRunnable(task, inner));
15401540
return task;
15411541
}
@@ -1563,7 +1563,7 @@ public static <T> FutureTask<Void> forEachFuture(
15631563
Action1<? super Throwable> onError,
15641564
Scheduler scheduler) {
15651565
FutureTask<Void> task = OperationForEachFuture.forEachFuture(source, onNext, onError);
1566-
final Inner inner = scheduler.createInner();
1566+
final Worker inner = scheduler.createWorker();
15671567
inner.schedule(Functionals.fromRunnable(task, inner));
15681568
return task;
15691569
}
@@ -1593,7 +1593,7 @@ public static <T> FutureTask<Void> forEachFuture(
15931593
Action0 onCompleted,
15941594
Scheduler scheduler) {
15951595
FutureTask<Void> task = OperationForEachFuture.forEachFuture(source, onNext, onError, onCompleted);
1596-
final Inner inner = scheduler.createInner();
1596+
final Worker inner = scheduler.createWorker();
15971597
inner.schedule(Functionals.fromRunnable(task, inner));
15981598
return task;
15991599
}
@@ -1800,7 +1800,7 @@ public void call(Subscriber<? super U> t1) {
18001800
}
18011801
}, csub);
18021802

1803-
final Inner inner = scheduler.createInner();
1803+
final Worker inner = scheduler.createWorker();
18041804
csub.set(inner);
18051805

18061806
inner.schedule(new Action0() {

Diff for: ‎rxjava-contrib/rxjava-async-util/src/main/java/rx/util/async/operators/Functionals.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
package rx.util.async.operators;
1818

19-
import rx.Scheduler.Inner;
19+
import rx.Scheduler.Worker;
2020
import rx.functions.Action0;
2121
import rx.functions.Action1;
2222

@@ -66,7 +66,7 @@ public void call() {
6666
* @param run the Runnable to run when the Action0 is called
6767
* @return the Action0 wrapping the Runnable
6868
*/
69-
public static Action0 fromRunnable(Runnable run, Inner inner) {
69+
public static Action0 fromRunnable(Runnable run, Worker inner) {
7070
if (run == null) {
7171
throw new NullPointerException("run");
7272
}
@@ -75,9 +75,9 @@ public static Action0 fromRunnable(Runnable run, Inner inner) {
7575
/** An Action1 which wraps and calls a Runnable. */
7676
private static final class ActionWrappingRunnable implements Action0 {
7777
final Runnable run;
78-
final Inner inner;
78+
final Worker inner;
7979

80-
public ActionWrappingRunnable(Runnable run, Inner inner) {
80+
public ActionWrappingRunnable(Runnable run, Worker inner) {
8181
this.run = run;
8282
this.inner = inner;
8383
}

Diff for: ‎rxjava-contrib/rxjava-quasar/src/main/java/rx/quasar/NewFiberScheduler.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,12 @@ private NewFiberScheduler() {
5454
}
5555

5656
@Override
57-
public Inner createInner() {
57+
public Worker createWorker() {
5858
return new EventLoopScheduler();
5959
}
6060

6161

62-
private class EventLoopScheduler extends Scheduler.Inner implements Subscription {
62+
private class EventLoopScheduler extends Scheduler.Worker implements Subscription {
6363
private final CompositeSubscription innerSubscription = new CompositeSubscription();
6464

6565
private EventLoopScheduler() {

Diff for: ‎rxjava-contrib/rxjava-swing/src/main/java/rx/schedulers/SwingScheduler.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,11 @@ public static SwingScheduler getInstance() {
4444
}
4545

4646
@Override
47-
public Inner createInner() {
47+
public Worker createWorker() {
4848
return new InnerSwingScheduler();
4949
}
5050

51-
private static class InnerSwingScheduler extends Inner {
51+
private static class InnerSwingScheduler extends Worker {
5252

5353
private final CompositeSubscription innerSubscription = new CompositeSubscription();
5454

Diff for: ‎rxjava-contrib/rxjava-swing/src/main/java/rx/subscriptions/SwingSubscriptions.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
import javax.swing.SwingUtilities;
1919

20-
import rx.Scheduler.Inner;
20+
import rx.Scheduler.Worker;
2121
import rx.Subscription;
2222
import rx.functions.Action0;
2323
import rx.schedulers.SwingScheduler;
@@ -41,7 +41,7 @@ public void call() {
4141
if (SwingUtilities.isEventDispatchThread()) {
4242
unsubscribe.call();
4343
} else {
44-
final Inner inner = SwingScheduler.getInstance().createInner();
44+
final Worker inner = SwingScheduler.getInstance().createWorker();
4545
inner.schedule(new Action0() {
4646
@Override
4747
public void call() {

Diff for: ‎rxjava-contrib/rxjava-swing/src/main/java/rx/swing/sources/SwingTestHelper.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import java.util.concurrent.CountDownLatch;
1919
import java.util.concurrent.TimeUnit;
2020

21-
import rx.Scheduler.Inner;
21+
import rx.Scheduler.Worker;
2222
import rx.functions.Action0;
2323
import rx.schedulers.SwingScheduler;
2424

@@ -35,7 +35,7 @@ public static SwingTestHelper create() {
3535
}
3636

3737
public SwingTestHelper runInEventDispatchThread(final Action0 action) {
38-
Inner inner = SwingScheduler.getInstance().createInner();
38+
Worker inner = SwingScheduler.getInstance().createWorker();
3939
inner.schedule(new Action0() {
4040

4141
@Override

Diff for: ‎rxjava-contrib/rxjava-swing/src/test/java/rx/schedulers/SwingSchedulerTest.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
import org.junit.rules.ExpectedException;
3434
import org.mockito.InOrder;
3535

36-
import rx.Scheduler.Inner;
36+
import rx.Scheduler.Worker;
3737
import rx.functions.Action0;
3838

3939
/**
@@ -48,7 +48,7 @@ public final class SwingSchedulerTest {
4848
@Test
4949
public void testInvalidDelayValues() {
5050
final SwingScheduler scheduler = new SwingScheduler();
51-
final Inner inner = scheduler.createInner();
51+
final Worker inner = scheduler.createWorker();
5252
final Action0 action = mock(Action0.class);
5353

5454
exception.expect(IllegalArgumentException.class);
@@ -67,7 +67,7 @@ public void testInvalidDelayValues() {
6767
@Test
6868
public void testPeriodicScheduling() throws Exception {
6969
final SwingScheduler scheduler = new SwingScheduler();
70-
final Inner inner = scheduler.createInner();
70+
final Worker inner = scheduler.createWorker();
7171

7272
final CountDownLatch latch = new CountDownLatch(4);
7373

@@ -98,7 +98,7 @@ public void call() {
9898
@Test
9999
public void testNestedActions() throws Exception {
100100
final SwingScheduler scheduler = new SwingScheduler();
101-
final Inner inner = scheduler.createInner();
101+
final Worker inner = scheduler.createWorker();
102102

103103
final Action0 firstStepStart = mock(Action0.class);
104104
final Action0 firstStepEnd = mock(Action0.class);

0 commit comments

Comments
 (0)