Update versions (#5704)

* Update versions

Signed-off-by: Paulo Lopes <[email protected]>

* Turns out pgclient did change API and required an update

Signed-off-by: Paulo Lopes <[email protected]>

frameworks/JavaScript/es4x/es4x.dockerfile

@@ -1,12 +1,13 @@
-FROM oracle/graalvm-ce:19.3.0
+FROM oracle/graalvm-ce:20.1.0
 # Set working dir
 RUN mkdir /app
 WORKDIR /app
 
-COPY ./ /app
-
+COPY ./package.json /app
 # Get dependencies
 RUN npm --unsafe-perm install
+# Copy the app
+COPY ./ /app
 # Compile the template
 RUN npm run template
 

frameworks/JavaScript/es4x/index.js

@@ -1,4 +1,4 @@
-/// <reference types="@vertx/core/runtime" />
+/// <reference types="es4x" />
 // @ts-check
 
 import { Router } from '@vertx/web';
@@ -44,7 +44,7 @@ let connectOptions = new PgConnectOptions()
 
 // Pool options
 let poolOptions = new PoolOptions()
-  .setMaxSize(1);
+  .setMaxSize(4);
 
 // Create the client pool
 let client = PgPool.pool(vertx, connectOptions, poolOptions);
@@ -54,7 +54,7 @@ let client = PgPool.pool(vertx, connectOptions, poolOptions);
  * and database connection pool.
  */
 app.get("/db").handler(ctx => {
-  client.preparedQuery(SELECT_WORLD, Tuple.of(util.randomWorld()), res => {
+  client.preparedQuery(SELECT_WORLD).execute(Tuple.of(util.randomWorld()), res => {
     if (res.succeeded()) {
       let resultSet = res.result().iterator();
 
@@ -88,7 +88,7 @@ app.get("/queries").handler(ctx => {
   const queries = util.getQueries(ctx.request());
 
   for (let i = 0; i < queries; i++) {
-    client.preparedQuery(SELECT_WORLD, Tuple.of(util.randomWorld()), ar => {
+    client.preparedQuery(SELECT_WORLD).execute(Tuple.of(util.randomWorld()), ar => {
       if (!failed) {
         if (ar.failed()) {
           failed = true;
@@ -118,7 +118,7 @@ app.get("/queries").handler(ctx => {
  * XSS countermeasures, and character encoding.
  */
 app.get("/fortunes").handler(ctx => {
-  client.preparedQuery(SELECT_FORTUNE, ar => {
+  client.preparedQuery(SELECT_FORTUNE).execute(ar => {
 
     if (ar.failed()) {
       ctx.fail(ar.cause());
@@ -183,7 +183,7 @@ app.route("/updates").handler(ctx => {
     const id = util.randomWorld();
     const index = i;
 
-    client.preparedQuery(SELECT_WORLD, Tuple.of(id), ar => {
+    client.preparedQuery(SELECT_WORLD).execute(Tuple.of(id), ar => {
       if (!failed) {
         if (ar.failed()) {
           failed = true;
@@ -206,7 +206,7 @@ app.route("/updates").handler(ctx => {
             batch.push(Tuple.of(world.randomNumber, world.id));
           });
 
-          client.preparedBatch(UPDATE_WORLD, batch, ar => {
+          client.preparedQuery(UPDATE_WORLD).executeBatch(batch, ar => {
             if (ar.failed()) {
               ctx.fail(ar.cause());
               return;
@@ -246,6 +246,12 @@ app.get("/plaintext").handler(ctx => {
 vertx
   .createHttpServer()
   .requestHandler(app)
-  .listen(8080);
+  .listen(8080, listen => {
+    if (listen.failed()) {
+      console.trace(listen.cause());
+      System.exit(1);
+    } else {
+      console.log('Server listening at: http://0.0.0.0:8080/');
+    }
+  });
 
-console.log('Server listening at: http://localhost:8080/');

frameworks/JavaScript/es4x/package.json

@@ -4,25 +4,27 @@
   "private": true,
   "main": "index.js",
   "devDependencies": {
-    "es4x-pm": "0.10.0"
+    "es4x-pm": "0.12.0"
   },
   "dependencies": {
-    "@vertx/core": "3.8.4",
-    "@vertx/web": "3.8.4",
-    "@vertx/web-templ-rocker": "3.8.4",
-    "@vertx/pg-client": "3.8.4"
+    "@vertx/core": "3.9.1",
+    "@vertx/web": "3.9.1",
+    "@vertx/web-templ-rocker": "3.9.1",
+    "@vertx/pg-client": "3.9.1"
   },
   "mvnDependencies": [
-    "io.netty:netty-transport-native-epoll:jar:linux-x86_64:4.1.42.Final",
-    "com.fizzed:rocker-runtime:1.2.1",
-    "xyz.jetdrone:vertx.command.rocker.compiler:0.1.0"
+    "com.ongres.scram:client:1.0.0-beta.2",
+    "io.netty:netty-transport-native-epoll:jar:linux-x86_64:4.1.49.Final",
+    "com.fizzed:rocker-runtime:1.2.3",
+    "com.google.guava:guava:19.0",
+    "xyz.jetdrone:vertx.command.rocker.compiler:0.1.1"
   ],
   "files": [
     "util.js",
-    "templates/fortunes.hbs"
+    "templates/Fortunes.rocker.html"
   ],
   "scripts": {
-    "start": "es4x-launcher",
+    "start": "es4x",
     "postinstall": "es4x install -v node_modules/.lib/vendor-templates.jar",
     "pretemplate": "es4x rocker -d node_modules/.rocker templates",
     "template": "javac -cp node_modules/.bin/es4x-launcher.jar @node_modules/.rocker/templates.lst -d node_modules/.rocker/classes",

frameworks/JavaScript/es4x/templates/Fortunes.rocker.html

@@ -11,7 +11,7 @@
   </tr>
   @for ((ForIterator i, Map fortune) : fortunes) {
     <tr>
-      <td>@fortune.get("id")</td>
+      <td>@raw(fortune.get("id"))</td>
       <td>@fortune.get("message")</td>
     </tr>
   }