PgConnectionImpl does not need an options supplier for one-shot conne…

…ctions Follows-up on #1306 Signed-off-by: Thomas Segismont <[email protected]>
eclipse-vertx · Apr 21, 2023 · cc83994 · cc83994
1 parent d542a61
commit cc83994
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/vertx-pg-client/src/main/java/io/vertx/pgclient/PgConnection.java b/vertx-pg-client/src/main/java/io/vertx/pgclient/PgConnection.java
@@ -17,12 +17,15 @@
 
 package io.vertx.pgclient;
 
+import io.vertx.codegen.annotations.Fluent;
+import io.vertx.codegen.annotations.VertxGen;
+import io.vertx.core.AsyncResult;
+import io.vertx.core.Future;
+import io.vertx.core.Handler;
+import io.vertx.core.Vertx;
 import io.vertx.core.impl.ContextInternal;
 import io.vertx.pgclient.impl.PgConnectionImpl;
 import io.vertx.sqlclient.SqlConnection;
-import io.vertx.codegen.annotations.Fluent;
-import io.vertx.codegen.annotations.VertxGen;
-import io.vertx.core.*;
 
 /**
  * A connection to Postgres.
@@ -52,7 +55,7 @@ public interface PgConnection extends SqlConnection {
    * @return a future notified with the connection or the failure
    */
   static Future<PgConnection> connect(Vertx vertx, PgConnectOptions options) {
-    return PgConnectionImpl.connect((ContextInternal) vertx.getOrCreateContext(), () -> options);
+    return PgConnectionImpl.connect((ContextInternal) vertx.getOrCreateContext(), options);
   }
 
   /**

diff --git a/vertx-pg-client/src/main/java/io/vertx/pgclient/impl/PgConnectionImpl.java b/vertx-pg-client/src/main/java/io/vertx/pgclient/impl/PgConnectionImpl.java
@@ -30,18 +30,16 @@
 import io.vertx.sqlclient.impl.SocketConnectionBase;
 import io.vertx.sqlclient.impl.SqlConnectionBase;
 
-import java.util.function.Supplier;
-
 public class PgConnectionImpl extends SqlConnectionBase<PgConnectionImpl> implements PgConnection  {
 
-  public static Future<PgConnection> connect(ContextInternal context, Supplier<PgConnectOptions> options) {
+  public static Future<PgConnection> connect(ContextInternal context, PgConnectOptions options) {
     PgConnectionFactory client;
     try {
       client = new PgConnectionFactory(context.owner());
     } catch (Exception e) {
       return context.failedFuture(e);
     }
-    return prepareForClose(context, client.connect(context, options.get())).map(PgConnection::cast);
+    return prepareForClose(context, client.connect(context, options)).map(PgConnection::cast);
   }
 
   private volatile Handler<PgNotification> notificationHandler;