From 282a9ac6ecdfbc0bca16615ee28a1f16fa2a963e Mon Sep 17 00:00:00 2001
From: Josiah Noel <32279667+SentryMan@users.noreply.github.com>
Date: Thu, 20 Feb 2025 00:27:24 -0500
Subject: [PATCH] use optimized jex jsonb
requires another jex RC
---
.../generator/jex/ControllerMethodWriter.java | 4 +---
tests/pom.xml | 2 +-
.../src/main/resources/public/openapi.json | 22 ++-----------------
3 files changed, 4 insertions(+), 24 deletions(-)
diff --git a/http-generator-jex/src/main/java/io/avaje/http/generator/jex/ControllerMethodWriter.java b/http-generator-jex/src/main/java/io/avaje/http/generator/jex/ControllerMethodWriter.java
index bdff607aa..61b3a7ec1 100644
--- a/http-generator-jex/src/main/java/io/avaje/http/generator/jex/ControllerMethodWriter.java
+++ b/http-generator-jex/src/main/java/io/avaje/http/generator/jex/ControllerMethodWriter.java
@@ -291,9 +291,7 @@ private void writeJsonReturn(String produces) {
return;
}
if (useJsonB) {
- writer.append(
- "%sJsonType.toJson(result, ctx.contentType(\"%s\").outputStream());",
- uType.shortName(), produces);
+ writer.append("ctx.jsonb(%sJsonType, result);", uType.shortName());
} else {
writer.append("ctx.json(result);");
}
diff --git a/tests/pom.xml b/tests/pom.xml
index 6be019994..60b9ae458 100644
--- a/tests/pom.xml
+++ b/tests/pom.xml
@@ -15,7 +15,7 @@
5.11.4
3.27.3
2.18.2
- 3.0-RC18
+ 3.0-RC20
11.2
4.1.6
6.4.0
diff --git a/tests/test-jex/src/main/resources/public/openapi.json b/tests/test-jex/src/main/resources/public/openapi.json
index e4b99b6d6..7f21eaf24 100644
--- a/tests/test-jex/src/main/resources/public/openapi.json
+++ b/tests/test-jex/src/main/resources/public/openapi.json
@@ -1517,30 +1517,12 @@
}
},
"Long>" : {
- "type" : "object",
- "properties" : {
- "value" : {
- "$ref" : "#/components/schemas/T"
- }
- }
+ "type" : "object"
},
"NestedEnum>" : {
- "type" : "object",
- "properties" : {
- "value" : {
- "$ref" : "#/components/schemas/T"
- }
- }
+ "type" : "object"
},
"String>" : {
- "type" : "object",
- "properties" : {
- "value" : {
- "$ref" : "#/components/schemas/T"
- }
- }
- },
- "T" : {
"type" : "object"
},
"ViewHome" : {