Merge pull request #3369 from KevinTCoughlin/remove-unnecessary-unboxing

Lint fixes for unnecessary unboxing
ReactiveX · Sep 22, 2015 · 6121baf · 6121baf
2 parents 84622bb + ab02902
commit 6121baf
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/src/main/java/rx/internal/operators/OnSubscribeRedo.java b/src/main/java/rx/internal/operators/OnSubscribeRedo.java
@@ -111,7 +111,7 @@ public Observable<? extends Notification<?>> call(Observable<? extends Notificat
                 @Override
                 public Notification<Integer> call(Notification<Integer> n, Notification<?> term) {
                     final int value = n.getValue();
-                    if (predicate.call(value, term.getThrowable()).booleanValue())
+                    if (predicate.call(value, term.getThrowable()))
                         return Notification.createOnNext(value + 1);
                     else
                         return (Notification<Integer>) term;

diff --git a/src/main/java/rx/internal/operators/OperatorReplay.java b/src/main/java/rx/internal/operators/OperatorReplay.java
@@ -805,7 +805,7 @@ public void replay(InnerProducer<T> output) {
                 int sourceIndex = size;
 
                 Integer destIndexObject = output.index();
-                int destIndex = destIndexObject != null ? destIndexObject.intValue() : 0;
+                int destIndex = destIndexObject != null ? destIndexObject : 0;
 
                 long r = output.get();
                 long r0 = r;

diff --git a/src/main/java/rx/schedulers/TestScheduler.java b/src/main/java/rx/schedulers/TestScheduler.java
@@ -57,9 +57,9 @@ private static class CompareActionsByTime implements Comparator<TimedAction> {
         @Override
         public int compare(TimedAction action1, TimedAction action2) {
             if (action1.time == action2.time) {
-                return Long.valueOf(action1.count).compareTo(Long.valueOf(action2.count));
+                return action1.count < action2.count ? -1 : ((action1.count > action2.count) ? 1 : 0);
             } else {
-                return Long.valueOf(action1.time).compareTo(Long.valueOf(action2.time));
+                return action1.time < action2.time ? -1 : ((action1.time > action2.time) ? 1 : 0);
             }
         }
     }