Skip to content

Commit caf3a94

Browse files
committed
Code cleanup
1 parent d0e0fd7 commit caf3a94

File tree

5 files changed

+6
-11
lines changed

5 files changed

+6
-11
lines changed

rxjava-core/src/main/java/rx/Observable.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ public Subscription subscribe(Observer<T> observer) {
131131
AtomicObservableSubscription subscription = new AtomicObservableSubscription();
132132
return subscription.wrap(onSubscribe.call(new AtomicObserver<T>(subscription, observer)));
133133
}
134-
};
134+
}
135135

136136
@SuppressWarnings({ "rawtypes", "unchecked" })
137137
public Subscription subscribe(final Map<String, Object> callbacks) {

rxjava-core/src/main/java/rx/operators/OperationFilter.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public Subscription call(final Observer<T> observer) {
4848
return subscription.wrap(that.subscribe(new Observer<T>() {
4949
public void onNext(T value) {
5050
try {
51-
if ((boolean) predicate.call(value)) {
51+
if (predicate.call(value)) {
5252
observer.onNext(value);
5353
}
5454
} catch (Exception ex) {
@@ -79,10 +79,7 @@ public void testFilter() {
7979

8080
@Override
8181
public Boolean call(String t1) {
82-
if (t1.equals("two"))
83-
return true;
84-
else
85-
return false;
82+
return t1.equals("two");
8683
}
8784
}));
8885

rxjava-core/src/main/java/rx/operators/OperationZip.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -260,9 +260,7 @@ private void stop() {
260260
if (running.compareAndSet(true, false)) {
261261
/* propogate to all Observers to unsubscribe if this thread succeeded in setting running=false */
262262
for (ZipObserver<T, ?> rw : observers) {
263-
if (rw.subscription != null) {
264-
rw.subscription.unsubscribe();
265-
}
263+
rw.subscription.unsubscribe();
266264
}
267265
}
268266
}

rxjava-core/src/main/java/rx/subjects/Subject.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ public void onNext(T args) {
7676
public static class UnitTest {
7777
@Test
7878
public void test() {
79-
Subject<Integer> subject = Subject.<Integer> create();
79+
Subject<Integer> subject = Subject.create();
8080
final AtomicReference<List<Notification<String>>> actualRef = new AtomicReference<List<Notification<String>>>();
8181

8282
Observable<List<Notification<Integer>>> wNotificationsList = subject.materialize().toList();

rxjava-core/src/main/java/rx/util/SynchronizedObserver.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -373,7 +373,7 @@ public void run() {
373373
}
374374

375375
private static enum TestConcurrencyObserverEvent {
376-
onCompleted, onError, onNext;
376+
onCompleted, onError, onNext
377377
}
378378

379379
private static class TestConcurrencyObserver implements Observer<String> {

0 commit comments

Comments
 (0)