From 2c3bd5b1381e7f448434b7b9831f5220eeebe4ac Mon Sep 17 00:00:00 2001 From: Thomas Segismont Date: Fri, 31 Jan 2025 15:37:56 +0100 Subject: [PATCH] Avoid deprecated PgPool type in quickstarts PgPool is deprecated in Vert.x 4 and is going away in Vert.x 5. Quickstarts should use the base Pool type instead. --- .../src/main/java/org/acme/reactive/crud/DBInit.java | 6 +++--- .../src/main/java/org/acme/reactive/crud/Fruit.java | 12 ++++++------ .../java/org/acme/reactive/crud/FruitResource.java | 6 +++--- .../src/main/java/org/acme/extra/Fruit.java | 12 ++++++------ .../src/main/java/org/acme/extra/FruitResource.java | 6 +++--- 5 files changed, 21 insertions(+), 21 deletions(-) diff --git a/getting-started-reactive-crud/src/main/java/org/acme/reactive/crud/DBInit.java b/getting-started-reactive-crud/src/main/java/org/acme/reactive/crud/DBInit.java index 56eec02831..8014771b1c 100644 --- a/getting-started-reactive-crud/src/main/java/org/acme/reactive/crud/DBInit.java +++ b/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; } diff --git a/getting-started-reactive-crud/src/main/java/org/acme/reactive/crud/Fruit.java b/getting-started-reactive-crud/src/main/java/org/acme/reactive/crud/Fruit.java index fdc3397b2e..f7deb77f54 100644 --- a/getting-started-reactive-crud/src/main/java/org/acme/reactive/crud/Fruit.java +++ b/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 findAll(PgPool client) { + public static Multi 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 findById(PgPool client, Long id) { + public static Uni 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 save(PgPool client) { + public Uni 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 update(PgPool client) { + public Uni 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 delete(PgPool client, Long id) { + public static Uni delete(Pool client, Long id) { return client.preparedQuery("DELETE FROM fruits WHERE id = $1").execute(Tuple.of(id)) .onItem().transform(pgRowSet -> pgRowSet.rowCount() == 1); } diff --git a/getting-started-reactive-crud/src/main/java/org/acme/reactive/crud/FruitResource.java b/getting-started-reactive-crud/src/main/java/org/acme/reactive/crud/FruitResource.java index c13bd6748a..33d4b45215 100644 --- a/getting-started-reactive-crud/src/main/java/org/acme/reactive/crud/FruitResource.java +++ b/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; } diff --git a/vertx-quickstart/src/main/java/org/acme/extra/Fruit.java b/vertx-quickstart/src/main/java/org/acme/extra/Fruit.java index 224a461285..97ecd05e2a 100644 --- a/vertx-quickstart/src/main/java/org/acme/extra/Fruit.java +++ b/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> findAll(PgPool client) { + public static Uni> findAll(Pool client) { return client.query("SELECT id, name FROM fruits ORDER BY name ASC").execute() .onItem().transform(pgRowSet -> { List list = new ArrayList<>(pgRowSet.size()); @@ -39,23 +39,23 @@ public static Uni> findAll(PgPool client) { }); } - public static Uni findById(PgPool client, Long id) { + public static Uni 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 save(PgPool client) { + public Uni 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 update(PgPool client) { + public Uni 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 delete(PgPool client, Long id) { + public static Uni delete(Pool client, Long id) { return client.preparedQuery("DELETE FROM fruits WHERE id = $1").execute(Tuple.of(id)) .onItem().transform(pgRowSet -> pgRowSet.rowCount() == 1); } diff --git a/vertx-quickstart/src/main/java/org/acme/extra/FruitResource.java b/vertx-quickstart/src/main/java/org/acme/extra/FruitResource.java index 45113e6553..a5bb5bdffe 100644 --- a/vertx-quickstart/src/main/java/org/acme/extra/FruitResource.java +++ b/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; }