Merge pull request #1496 from tsegismont/avoid-deprecated-pgpool

Avoid deprecated PgPool type in quickstarts

Author: geoand

getting-started-reactive-crud/src/main/java/org/acme/reactive/crud/DBInit.java

@@ -1,7 +1,7 @@
 package org.acme.reactive.crud;
 
 import io.quarkus.runtime.StartupEvent;
-import io.vertx.mutiny.pgclient.PgPool;
+import io.vertx.mutiny.sqlclient.Pool;
 import org.eclipse.microprofile.config.inject.ConfigProperty;
 
 import jakarta.enterprise.context.ApplicationScoped;
@@ -10,10 +10,10 @@
 @ApplicationScoped
 public class DBInit {
 
-    private final PgPool client;
+    private final Pool client;
     private final boolean schemaCreate;
 
-    public DBInit(PgPool client, @ConfigProperty(name = "myapp.schema.create", defaultValue = "true") boolean schemaCreate) {
+    public DBInit(Pool client, @ConfigProperty(name = "myapp.schema.create", defaultValue = "true") boolean schemaCreate) {
         this.client = client;
         this.schemaCreate = schemaCreate;
     }

getting-started-reactive-crud/src/main/java/org/acme/reactive/crud/Fruit.java

@@ -18,7 +18,7 @@
 
 import io.smallrye.mutiny.Multi;
 import io.smallrye.mutiny.Uni;
-import io.vertx.mutiny.pgclient.PgPool;
+import io.vertx.mutiny.sqlclient.Pool;
 import io.vertx.mutiny.sqlclient.Row;
 import io.vertx.mutiny.sqlclient.RowSet;
 import io.vertx.mutiny.sqlclient.Tuple;
@@ -42,29 +42,29 @@ public Fruit(Long id, String name) {
         this.name = name;
     }
 
-    public static Multi<Fruit> findAll(PgPool client) {
+    public static Multi<Fruit> findAll(Pool client) {
         return client.query("SELECT id, name FROM fruits ORDER BY name ASC").execute()
                 .onItem().transformToMulti(set -> Multi.createFrom().iterable(set))
                 .onItem().transform(Fruit::from);
     }
 
-    public static Uni<Fruit> findById(PgPool client, Long id) {
+    public static Uni<Fruit> findById(Pool client, Long id) {
         return client.preparedQuery("SELECT id, name FROM fruits WHERE id = $1").execute(Tuple.of(id))
                 .onItem().transform(RowSet::iterator)
                 .onItem().transform(iterator -> iterator.hasNext() ? from(iterator.next()) : null);
     }
 
-    public Uni<Long> save(PgPool client) {
+    public Uni<Long> save(Pool client) {
         return client.preparedQuery("INSERT INTO fruits (name) VALUES ($1) RETURNING id").execute(Tuple.of(name))
                 .onItem().transform(pgRowSet -> pgRowSet.iterator().next().getLong("id"));
     }
 
-    public Uni<Boolean> update(PgPool client) {
+    public Uni<Boolean> update(Pool client) {
         return client.preparedQuery("UPDATE fruits SET name = $1 WHERE id = $2").execute(Tuple.of(name, id))
                 .onItem().transform(pgRowSet -> pgRowSet.rowCount() == 1);
     }
 
-    public static Uni<Boolean> delete(PgPool client, Long id) {
+    public static Uni<Boolean> delete(Pool client, Long id) {
         return client.preparedQuery("DELETE FROM fruits WHERE id = $1").execute(Tuple.of(id))
                 .onItem().transform(pgRowSet -> pgRowSet.rowCount() == 1);
     }

getting-started-reactive-crud/src/main/java/org/acme/reactive/crud/FruitResource.java

@@ -29,14 +29,14 @@
 
 import io.smallrye.mutiny.Multi;
 import io.smallrye.mutiny.Uni;
-import io.vertx.mutiny.pgclient.PgPool;
+import io.vertx.mutiny.sqlclient.Pool;
 
 @Path("fruits")
 public class FruitResource {
 
-    private final PgPool client;
+    private final Pool client;
 
-    public FruitResource(PgPool client) {
+    public FruitResource(Pool client) {
         this.client = client;
     }
 

vertx-quickstart/src/main/java/org/acme/extra/Fruit.java

@@ -4,7 +4,7 @@
 import java.util.List;
 
 import io.smallrye.mutiny.Uni;
-import io.vertx.mutiny.pgclient.PgPool;
+import io.vertx.mutiny.sqlclient.Pool;
 import io.vertx.mutiny.sqlclient.Row;
 import io.vertx.mutiny.sqlclient.RowSet;
 import io.vertx.mutiny.sqlclient.Tuple;
@@ -28,7 +28,7 @@ public Fruit(Long id, String name) {
         this.name = name;
     }
 
-    public static Uni<List<Fruit>> findAll(PgPool client) {
+    public static Uni<List<Fruit>> findAll(Pool client) {
         return client.query("SELECT id, name FROM fruits ORDER BY name ASC").execute()
                 .onItem().transform(pgRowSet -> {
                     List<Fruit> list = new ArrayList<>(pgRowSet.size());
@@ -39,23 +39,23 @@ public static Uni<List<Fruit>> findAll(PgPool client) {
                 });
     }
 
-    public static Uni<Fruit> findById(PgPool client, Long id) {
+    public static Uni<Fruit> findById(Pool client, Long id) {
         return client.preparedQuery("SELECT id, name FROM fruits WHERE id = $1").execute(Tuple.of(id))
                 .onItem().transform(RowSet::iterator)
                 .onItem().transform(iterator -> iterator.hasNext() ? from(iterator.next()) : null);
     }
 
-    public Uni<Long> save(PgPool client) {
+    public Uni<Long> save(Pool client) {
         return client.preparedQuery("INSERT INTO fruits (name) VALUES ($1) RETURNING (id)").execute(Tuple.of(name))
                 .onItem().transform(pgRowSet -> pgRowSet.iterator().next().getLong("id"));
     }
 
-    public Uni<Boolean> update(PgPool client) {
+    public Uni<Boolean> update(Pool client) {
         return client.preparedQuery("UPDATE fruits SET name = $1 WHERE id = $2").execute(Tuple.of(name, id))
                 .onItem().transform(pgRowSet -> pgRowSet.rowCount() == 1);
     }
 
-    public static Uni<Boolean> delete(PgPool client, Long id) {
+    public static Uni<Boolean> delete(Pool client, Long id) {
         return client.preparedQuery("DELETE FROM fruits WHERE id = $1").execute(Tuple.of(id))
                 .onItem().transform(pgRowSet -> pgRowSet.rowCount() == 1);
     }

vertx-quickstart/src/main/java/org/acme/extra/FruitResource.java

@@ -16,15 +16,15 @@
 
 import io.quarkus.runtime.StartupEvent;
 import io.smallrye.mutiny.Uni;
-import io.vertx.mutiny.pgclient.PgPool;
+import io.vertx.mutiny.sqlclient.Pool;
 
 @Path("fruits")
 public class FruitResource {
 
-    private final PgPool client;
+    private final Pool client;
     private final boolean schemaCreate;
 
-    public FruitResource(PgPool client, @ConfigProperty(name = "myapp.schema.create", defaultValue = "true") boolean schemaCreate) {
+    public FruitResource(Pool client, @ConfigProperty(name = "myapp.schema.create", defaultValue = "true") boolean schemaCreate) {
         this.client = client;
         this.schemaCreate = schemaCreate;
     }