Merge pull request #3587 from JakeWharton/jw/remove-synthetic-methods

Remove the need for javac to generate synthetic methods.

Author: akarnokd

src/main/java/rx/Observable.java

@@ -60,7 +60,7 @@ protected Observable(OnSubscribe<T> f) {
         this.onSubscribe = f;
     }
 
-    private static final RxJavaObservableExecutionHook hook = RxJavaPlugins.getInstance().getObservableExecutionHook();
+    static final RxJavaObservableExecutionHook hook = RxJavaPlugins.getInstance().getObservableExecutionHook();
 
     /**
      * Returns an Observable that will execute the specified function when a {@link Subscriber} subscribes to

src/main/java/rx/Single.java

@@ -111,7 +111,7 @@ private Single(final Observable.OnSubscribe<T> f) {
         this.onSubscribe = f;
     }
 
-    private static final RxJavaObservableExecutionHook hook = RxJavaPlugins.getInstance().getObservableExecutionHook();
+    static final RxJavaObservableExecutionHook hook = RxJavaPlugins.getInstance().getObservableExecutionHook();
 
     /**
      * Returns a Single that will execute the specified function when a {@link SingleSubscriber} executes it or

src/main/java/rx/functions/Actions.java

@@ -43,6 +43,9 @@ private static final class EmptyAction<T0, T1, T2, T3, T4, T5, T6, T7, T8> imple
             Action8<T0, T1, T2, T3, T4, T5, T6, T7>,
             Action9<T0, T1, T2, T3, T4, T5, T6, T7, T8>,
             ActionN {
+        EmptyAction() {
+        }
+
         @Override
         public void call() {
         }

src/main/java/rx/internal/operators/BlockingOperatorMostRecent.java

@@ -63,8 +63,8 @@ public Iterator<T> iterator() {
     private static final class MostRecentObserver<T> extends Subscriber<T> {
         final NotificationLite<T> nl = NotificationLite.instance();
         volatile Object value;
-        
-        private MostRecentObserver(T value) {
+
+        MostRecentObserver(T value) {
             this.value = nl.next(value);
         }
 

src/main/java/rx/internal/operators/BlockingOperatorNext.java

@@ -66,7 +66,7 @@ public Iterator<T> iterator() {
         private Throwable error = null;
         private boolean started = false;
 
-        private NextIterator(Observable<? extends T> items, NextObserver<T> observer) {
+        NextIterator(Observable<? extends T> items, NextObserver<T> observer) {
             this.items = items;
             this.observer = observer;
         }
@@ -149,6 +149,9 @@ private static class NextObserver<T> extends Subscriber<Notification<? extends T
         private final BlockingQueue<Notification<? extends T>> buf = new ArrayBlockingQueue<Notification<? extends T>>(1);
         final AtomicInteger waiting = new AtomicInteger();
 
+        NextObserver() {
+        }
+
         @Override
         public void onCompleted() {
             // ignore

src/main/java/rx/internal/operators/BufferUntilSubscriber.java

@@ -187,7 +187,7 @@ public boolean hasObservers() {
     }
 
     @SuppressWarnings("rawtypes")
-    private final static Observer EMPTY_OBSERVER = new Observer() {
+    final static Observer EMPTY_OBSERVER = new Observer() {
 
         @Override
         public void onCompleted() {

src/main/java/rx/internal/operators/NotificationLite.java

@@ -71,7 +71,7 @@ public String toString() {
 
     private static class OnErrorSentinel implements Serializable {
         private static final long serialVersionUID = 3;
-        private final Throwable e;
+        final Throwable e;
 
         public OnErrorSentinel(Throwable e) {
             this.e = e;

src/main/java/rx/internal/operators/OnSubscribeAmb.java

@@ -271,7 +271,7 @@ private static final class AmbSubscriber<T> extends Subscriber<T> {
         private final Selection<T> selection;
         private boolean chosen;
 
-        private AmbSubscriber(long requested, Subscriber<? super T> subscriber, Selection<T> selection) {
+        AmbSubscriber(long requested, Subscriber<? super T> subscriber, Selection<T> selection) {
             this.subscriber = subscriber;
             this.selection = selection;
             // initial request
@@ -434,7 +434,7 @@ public void request(long n) {
         });
     }
 
-    private static <T> void unsubscribeAmbSubscribers(Collection<AmbSubscriber<T>> ambSubscribers) {
+    static <T> void unsubscribeAmbSubscribers(Collection<AmbSubscriber<T>> ambSubscribers) {
         if(!ambSubscribers.isEmpty()) {
             for (AmbSubscriber<T> other : ambSubscribers) {
                 other.unsubscribe();

src/main/java/rx/internal/operators/OnSubscribeFromIterable.java

@@ -55,7 +55,7 @@ private static final class IterableProducer<T> extends AtomicLong implements Pro
         private final Subscriber<? super T> o;
         private final Iterator<? extends T> it;
 
-        private IterableProducer(Subscriber<? super T> o, Iterator<? extends T> it) {
+        IterableProducer(Subscriber<? super T> o, Iterator<? extends T> it) {
             this.o = o;
             this.it = it;
         }

src/main/java/rx/internal/operators/OnSubscribeRange.java

@@ -46,7 +46,7 @@ private static final class RangeProducer extends AtomicLong implements Producer
         private final int end;
         private long index;
 
-        private RangeProducer(Subscriber<? super Integer> o, int start, int end) {
+        RangeProducer(Subscriber<? super Integer> o, int start, int end) {
             this.o = o;
             this.index = start;
             this.end = end;