upgrade dependencies + code fixes for API changes (#4433)

frameworks/Java/vertx-web/pom.xml

@@ -7,7 +7,7 @@
 
   <groupId>io.vertx</groupId>
   <artifactId>vertx-web-benchmark</artifactId>
-  <version>3.5.4</version>
+  <version>3.6.3</version>
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -17,41 +17,55 @@
     <main.verticle>io.vertx.benchmark.App</main.verticle>
   </properties>
 
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>io.vertx</groupId>
+        <artifactId>vertx-stack-depchain</artifactId>
+        <version>${project.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
   <dependencies>
     <dependency>
       <groupId>io.vertx</groupId>
       <artifactId>vertx-core</artifactId>
-      <version>${project.version}</version>
     </dependency>
 
     <dependency>
       <groupId>io.vertx</groupId>
       <artifactId>vertx-web</artifactId>
-      <version>${project.version}</version>
     </dependency>
 
     <dependency>
       <groupId>io.vertx</groupId>
       <artifactId>vertx-mongo-client</artifactId>
-      <version>${project.version}</version>
     </dependency>
 
     <dependency>
-      <groupId>com.julienviet</groupId>
-      <artifactId>vertx-pg-client</artifactId>
-      <version>0.3.0</version>
+      <groupId>io.reactiverse</groupId>
+      <artifactId>reactive-pg-client</artifactId>
+      <version>0.11.2</version>
     </dependency>
 
     <dependency>
       <groupId>io.vertx</groupId>
       <artifactId>vertx-web-templ-handlebars</artifactId>
-      <version>${project.version}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-transport-native-epoll</artifactId>
+      <classifier>linux-x86_64</classifier>
     </dependency>
 
     <dependency>
       <groupId>com.github.susom</groupId>
       <artifactId>database</artifactId>
-      <version>2.1</version>
+      <version>2.5</version>
     </dependency>
 
     <dependency>
@@ -63,7 +77,7 @@
     <dependency>
       <groupId>com.fasterxml.jackson.module</groupId>
       <artifactId>jackson-module-afterburner</artifactId>
-      <version>2.9.7</version>
+      <version>2.9.8</version>
     </dependency>
 
     <dependency>

frameworks/Java/vertx-web/src/main/conf/vertx.json

@@ -0,0 +1,3 @@
+{
+    "preferNativeTransport": true
+}

frameworks/Java/vertx-web/src/main/java/io/vertx/benchmark/App.java

@@ -6,19 +6,18 @@ import com.github.susom.database.ConfigFrom;
 import com.github.susom.database.DatabaseProviderVertx;
 import com.github.susom.database.DatabaseProviderVertx.Builder;
 import com.github.susom.database.SqlInsert;
-import com.julienviet.pgclient.*;
+import io.reactiverse.pgclient.*;
 import io.vertx.benchmark.model.Fortune;
 import io.vertx.benchmark.model.Message;
 import io.vertx.benchmark.model.World;
 import io.vertx.core.*;
 import io.vertx.core.http.HttpHeaders;
 import io.vertx.core.json.Json;
-import io.vertx.core.json.JsonArray;
 import io.vertx.core.json.JsonObject;
 import io.vertx.ext.mongo.MongoClient;
 import io.vertx.ext.web.Router;
 import io.vertx.ext.web.RoutingContext;
-import io.vertx.ext.web.templ.HandlebarsTemplateEngine;
+import io.vertx.ext.web.templ.handlebars.HandlebarsTemplateEngine;
 
 import java.time.ZonedDateTime;
 import java.time.format.DateTimeFormatter;
@@ -51,7 +50,7 @@ public class App extends AbstractVerticle {
       mongoConfig.remove("password");
 
       this.database = MongoClient.createShared(vertx, mongoConfig);
-      this.engine = HandlebarsTemplateEngine.create();
+      this.engine = HandlebarsTemplateEngine.create(vertx);
     }
 
     public final void dbHandler(final RoutingContext ctx) {
@@ -122,7 +121,7 @@ public class App extends AbstractVerticle {
         ctx.put("fortunes", fortunes);
 
         // and now delegate to the engine to render it.
-        engine.render(ctx, "templates/fortunes.hbs", res -> {
+        engine.render(ctx.data(), "templates/fortunes.hbs", res -> {
           if (res.succeeded()) {
             ctx.response()
                 .putHeader(HttpHeaders.SERVER, SERVER)
@@ -194,123 +193,91 @@ public class App extends AbstractVerticle {
     private static final String SELECT_FORTUNE = "SELECT id, message from FORTUNE";
 
     private final PgClient client;
-    private final PgConnectionPool pool;
 
     // In order to use a template we first need to create an engine
     private final HandlebarsTemplateEngine engine;
 
     public PgClientBenchmark(Vertx vertx, JsonObject config) {
-      PgClientOptions options = new PgClientOptions();
+      PgPoolOptions options = new PgPoolOptions();
       options.setDatabase(config.getString("database"));
       options.setHost(config.getString("host"));
       options.setPort(config.getInteger("port", 5432));
-      options.setUsername(config.getString("username"));
+      options.setUser(config.getString("username"));
       options.setPassword(config.getString("password"));
       options.setCachePreparedStatements(true);
-      client = PgClient.create(vertx, options);
-      pool = client.createPool(new PgPoolOptions().setMode(PoolingMode.STATEMENT));
-      this.engine = HandlebarsTemplateEngine.create();
+      client = PgClient.pool(vertx, new PgPoolOptions(options).setMaxSize(4));
+      this.engine = HandlebarsTemplateEngine.create(vertx);
     }
 
     public final void dbHandler(final RoutingContext ctx) {
-      pool.getConnection(getConnection -> {
-        if (getConnection.failed()) {
-          ctx.fail(getConnection.cause());
-          return;
-        }
-
-        final PgConnection conn = getConnection.result();
-        final PgPreparedStatement worldSelect = conn.prepare(SELECT_WORLD);
-
-        worldSelect.query(randomWorld()).execute(res -> {
-          conn.close();
-          if (res.succeeded()) {
-            final List<JsonArray> resultSet = res.result().getResults();
-            if (resultSet.isEmpty()) {
-              ctx.response()
-                .setStatusCode(404)
-                .end();
-              return;
-            }
-            final JsonArray row = resultSet.get(0);
+      client.preparedQuery(SELECT_WORLD, Tuple.of(randomWorld()), res -> {
+        if (res.succeeded()) {
+          final PgIterator resultSet = res.result().iterator();
+          if (!resultSet.hasNext()) {
             ctx.response()
-              .putHeader(HttpHeaders.SERVER, SERVER)
-              .putHeader(HttpHeaders.DATE, date)
-              .putHeader(HttpHeaders.CONTENT_TYPE, "application/json")
-              .end(Json.encodeToBuffer(new World(row.getInteger(0), row.getInteger(1))));
-          } else {
-            ctx.fail(res.cause());
+              .setStatusCode(404)
+              .end();
+            return;
           }
-        });
+          final Row row = resultSet.next();
+          ctx.response()
+            .putHeader(HttpHeaders.SERVER, SERVER)
+            .putHeader(HttpHeaders.DATE, date)
+            .putHeader(HttpHeaders.CONTENT_TYPE, "application/json")
+            .end(Json.encodeToBuffer(new World(row.getInteger(0), row.getInteger(1))));
+        } else {
+          ctx.fail(res.cause());
+        }
       });
     }
 
     public final void queriesHandler(final RoutingContext ctx) {
 
-      pool.getConnection(getConnection -> {
-        if (getConnection.failed()) {
-          ctx.fail(getConnection.cause());
-          return;
-        }
-
-        final PgConnection conn = getConnection.result();
-        final PgPreparedStatement worldSelect = conn.prepare(SELECT_WORLD);
-        final int queries = Helper.getQueries(ctx.request());
-        final World[] worlds = new World[queries];
-        final boolean[] failed = { false };
-        final int[] cnt = { 0 };
-
-        for (int i = 0; i < queries; i++) {
-          worldSelect.query(randomWorld()).execute(ar -> {
-            if (!failed[0]) {
-              if (ar.failed()) {
-                conn.close();
-                failed[0] = true;
-                ctx.fail(ar.cause());
-                return;
-              }
+      final int queries = Helper.getQueries(ctx.request());
+      final World[] worlds = new World[queries];
+      final boolean[] failed = { false };
+      final int[] cnt = { 0 };
+
+      for (int i = 0; i < queries; i++) {
+        client.preparedQuery(SELECT_WORLD, Tuple.of(randomWorld()), res -> {
+          if (!failed[0]) {
+            if (res.failed()) {
+              failed[0] = true;
+              ctx.fail(res.cause());
+              return;
+            }
 
-              // we need a final reference
-              final JsonArray row = ar.result().getResults().get(0);
-              worlds[cnt[0]++] = new World(row.getInteger(0), row.getInteger(1));
+            // we need a final reference
+            final Row row = res.result().iterator().next();
+            worlds[cnt[0]++] = new World(row.getInteger(0), row.getInteger(1));
 
-              // stop condition
-              if (cnt[0] == queries) {
-                conn.close();
-                ctx.response()
-                  .putHeader(HttpHeaders.SERVER, SERVER)
-                  .putHeader(HttpHeaders.DATE, date)
-                  .putHeader(HttpHeaders.CONTENT_TYPE, "application/json")
-                  .end(Json.encodeToBuffer(worlds));
-              }
+            // stop condition
+            if (cnt[0] == queries) {
+              ctx.response()
+                .putHeader(HttpHeaders.SERVER, SERVER)
+                .putHeader(HttpHeaders.DATE, date)
+                .putHeader(HttpHeaders.CONTENT_TYPE, "application/json")
+                .end(Json.encodeToBuffer(worlds));
             }
-          });
-        }
-      });
+          }
+        });
+      }
     }
 
     public final void fortunesHandler(final RoutingContext ctx) {
 
-      pool.getConnection(getConnection -> {
-        if (getConnection.failed()) {
-          ctx.fail(getConnection.cause());
-          return;
-        }
-
-        final PgConnection conn = getConnection.result();
-        final PgPreparedStatement fortuneSelect = conn.prepare(SELECT_FORTUNE);
-        fortuneSelect.query().execute(ar -> {
-          conn.close();
+      client.preparedQuery(SELECT_FORTUNE, ar -> {
           if (ar.succeeded()) {
-            final List<JsonArray> resultSet = ar.result().getResults();
-            if (resultSet == null || resultSet.size() == 0) {
+            final PgIterator resultSet = ar.result().iterator();
+            if (!resultSet.hasNext()) {
               ctx.fail(404);
               return;
             }
 
-            final List<Fortune> fortunes = new ArrayList<>(resultSet.size() + 1);
+            final List<Fortune> fortunes = new ArrayList<>();
 
-            for (JsonArray row : resultSet) {
+            while (resultSet.hasNext()) {
+                final Row row = resultSet.next();
               fortunes.add(new Fortune(row.getInteger(0), row.getString(1)));
             }
 
@@ -320,7 +287,7 @@ public class App extends AbstractVerticle {
             ctx.put("fortunes", fortunes);
 
             // and now delegate to the engine to render it.
-            engine.render(ctx, "templates", "/fortunes.hbs", res -> {
+            engine.render(ctx.data(), "templates/fortunes.hbs", res -> {
               if (res.succeeded()) {
                 ctx.response()
                         .putHeader(HttpHeaders.SERVER, SERVER)
@@ -335,65 +302,52 @@ public class App extends AbstractVerticle {
             ctx.fail(ar.cause());
           }
         });
-      });
     }
 
     public final void updateHandler(final RoutingContext ctx) {
 
-      pool.getConnection(getConnection -> {
-        if (getConnection.failed()) {
-          ctx.fail(getConnection.cause());
-          return;
-        }
-
-        final PgConnection conn = getConnection.result();
-
-        final PgPreparedStatement worldSelect = conn.prepare(SELECT_WORLD);
-        final int queries = Helper.getQueries(ctx.request());
-        final World[] worlds = new World[queries];
-        final boolean[] failed = { false };
-        final int[] queryCount = { 0 };
-
-        for (int i = 0; i < worlds.length; i++) {
-          int id = randomWorld();
-          worldSelect.query(id).execute(ar2 -> {
-            if (!failed[0]) {
-              if (ar2.failed()) {
-                failed[0] = true;
-                conn.close();
-                ctx.fail(ar2.cause());
-                return;
-              }
-
-              final JsonArray row = ar2.result().getResults().get(0);
-              worlds[queryCount[0]++] = new World(row.getInteger(0), randomWorld());
-
-              if (queryCount[0] == worlds.length) {
-                Arrays.sort(worlds);
-                PgPreparedStatement worldUpdate = conn.prepare(UPDATE_WORLD);
-                PgBatch batch = worldUpdate.batch();
-
-                for (World world : worlds) {
-                  batch.add(world.getRandomNumber(), world.getId());
-                }
-                batch.execute(ar3 -> {
-                  conn.close();
-                  if (ar3.failed()) {
-                    ctx.fail(ar3.cause());
-                    return;
-                  }
-
-                  ctx.response()
-                    .putHeader(HttpHeaders.SERVER, SERVER)
-                    .putHeader(HttpHeaders.DATE, date)
-                    .putHeader(HttpHeaders.CONTENT_TYPE, "application/json")
-                    .end(Json.encodeToBuffer(worlds));
-                });
-              }
-            }
-          });
-        }
-      });
+         final int queries = Helper.getQueries(ctx.request());
+         final World[] worlds = new World[queries];
+         final boolean[] failed = { false };
+         final int[] queryCount = { 0 };
+
+         for (int i = 0; i < worlds.length; i++) {
+           int id = randomWorld();
+           client.preparedQuery(SELECT_WORLD, Tuple.of(id), ar2 -> {
+             if (!failed[0]) {
+               if (ar2.failed()) {
+                 failed[0] = true;
+                 ctx.fail(ar2.cause());
+                 return;
+               }
+
+               final Row row = ar2.result().iterator().next();
+               worlds[queryCount[0]++] = new World(row.getInteger(0), randomWorld());
+
+               if (queryCount[0] == worlds.length) {
+                 Arrays.sort(worlds);
+                 List<Tuple> batch = new ArrayList<>();
+
+                 for (World world : worlds) {
+                   batch.add(Tuple.of(world.getRandomNumber(), world.getId()));
+                 }
+
+                 client.preparedBatch(UPDATE_WORLD, batch, ar3 -> {
+                   if (ar3.failed()) {
+                     ctx.fail(ar3.cause());
+                     return;
+                   }
+
+                   ctx.response()
+                     .putHeader(HttpHeaders.SERVER, SERVER)
+                     .putHeader(HttpHeaders.DATE, date)
+                     .putHeader(HttpHeaders.CONTENT_TYPE, "application/json")
+                     .end(Json.encodeToBuffer(worlds));
+                 });
+               }
+             }
+           });
+         }
     }
   }
 
@@ -414,7 +368,7 @@ public class App extends AbstractVerticle {
           .value("database.url", "jdbc:postgresql://" + jsonConfig.getString("host") + "/" + jsonConfig.getString("database"))
           .get();
       dbBuilder = DatabaseProviderVertx.pooledBuilder(vertx, config);
-      engine = HandlebarsTemplateEngine.create();
+      engine = HandlebarsTemplateEngine.create(vertx);
     }
 
     void dbHandler(final RoutingContext ctx) {
@@ -482,7 +436,7 @@ public class App extends AbstractVerticle {
             ctx.fail(404);
           } else {
             ctx.put("fortunes", call.result());
-            engine.render(ctx, "templates/fortunes.hbs", res -> {
+            engine.render(ctx.data(), "templates/fortunes.hbs", res -> {
               if (res.succeeded()) {
                 ctx.response()
                     .putHeader(HttpHeaders.SERVER, SERVER)

frameworks/Java/vertx-web/vertx-web-mongodb.dockerfile

@@ -16,9 +16,12 @@ CMD java \
     -Dvertx.threadChecks=false                        \
     -Dvertx.disableContextTimings=true                \
     -Dvertx.disableTCCL=true                          \
+    -Dvertx.disableHttpHeadersValidation=true         \
     -jar                                              \
-    target/vertx-web-benchmark-3.5.4-fat.jar          \
+    target/vertx-web-benchmark-3.6.3-fat.jar          \
     --instances                                       \
     `grep --count ^processor /proc/cpuinfo`           \
     --conf                                            \
-    src/main/conf/config.json
+    src/main/conf/config.json                         \
+    --options                                         \
+    src/main/conf/vertx.json

frameworks/Java/vertx-web/vertx-web-postgres.dockerfile

@@ -16,9 +16,12 @@ CMD java \
     -Dvertx.threadChecks=false                        \
     -Dvertx.disableContextTimings=true                \
     -Dvertx.disableTCCL=true                          \
+    -Dvertx.disableHttpHeadersValidation=true         \
     -jar                                              \
-    target/vertx-web-benchmark-3.5.4-fat.jar          \
+    target/vertx-web-benchmark-3.6.3-fat.jar          \
     --instances                                       \
     `grep --count ^processor /proc/cpuinfo`           \
     --conf                                            \
-    src/main/conf/config.json
+    src/main/conf/config.json                         \
+    --options                                         \
+    src/main/conf/vertx.json

frameworks/Java/vertx-web/vertx-web-susom-postgres.dockerfile

@@ -16,9 +16,12 @@ CMD java \
     -Dvertx.threadChecks=false                        \
     -Dvertx.disableContextTimings=true                \
     -Dvertx.disableTCCL=true                          \
+    -Dvertx.disableHttpHeadersValidation=true         \
     -jar                                              \
-    target/vertx-web-benchmark-3.5.4-fat.jar          \
+    target/vertx-web-benchmark-3.6.3-fat.jar          \
     --instances                                       \
     `grep --count ^processor /proc/cpuinfo`           \
     --conf                                            \
-    src/main/conf/config.json
+    src/main/conf/config.json                         \
+    --options                                         \
+    src/main/conf/vertx.json

frameworks/Java/vertx-web/vertx-web.dockerfile

@@ -16,9 +16,12 @@ CMD java \
     -Dvertx.threadChecks=false                        \
     -Dvertx.disableContextTimings=true                \
     -Dvertx.disableTCCL=true                          \
+    -Dvertx.disableHttpHeadersValidation=true         \
     -jar                                              \
-    target/vertx-web-benchmark-3.5.4-fat.jar          \
+    target/vertx-web-benchmark-3.6.3-fat.jar          \
     --instances                                       \
     `grep --count ^processor /proc/cpuinfo`           \
     --conf                                            \
-    src/main/conf/config.json
+    src/main/conf/config.json                         \
+    --options                                         \
+    src/main/conf/vertx.json