From f753a86e845be37b041e9f2dd94344c7d02e1d07 Mon Sep 17 00:00:00 2001 From: Grzegorz Piwowarek Date: Wed, 18 Oct 2017 17:13:04 +0200 Subject: [PATCH] Refactor RxJava (#2749) * Refactor RxJava * Merge fix --- .../algorithms/bubblesort/BubbleSort.java | 23 ++++++++----------- .../rxjava/ComputeFunction.java | 2 +- .../rxjava/ConnectableObservableImpl.java | 2 +- .../rxjava/ObservableImpl.java | 12 +++++----- .../rxjava/ResourceManagement.java | 2 +- .../rxjava/SingleImpl.java | 2 +- .../rxjava/SubjectImpl.java | 12 +++++----- .../com/baeldung/rxjava/jdbc/Connector.java | 6 ++--- .../rxjava/operator/ToCleanString.java | 2 +- .../rxjava/operator/ToLength.java | 2 +- .../com/baeldung/rxjava/ObservableTest.java | 2 +- .../rxjava/RxJavaCustomOperatorUnitTest.java | 4 ++-- ...ulersTest.java => SchedulersLiveTest.java} | 2 +- .../java/com/baeldung/rxjava/SubjectTest.java | 1 - .../jdbc/BasicQueryTypesIntegrationTest.java | 12 +++++----- 15 files changed, 41 insertions(+), 45 deletions(-) rename rxjava/src/main/java/com/{baelding => baeldung}/rxjava/ComputeFunction.java (97%) rename rxjava/src/main/java/com/{baelding => baeldung}/rxjava/ConnectableObservableImpl.java (94%) rename rxjava/src/main/java/com/{baelding => baeldung}/rxjava/ObservableImpl.java (87%) rename rxjava/src/main/java/com/{baelding => baeldung}/rxjava/ResourceManagement.java (95%) rename rxjava/src/main/java/com/{baelding => baeldung}/rxjava/SingleImpl.java (92%) rename rxjava/src/main/java/com/{baelding => baeldung}/rxjava/SubjectImpl.java (85%) rename rxjava/src/main/java/com/{baelding => baeldung}/rxjava/operator/ToCleanString.java (96%) rename rxjava/src/main/java/com/{baelding => baeldung}/rxjava/operator/ToLength.java (90%) rename rxjava/src/test/java/com/baeldung/rxjava/{SchedulersTest.java => SchedulersLiveTest.java} (99%) diff --git a/algorithms/src/main/java/com/baeldung/algorithms/bubblesort/BubbleSort.java b/algorithms/src/main/java/com/baeldung/algorithms/bubblesort/BubbleSort.java index aa5e085153..f5080efa40 100644 --- a/algorithms/src/main/java/com/baeldung/algorithms/bubblesort/BubbleSort.java +++ b/algorithms/src/main/java/com/baeldung/algorithms/bubblesort/BubbleSort.java @@ -4,22 +4,20 @@ import java.util.stream.IntStream; public class BubbleSort { - public void bubbleSort(Integer[] arr) { + void bubbleSort(Integer[] arr) { int n = arr.length; IntStream.range(0, n - 1) - .forEach(i -> { - IntStream.range(i + 1, n - i) - .forEach(j -> { - if (arr[j - 1] > arr[j]) { - int temp = arr[j]; - arr[j] = arr[j - 1]; - arr[j - 1] = temp; - } - }); - }); + .flatMap(i -> IntStream.range(i + 1, n - i)) + .forEach(j -> { + if (arr[j - 1] > arr[j]) { + int temp = arr[j]; + arr[j] = arr[j - 1]; + arr[j - 1] = temp; + } + }); } - public void optimizedBubbleSort(Integer[] arr) { + void optimizedBubbleSort(Integer[] arr) { int i = 0, n = arr.length; boolean swapNeeded = true; while (i < n - 1 && swapNeeded) { @@ -37,5 +35,4 @@ public class BubbleSort { i++; } } - } diff --git a/rxjava/src/main/java/com/baelding/rxjava/ComputeFunction.java b/rxjava/src/main/java/com/baeldung/rxjava/ComputeFunction.java similarity index 97% rename from rxjava/src/main/java/com/baelding/rxjava/ComputeFunction.java rename to rxjava/src/main/java/com/baeldung/rxjava/ComputeFunction.java index 924862ab37..7f9787a9d5 100644 --- a/rxjava/src/main/java/com/baelding/rxjava/ComputeFunction.java +++ b/rxjava/src/main/java/com/baeldung/rxjava/ComputeFunction.java @@ -1,4 +1,4 @@ -package com.baelding.rxjava; +package com.baeldung.rxjava; import rx.Observable; diff --git a/rxjava/src/main/java/com/baelding/rxjava/ConnectableObservableImpl.java b/rxjava/src/main/java/com/baeldung/rxjava/ConnectableObservableImpl.java similarity index 94% rename from rxjava/src/main/java/com/baelding/rxjava/ConnectableObservableImpl.java rename to rxjava/src/main/java/com/baeldung/rxjava/ConnectableObservableImpl.java index 005487dae8..a3e20a33f0 100644 --- a/rxjava/src/main/java/com/baelding/rxjava/ConnectableObservableImpl.java +++ b/rxjava/src/main/java/com/baeldung/rxjava/ConnectableObservableImpl.java @@ -1,4 +1,4 @@ -package com.baelding.rxjava; +package com.baeldung.rxjava; import rx.Observable; import rx.observables.ConnectableObservable; diff --git a/rxjava/src/main/java/com/baelding/rxjava/ObservableImpl.java b/rxjava/src/main/java/com/baeldung/rxjava/ObservableImpl.java similarity index 87% rename from rxjava/src/main/java/com/baelding/rxjava/ObservableImpl.java rename to rxjava/src/main/java/com/baeldung/rxjava/ObservableImpl.java index 9ab0d0e1e6..305aba6381 100644 --- a/rxjava/src/main/java/com/baelding/rxjava/ObservableImpl.java +++ b/rxjava/src/main/java/com/baeldung/rxjava/ObservableImpl.java @@ -1,4 +1,4 @@ -package com.baelding.rxjava; +package com.baeldung.rxjava; import rx.Observable; import rx.observables.BlockingObservable; @@ -8,13 +8,13 @@ import java.util.List; public class ObservableImpl { - static Integer[] numbers = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9}; + private static Integer[] numbers = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9}; - static String[] letters = {"a", "b", "c", "d", "e", "f", "g", "h", "i"}; - static String[] titles = {"title"}; - public static List titleList = Arrays.asList(titles); + private static String[] letters = {"a", "b", "c", "d", "e", "f", "g", "h", "i"}; + private static String[] titles = {"title"}; + private static List titleList = Arrays.asList(titles); - public static Observable getTitle() { + static Observable getTitle() { return Observable.from(titleList); } diff --git a/rxjava/src/main/java/com/baelding/rxjava/ResourceManagement.java b/rxjava/src/main/java/com/baeldung/rxjava/ResourceManagement.java similarity index 95% rename from rxjava/src/main/java/com/baelding/rxjava/ResourceManagement.java rename to rxjava/src/main/java/com/baeldung/rxjava/ResourceManagement.java index 44bbd7edda..272442098f 100644 --- a/rxjava/src/main/java/com/baelding/rxjava/ResourceManagement.java +++ b/rxjava/src/main/java/com/baeldung/rxjava/ResourceManagement.java @@ -1,4 +1,4 @@ -package com.baelding.rxjava; +package com.baeldung.rxjava; import rx.Observable; diff --git a/rxjava/src/main/java/com/baelding/rxjava/SingleImpl.java b/rxjava/src/main/java/com/baeldung/rxjava/SingleImpl.java similarity index 92% rename from rxjava/src/main/java/com/baelding/rxjava/SingleImpl.java rename to rxjava/src/main/java/com/baeldung/rxjava/SingleImpl.java index f625ab6b44..f0fda5d4df 100644 --- a/rxjava/src/main/java/com/baelding/rxjava/SingleImpl.java +++ b/rxjava/src/main/java/com/baeldung/rxjava/SingleImpl.java @@ -1,4 +1,4 @@ -package com.baelding.rxjava; +package com.baeldung.rxjava; import rx.Observable; import rx.Single; diff --git a/rxjava/src/main/java/com/baelding/rxjava/SubjectImpl.java b/rxjava/src/main/java/com/baeldung/rxjava/SubjectImpl.java similarity index 85% rename from rxjava/src/main/java/com/baelding/rxjava/SubjectImpl.java rename to rxjava/src/main/java/com/baeldung/rxjava/SubjectImpl.java index aac9b4454a..ceef3ab5f3 100644 --- a/rxjava/src/main/java/com/baelding/rxjava/SubjectImpl.java +++ b/rxjava/src/main/java/com/baeldung/rxjava/SubjectImpl.java @@ -1,14 +1,14 @@ -package com.baelding.rxjava; +package com.baeldung.rxjava; import rx.Observer; import rx.subjects.PublishSubject; public class SubjectImpl { - public static Integer subscriber1 = 0; - public static Integer subscriber2 = 0; + static Integer subscriber1 = 0; + static Integer subscriber2 = 0; - public static Integer subjectMethod() { + private static Integer subjectMethod() { PublishSubject subject = PublishSubject.create(); subject.subscribe(getFirstObserver()); @@ -25,7 +25,7 @@ public class SubjectImpl { } - public static Observer getFirstObserver() { + static Observer getFirstObserver() { return new Observer() { @Override @@ -46,7 +46,7 @@ public class SubjectImpl { }; } - public static Observer getSecondObserver() { + static Observer getSecondObserver() { return new Observer() { @Override diff --git a/rxjava/src/main/java/com/baeldung/rxjava/jdbc/Connector.java b/rxjava/src/main/java/com/baeldung/rxjava/jdbc/Connector.java index b7416e471a..25cd0bde83 100644 --- a/rxjava/src/main/java/com/baeldung/rxjava/jdbc/Connector.java +++ b/rxjava/src/main/java/com/baeldung/rxjava/jdbc/Connector.java @@ -5,9 +5,9 @@ import com.github.davidmoten.rx.jdbc.ConnectionProviderFromUrl; class Connector { - static final String DB_CONNECTION = "jdbc:h2:mem:test;DB_CLOSE_DELAY=-1"; - static final String DB_USER = ""; - static final String DB_PASSWORD = ""; + private static final String DB_CONNECTION = "jdbc:h2:mem:test;DB_CLOSE_DELAY=-1"; + private static final String DB_USER = ""; + private static final String DB_PASSWORD = ""; static final ConnectionProvider connectionProvider = new ConnectionProviderFromUrl(DB_CONNECTION, DB_USER, DB_PASSWORD); } diff --git a/rxjava/src/main/java/com/baelding/rxjava/operator/ToCleanString.java b/rxjava/src/main/java/com/baeldung/rxjava/operator/ToCleanString.java similarity index 96% rename from rxjava/src/main/java/com/baelding/rxjava/operator/ToCleanString.java rename to rxjava/src/main/java/com/baeldung/rxjava/operator/ToCleanString.java index 32db92c8fe..708f7e9b86 100644 --- a/rxjava/src/main/java/com/baelding/rxjava/operator/ToCleanString.java +++ b/rxjava/src/main/java/com/baeldung/rxjava/operator/ToCleanString.java @@ -1,4 +1,4 @@ -package com.baelding.rxjava.operator; +package com.baeldung.rxjava.operator; import rx.Observable.Operator; import rx.Subscriber; diff --git a/rxjava/src/main/java/com/baelding/rxjava/operator/ToLength.java b/rxjava/src/main/java/com/baeldung/rxjava/operator/ToLength.java similarity index 90% rename from rxjava/src/main/java/com/baelding/rxjava/operator/ToLength.java rename to rxjava/src/main/java/com/baeldung/rxjava/operator/ToLength.java index 006d59de36..70ba8b8ca9 100644 --- a/rxjava/src/main/java/com/baelding/rxjava/operator/ToLength.java +++ b/rxjava/src/main/java/com/baeldung/rxjava/operator/ToLength.java @@ -1,4 +1,4 @@ -package com.baelding.rxjava.operator; +package com.baeldung.rxjava.operator; import rx.Observable; import rx.Observable.Transformer; diff --git a/rxjava/src/test/java/com/baeldung/rxjava/ObservableTest.java b/rxjava/src/test/java/com/baeldung/rxjava/ObservableTest.java index 3d3bb021d2..beb2cbeed3 100644 --- a/rxjava/src/test/java/com/baeldung/rxjava/ObservableTest.java +++ b/rxjava/src/test/java/com/baeldung/rxjava/ObservableTest.java @@ -3,7 +3,7 @@ package com.baeldung.rxjava; import org.junit.Test; import rx.Observable; -import static com.baelding.rxjava.ObservableImpl.getTitle; +import static com.baeldung.rxjava.ObservableImpl.getTitle; import static junit.framework.Assert.assertTrue; public class ObservableTest { diff --git a/rxjava/src/test/java/com/baeldung/rxjava/RxJavaCustomOperatorUnitTest.java b/rxjava/src/test/java/com/baeldung/rxjava/RxJavaCustomOperatorUnitTest.java index bba891da88..414d951b86 100644 --- a/rxjava/src/test/java/com/baeldung/rxjava/RxJavaCustomOperatorUnitTest.java +++ b/rxjava/src/test/java/com/baeldung/rxjava/RxJavaCustomOperatorUnitTest.java @@ -10,8 +10,8 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import static com.baelding.rxjava.operator.ToCleanString.toCleanString; -import static com.baelding.rxjava.operator.ToLength.toLength; +import static com.baeldung.rxjava.operator.ToCleanString.toCleanString; +import static com.baeldung.rxjava.operator.ToLength.toLength; import static org.hamcrest.Matchers.hasItems; import static org.hamcrest.Matchers.hasSize; import static org.hamcrest.Matchers.notNullValue; diff --git a/rxjava/src/test/java/com/baeldung/rxjava/SchedulersTest.java b/rxjava/src/test/java/com/baeldung/rxjava/SchedulersLiveTest.java similarity index 99% rename from rxjava/src/test/java/com/baeldung/rxjava/SchedulersTest.java rename to rxjava/src/test/java/com/baeldung/rxjava/SchedulersLiveTest.java index 05b86e52b9..712f07324c 100644 --- a/rxjava/src/test/java/com/baeldung/rxjava/SchedulersTest.java +++ b/rxjava/src/test/java/com/baeldung/rxjava/SchedulersLiveTest.java @@ -21,7 +21,7 @@ import static org.hamcrest.Matchers.hasItems; import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; -public class SchedulersTest { +public class SchedulersLiveTest { private String result = ""; private String result1 = ""; private String result2 = ""; diff --git a/rxjava/src/test/java/com/baeldung/rxjava/SubjectTest.java b/rxjava/src/test/java/com/baeldung/rxjava/SubjectTest.java index 210ceaa636..628b1e5476 100644 --- a/rxjava/src/test/java/com/baeldung/rxjava/SubjectTest.java +++ b/rxjava/src/test/java/com/baeldung/rxjava/SubjectTest.java @@ -1,6 +1,5 @@ package com.baeldung.rxjava; -import com.baelding.rxjava.SubjectImpl; import org.junit.Test; import rx.subjects.PublishSubject; diff --git a/rxjava/src/test/java/com/baeldung/rxjava/jdbc/BasicQueryTypesIntegrationTest.java b/rxjava/src/test/java/com/baeldung/rxjava/jdbc/BasicQueryTypesIntegrationTest.java index c2fb2c32e3..5f445234d7 100644 --- a/rxjava/src/test/java/com/baeldung/rxjava/jdbc/BasicQueryTypesIntegrationTest.java +++ b/rxjava/src/test/java/com/baeldung/rxjava/jdbc/BasicQueryTypesIntegrationTest.java @@ -18,25 +18,25 @@ public class BasicQueryTypesIntegrationTest { private ConnectionProvider connectionProvider = Connector.connectionProvider; private Database db = Database.from(connectionProvider); - private Observable create, insert1, insert2, insert3, update, delete = null; + private Observable create; @Test public void whenCreateTableAndInsertRecords_thenCorrect() { create = db.update("CREATE TABLE IF NOT EXISTS EMPLOYEE(id int primary key, name varchar(255))") .count(); - insert1 = db.update("INSERT INTO EMPLOYEE(id, name) VALUES(1, 'John')") + Observable insert1 = db.update("INSERT INTO EMPLOYEE(id, name) VALUES(1, 'John')") .dependsOn(create) .count(); - update = db.update("UPDATE EMPLOYEE SET name = 'Alan' WHERE id = 1") + Observable update = db.update("UPDATE EMPLOYEE SET name = 'Alan' WHERE id = 1") .dependsOn(create) .count(); - insert2 = db.update("INSERT INTO EMPLOYEE(id, name) VALUES(2, 'Sarah')") + Observable insert2 = db.update("INSERT INTO EMPLOYEE(id, name) VALUES(2, 'Sarah')") .dependsOn(create) .count(); - insert3 = db.update("INSERT INTO EMPLOYEE(id, name) VALUES(3, 'Mike')") + Observable insert3 = db.update("INSERT INTO EMPLOYEE(id, name) VALUES(3, 'Mike')") .dependsOn(create) .count(); - delete = db.update("DELETE FROM EMPLOYEE WHERE id = 2") + Observable delete = db.update("DELETE FROM EMPLOYEE WHERE id = 2") .dependsOn(create) .count(); List names = db.select("select name from EMPLOYEE where id < ?")