Refactor RxJava (#2564)

rxjava/src/main/java/com/baelding/rxjava/ConnectableObservableImpl.java

@@ -15,7 +15,7 @@ public class ConnectableObservableImpl {
         System.out.println("Connect");
         connectable.connect();
 
-        Thread.currentThread().sleep(500);
+        Thread.sleep(500);
         System.out.println("Sleep");
     }
 }

rxjava/src/main/java/com/baelding/rxjava/ObservableImpl.java

@@ -5,7 +5,6 @@ import rx.observables.BlockingObservable;
 
 public class ObservableImpl {
 
-
     public static void main(String[] args) {
 
         Integer[] numbers = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10};
@@ -14,12 +13,9 @@ public class ObservableImpl {
         System.out.println("-------Just-----------");
         Observable<String> observable = Observable.just("Hello");
         observable.subscribe(
-                //onNext
+          System.out::println, //onNext
-                System.out::println,
+          Throwable::printStackTrace, //onError
-                //onError
+          () -> System.out.println("onCompleted")  //onCompleted
-                Throwable::printStackTrace,
-                //onCompleted
-                () -> System.out.println("onCompleted")
         );
 
         BlockingObservable<String> blockingObservable = observable.toBlocking();
@@ -27,12 +23,8 @@ public class ObservableImpl {
         System.out.println();
         System.out.println("-------Map-----------");
         Observable.from(letters)
-                .map((letter) -> {
+          .map(String::toUpperCase)
-                    return letter.toUpperCase();
+          .subscribe(System.out::print);
-                })
-                .subscribe(
-                        System.out::print
-                );
 
         System.out.println();
         System.out.println("-------FlatMap-----------");
@@ -48,36 +40,25 @@ public class ObservableImpl {
         System.out.println();
         System.out.println("--------Scan----------");
         Observable.from(letters)
-                .scan(new StringBuilder(), (buffer, nextLetter) -> {
+          .scan(new StringBuilder(), StringBuilder::append)
-                    return buffer.append(nextLetter);
+          .subscribe(System.out::println);
-                })
-                .subscribe((total) -> {
-                    System.out.println(total.toString());
-                });
 
         System.out.println();
         System.out.println("------GroubBy------------");
         Observable.from(numbers)
-                .groupBy((i) -> {
+          .groupBy(i -> 0 == (i % 2) ? "EVEN" : "ODD")
-                    return 0 == (i % 2) ? "EVEN" : "ODD";
+          .subscribe((group) -> group.subscribe((number) -> {
-                })
-                .subscribe((group) -> {
-                    group.subscribe((number) -> {
               System.out.println(group.getKey() + " : " + number);
-                    });
+          }));
-                });
 
         System.out.println();
         System.out.println("-------Filter-----------");
         Observable.from(numbers)
-                .filter((i) -> {
+          .filter(i -> (i % 2 == 1))
-                    return (i % 2 == 1);
-                })
           .subscribe(
             System.out::println
           );
 
-
         System.out.println("------DefaultIfEmpty------------");
         Observable.empty()
           .defaultIfEmpty("Observable is empty")
@@ -85,8 +66,6 @@ public class ObservableImpl {
             System.out::println
           );
 
-
-
         System.out.println("------DefaultIfEmpty-2-----------");
         Observable.from(letters)
           .defaultIfEmpty("Observable is empty")
@@ -95,11 +74,7 @@ public class ObservableImpl {
 
         System.out.println("-------TakeWhile-----------");
         Observable.from(numbers)
-                .takeWhile((i) -> {
+          .takeWhile(i -> i < 5)
-                    return i < 5;
-                })
           .subscribe(System.out::println);
-
-
     }
 }

rxjava/src/main/java/com/baelding/rxjava/ResourceManagement.java

@@ -1,37 +1,29 @@
 package com.baelding.rxjava;
 
-
 import rx.Observable;
 
 public class ResourceManagement {
 
-
     public static void main(String[] args) {
 
         Observable<Character> values = Observable.using(
-                //a factory function that creates a disposable resource
           () -> {
               String resource = "MyResource";
               System.out.println("Leased: " + resource);
               return resource;
           },
-                //a factory function that creates an Observable
+          r -> Observable.create(o -> {
-                (resource) -> {
+              for (Character c : r.toCharArray())
-                    return Observable.create(o -> {
-                        for (Character c : resource.toCharArray())
                   o.onNext(c);
               o.onCompleted();
-                    });
+          }),
-                },
+          r -> System.out.println("Disposed: " + r)
-                //a function that disposes of the resource
-                (resource) -> System.out.println("Disposed: " + resource)
         );
 
         values.subscribe(
-                v -> System.out.println(v),
+          System.out::println,
-                e -> System.out.println(e)
+          System.out::println
         );
-
     }
 }
 

rxjava/src/main/java/com/baelding/rxjava/SingleImpl.java

@@ -9,16 +9,10 @@ public class SingleImpl {
 
         Single<String> single = Observable.just("Hello")
           .toSingle()
-                .doOnSuccess(
+          .doOnSuccess(System.out::print)
-                        System.out::print
+          .doOnError(e -> {
-                )
+              throw new RuntimeException(e.getMessage());
-                .doOnError(
-                        (error) -> {
-                            throw new RuntimeException(error.getMessage());
           });
         single.subscribe();
-
-
     }
-
 }

rxjava/src/main/java/com/baelding/rxjava/SubjectImpl.java

@@ -4,7 +4,6 @@ import rx.Observable;
 import rx.schedulers.Schedulers;
 import rx.subjects.PublishSubject;
 
-
 public class SubjectImpl {
 
     public static final String[] subscriber1 = {""};
@@ -12,9 +11,8 @@ public class SubjectImpl {
 
     public static String subjectMethod() throws InterruptedException {
 
-
         String[] letters = {"a", "b", "c", "d", "e", "f", "g"};
-        Long signal = new Long(500L);
+        Long signal = 500L;
         PublishSubject<String> subject;
 
         synchronized (signal) {
@@ -24,7 +22,7 @@ public class SubjectImpl {
                   subscriber1[0] += letter;
                   System.out.println("Subscriber 1: " + subscriber1[0]);
                   try {
-                            Thread.currentThread().sleep(500);
+                      Thread.sleep(500);
                   } catch (InterruptedException e) {
                       e.printStackTrace();
                   }
@@ -40,19 +38,14 @@ public class SubjectImpl {
         Observable.from(letters)
           .subscribeOn(Schedulers.computation())
           .subscribe(
-                        (letter) -> {
+            subject::onNext,
-                            subject.onNext(letter);
+            subject::onError,
-                        },
-                        (t) -> {
-                            subject.onError(t);
-                        },
             () -> {
                 System.out.println("Subscriber 1 completed ");
                 subject.onCompleted();
                 synchronized (signal) {
                     signal.notify();
                 }
-
             }
           );
 
@@ -63,12 +56,8 @@ public class SubjectImpl {
                   subscriber2[0] += letter;
                   System.out.println("Subscriber 2: " + subscriber2[0]);
               },
-                    (t) -> {
+              subject::onError,
-                        subject.onError(t);
+              () -> System.out.println("Subscriber 2 completed ")
-                    },
-                    () -> {
-                        System.out.println("Subscriber 2 completed ");
-                    }
             );
         }
 
@@ -76,7 +65,5 @@ public class SubjectImpl {
             signal.wait();
             return subscriber1[0] + subscriber2[0];
         }
-
     }
-
 }

rxjava/src/main/java/com/baelding/rxjava/operator/ToCleanString.java

@@ -39,5 +39,4 @@ public class ToCleanString implements Operator<String, String> {
             }
         };
     }
-
 }