diff --git a/src/main/java/rx/Observable.java b/src/main/java/rx/Observable.java index b65fd94f5b..7ed81fea06 100644 --- a/src/main/java/rx/Observable.java +++ b/src/main/java/rx/Observable.java @@ -98,7 +98,7 @@ public final static <T> Observable<T> create(OnSubscribe<T> f) { /** * Invoked when Obserable.subscribe is called. */ - public static interface OnSubscribe<T> extends Action1<Subscriber<? super T>> { + public interface OnSubscribe<T> extends Action1<Subscriber<? super T>> { // cover for generics insanity } @@ -191,7 +191,7 @@ public <R> Observable<R> compose(Transformer<? super T, ? extends R> transformer * Transformer function used by {@link #compose}. * @warn more complete description needed */ - public static interface Transformer<T, R> extends Func1<Observable<T>, Observable<R>> { + public interface Transformer<T, R> extends Func1<Observable<T>, Observable<R>> { // cover for generics insanity } diff --git a/src/main/java/rx/Observer.java b/src/main/java/rx/Observer.java index 22f4de9704..8c7eca5c77 100644 --- a/src/main/java/rx/Observer.java +++ b/src/main/java/rx/Observer.java @@ -34,7 +34,7 @@ public interface Observer<T> { * <p> * The {@link Observable} will not call this method if it calls {@link #onError}. */ - public abstract void onCompleted(); + void onCompleted(); /** * Notifies the Observer that the {@link Observable} has experienced an error condition. @@ -45,7 +45,7 @@ public interface Observer<T> { * @param e * the exception encountered by the Observable */ - public abstract void onError(Throwable e); + void onError(Throwable e); /** * Provides the Observer with a new item to observe. @@ -58,6 +58,6 @@ public interface Observer<T> { * @param t * the item emitted by the Observable */ - public abstract void onNext(T t); + void onNext(T t); } diff --git a/src/main/java/rx/Producer.java b/src/main/java/rx/Producer.java index 37f88d1861..4d9f4428fd 100644 --- a/src/main/java/rx/Producer.java +++ b/src/main/java/rx/Producer.java @@ -37,6 +37,6 @@ public interface Producer { * @param n the maximum number of items you want this Producer to produce, or {@code Long.MAX_VALUE} if you * want the Producer to produce items at its own pace */ - public void request(long n); + void request(long n); } diff --git a/src/main/java/rx/Subscription.java b/src/main/java/rx/Subscription.java index aefa9d7f21..00358903c4 100644 --- a/src/main/java/rx/Subscription.java +++ b/src/main/java/rx/Subscription.java @@ -33,13 +33,13 @@ public interface Subscription { * This allows unregistering an {@link Subscriber} before it has finished receiving all events (i.e. before * onCompleted is called). */ - public void unsubscribe(); + void unsubscribe(); /** * Indicates whether this {@code Subscription} is currently unsubscribed. * * @return {@code true} if this {@code Subscription} is currently unsubscribed, {@code false} otherwise */ - public boolean isUnsubscribed(); + boolean isUnsubscribed(); } diff --git a/src/main/java/rx/functions/Action0.java b/src/main/java/rx/functions/Action0.java index 9840633327..cf11288d28 100644 --- a/src/main/java/rx/functions/Action0.java +++ b/src/main/java/rx/functions/Action0.java @@ -19,5 +19,5 @@ * A zero-argument action. */ public interface Action0 extends Action { - public void call(); + void call(); } diff --git a/src/main/java/rx/functions/Action1.java b/src/main/java/rx/functions/Action1.java index ef9ac8f166..e660036d5d 100644 --- a/src/main/java/rx/functions/Action1.java +++ b/src/main/java/rx/functions/Action1.java @@ -19,5 +19,5 @@ * A one-argument action. */ public interface Action1<T1> extends Action { - public void call(T1 t1); + void call(T1 t1); } diff --git a/src/main/java/rx/functions/Action2.java b/src/main/java/rx/functions/Action2.java index 8ff47a378b..b22cd77911 100644 --- a/src/main/java/rx/functions/Action2.java +++ b/src/main/java/rx/functions/Action2.java @@ -19,5 +19,5 @@ * A two-argument action. */ public interface Action2<T1, T2> extends Action { - public void call(T1 t1, T2 t2); + void call(T1 t1, T2 t2); } diff --git a/src/main/java/rx/functions/Action3.java b/src/main/java/rx/functions/Action3.java index 597490b6f9..56a9dd64a9 100644 --- a/src/main/java/rx/functions/Action3.java +++ b/src/main/java/rx/functions/Action3.java @@ -19,5 +19,5 @@ * A three-argument action. */ public interface Action3<T1, T2, T3> extends Action { - public void call(T1 t1, T2 t2, T3 t3); + void call(T1 t1, T2 t2, T3 t3); } diff --git a/src/main/java/rx/functions/Func0.java b/src/main/java/rx/functions/Func0.java index a7ba8bf76c..96df934066 100644 --- a/src/main/java/rx/functions/Func0.java +++ b/src/main/java/rx/functions/Func0.java @@ -22,5 +22,5 @@ */ public interface Func0<R> extends Function, Callable<R> { @Override - public R call(); + R call(); } diff --git a/src/main/java/rx/functions/Func1.java b/src/main/java/rx/functions/Func1.java index 9aa142ec4b..eb5d64fd24 100644 --- a/src/main/java/rx/functions/Func1.java +++ b/src/main/java/rx/functions/Func1.java @@ -19,5 +19,5 @@ * Represents a function with one argument. */ public interface Func1<T1, R> extends Function { - public R call(T1 t1); + R call(T1 t1); } diff --git a/src/main/java/rx/functions/Func2.java b/src/main/java/rx/functions/Func2.java index c5fbae9a09..b44aeed76e 100644 --- a/src/main/java/rx/functions/Func2.java +++ b/src/main/java/rx/functions/Func2.java @@ -19,5 +19,5 @@ * Represents a function with two arguments. */ public interface Func2<T1, T2, R> extends Function { - public R call(T1 t1, T2 t2); + R call(T1 t1, T2 t2); } diff --git a/src/main/java/rx/functions/Func3.java b/src/main/java/rx/functions/Func3.java index 978edf820c..a47cbaf893 100644 --- a/src/main/java/rx/functions/Func3.java +++ b/src/main/java/rx/functions/Func3.java @@ -19,5 +19,5 @@ * Represents a function with three arguments. */ public interface Func3<T1, T2, T3, R> extends Function { - public R call(T1 t1, T2 t2, T3 t3); + R call(T1 t1, T2 t2, T3 t3); } diff --git a/src/main/java/rx/functions/Func4.java b/src/main/java/rx/functions/Func4.java index 9b3332787b..b07ea63d99 100644 --- a/src/main/java/rx/functions/Func4.java +++ b/src/main/java/rx/functions/Func4.java @@ -19,5 +19,5 @@ * Represents a function with four arguments. */ public interface Func4<T1, T2, T3, T4, R> extends Function { - public R call(T1 t1, T2 t2, T3 t3, T4 t4); + R call(T1 t1, T2 t2, T3 t3, T4 t4); } diff --git a/src/main/java/rx/functions/Func5.java b/src/main/java/rx/functions/Func5.java index 8b1c29af7a..30016c7eaf 100644 --- a/src/main/java/rx/functions/Func5.java +++ b/src/main/java/rx/functions/Func5.java @@ -19,5 +19,5 @@ * Represents a function with five arguments. */ public interface Func5<T1, T2, T3, T4, T5, R> extends Function { - public R call(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5); + R call(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5); } diff --git a/src/main/java/rx/functions/Func6.java b/src/main/java/rx/functions/Func6.java index 0eb01ab224..e74af30733 100644 --- a/src/main/java/rx/functions/Func6.java +++ b/src/main/java/rx/functions/Func6.java @@ -19,5 +19,5 @@ * Represents a function with six arguments. */ public interface Func6<T1, T2, T3, T4, T5, T6, R> extends Function { - public R call(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6); + R call(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6); } diff --git a/src/main/java/rx/functions/Func7.java b/src/main/java/rx/functions/Func7.java index 848eee880b..181e504df0 100644 --- a/src/main/java/rx/functions/Func7.java +++ b/src/main/java/rx/functions/Func7.java @@ -19,5 +19,5 @@ * Represents a function with seven arguments. */ public interface Func7<T1, T2, T3, T4, T5, T6, T7, R> extends Function { - public R call(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7); + R call(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7); } diff --git a/src/main/java/rx/functions/Func8.java b/src/main/java/rx/functions/Func8.java index d91332f1e2..1f49817d12 100644 --- a/src/main/java/rx/functions/Func8.java +++ b/src/main/java/rx/functions/Func8.java @@ -19,5 +19,5 @@ * Represents a function with eight arguments. */ public interface Func8<T1, T2, T3, T4, T5, T6, T7, T8, R> extends Function { - public R call(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8); + R call(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8); } diff --git a/src/main/java/rx/functions/Func9.java b/src/main/java/rx/functions/Func9.java index 4d6e664f2f..56deac6119 100644 --- a/src/main/java/rx/functions/Func9.java +++ b/src/main/java/rx/functions/Func9.java @@ -19,5 +19,5 @@ * Represents a function with nine arguments. */ public interface Func9<T1, T2, T3, T4, T5, T6, T7, T8, T9, R> extends Function { - public R call(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9); + R call(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9); } diff --git a/src/main/java/rx/functions/FuncN.java b/src/main/java/rx/functions/FuncN.java index 3407eb4dab..72d1742d40 100644 --- a/src/main/java/rx/functions/FuncN.java +++ b/src/main/java/rx/functions/FuncN.java @@ -19,5 +19,5 @@ * Represents a vector-argument function. */ public interface FuncN<R> extends Function { - public R call(Object... args); + R call(Object... args); } diff --git a/src/main/java/rx/internal/operators/OperatorTimeoutBase.java b/src/main/java/rx/internal/operators/OperatorTimeoutBase.java index 0e294dc531..038bf88a0c 100644 --- a/src/main/java/rx/internal/operators/OperatorTimeoutBase.java +++ b/src/main/java/rx/internal/operators/OperatorTimeoutBase.java @@ -36,7 +36,7 @@ class OperatorTimeoutBase<T> implements Operator<T, T> { * * @param <T> */ - /* package-private */static interface FirstTimeoutStub<T> extends + /* package-private */interface FirstTimeoutStub<T> extends Func3<TimeoutSubscriber<T>, Long, Scheduler.Worker, Subscription> { } @@ -45,7 +45,7 @@ class OperatorTimeoutBase<T> implements Operator<T, T> { * * @param <T> */ - /* package-private */static interface TimeoutStub<T> extends + /* package-private */interface TimeoutStub<T> extends Func4<TimeoutSubscriber<T>, Long, T, Scheduler.Worker, Subscription> { } diff --git a/src/test/java/rx/internal/operators/OnSubscribeUsingTest.java b/src/test/java/rx/internal/operators/OnSubscribeUsingTest.java index c66e43e246..03d4cfd24a 100644 --- a/src/test/java/rx/internal/operators/OnSubscribeUsingTest.java +++ b/src/test/java/rx/internal/operators/OnSubscribeUsingTest.java @@ -44,7 +44,7 @@ public class OnSubscribeUsingTest { - private static interface Resource { + private interface Resource { public String getTextFromWeb(); public void dispose();