Skip to content

Commit c9ad1c7

Browse files
committed
fix: Correct the jsonb according to the logic of jackjson, and solve the problems caused by the changes in v4 style.
1 parent 41f97d8 commit c9ad1c7

File tree

6 files changed

+12
-6
lines changed

6 files changed

+12
-6
lines changed

modules/openapi-generator/src/main/resources/java-helidon/client/libraries/se/ApiClient.mustache

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@ import org.openapitools.jackson.nullable.JsonNullableModule;
1414

1515
import io.helidon.config.Config;
1616
{{#jsonb}}
17+
{{#x-helidon-v3}}
1718
import io.helidon.media.jsonb.JsonbSupport;
19+
{{/x-helidon-v3}}
1820
{{/jsonb}}
1921
{{#jackson}}{{#x-helidon-v3}}{{!
2022
}}import io.helidon.media.jackson.JacksonSupport;
@@ -260,9 +262,11 @@ public class ApiClient {
260262
.baseUri("{{basePath}}")
261263
.config(clientConfig());
262264
{{#jsonb}}
265+
{{#x-helidon-v3}}
263266
defaultWebClientBuilder.addMediaSupport(jsonbConfig == null
264267
? JsonbSupport.create()
265268
: JsonbSupport.create(JsonbBuilder.create(jsonbConfig)));
269+
{{/x-helidon-v3}}
266270
{{/jsonb}}
267271
{{#jackson}}
268272
defaultWebClientBuilder.addMediaSupport(objectMapper == null

modules/openapi-generator/src/main/resources/java-helidon/client/libraries/se/api_impl.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import io.helidon.config.Config;
2525
}}import io.helidon.http.Method;
2626
import io.helidon.http.media.MediaSupport;
2727
{{/x-helidon-v3}}
28-
{{#jsonb}}import io.helidon.media.jsonb.JsonbSupport;{{/jsonb}}
28+
{{#jsonb}}{{#x-helidon-v3}}import io.helidon.media.jsonb.JsonbSupport;{{/x-helidon-v3}}{{/jsonb}}
2929
{{#jackson}}import io.helidon{{^x-helidon-v3}}.http{{/x-helidon-v3}}.media.jackson.JacksonSupport;{{/jackson}}
3030
{{#x-helidon-v3}}import io.helidon.webclient.WebClientRequestBuilder;
3131
import io.helidon.webclient.WebClientResponse;

modules/openapi-generator/src/main/resources/java-helidon/client/libraries/se/api_impl_for_v4.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import io.helidon.common.GenericType;
1515
import io.helidon.common.media.type.MediaType;
1616
import io.helidon.config.Config;
1717
import io.helidon.http.media.MediaSupport;
18-
{{#jsonb}}import io.helidon.http.media.jsonb.JsonbSupport;{{/jsonb}}
18+
{{#jsonb}}{{#x-helidon-v3}}import io.helidon.http.media.jsonb.JsonbSupport;{{/x-helidon-v3}}{{/jsonb}}
1919
{{#jackson}}import io.helidon.http.media.jackson.JacksonSupport;{{/jackson}}
2020
import io.helidon.webclient.api.HttpClientRequest;
2121
import io.helidon.webclient.api.HttpClientResponse;

modules/openapi-generator/src/main/resources/java-helidon/client/libraries/se/pom.mustache

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@
6363
<artifactId>{{x-helidon-rootJavaEEDepPrefix}}.json.bind-api</artifactId>
6464
</dependency>
6565
<dependency>
66-
<groupId>io.helidon.http.media</groupId>
67-
<artifactId>helidon-http1media-jsonb</artifactId>
66+
<groupId>io.helidon.{{^x-helidon-v3}}http.{{/x-helidon-v3}}media</groupId>
67+
<artifactId>helidon-{{^x-helidon-v3}}http-{{/x-helidon-v3}}jsonb</artifactId>
6868
</dependency>
6969
{{/jsonb}}
7070
<dependency>

modules/openapi-generator/src/main/resources/java-helidon/server/libraries/se/main.mustache

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,9 @@ public final class Main {
7272
.config(config.get("server"))
7373
.addMediaSupport(JsonpSupport.create())
7474
{{#jsonb}}
75+
{{#x-helidon-v3}}
7576
.addMediaSupport(JsonbSupport.create())
77+
{{/x-helidon-v3}}
7678
{{/jsonb}}
7779
{{#jackson}}
7880
.addMediaSupport(JacksonSupport.create(JsonProvider.objectMapper()))

modules/openapi-generator/src/main/resources/java-helidon/server/libraries/se/pom.mustache

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,8 @@
108108
{{/jackson}}
109109
{{#jsonb}}
110110
<dependency>
111-
<groupId>io.helidon.{{#x-helidon-v3}}http.{{/x-helidon-v3}}media</groupId>
112-
<artifactId>helidon-{{#x-helidon-v3}}http-{{/x-helidon-v3}}media-jsonb</artifactId>
111+
<groupId>io.helidon.{{^x-helidon-v3}}http.{{/x-helidon-v3}}media</groupId>
112+
<artifactId>helidon-{{^x-helidon-v3}}http-{{/x-helidon-v3}}media-jsonb</artifactId>
113113
</dependency>
114114
{{/jsonb}}
115115
<dependency>

0 commit comments

Comments
 (0)