Skip to content

Commit 7228260

Browse files
authored
jooby: upgrade 3.1 (#9044)
1 parent ceaeb30 commit 7228260

File tree

4 files changed

+38
-18
lines changed

4 files changed

+38
-18
lines changed

frameworks/Java/jooby/pom.xml

Lines changed: 29 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@
1111
<name>jooby</name>
1212

1313
<properties>
14-
<jooby.version>3.0.8</jooby.version>
14+
<jooby.version>3.1.1</jooby.version>
15+
<netty.version>4.1.109.Final</netty.version>
1516
<dsl-json.version>2.0.2</dsl-json.version>
1617
<postgresql.version>42.7.2</postgresql.version>
1718
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -44,7 +45,6 @@
4445
<version>8.3.0</version>
4546
</dependency>
4647

47-
4848
<!-- postgresql -->
4949
<dependency>
5050
<groupId>org.postgresql</groupId>
@@ -166,6 +166,25 @@
166166
</build>
167167

168168
<profiles>
169+
<profile>
170+
<id>mac</id>
171+
<activation>
172+
<os>
173+
<family>mac</family>
174+
</os>
175+
</activation>
176+
<dependencies>
177+
<dependency>
178+
<groupId>com.ongres.scram</groupId>
179+
<artifactId>client</artifactId>
180+
<version>2.1</version>
181+
</dependency>
182+
<dependency>
183+
<groupId>io.netty</groupId>
184+
<artifactId>netty-resolver-dns-native-macos</artifactId>
185+
</dependency>
186+
</dependencies>
187+
</profile>
169188
<profile>
170189
<id>undertow</id>
171190
<dependencies>
@@ -202,6 +221,14 @@
202221

203222
<dependencyManagement>
204223
<dependencies>
224+
<dependency>
225+
<groupId>io.netty</groupId>
226+
<artifactId>netty-bom</artifactId>
227+
<version>${netty.version}</version>
228+
<type>pom</type>
229+
<scope>import</scope>
230+
</dependency>
231+
205232
<dependency>
206233
<groupId>io.jooby</groupId>
207234
<artifactId>jooby-bom</artifactId>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public class App extends Jooby {
4040
DataSource ds = require(DataSource.class);
4141

4242
/** Template engine: */
43-
install(new RockerModule().reuseBuffer(true));
43+
install(new RockerModule());
4444

4545
get("/plaintext", ctx ->
4646
ctx.send(MESSAGE_BUFFER.duplicate())

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

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,35 +19,31 @@ public class Json {
1919
public static ByteBuffer encode(Message data) {
2020
JsonWriter writer = pool.get();
2121
writer.reset();
22-
_Message_DslJsonConverter.ObjectFormatConverter converter = new _Message_DslJsonConverter.ObjectFormatConverter(
23-
dslJson);
22+
var converter = new _Message_DslJsonConverter.ObjectFormatConverter(dslJson);
2423
converter.write(writer, data);
2524
return ByteBuffer.wrap(writer.getByteBuffer(), 0, writer.size());
2625
}
2726

2827
public static ByteBuffer encode(World data) {
2928
JsonWriter writer = pool.get();
3029
writer.reset();
31-
_World_DslJsonConverter.ObjectFormatConverter converter = new _World_DslJsonConverter.ObjectFormatConverter(
32-
dslJson);
30+
var converter = new _World_DslJsonConverter.ObjectFormatConverter(dslJson);
3331
converter.write(writer, data);
3432
return ByteBuffer.wrap(writer.getByteBuffer(), 0, writer.size());
3533
}
3634

3735
public static ByteBuffer encode(World[] data) {
3836
JsonWriter writer = pool.get();
3937
writer.reset();
40-
_World_DslJsonConverter.ObjectFormatConverter converter = new _World_DslJsonConverter.ObjectFormatConverter(
41-
dslJson);
38+
var converter = new _World_DslJsonConverter.ObjectFormatConverter(dslJson);
4239
writer.serialize(data, converter);
4340
return ByteBuffer.wrap(writer.getByteBuffer(), 0, writer.size());
4441
}
4542

4643
public static ByteBuffer encode(List<World> data) {
4744
JsonWriter writer = pool.get();
4845
writer.reset();
49-
_World_DslJsonConverter.ObjectFormatConverter converter = new _World_DslJsonConverter.ObjectFormatConverter(
50-
dslJson);
46+
var converter = new _World_DslJsonConverter.ObjectFormatConverter(dslJson);
5147
writer.serialize(data, converter);
5248
return ByteBuffer.wrap(writer.getByteBuffer(), 0, writer.size());
5349
}

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

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,14 @@
44
import static io.jooby.ExecutionMode.EVENT_LOOP;
55
import static io.jooby.MediaType.JSON;
66

7-
import java.util.ArrayList;
8-
import java.util.Arrays;
9-
import java.util.Collections;
10-
import java.util.List;
7+
import java.util.*;
118

129
import com.fizzed.rocker.RockerOutputFactory;
1310
import io.jooby.Context;
1411
import io.jooby.Jooby;
1512
import io.jooby.MediaType;
1613
import io.jooby.ServerOptions;
17-
import io.jooby.rocker.ByteBufferOutput;
14+
import io.jooby.rocker.DataBufferOutput;
1815
import io.jooby.rocker.RockerModule;
1916
import io.vertx.sqlclient.Row;
2017
import io.vertx.sqlclient.RowIterator;
@@ -34,7 +31,7 @@ public class ReactivePg extends Jooby {
3431
PgClient client = new PgClient(getConfig().getConfig("db"));
3532

3633
/** Template engine: */
37-
install(new RockerModule().reuseBuffer(true));
34+
install(new RockerModule());
3835

3936
/** Single query: */
4037
get("/db", ctx -> {
@@ -109,7 +106,7 @@ public class ReactivePg extends Jooby {
109106
}).setNonBlocking(true);
110107

111108
/** Fortunes: */
112-
RockerOutputFactory<ByteBufferOutput> factory = require(RockerOutputFactory.class);
109+
RockerOutputFactory<DataBufferOutput> factory = require(RockerOutputFactory.class);
113110
get("/fortunes", ctx -> {
114111
client.fortunes(rsp -> {
115112
if (rsp.succeeded()) {

0 commit comments

Comments
 (0)