Issue helidon-io#7187 - Fix examples to handle transactions in try/ca…

…tch blocks, so the transaction is always either committed or rolled-back Signed-off-by: Tomáš Kraus <tomas.kraus@oracle.com>
Tomas-Kraus · Jul 21, 2023 · 24475c2 · 24475c2
1 parent fb7585c
commit 24475c2
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 15 deletions.
diff --git a/...ient/common/src/main/java/io/helidon/examples/dbclient/common/AbstractPokemonService.java b/...ient/common/src/main/java/io/helidon/examples/dbclient/common/AbstractPokemonService.java
@@ -159,15 +159,20 @@ private void updatePokemonType(ServerRequest req, ServerResponse res) {
     private void transactional(ServerRequest req, ServerResponse res) {
         Pokemon pokemon = req.content().as(Pokemon.class);
         DbTransaction tx = dbClient.transaction();
-        long count = tx.createNamedGet("select-for-update")
-                .namedParam(pokemon)
-                .execute()
-                .map(dbRow -> tx.createNamedUpdate("update")
-                        .namedParam(pokemon)
-                        .execute())
-                .orElse(0L);
-        tx.commit();
-        res.send("Updated " + count + " records");
+        try {
+            long count = tx.createNamedGet("select-for-update")
+                    .namedParam(pokemon)
+                    .execute()
+                    .map(dbRow -> tx.createNamedUpdate("update")
+                            .namedParam(pokemon)
+                            .execute())
+                    .orElse(0L);
+            tx.commit();
+            res.send("Updated " + count + " records");
+        } catch (Throwable t) {
+            tx.rollback();
+            throw t;
+        }
     }
 
     /**

diff --git a/...s/dbclient/pokemons/src/main/java/io/helidon/examples/dbclient/pokemons/InitializeDb.java b/...s/dbclient/pokemons/src/main/java/io/helidon/examples/dbclient/pokemons/InitializeDb.java
@@ -17,6 +17,7 @@
 
 import io.helidon.dbclient.DbClient;
 import io.helidon.dbclient.DbExecute;
+import io.helidon.dbclient.DbTransaction;
 
 import jakarta.json.Json;
 import jakarta.json.JsonArray;
@@ -82,9 +83,15 @@ private static void initSchema(DbClient dbClient) {
      */
     private static void initData(DbClient dbClient) {
         // Init Pokémon types
-        DbExecute exec = dbClient.execute();
-        initTypes(exec);
-        initPokemons(exec);
+        DbTransaction tx = dbClient.transaction();
+        try {
+            initTypes(tx);
+            initPokemons(tx);
+            tx.commit();
+        } catch (Throwable t) {
+            tx.rollback();
+            throw t;
+        }
     }
 
     /**
@@ -93,9 +100,15 @@ private static void initData(DbClient dbClient) {
      * @param dbClient database client
      */
     private static void deleteData(DbClient dbClient) {
-        DbExecute exec = dbClient.execute();
-        exec.namedDelete("delete-all-pokemons");
-        exec.namedDelete("delete-all-types");
+        DbTransaction tx = dbClient.transaction();
+        try {
+            tx.namedDelete("delete-all-pokemons");
+            tx.namedDelete("delete-all-types");
+            tx.commit();
+        } catch (Throwable t) {
+            tx.rollback();
+            throw t;
+        }
     }
 
     /**