update

making · Jun 2, 2019 · 3341134 · 3341134
1 parent b3e2e76
commit 3341134
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 15 deletions.
diff --git a/03-r2dbc.md b/03-r2dbc.md
@@ -98,20 +98,19 @@ public class R2dbcExpenditureRepository implements ExpenditureRepository {
         return ("postgres".equals(uri.getScheme()) ? databaseUrl.replace("postgres", "postgresql") : databaseUrl);
     }
 
-    static void initializeDatabase(String name, DatabaseClient databaseClient) {
+    public static Mono<Void> initializeDatabase(String name, DatabaseClient databaseClient) {
         if ("H2".equals(name)) {
-            databaseClient.execute()
+            return databaseClient.execute()
                 .sql("CREATE TABLE IF NOT EXISTS expenditure (expenditure_id INT PRIMARY KEY AUTO_INCREMENT, expenditure_name VARCHAR(255), unit_price INT NOT NULL, quantity INT NOT NULL, " +
                     "expenditure_date DATE NOT NULL)")
-                .then()
-                .subscribe();
+                .then();
         } else if ("PostgreSQL".equals(name)) {
-            databaseClient.execute()
+            return databaseClient.execute()
                 .sql("CREATE TABLE IF NOT EXISTS expenditure (expenditure_id SERIAL PRIMARY KEY, expenditure_name VARCHAR(255), unit_price INT NOT NULL, quantity INT NOT NULL, " +
                     "expenditure_date DATE NOT NULL)")
-                .then()
-                .subscribe();
+                .then();
         }
+        return Mono.error(new IllegalStateException(name + " is not supported."));
     }
 ```
 
@@ -125,7 +124,7 @@ public class R2dbcExpenditureRepository implements ExpenditureRepository {
             .build();
         final TransactionalOperator transactionalOperator = TransactionalOperator.create(new R2dbcTransactionManager(connectionFactory));
 
-        initializeDatabase(connectionFactory.getMetadata().getName(), databaseClient);
+        initializeDatabase(connectionFactory.getMetadata().getName(), databaseClient).subscribe();
 
         return new ExpenditureHandler(new R2dbcExpenditureRepository(databaseClient, transactionalOperator)).routes();
     }

diff --git a/06-income-api.md b/06-income-api.md
@@ -133,25 +133,24 @@ public class IncomeBuilder {
 
 
 ```java
-    static void initializeDatabase(String name, DatabaseClient databaseClient) {
+    public static Mono<Void> initializeDatabase(String name, DatabaseClient databaseClient) {
         if ("H2".equals(name)) {
-            databaseClient.execute()
+            return databaseClient.execute()
                 .sql("CREATE TABLE IF NOT EXISTS expenditure (expenditure_id INT PRIMARY KEY AUTO_INCREMENT, expenditure_name VARCHAR(255), unit_price INT NOT NULL, quantity INT NOT NULL, " +
                     "expenditure_date DATE NOT NULL)")
                 .then()
                 .then(databaseClient.execute()
                     .sql("CREATE TABLE IF NOT EXISTS income (income_id INT PRIMARY KEY AUTO_INCREMENT, income_name VARCHAR(255), amount INT NOT NULL, income_date DATE NOT NULL)")
-                    .then())
-                .subscribe();
+                    .then());
         } else if ("PostgreSQL".equals(name)) {
-            databaseClient.execute()
+            return databaseClient.execute()
                 .sql("CREATE TABLE IF NOT EXISTS expenditure (expenditure_id SERIAL PRIMARY KEY, expenditure_name VARCHAR(255), unit_price INT NOT NULL, quantity INT NOT NULL, " +
                     "expenditure_date DATE NOT NULL)")
                 .then()
                 .then(databaseClient.execute()
                     .sql("CREATE TABLE IF NOT EXISTS income (income_id SERIAL PRIMARY KEY, income_name VARCHAR(255), amount INT NOT NULL, income_date DATE NOT NULL)")
-                    .then())
-                .subscribe();
+                    .then());
         }
+        return Mono.error(new IllegalStateException(name + " is not supported."));
     }
 ```