Update undertow's dependencies, other minor cleanup (#3140)

frameworks/Java/undertow/pom.xml

@@ -13,14 +13,14 @@
     <maven.compiler.source>1.8</maven.compiler.source>
     <maven.compiler.target>1.8</maven.compiler.target>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <version.hikaricp>2.6.1</version.hikaricp>
-    <version.jackson>2.8.8.1</version.jackson>
-    <version.maven-shade-plugin>3.0.0</version.maven-shade-plugin>
-    <version.mongodb>3.4.2</version.mongodb>
-    <version.mustache>0.9.4</version.mustache>
-    <version.mysql>5.1.41</version.mysql>
-    <version.postgresql>9.4.1212</version.postgresql>
-    <version.undertow>1.4.13.Final</version.undertow>
+    <version.hikaricp>2.7.4</version.hikaricp>
+    <version.jackson>2.9.2</version.jackson>
+    <version.maven-shade-plugin>3.1.0</version.maven-shade-plugin>
+    <version.mongodb>3.6.0</version.mongodb>
+    <version.mustache>0.9.5</version.mustache>
+    <version.mysql>5.1.45</version.mysql>
+    <version.postgresql>42.1.4</version.postgresql>
+    <version.undertow>1.4.21.Final</version.undertow>
   </properties>
 
   <prerequisites>

frameworks/Java/undertow/src/main/java/hello/DbMongoAsyncHandler.java

@@ -1,6 +1,6 @@
 package hello;
 
-import static hello.Helper.randomWorld;
+import static hello.Helper.randomWorldNumber;
 import static hello.Helper.sendException;
 import static hello.Helper.sendJson;
 
@@ -25,7 +25,7 @@ final class DbMongoAsyncHandler implements HttpHandler {
   @Override
   public void handleRequest(HttpServerExchange exchange) {
     worldCollection
-        .find(Filters.eq(randomWorld()))
+        .find(Filters.eq(randomWorldNumber()))
         .map(Helper::mongoDocumentToWorld)
         .first(
             (world, exception) -> {

frameworks/Java/undertow/src/main/java/hello/DbMongoHandler.java

@@ -1,6 +1,6 @@
 package hello;
 
-import static hello.Helper.randomWorld;
+import static hello.Helper.randomWorldNumber;
 import static hello.Helper.sendJson;
 
 import com.mongodb.client.MongoCollection;
@@ -24,7 +24,7 @@ final class DbMongoHandler implements HttpHandler {
   public void handleRequest(HttpServerExchange exchange) {
     World world =
         worldCollection
-            .find(Filters.eq(randomWorld()))
+            .find(Filters.eq(randomWorldNumber()))
             .map(Helper::mongoDocumentToWorld)
             .first();
     sendJson(exchange, world);

frameworks/Java/undertow/src/main/java/hello/DbSqlHandler.java

@@ -1,6 +1,6 @@
 package hello;
 
-import static hello.Helper.randomWorld;
+import static hello.Helper.randomWorldNumber;
 import static hello.Helper.sendJson;
 
 import io.undertow.server.HttpHandler;
@@ -27,7 +27,7 @@ final class DbSqlHandler implements HttpHandler {
     try (Connection connection = db.getConnection();
          PreparedStatement statement =
              connection.prepareStatement("SELECT * FROM World WHERE id = ?")) {
-      statement.setInt(1, randomWorld());
+      statement.setInt(1, randomWorldNumber());
       try (ResultSet resultSet = statement.executeQuery()) {
         resultSet.next();
         int id = resultSet.getInt("id");

frameworks/Java/undertow/src/main/java/hello/Helper.java

@@ -53,7 +53,7 @@ final class Helper {
    *
    * @return a random world number
    */
-  static int randomWorld() {
+  static int randomWorldNumber() {
     return 1 + ThreadLocalRandom.current().nextInt(10000);
   }
 

frameworks/Java/undertow/src/main/java/hello/QueriesMongoAsyncHandler.java

@@ -1,7 +1,7 @@
 package hello;
 
 import static hello.Helper.getQueries;
-import static hello.Helper.randomWorld;
+import static hello.Helper.randomWorldNumber;
 import static hello.Helper.sendException;
 import static hello.Helper.sendJson;
 
@@ -37,7 +37,7 @@ final class QueriesMongoAsyncHandler implements HttpHandler {
   }
 
   private CompletableFuture<World[]> nWorlds(int n) {
-    @SuppressWarnings("unchecked")
+    @SuppressWarnings({ "unchecked", "rawtypes" })
     CompletableFuture<World>[] futures = new CompletableFuture[n];
     for (int i = 0; i < futures.length; i++) {
       futures[i] = oneWorld();
@@ -55,7 +55,7 @@ final class QueriesMongoAsyncHandler implements HttpHandler {
   private CompletableFuture<World> oneWorld() {
     CompletableFuture<World> future = new CompletableFuture<>();
     worldCollection
-        .find(Filters.eq(randomWorld()))
+        .find(Filters.eq(randomWorldNumber()))
         .map(Helper::mongoDocumentToWorld)
         .first(
             (world, exception) -> {

frameworks/Java/undertow/src/main/java/hello/QueriesMongoHandler.java

@@ -1,7 +1,7 @@
 package hello;
 
 import static hello.Helper.getQueries;
-import static hello.Helper.randomWorld;
+import static hello.Helper.randomWorldNumber;
 import static hello.Helper.sendJson;
 
 import com.mongodb.client.MongoCollection;
@@ -28,7 +28,7 @@ final class QueriesMongoHandler implements HttpHandler {
     for (int i = 0; i < worlds.length; i++) {
       worlds[i] =
           worldCollection
-              .find(Filters.eq(randomWorld()))
+              .find(Filters.eq(randomWorldNumber()))
               .map(Helper::mongoDocumentToWorld)
               .first();
     }

frameworks/Java/undertow/src/main/java/hello/QueriesSqlHandler.java

@@ -1,7 +1,7 @@
 package hello;
 
 import static hello.Helper.getQueries;
-import static hello.Helper.randomWorld;
+import static hello.Helper.randomWorldNumber;
 import static hello.Helper.sendJson;
 
 import io.undertow.server.HttpHandler;
@@ -30,7 +30,7 @@ final class QueriesSqlHandler implements HttpHandler {
          PreparedStatement statement =
              connection.prepareStatement("SELECT * FROM World WHERE id = ?")) {
       for (int i = 0; i < worlds.length; i++) {
-        statement.setInt(1, randomWorld());
+        statement.setInt(1, randomWorldNumber());
         try (ResultSet resultSet = statement.executeQuery()) {
           resultSet.next();
           int id = resultSet.getInt("id");

frameworks/Java/undertow/src/main/java/hello/UpdatesMongoAsyncHandler.java

@@ -1,7 +1,7 @@
 package hello;
 
 import static hello.Helper.getQueries;
-import static hello.Helper.randomWorld;
+import static hello.Helper.randomWorldNumber;
 import static hello.Helper.sendException;
 import static hello.Helper.sendJson;
 
@@ -47,7 +47,7 @@ final class UpdatesMongoAsyncHandler implements HttpHandler {
         worlds -> {
           List<WriteModel<Document>> writes = new ArrayList<>(worlds.length);
           for (World world : worlds) {
-            world.randomNumber = randomWorld();
+            world.randomNumber = randomWorldNumber();
             Bson filter = Filters.eq(world.id);
             Bson update = Updates.set("randomNumber", world.randomNumber);
             writes.add(new UpdateOneModel<>(filter, update));
@@ -67,7 +67,7 @@ final class UpdatesMongoAsyncHandler implements HttpHandler {
   }
 
   private CompletableFuture<World[]> nWorlds(int n) {
-    @SuppressWarnings("unchecked")
+    @SuppressWarnings({ "unchecked", "rawtypes" })
     CompletableFuture<World>[] futures = new CompletableFuture[n];
     for (int i = 0; i < futures.length; i++) {
       futures[i] = oneWorld();
@@ -85,7 +85,7 @@ final class UpdatesMongoAsyncHandler implements HttpHandler {
   private CompletableFuture<World> oneWorld() {
     CompletableFuture<World> future = new CompletableFuture<>();
     worldCollection
-        .find(Filters.eq(randomWorld()))
+        .find(Filters.eq(randomWorldNumber()))
         .map(Helper::mongoDocumentToWorld)
         .first(
             (world, exception) -> {

frameworks/Java/undertow/src/main/java/hello/UpdatesMongoHandler.java

@@ -1,7 +1,7 @@
 package hello;
 
 import static hello.Helper.getQueries;
-import static hello.Helper.randomWorld;
+import static hello.Helper.randomWorldNumber;
 import static hello.Helper.sendJson;
 
 import com.mongodb.client.MongoCollection;
@@ -34,13 +34,13 @@ final class UpdatesMongoHandler implements HttpHandler {
     for (int i = 0; i < worlds.length; i++) {
       worlds[i] =
           worldCollection
-              .find(Filters.eq(randomWorld()))
+              .find(Filters.eq(randomWorldNumber()))
               .map(Helper::mongoDocumentToWorld)
               .first();
     }
     List<WriteModel<Document>> writes = new ArrayList<>(worlds.length);
     for (World world : worlds) {
-      world.randomNumber = randomWorld();
+      world.randomNumber = randomWorldNumber();
       Bson filter = Filters.eq(world.id);
       Bson update = Updates.set("randomNumber", world.randomNumber);
       writes.add(new UpdateOneModel<>(filter, update));

frameworks/Java/undertow/src/main/java/hello/UpdatesSqlHandler.java

@@ -1,7 +1,7 @@
 package hello;
 
 import static hello.Helper.getQueries;
-import static hello.Helper.randomWorld;
+import static hello.Helper.randomWorldNumber;
 import static hello.Helper.sendJson;
 
 import io.undertow.server.HttpHandler;
@@ -31,7 +31,7 @@ final class UpdatesSqlHandler implements HttpHandler {
                connection.prepareStatement(
                    "SELECT * FROM World WHERE id = ?")) {
         for (int i = 0; i < worlds.length; i++) {
-          statement.setInt(1, randomWorld());
+          statement.setInt(1, randomWorldNumber());
           try (ResultSet resultSet = statement.executeQuery()) {
             resultSet.next();
             int id = resultSet.getInt("id");
@@ -44,7 +44,7 @@ final class UpdatesSqlHandler implements HttpHandler {
                connection.prepareStatement(
                    "UPDATE World SET randomNumber = ? WHERE id = ?")) {
         for (World world : worlds) {
-          world.randomNumber = randomWorld();
+          world.randomNumber = randomWorldNumber();
           statement.setInt(1, world.randomNumber);
           statement.setInt(2, world.id);
           statement.executeUpdate();

frameworks/Java/undertow/src/main/resources/hello/server.properties

@@ -1,7 +1,7 @@
 undertow.port = 8080
 undertow.host = 0.0.0.0
 
-mysql.jdbcUrl = jdbc:mysql://TFB-database:3306/hello_world?useServerPrepStmts=true&cachePrepStmts=true
+mysql.jdbcUrl = jdbc:mysql://TFB-database:3306/hello_world?useSSL=false&useServerPrepStmts=true&cachePrepStmts=true
 mysql.username = benchmarkdbuser
 mysql.password = benchmarkdbpass
 mysql.connections = 48