Skip to content

Commit 884e49b

Browse files
committed
Merge pull request #3587 from JakeWharton/jw/remove-synthetic-methods
Remove the need for javac to generate synthetic methods.
2 parents 68451ca + 04be9ee commit 884e49b

File tree

72 files changed

+157
-128
lines changed

Some content is hidden

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

72 files changed

+157
-128
lines changed

src/main/java/rx/Observable.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ protected Observable(OnSubscribe<T> f) {
6060
this.onSubscribe = f;
6161
}
6262

63-
private static final RxJavaObservableExecutionHook hook = RxJavaPlugins.getInstance().getObservableExecutionHook();
63+
static final RxJavaObservableExecutionHook hook = RxJavaPlugins.getInstance().getObservableExecutionHook();
6464

6565
/**
6666
* Returns an Observable that will execute the specified function when a {@link Subscriber} subscribes to

src/main/java/rx/Single.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ private Single(final Observable.OnSubscribe<T> f) {
111111
this.onSubscribe = f;
112112
}
113113

114-
private static final RxJavaObservableExecutionHook hook = RxJavaPlugins.getInstance().getObservableExecutionHook();
114+
static final RxJavaObservableExecutionHook hook = RxJavaPlugins.getInstance().getObservableExecutionHook();
115115

116116
/**
117117
* Returns a Single that will execute the specified function when a {@link SingleSubscriber} executes it or

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,9 @@ private static final class EmptyAction<T0, T1, T2, T3, T4, T5, T6, T7, T8> imple
4343
Action8<T0, T1, T2, T3, T4, T5, T6, T7>,
4444
Action9<T0, T1, T2, T3, T4, T5, T6, T7, T8>,
4545
ActionN {
46+
EmptyAction() {
47+
}
48+
4649
@Override
4750
public void call() {
4851
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@ public Iterator<T> iterator() {
6363
private static final class MostRecentObserver<T> extends Subscriber<T> {
6464
final NotificationLite<T> nl = NotificationLite.instance();
6565
volatile Object value;
66-
67-
private MostRecentObserver(T value) {
66+
67+
MostRecentObserver(T value) {
6868
this.value = nl.next(value);
6969
}
7070

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public Iterator<T> iterator() {
6666
private Throwable error = null;
6767
private boolean started = false;
6868

69-
private NextIterator(Observable<? extends T> items, NextObserver<T> observer) {
69+
NextIterator(Observable<? extends T> items, NextObserver<T> observer) {
7070
this.items = items;
7171
this.observer = observer;
7272
}
@@ -149,6 +149,9 @@ private static class NextObserver<T> extends Subscriber<Notification<? extends T
149149
private final BlockingQueue<Notification<? extends T>> buf = new ArrayBlockingQueue<Notification<? extends T>>(1);
150150
final AtomicInteger waiting = new AtomicInteger();
151151

152+
NextObserver() {
153+
}
154+
152155
@Override
153156
public void onCompleted() {
154157
// ignore

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ public boolean hasObservers() {
187187
}
188188

189189
@SuppressWarnings("rawtypes")
190-
private final static Observer EMPTY_OBSERVER = new Observer() {
190+
final static Observer EMPTY_OBSERVER = new Observer() {
191191

192192
@Override
193193
public void onCompleted() {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public String toString() {
7171

7272
private static class OnErrorSentinel implements Serializable {
7373
private static final long serialVersionUID = 3;
74-
private final Throwable e;
74+
final Throwable e;
7575

7676
public OnErrorSentinel(Throwable e) {
7777
this.e = e;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ private static final class AmbSubscriber<T> extends Subscriber<T> {
271271
private final Selection<T> selection;
272272
private boolean chosen;
273273

274-
private AmbSubscriber(long requested, Subscriber<? super T> subscriber, Selection<T> selection) {
274+
AmbSubscriber(long requested, Subscriber<? super T> subscriber, Selection<T> selection) {
275275
this.subscriber = subscriber;
276276
this.selection = selection;
277277
// initial request
@@ -434,7 +434,7 @@ public void request(long n) {
434434
});
435435
}
436436

437-
private static <T> void unsubscribeAmbSubscribers(Collection<AmbSubscriber<T>> ambSubscribers) {
437+
static <T> void unsubscribeAmbSubscribers(Collection<AmbSubscriber<T>> ambSubscribers) {
438438
if(!ambSubscribers.isEmpty()) {
439439
for (AmbSubscriber<T> other : ambSubscribers) {
440440
other.unsubscribe();

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ private static final class IterableProducer<T> extends AtomicLong implements Pro
5555
private final Subscriber<? super T> o;
5656
private final Iterator<? extends T> it;
5757

58-
private IterableProducer(Subscriber<? super T> o, Iterator<? extends T> it) {
58+
IterableProducer(Subscriber<? super T> o, Iterator<? extends T> it) {
5959
this.o = o;
6060
this.it = it;
6161
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ private static final class RangeProducer extends AtomicLong implements Producer
4646
private final int end;
4747
private long index;
4848

49-
private RangeProducer(Subscriber<? super Integer> o, int start, int end) {
49+
RangeProducer(Subscriber<? super Integer> o, int start, int end) {
5050
this.o = o;
5151
this.index = start;
5252
this.end = end;

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ public Notification<?> call(Notification<?> terminal) {
6767
};
6868

6969
public static final class RedoFinite implements Func1<Observable<? extends Notification<?>>, Observable<?>> {
70-
private final long count;
70+
final long count;
7171

7272
public RedoFinite(long count) {
7373
this.count = count;
@@ -98,7 +98,7 @@ public Notification<?> call(Notification<?> terminalNotification) {
9898
}
9999

100100
public static final class RetryWithPredicate implements Func1<Observable<? extends Notification<?>>, Observable<? extends Notification<?>>> {
101-
private final Func2<Integer, Throwable, Boolean> predicate;
101+
final Func2<Integer, Throwable, Boolean> predicate;
102102

103103
public RetryWithPredicate(Func2<Integer, Throwable, Boolean> predicate) {
104104
this.predicate = predicate;
@@ -173,10 +173,10 @@ public static <T> Observable<T> redo(Observable<T> source, Func1<? super Observa
173173
return create(new OnSubscribeRedo<T>(source, notificationHandler, false, false, scheduler));
174174
}
175175

176-
private final Observable<T> source;
176+
final Observable<T> source;
177177
private final Func1<? super Observable<? extends Notification<?>>, ? extends Observable<?>> controlHandlerFunction;
178-
private final boolean stopOnComplete;
179-
private final boolean stopOnError;
178+
final boolean stopOnComplete;
179+
final boolean stopOnError;
180180
private final Scheduler scheduler;
181181

182182
private OnSubscribeRedo(Observable<T> source, Func1<? super Observable<? extends Notification<?>>, ? extends Observable<?>> f, boolean stopOnComplete, boolean stopOnError,

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,13 @@
3838
public final class OnSubscribeRefCount<T> implements OnSubscribe<T> {
3939

4040
private final ConnectableObservable<? extends T> source;
41-
private volatile CompositeSubscription baseSubscription = new CompositeSubscription();
42-
private final AtomicInteger subscriptionCount = new AtomicInteger(0);
41+
volatile CompositeSubscription baseSubscription = new CompositeSubscription();
42+
final AtomicInteger subscriptionCount = new AtomicInteger(0);
4343

4444
/**
4545
* Use this lock for every subscription and disconnect action.
4646
*/
47-
private final ReentrantLock lock = new ReentrantLock();
47+
final ReentrantLock lock = new ReentrantLock();
4848

4949
/**
5050
* Constructor.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ private OnSubscribeToObservableFuture() {
4141
}
4242

4343
/* package accessible for unit tests */static class ToObservableFuture<T> implements OnSubscribe<T> {
44-
private final Future<? extends T> that;
44+
final Future<? extends T> that;
4545
private final long time;
4646
private final TimeUnit unit;
4747

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ private static final class DisposeAction<Resource> extends AtomicBoolean impleme
105105
private Action1<? super Resource> dispose;
106106
private Resource resource;
107107

108-
private DisposeAction(Action1<? super Resource> dispose, Resource resource) {
108+
DisposeAction(Action1<? super Resource> dispose, Resource resource) {
109109
this.dispose = dispose;
110110
this.resource = resource;
111111
lazySet(false); // StoreStore barrier

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
* <img width="640" src="https://github.com/ReactiveX/RxJava/wiki/images/rx-operators/all.png" alt="">
2929
*/
3030
public final class OperatorAll<T> implements Operator<Boolean, T> {
31-
private final Func1<? super T, Boolean> predicate;
31+
final Func1<? super T, Boolean> predicate;
3232

3333
public OperatorAll(Func1<? super T, Boolean> predicate) {
3434
this.predicate = predicate;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
* an observable sequence satisfies a condition, otherwise <code>false</code>.
2828
*/
2929
public final class OperatorAny<T> implements Operator<Boolean, T> {
30-
private final Func1<? super T, Boolean> predicate;
31-
private final boolean returnOnEmpty;
30+
final Func1<? super T, Boolean> predicate;
31+
final boolean returnOnEmpty;
3232

3333
public OperatorAny(Func1<? super T, Boolean> predicate, boolean returnOnEmpty) {
3434
this.predicate = predicate;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ private static final class Holder {
3737
public static <T> OperatorAsObservable<T> instance() {
3838
return (OperatorAsObservable<T>)Holder.INSTANCE;
3939
}
40-
private OperatorAsObservable() { }
40+
OperatorAsObservable() { }
4141
@Override
4242
public Subscriber<? super T> call(Subscriber<? super T> s) {
4343
return s;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
*/
2525
public class OperatorCast<T, R> implements Operator<R, T> {
2626

27-
private final Class<R> castClass;
27+
final Class<R> castClass;
2828

2929
public OperatorCast(Class<R> castClass) {
3030
this.castClass = castClass;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ private static final class Holder {
5050
public static <T> OperatorConcat<T> instance() {
5151
return (OperatorConcat<T>)Holder.INSTANCE;
5252
}
53-
private OperatorConcat() { }
53+
OperatorConcat() { }
5454
@Override
5555
public Subscriber<? super Observable<? extends T>> call(final Subscriber<? super T> child) {
5656
final SerializedSubscriber<T> s = new SerializedSubscriber<T>(child);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ private static final class Holder {
4242
public static OperatorDematerialize instance() {
4343
return Holder.INSTANCE; // using raw types because the type inference is not good enough
4444
}
45-
private OperatorDematerialize() { }
45+
OperatorDematerialize() { }
4646
@Override
4747
public Subscriber<? super Notification<T>> call(final Subscriber<? super T> child) {
4848
return new Subscriber<Notification<T>>(child) {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
* Converts the elements of an observable sequence to the specified type.
2626
*/
2727
public class OperatorDoOnEach<T> implements Operator<T, T> {
28-
private final Observer<? super T> doOnEachObserver;
28+
final Observer<? super T> doOnEachObserver;
2929

3030
public OperatorDoOnEach(Observer<? super T> doOnEachObserver) {
3131
this.doOnEachObserver = doOnEachObserver;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
*/
2929
public class OperatorDoOnRequest<T> implements Operator<T, T> {
3030

31-
private final Action1<Long> request;
31+
final Action1<Long> request;
3232

3333
public OperatorDoOnRequest(Action1<Long> request) {
3434
this.request = request;
@@ -55,7 +55,7 @@ public void request(long n) {
5555
private static final class ParentSubscriber<T> extends Subscriber<T> {
5656
private final Subscriber<? super T> child;
5757

58-
private ParentSubscriber(Subscriber<? super T> child) {
58+
ParentSubscriber(Subscriber<? super T> child) {
5959
this.child = child;
6060
}
6161

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@
2626
*/
2727
public final class OperatorElementAt<T> implements Operator<T, T> {
2828

29-
private final int index;
30-
private final boolean hasDefault;
31-
private final T defaultValue;
29+
final int index;
30+
final boolean hasDefault;
31+
final T defaultValue;
3232

3333
public OperatorElementAt(int index) {
3434
this(index, null, false);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
*/
2828
public final class OperatorFilter<T> implements Operator<T, T> {
2929

30-
private final Func1<? super T, Boolean> predicate;
30+
final Func1<? super T, Boolean> predicate;
3131

3232
public OperatorFilter(Func1<? super T, Boolean> predicate) {
3333
this.predicate = predicate;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public static <T> OperatorIgnoreElements<T> instance() {
2929
return (OperatorIgnoreElements<T>) Holder.INSTANCE;
3030
}
3131

32-
private OperatorIgnoreElements() {
32+
OperatorIgnoreElements() {
3333

3434
}
3535

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
*/
2929
public final class OperatorMap<T, R> implements Operator<R, T> {
3030

31-
private final Func1<? super T, ? extends R> transformer;
31+
final Func1<? super T, ? extends R> transformer;
3232

3333
public OperatorMap(Func1<? super T, ? extends R> transformer) {
3434
this.transformer = transformer;

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@
3434
*/
3535
public final class OperatorMapNotification<T, R> implements Operator<R, T> {
3636

37-
private final Func1<? super T, ? extends R> onNext;
38-
private final Func1<? super Throwable, ? extends R> onError;
39-
private final Func0<? extends R> onCompleted;
37+
final Func1<? super T, ? extends R> onNext;
38+
final Func1<? super Throwable, ? extends R> onError;
39+
final Func0<? extends R> onCompleted;
4040

4141
public OperatorMapNotification(Func1<? super T, ? extends R> onNext, Func1<? super Throwable, ? extends R> onError, Func0<? extends R> onCompleted) {
4242
this.onNext = onNext;
@@ -58,8 +58,8 @@ final class MapNotificationSubscriber extends Subscriber<T> {
5858
private final Subscriber<? super R> o;
5959
private final ProducerArbiter pa;
6060
final SingleEmitter<R> emitter;
61-
62-
private MapNotificationSubscriber(ProducerArbiter pa, Subscriber<? super R> o) {
61+
62+
MapNotificationSubscriber(ProducerArbiter pa, Subscriber<? super R> o) {
6363
this.pa = pa;
6464
this.o = o;
6565
this.emitter = new SingleEmitter<R>(o, pa, this);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public static <T> OperatorMaterialize<T> instance() {
4747
return (OperatorMaterialize<T>) Holder.INSTANCE;
4848
}
4949

50-
private OperatorMaterialize() {
50+
OperatorMaterialize() {
5151
}
5252

5353
@Override

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ public static <T> OperatorMerge<T> instance(boolean delayErrors, int maxConcurre
9090
final boolean delayErrors;
9191
final int maxConcurrent;
9292

93-
private OperatorMerge(boolean delayErrors, int maxConcurrent) {
93+
OperatorMerge(boolean delayErrors, int maxConcurrent) {
9494
this.delayErrors = delayErrors;
9595
this.maxConcurrent = maxConcurrent;
9696
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@ public final class OperatorMulticast<T, R> extends ConnectableObservable<R> {
4646
final List<Subscriber<? super R>> waitingForConnect;
4747

4848
/** Guarded by guard. */
49-
private Subscriber<T> subscription;
49+
Subscriber<T> subscription;
5050
// wraps subscription above for unsubscription using guard
51-
private Subscription guardedSubscription;
51+
Subscription guardedSubscription;
5252

5353
public OperatorMulticast(Observable<? extends T> source, final Func0<? extends Subject<? super T, ? extends R>> subjectFactory) {
5454
this(new Object(), new AtomicReference<Subject<? super T, ? extends R>>(), new ArrayList<Subscriber<? super R>>(), source, subjectFactory);

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ private static class Holder {
3939
public static <T> OperatorOnBackpressureBuffer<T> instance() {
4040
return (OperatorOnBackpressureBuffer<T>) Holder.INSTANCE;
4141
}
42-
43-
private OperatorOnBackpressureBuffer() {
42+
43+
OperatorOnBackpressureBuffer() {
4444
this.capacity = null;
4545
this.onOverflow = null;
4646
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ public static <T> OperatorOnBackpressureDrop<T> instance() {
3838
return (OperatorOnBackpressureDrop<T>)Holder.INSTANCE;
3939
}
4040

41-
private final Action1<? super T> onDrop;
41+
final Action1<? super T> onDrop;
4242

43-
private OperatorOnBackpressureDrop() {
43+
OperatorOnBackpressureDrop() {
4444
this(null);
4545
}
4646

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ void emit() {
194194
static final class LatestSubscriber<T> extends Subscriber<T> {
195195
private final LatestEmitter<T> producer;
196196

197-
private LatestSubscriber(LatestEmitter<T> producer) {
197+
LatestSubscriber(LatestEmitter<T> producer) {
198198
this.producer = producer;
199199
}
200200

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
*/
4444
public final class OperatorOnErrorResumeNextViaFunction<T> implements Operator<T, T> {
4545

46-
private final Func1<Throwable, ? extends Observable<? extends T>> resumeFunction;
46+
final Func1<Throwable, ? extends Observable<? extends T>> resumeFunction;
4747

4848
public OperatorOnErrorResumeNextViaFunction(Func1<Throwable, ? extends Observable<? extends T>> f) {
4949
this.resumeFunction = f;

0 commit comments

Comments
 (0)