From b3edd4bbbaceb82a18093d5f74b473f81b5d4b0a Mon Sep 17 00:00:00 2001 From: Ahmed Tawila Date: Sat, 23 Sep 2017 16:09:01 +0200 Subject: [PATCH] Refactor rxjava-jdbc --- .../com/baeldung/rxjava/jdbc/Connector.java | 10 ++-- .../com/baeldung/rxjava/jdbc/Manager.java | 1 - .../java/com/baeldung/rxjava/jdbc/Utils.java | 4 +- .../rxjava/jdbc/AutomapClassTest.java | 34 ++++++------- .../rxjava/jdbc/AutomapInterfaceTest.java | 33 +++++++------ .../rxjava/jdbc/BasicQueryTypesTest.java | 48 +++++++++---------- .../baeldung/rxjava/jdbc/InsertBlobTest.java | 24 +++++----- .../baeldung/rxjava/jdbc/InsertClobTest.java | 25 +++++----- .../baeldung/rxjava/jdbc/ReturnKeysTest.java | 19 ++++---- .../baeldung/rxjava/jdbc/TransactionTest.java | 23 +++++---- 10 files changed, 107 insertions(+), 114 deletions(-) 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 290cc9cb3d..b7416e471a 100644 --- a/rxjava/src/main/java/com/baeldung/rxjava/jdbc/Connector.java +++ b/rxjava/src/main/java/com/baeldung/rxjava/jdbc/Connector.java @@ -3,11 +3,11 @@ package com.baeldung.rxjava.jdbc; import com.github.davidmoten.rx.jdbc.ConnectionProvider; import com.github.davidmoten.rx.jdbc.ConnectionProviderFromUrl; -public class Connector { +class Connector { - public static final String DB_CONNECTION = "jdbc:h2:mem:test;DB_CLOSE_DELAY=-1"; - public static final String DB_USER = ""; - public static final String DB_PASSWORD = ""; + static final String DB_CONNECTION = "jdbc:h2:mem:test;DB_CLOSE_DELAY=-1"; + static final String DB_USER = ""; + static final String DB_PASSWORD = ""; - public static final ConnectionProvider connectionProvider = new ConnectionProviderFromUrl(DB_CONNECTION, DB_USER, DB_PASSWORD); + static final ConnectionProvider connectionProvider = new ConnectionProviderFromUrl(DB_CONNECTION, DB_USER, DB_PASSWORD); } diff --git a/rxjava/src/main/java/com/baeldung/rxjava/jdbc/Manager.java b/rxjava/src/main/java/com/baeldung/rxjava/jdbc/Manager.java index d2b87fc897..56faa4cae7 100644 --- a/rxjava/src/main/java/com/baeldung/rxjava/jdbc/Manager.java +++ b/rxjava/src/main/java/com/baeldung/rxjava/jdbc/Manager.java @@ -25,5 +25,4 @@ public class Manager { public void setName(String name) { this.name = name; } - } diff --git a/rxjava/src/main/java/com/baeldung/rxjava/jdbc/Utils.java b/rxjava/src/main/java/com/baeldung/rxjava/jdbc/Utils.java index f1dbd2676b..401962d1a9 100644 --- a/rxjava/src/main/java/com/baeldung/rxjava/jdbc/Utils.java +++ b/rxjava/src/main/java/com/baeldung/rxjava/jdbc/Utils.java @@ -6,9 +6,9 @@ import java.io.StringWriter; import org.apache.commons.io.IOUtils; -public class Utils { +class Utils { - public static String getStringFromInputStream(InputStream input) throws IOException { + static String getStringFromInputStream(InputStream input) throws IOException { StringWriter writer = new StringWriter(); IOUtils.copy(input, writer, "UTF-8"); return writer.toString(); diff --git a/rxjava/src/test/java/com/baeldung/rxjava/jdbc/AutomapClassTest.java b/rxjava/src/test/java/com/baeldung/rxjava/jdbc/AutomapClassTest.java index 50d4551494..f44d4ac6b8 100644 --- a/rxjava/src/test/java/com/baeldung/rxjava/jdbc/AutomapClassTest.java +++ b/rxjava/src/test/java/com/baeldung/rxjava/jdbc/AutomapClassTest.java @@ -24,40 +24,40 @@ public class AutomapClassTest { @Before public void setup() { create = db.update("CREATE TABLE IF NOT EXISTS MANAGER(id int primary key, name varchar(255))") - .count(); + .count(); insert1 = db.update("INSERT INTO MANAGER(id, name) VALUES(1, 'Alan')") - .dependsOn(create) - .count(); + .dependsOn(create) + .count(); insert2 = db.update("INSERT INTO MANAGER(id, name) VALUES(2, 'Sarah')") - .dependsOn(create) - .count(); + .dependsOn(create) + .count(); } @Test public void whenSelectManagersAndAutomap_thenCorrect() { List managers = db.select("select id, name from MANAGER") - .dependsOn(create) - .dependsOn(insert1) - .dependsOn(insert2) - .autoMap(Manager.class) - .toList() - .toBlocking() - .single(); + .dependsOn(create) + .dependsOn(insert1) + .dependsOn(insert2) + .autoMap(Manager.class) + .toList() + .toBlocking() + .single(); assertThat(managers.get(0) - .getId()).isEqualTo(1); + .getId()).isEqualTo(1); assertThat(managers.get(0) - .getName()).isEqualTo("Alan"); + .getName()).isEqualTo("Alan"); assertThat(managers.get(1) - .getId()).isEqualTo(2); + .getId()).isEqualTo(2); assertThat(managers.get(1) - .getName()).isEqualTo("Sarah"); + .getName()).isEqualTo("Sarah"); } @After public void close() { db.update("DROP TABLE MANAGER") - .dependsOn(create); + .dependsOn(create); connectionProvider.close(); } } diff --git a/rxjava/src/test/java/com/baeldung/rxjava/jdbc/AutomapInterfaceTest.java b/rxjava/src/test/java/com/baeldung/rxjava/jdbc/AutomapInterfaceTest.java index fc85213b80..79bae281eb 100644 --- a/rxjava/src/test/java/com/baeldung/rxjava/jdbc/AutomapInterfaceTest.java +++ b/rxjava/src/test/java/com/baeldung/rxjava/jdbc/AutomapInterfaceTest.java @@ -9,7 +9,6 @@ import org.junit.Before; import org.junit.Test; import com.github.davidmoten.rx.jdbc.ConnectionProvider; -import com.github.davidmoten.rx.jdbc.ConnectionProviderFromUrl; import com.github.davidmoten.rx.jdbc.Database; import rx.Observable; @@ -25,34 +24,34 @@ public class AutomapInterfaceTest { @Before public void setup() { create = db.update("CREATE TABLE IF NOT EXISTS EMPLOYEE(id int primary key, name varchar(255))") - .count(); + .count(); insert1 = db.update("INSERT INTO EMPLOYEE(id, name) VALUES(1, 'Alan')") - .dependsOn(create) - .count(); + .dependsOn(create) + .count(); insert2 = db.update("INSERT INTO EMPLOYEE(id, name) VALUES(2, 'Sarah')") - .dependsOn(create) - .count(); + .dependsOn(create) + .count(); } @Test public void whenSelectFromTableAndAutomap_thenCorrect() { List employees = db.select("select id, name from EMPLOYEE") - .dependsOn(create) - .dependsOn(insert1) - .dependsOn(insert2) - .autoMap(Employee.class) - .toList() - .toBlocking() - .single(); + .dependsOn(create) + .dependsOn(insert1) + .dependsOn(insert2) + .autoMap(Employee.class) + .toList() + .toBlocking() + .single(); assertThat(employees.get(0) - .id()).isEqualTo(1); + .id()).isEqualTo(1); assertThat(employees.get(0) - .name()).isEqualTo("Alan"); + .name()).isEqualTo("Alan"); assertThat(employees.get(1) - .id()).isEqualTo(2); + .id()).isEqualTo(2); assertThat(employees.get(1) - .name()).isEqualTo("Sarah"); + .name()).isEqualTo("Sarah"); } @After diff --git a/rxjava/src/test/java/com/baeldung/rxjava/jdbc/BasicQueryTypesTest.java b/rxjava/src/test/java/com/baeldung/rxjava/jdbc/BasicQueryTypesTest.java index 17d047d42f..7677b2375d 100644 --- a/rxjava/src/test/java/com/baeldung/rxjava/jdbc/BasicQueryTypesTest.java +++ b/rxjava/src/test/java/com/baeldung/rxjava/jdbc/BasicQueryTypesTest.java @@ -6,11 +6,9 @@ import java.util.Arrays; import java.util.List; import org.junit.After; -import org.junit.Before; import org.junit.Test; import com.github.davidmoten.rx.jdbc.ConnectionProvider; -import com.github.davidmoten.rx.jdbc.ConnectionProviderFromUrl; import com.github.davidmoten.rx.jdbc.Database; import rx.Observable; @@ -25,34 +23,34 @@ public class BasicQueryTypesTest { @Test public void whenCreateTableAndInsertRecords_thenCorrect() { create = db.update("CREATE TABLE IF NOT EXISTS EMPLOYEE(id int primary key, name varchar(255))") - .count(); + .count(); insert1 = db.update("INSERT INTO EMPLOYEE(id, name) VALUES(1, 'John')") - .dependsOn(create) - .count(); + .dependsOn(create) + .count(); update = db.update("UPDATE EMPLOYEE SET name = 'Alan' WHERE id = 1") - .dependsOn(create) - .count(); + .dependsOn(create) + .count(); insert2 = db.update("INSERT INTO EMPLOYEE(id, name) VALUES(2, 'Sarah')") - .dependsOn(create) - .count(); + .dependsOn(create) + .count(); insert3 = db.update("INSERT INTO EMPLOYEE(id, name) VALUES(3, 'Mike')") - .dependsOn(create) - .count(); + .dependsOn(create) + .count(); delete = db.update("DELETE FROM EMPLOYEE WHERE id = 2") - .dependsOn(create) - .count(); + .dependsOn(create) + .count(); List names = db.select("select name from EMPLOYEE where id < ?") - .parameter(3) - .dependsOn(create) - .dependsOn(insert1) - .dependsOn(insert2) - .dependsOn(insert3) - .dependsOn(update) - .dependsOn(delete) - .getAs(String.class) - .toList() - .toBlocking() - .single(); + .parameter(3) + .dependsOn(create) + .dependsOn(insert1) + .dependsOn(insert2) + .dependsOn(insert3) + .dependsOn(update) + .dependsOn(delete) + .getAs(String.class) + .toList() + .toBlocking() + .single(); assertEquals(Arrays.asList("Alan"), names); } @@ -60,7 +58,7 @@ public class BasicQueryTypesTest { @After public void close() { db.update("DROP TABLE EMPLOYEE") - .dependsOn(create); + .dependsOn(create); connectionProvider.close(); } } diff --git a/rxjava/src/test/java/com/baeldung/rxjava/jdbc/InsertBlobTest.java b/rxjava/src/test/java/com/baeldung/rxjava/jdbc/InsertBlobTest.java index d166bdac10..fb3018ede4 100644 --- a/rxjava/src/test/java/com/baeldung/rxjava/jdbc/InsertBlobTest.java +++ b/rxjava/src/test/java/com/baeldung/rxjava/jdbc/InsertBlobTest.java @@ -29,7 +29,7 @@ public class InsertBlobTest { @Before public void setup() throws IOException { create = db.update("CREATE TABLE IF NOT EXISTS SERVERLOG (id int primary key, document BLOB)") - .count(); + .count(); InputStream actualInputStream = new FileInputStream("src/test/resources/actual_clob"); this.actualDocument = Utils.getStringFromInputStream(actualInputStream); @@ -38,28 +38,28 @@ public class InsertBlobTest { InputStream expectedInputStream = new FileInputStream("src/test/resources/expected_clob"); this.expectedDocument = Utils.getStringFromInputStream(expectedInputStream); this.insert = db.update("insert into SERVERLOG(id,document) values(?,?)") - .parameter(1) - .parameter(Database.toSentinelIfNull(bytes)) - .dependsOn(create) - .count(); + .parameter(1) + .parameter(Database.toSentinelIfNull(bytes)) + .dependsOn(create) + .count(); } @Test public void whenInsertBLOB_thenCorrect() throws IOException { db.select("select document from SERVERLOG where id = 1") - .dependsOn(create) - .dependsOn(insert) - .getAs(String.class) - .toList() - .toBlocking() - .single(); + .dependsOn(create) + .dependsOn(insert) + .getAs(String.class) + .toList() + .toBlocking() + .single(); assertEquals(expectedDocument, actualDocument); } @After public void close() { db.update("DROP TABLE SERVERLOG") - .dependsOn(create); + .dependsOn(create); connectionProvider.close(); } } diff --git a/rxjava/src/test/java/com/baeldung/rxjava/jdbc/InsertClobTest.java b/rxjava/src/test/java/com/baeldung/rxjava/jdbc/InsertClobTest.java index d49d7edf1a..d29c2e3de2 100644 --- a/rxjava/src/test/java/com/baeldung/rxjava/jdbc/InsertClobTest.java +++ b/rxjava/src/test/java/com/baeldung/rxjava/jdbc/InsertClobTest.java @@ -11,7 +11,6 @@ import org.junit.Before; import org.junit.Test; import com.github.davidmoten.rx.jdbc.ConnectionProvider; -import com.github.davidmoten.rx.jdbc.ConnectionProviderFromUrl; import com.github.davidmoten.rx.jdbc.Database; import rx.Observable; @@ -29,7 +28,7 @@ public class InsertClobTest { @Before public void setup() throws IOException { create = db.update("CREATE TABLE IF NOT EXISTS SERVERLOG (id int primary key, document CLOB)") - .count(); + .count(); InputStream actualInputStream = new FileInputStream("src/test/resources/actual_clob"); this.actualDocument = Utils.getStringFromInputStream(actualInputStream); @@ -37,28 +36,28 @@ public class InsertClobTest { InputStream expectedInputStream = new FileInputStream("src/test/resources/expected_clob"); this.expectedDocument = Utils.getStringFromInputStream(expectedInputStream); this.insert = db.update("insert into SERVERLOG(id,document) values(?,?)") - .parameter(1) - .parameter(Database.toSentinelIfNull(actualDocument)) - .dependsOn(create) - .count(); + .parameter(1) + .parameter(Database.toSentinelIfNull(actualDocument)) + .dependsOn(create) + .count(); } @Test public void whenSelectCLOB_thenCorrect() throws IOException { db.select("select document from SERVERLOG where id = 1") - .dependsOn(create) - .dependsOn(insert) - .getAs(String.class) - .toList() - .toBlocking() - .single(); + .dependsOn(create) + .dependsOn(insert) + .getAs(String.class) + .toList() + .toBlocking() + .single(); assertEquals(expectedDocument, actualDocument); } @After public void close() { db.update("DROP TABLE SERVERLOG") - .dependsOn(create); + .dependsOn(create); connectionProvider.close(); } } \ No newline at end of file diff --git a/rxjava/src/test/java/com/baeldung/rxjava/jdbc/ReturnKeysTest.java b/rxjava/src/test/java/com/baeldung/rxjava/jdbc/ReturnKeysTest.java index 9a2765f03d..87604b6c5f 100644 --- a/rxjava/src/test/java/com/baeldung/rxjava/jdbc/ReturnKeysTest.java +++ b/rxjava/src/test/java/com/baeldung/rxjava/jdbc/ReturnKeysTest.java @@ -7,7 +7,6 @@ import org.junit.Before; import org.junit.Test; import com.github.davidmoten.rx.jdbc.ConnectionProvider; -import com.github.davidmoten.rx.jdbc.ConnectionProviderFromUrl; import com.github.davidmoten.rx.jdbc.Database; import rx.Observable; @@ -24,26 +23,26 @@ public class ReturnKeysTest { public void setup() { begin = db.beginTransaction(); createStatement = db.update("CREATE TABLE IF NOT EXISTS EMPLOYEE(id int auto_increment primary key, name varchar(255))") - .dependsOn(begin) - .count(); + .dependsOn(begin) + .count(); } @Test public void whenInsertAndReturnGeneratedKey_thenCorrect() { Integer key = db.update("INSERT INTO EMPLOYEE(name) VALUES('John')") - .dependsOn(createStatement) - .returnGeneratedKeys() - .getAs(Integer.class) - .count() - .toBlocking() - .single(); + .dependsOn(createStatement) + .returnGeneratedKeys() + .getAs(Integer.class) + .count() + .toBlocking() + .single(); assertThat(key).isEqualTo(1); } @After public void close() { db.update("DROP TABLE EMPLOYEE") - .dependsOn(createStatement); + .dependsOn(createStatement); connectionProvider.close(); } } diff --git a/rxjava/src/test/java/com/baeldung/rxjava/jdbc/TransactionTest.java b/rxjava/src/test/java/com/baeldung/rxjava/jdbc/TransactionTest.java index 584add4a6e..acca98d6d6 100644 --- a/rxjava/src/test/java/com/baeldung/rxjava/jdbc/TransactionTest.java +++ b/rxjava/src/test/java/com/baeldung/rxjava/jdbc/TransactionTest.java @@ -6,7 +6,6 @@ import org.junit.After; import org.junit.Test; import com.github.davidmoten.rx.jdbc.ConnectionProvider; -import com.github.davidmoten.rx.jdbc.ConnectionProviderFromUrl; import com.github.davidmoten.rx.jdbc.Database; import rx.Observable; @@ -23,20 +22,20 @@ public class TransactionTest { public void whenCommitTransaction_thenRecordUpdated() { begin = db.beginTransaction(); createStatement = db.update("CREATE TABLE IF NOT EXISTS EMPLOYEE(id int primary key, name varchar(255))") - .dependsOn(begin) - .count(); + .dependsOn(begin) + .count(); insertStatement = db.update("INSERT INTO EMPLOYEE(id, name) VALUES(1, 'John')") - .dependsOn(createStatement) - .count(); + .dependsOn(createStatement) + .count(); updateStatement = db.update("UPDATE EMPLOYEE SET name = 'Tom' WHERE id = 1") - .dependsOn(insertStatement) - .count(); + .dependsOn(insertStatement) + .count(); commit = db.commit(updateStatement); String name = db.select("select name from EMPLOYEE WHERE id = 1") - .dependsOn(commit) - .getAs(String.class) - .toBlocking() - .single(); + .dependsOn(commit) + .getAs(String.class) + .toBlocking() + .single(); assertEquals("Tom", name); } @@ -44,7 +43,7 @@ public class TransactionTest { @After public void close() { db.update("DROP TABLE EMPLOYEE") - .dependsOn(createStatement); + .dependsOn(createStatement); connectionProvider.close(); } }