Merge pull request #3449 from JakeWharton/jw/delete-code

2.x: Remove duplication of Optional API behavior.

Author: zsxwing

src/main/java/io/reactivex/observables/BlockingObservable.java

@@ -164,57 +164,35 @@ public Optional<T> firstOption() {
     }
 
     public T first() {
-        Optional<T> o = firstOption();
-        if (o.isPresent()) {
-            return o.get();
-        }
-        throw new NoSuchElementException();
+        return firstOption().get();
     }
 
     public T first(T defaultValue) {
-        Optional<T> o = firstOption();
-        if (o.isPresent()) {
-            return o.get();
-        }
-        return defaultValue;
+        return firstOption().orElse(defaultValue);
     }
 
     public Optional<T> lastOption() {
         return stream().reduce((a, b) -> b);
     }
 
     public T last() {
-        Optional<T> o = lastOption();
-        if (o.isPresent()) {
-            return o.get();
-        }
-        throw new NoSuchElementException();
+        return lastOption().get();
     }
 
     public T last(T defaultValue) {
-        Optional<T> o = lastOption();
-        if (o.isPresent()) {
-            return o.get();
-        }
-        return defaultValue;
+        return lastOption().orElse(defaultValue);
     }
 
     public T single() {
         Iterator<T> it = iterate(Observable.fromPublisher(o).single());
         Optional<T> o = makeStream(it, false).findFirst();
-        if (o.isPresent()) {
-            return o.get();
-        }
-        throw new NoSuchElementException();
+        return o.get();
     }
 
     public T single(T defaultValue) {
         Iterator<T> it = iterate(Observable.<T>fromPublisher(o).single(defaultValue));
         Optional<T> o = makeStream(it, false).findFirst();
-        if (o.isPresent()) {
-            return o.get();
-        }
-        return defaultValue;
+        return o.orElse(defaultValue);
     }
 
     public Iterable<T> mostRecent(T initialValue) {

src/main/java/io/reactivex/observables/nbp/NbpBlockingObservable.java

@@ -159,58 +159,36 @@ public Optional<T> firstOption() {
     }
 
     public T first() {
-        Optional<T> o = firstOption();
-        if (o.isPresent()) {
-            return o.get();
-        }
-        throw new NoSuchElementException();
+        return firstOption().get();
     }
 
     public T first(T defaultValue) {
-        Optional<T> o = firstOption();
-        if (o.isPresent()) {
-            return o.get();
-        }
-        return defaultValue;
+        return firstOption().orElse(defaultValue);
     }
 
     public Optional<T> lastOption() {
         return stream().reduce((a, b) -> b);
     }
 
     public T last() {
-        Optional<T> o = lastOption();
-        if (o.isPresent()) {
-            return o.get();
-        }
-        throw new NoSuchElementException();
+        return lastOption().get();
     }
 
     public T last(T defaultValue) {
-        Optional<T> o = lastOption();
-        if (o.isPresent()) {
-            return o.get();
-        }
-        return defaultValue;
+        return lastOption().orElse(defaultValue);
     }
 
     public T single() {
         Iterator<T> it = iterate(o.single());
         Optional<T> o = makeStream(it, false).findFirst();
-        if (o.isPresent()) {
-            return o.get();
-        }
-        throw new NoSuchElementException();
+        return o.get();
     }
 
     public T single(T defaultValue) {
         @SuppressWarnings("unchecked")
         Iterator<T> it = iterate(((NbpObservable<T>)o).single(defaultValue));
         Optional<T> o = makeStream(it, false).findFirst();
-        if (o.isPresent()) {
-            return o.get();
-        }
-        return defaultValue;
+        return o.orElse(defaultValue);
     }
 
     public Iterable<T> mostRecent(T initialValue) {