Connect auto retry does actually retry one more time than expected - fixes #1102

Author: vietj

vertx-db2-client/src/test/java/io/vertx/db2client/tck/ClientConfig.java

@@ -38,7 +38,7 @@ public Connector<SqlConnection> connect(Vertx vertx, SqlConnectOptions options)
       return new Connector<SqlConnection>() {
         @Override
         public void connect(Handler<AsyncResult<SqlConnection>> handler) {
-          DB2Connection.connect(vertx, new DB2ConnectOptions(options.toJson()), ar -> {
+          DB2Connection.connect(vertx, new DB2ConnectOptions(options), ar -> {
             if (ar.succeeded()) {
               handler.handle(Future.succeededFuture(ar.result()));
             } else {
@@ -57,7 +57,7 @@ public void close() {
   POOLED() {
     @Override
     public Connector<SqlConnection> connect(Vertx vertx, SqlConnectOptions options) {
-      DB2Pool pool = DB2Pool.pool(vertx, new DB2ConnectOptions(options.toJson()), new PoolOptions().setMaxSize(1));
+      DB2Pool pool = DB2Pool.pool(vertx, new DB2ConnectOptions(options), new PoolOptions().setMaxSize(1));
       return new Connector<SqlConnection>() {
         @Override
         public void connect(Handler<AsyncResult<SqlConnection>> handler) {

vertx-mssql-client/src/test/java/io/vertx/mssqlclient/tck/ClientConfig.java

@@ -32,7 +32,7 @@ Connector<SqlConnection> connect(Vertx vertx, SqlConnectOptions options) {
         @Override
         public void connect(Handler<AsyncResult<SqlConnection>> handler) {
           //TODO remove this when we have data object support for connect options
-          MSSQLConnectOptions connectOptions = new MSSQLConnectOptions(options.toJson());
+          MSSQLConnectOptions connectOptions = new MSSQLConnectOptions(options);
           MSSQLConnection.connect(vertx, connectOptions, ar -> {
             if (ar.succeeded()) {
               handler.handle(Future.succeededFuture(ar.result()));
@@ -52,7 +52,7 @@ public void close() {
   POOLED() {
     @Override
     Connector<SqlClient> connect(Vertx vertx, SqlConnectOptions options) {
-      MSSQLPool pool = MSSQLPool.pool(vertx, new MSSQLConnectOptions(options.toJson()), new PoolOptions().setMaxSize(1));
+      MSSQLPool pool = MSSQLPool.pool(vertx, new MSSQLConnectOptions(options), new PoolOptions().setMaxSize(1));
       return new Connector<SqlClient>() {
         @Override
         public void connect(Handler<AsyncResult<SqlClient>> handler) {

vertx-mysql-client/src/test/java/io/vertx/mysqlclient/tck/ClientConfig.java

@@ -37,7 +37,7 @@ Connector<SqlConnection> connect(Vertx vertx, SqlConnectOptions options) {
       return new Connector<SqlConnection>() {
         @Override
         public void connect(Handler<AsyncResult<SqlConnection>> handler) {
-          MySQLConnection.connect(vertx, new MySQLConnectOptions(options.toJson()), ar -> {
+          MySQLConnection.connect(vertx, new MySQLConnectOptions(options), ar -> {
             if (ar.succeeded()) {
               handler.handle(Future.succeededFuture(ar.result()));
             } else {
@@ -56,7 +56,7 @@ public void close() {
   POOLED() {
     @Override
     Connector<SqlConnection> connect(Vertx vertx, SqlConnectOptions options) {
-      MySQLPool pool = MySQLPool.pool(vertx, new MySQLConnectOptions(options.toJson()), new PoolOptions().setMaxSize(1));
+      MySQLPool pool = MySQLPool.pool(vertx, new MySQLConnectOptions(options), new PoolOptions().setMaxSize(1));
       return new Connector<SqlConnection>() {
         @Override
         public void connect(Handler<AsyncResult<SqlConnection>> handler) {

vertx-oracle-client/src/test/java/io/vertx/oracleclient/test/tck/ClientConfig.java

@@ -32,7 +32,7 @@ Connector<SqlConnection> connect(Vertx vertx, SqlConnectOptions options) {
 
         @Override
         public void connect(Handler<AsyncResult<SqlConnection>> handler) {
-          factory = new OracleConnectionFactory((VertxInternal) vertx, new OracleConnectOptions(options.toJson()), new PoolOptions().setMaxSize(1), null, null);
+          factory = new OracleConnectionFactory((VertxInternal) vertx, new OracleConnectOptions(options), new PoolOptions().setMaxSize(1), null, null);
           Context context = vertx.getOrCreateContext();
           factory.connect(context).onComplete(handler);
         }
@@ -51,7 +51,7 @@ public void close() {
     @Override
     Connector<SqlConnection> connect(Vertx vertx, SqlConnectOptions options) {
       OraclePool pool = OraclePool
-        .pool(vertx, new OracleConnectOptions(options.toJson()), new PoolOptions().setMaxSize(5));
+        .pool(vertx, new OracleConnectOptions(options), new PoolOptions().setMaxSize(5));
       return new Connector<>() {
         @Override
         public void connect(Handler<AsyncResult<SqlConnection>> handler) {

vertx-pg-client/src/test/java/io/vertx/pgclient/tck/ClientConfig.java

@@ -36,7 +36,7 @@ Connector<PgConnection> connect(Vertx vertx, SqlConnectOptions options) {
       return new Connector<PgConnection>() {
         @Override
         public void connect(Handler<AsyncResult<PgConnection>> handler) {
-          PgConnection.connect(vertx, new PgConnectOptions(options.toJson()), ar -> {
+          PgConnection.connect(vertx, new PgConnectOptions(options), ar -> {
             if (ar.succeeded()) {
               handler.handle(Future.succeededFuture(ar.result()));
             } else {
@@ -54,7 +54,7 @@ public void close() {
   POOLED() {
     @Override
     Connector<SqlClient> connect(Vertx vertx, SqlConnectOptions options) {
-      PgPool pool = PgPool.pool(vertx, new PgConnectOptions(options.toJson()), new PoolOptions().setMaxSize(1));
+      PgPool pool = PgPool.pool(vertx, new PgConnectOptions(options), new PoolOptions().setMaxSize(1));
       return new Connector<SqlClient>() {
         @Override
         public void connect(Handler<AsyncResult<SqlClient>> handler) {

vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/ConnectionFactoryBase.java

@@ -102,7 +102,7 @@ private void doConnectWithRetry(SocketAddress server, String username, String pa
       if (ar.succeeded()) {
         promise.complete(ar.result());
       } else {
-        if (remainingAttempts >= 0) {
+        if (remainingAttempts > 0) {
           ctx.owner().setTimer(reconnectInterval, id -> {
             doConnectWithRetry(server, username, password, database, promise, remainingAttempts - 1);
           });