jooby: upgrade 3.1 (#9044)

frameworks/Java/jooby/pom.xml

@@ -11,7 +11,8 @@
   <name>jooby</name>
 
   <properties>
-    <jooby.version>3.0.8</jooby.version>
+    <jooby.version>3.1.1</jooby.version>
+    <netty.version>4.1.109.Final</netty.version>
     <dsl-json.version>2.0.2</dsl-json.version>
     <postgresql.version>42.7.2</postgresql.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -44,7 +45,6 @@
       <version>8.3.0</version>
     </dependency>
 
-
     <!-- postgresql -->
     <dependency>
       <groupId>org.postgresql</groupId>
@@ -166,6 +166,25 @@
   </build>
 
   <profiles>
+    <profile>
+      <id>mac</id>
+      <activation>
+        <os>
+          <family>mac</family>
+        </os>
+      </activation>
+      <dependencies>
+        <dependency>
+          <groupId>com.ongres.scram</groupId>
+          <artifactId>client</artifactId>
+          <version>2.1</version>
+        </dependency>
+        <dependency>
+          <groupId>io.netty</groupId>
+          <artifactId>netty-resolver-dns-native-macos</artifactId>
+        </dependency>
+      </dependencies>
+    </profile>
     <profile>
       <id>undertow</id>
       <dependencies>
@@ -202,6 +221,14 @@
 
   <dependencyManagement>
     <dependencies>
+      <dependency>
+        <groupId>io.netty</groupId>
+        <artifactId>netty-bom</artifactId>
+        <version>${netty.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+
       <dependency>
         <groupId>io.jooby</groupId>
         <artifactId>jooby-bom</artifactId>

frameworks/Java/jooby/src/main/java/com/techempower/App.java

@@ -40,7 +40,7 @@ public class App extends Jooby {
     DataSource ds = require(DataSource.class);
 
     /** Template engine: */
-    install(new RockerModule().reuseBuffer(true));
+    install(new RockerModule());
 
     get("/plaintext", ctx ->
         ctx.send(MESSAGE_BUFFER.duplicate())

frameworks/Java/jooby/src/main/java/com/techempower/Json.java

@@ -19,8 +19,7 @@ public class Json {
   public static ByteBuffer encode(Message data) {
     JsonWriter writer = pool.get();
     writer.reset();
-    _Message_DslJsonConverter.ObjectFormatConverter converter = new _Message_DslJsonConverter.ObjectFormatConverter(
-        dslJson);
+    var converter = new _Message_DslJsonConverter.ObjectFormatConverter(dslJson);
     converter.write(writer, data);
     return ByteBuffer.wrap(writer.getByteBuffer(), 0, writer.size());
   }
@@ -28,8 +27,7 @@ public class Json {
   public static ByteBuffer encode(World data) {
     JsonWriter writer = pool.get();
     writer.reset();
-    _World_DslJsonConverter.ObjectFormatConverter converter = new _World_DslJsonConverter.ObjectFormatConverter(
-        dslJson);
+    var converter = new _World_DslJsonConverter.ObjectFormatConverter(dslJson);
     converter.write(writer, data);
     return ByteBuffer.wrap(writer.getByteBuffer(), 0, writer.size());
   }
@@ -37,8 +35,7 @@ public class Json {
   public static ByteBuffer encode(World[] data) {
     JsonWriter writer = pool.get();
     writer.reset();
-    _World_DslJsonConverter.ObjectFormatConverter converter = new _World_DslJsonConverter.ObjectFormatConverter(
-        dslJson);
+    var converter = new _World_DslJsonConverter.ObjectFormatConverter(dslJson);
     writer.serialize(data, converter);
     return ByteBuffer.wrap(writer.getByteBuffer(), 0, writer.size());
   }
@@ -46,8 +43,7 @@ public class Json {
   public static ByteBuffer encode(List<World> data) {
     JsonWriter writer = pool.get();
     writer.reset();
-    _World_DslJsonConverter.ObjectFormatConverter converter = new _World_DslJsonConverter.ObjectFormatConverter(
-        dslJson);
+    var converter = new _World_DslJsonConverter.ObjectFormatConverter(dslJson);
     writer.serialize(data, converter);
     return ByteBuffer.wrap(writer.getByteBuffer(), 0, writer.size());
   }

frameworks/Java/jooby/src/main/java/com/techempower/ReactivePg.java

@@ -4,17 +4,14 @@ import static com.techempower.Util.randomWorld;
 import static io.jooby.ExecutionMode.EVENT_LOOP;
 import static io.jooby.MediaType.JSON;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
+import java.util.*;
 
 import com.fizzed.rocker.RockerOutputFactory;
 import io.jooby.Context;
 import io.jooby.Jooby;
 import io.jooby.MediaType;
 import io.jooby.ServerOptions;
-import io.jooby.rocker.ByteBufferOutput;
+import io.jooby.rocker.DataBufferOutput;
 import io.jooby.rocker.RockerModule;
 import io.vertx.sqlclient.Row;
 import io.vertx.sqlclient.RowIterator;
@@ -34,7 +31,7 @@ public class ReactivePg extends Jooby {
     PgClient client = new PgClient(getConfig().getConfig("db"));
 
     /** Template engine: */
-    install(new RockerModule().reuseBuffer(true));
+    install(new RockerModule());
 
     /** Single query: */
     get("/db", ctx -> {
@@ -109,7 +106,7 @@ public class ReactivePg extends Jooby {
     }).setNonBlocking(true);
 
     /** Fortunes: */
-    RockerOutputFactory<ByteBufferOutput> factory = require(RockerOutputFactory.class);
+    RockerOutputFactory<DataBufferOutput> factory = require(RockerOutputFactory.class);
     get("/fortunes", ctx -> {
       client.fortunes(rsp -> {
         if (rsp.succeeded()) {