Skip to content

Commit cf4a519

Browse files
thorstenhirschthorstenhirsch
committed
update Jackson to v3.1.0, use {{jacksonPackage}}
1 parent 52a5a6b commit cf4a519

109 files changed

Lines changed: 361 additions & 296 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaClientCodegen.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -821,7 +821,7 @@ public void processOpts() {
821821
additionalProperties.remove(SERIALIZATION_LIBRARY_GSON);
822822
additionalProperties.remove(SERIALIZATION_LIBRARY_JSONB);
823823
supportingFiles.add(new SupportingFile("RFC3339DateFormat.mustache", invokerFolder, "RFC3339DateFormat.java"));
824-
if (!useJackson3) {
824+
if (!useJackson3 || libNative) {
825825
supportingFiles.add(new SupportingFile("RFC3339InstantDeserializer.mustache", invokerFolder, "RFC3339InstantDeserializer.java"));
826826
supportingFiles.add(new SupportingFile("RFC3339JavaTimeModule.mustache", invokerFolder, "RFC3339JavaTimeModule.java"));
827827
}

‎modules/openapi-generator/src/main/resources/Java/RFC3339InstantDeserializer.mustache‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,16 @@ import java.time.temporal.TemporalAccessor;
1414
import java.util.function.BiFunction;
1515
import java.util.function.Function;
1616

17+
{{#useJackson3}}
18+
import tools.jackson.core.JacksonException;
19+
{{/useJackson3}}
20+
import {{jacksonPackage}}.core.JsonParser;
21+
import {{jacksonPackage}}.databind.DeserializationContext;
1722
{{^useJackson3}}
18-
import com.fasterxml.jackson.core.JsonParser;
19-
import com.fasterxml.jackson.databind.DeserializationContext;
2023
import com.fasterxml.jackson.datatype.jsr310.JavaTimeFeature;
2124
import com.fasterxml.jackson.datatype.jsr310.deser.InstantDeserializer;
2225
{{/useJackson3}}
2326
{{#useJackson3}}
24-
import tools.jackson.core.JacksonException;
25-
import tools.jackson.core.JsonParser;
26-
import tools.jackson.databind.DeserializationContext;
2727
import tools.jackson.databind.cfg.DateTimeFeature;
2828
import tools.jackson.databind.ext.javatime.deser.InstantDeserializer;
2929
{{/useJackson3}}

‎modules/openapi-generator/src/main/resources/Java/RFC3339JavaTimeModule.mustache‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,10 @@ import java.time.Instant;
55
import java.time.OffsetDateTime;
66
import java.time.ZonedDateTime;
77

8+
import {{jacksonPackage}}.databind.module.SimpleModule;
89
{{^useJackson3}}
9-
import com.fasterxml.jackson.databind.module.SimpleModule;
1010
import com.fasterxml.jackson.databind.Module.SetupContext;
1111
{{/useJackson3}}
12-
{{#useJackson3}}
13-
import tools.jackson.databind.module.SimpleModule;
14-
{{/useJackson3}}
1512

1613
{{>generatedAnnotation}}
1714

‎modules/openapi-generator/src/main/resources/Java/libraries/native/ApiClient.mustache‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,19 @@
11
{{>licenseInfo}}
22
package {{invokerPackage}};
33

4-
{{^useJackson3}}
54
import com.fasterxml.jackson.annotation.JsonInclude;
6-
import com.fasterxml.jackson.databind.DeserializationFeature;
7-
import com.fasterxml.jackson.databind.ObjectMapper;
5+
import {{jacksonPackage}}.databind.DeserializationFeature;
6+
import {{jacksonPackage}}.databind.ObjectMapper;
7+
{{^useJackson3}}
88
import com.fasterxml.jackson.databind.SerializationFeature;
99
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
1010
{{#openApiNullable}}
1111
import org.openapitools.jackson.nullable.JsonNullableModule;
1212
{{/openApiNullable}}
1313
{{/useJackson3}}
1414
{{#useJackson3}}
15-
import com.fasterxml.jackson.annotation.JsonInclude;
1615
import tools.jackson.databind.cfg.DateTimeFeature;
1716
import tools.jackson.databind.cfg.EnumFeature;
18-
import tools.jackson.databind.DeserializationFeature;
19-
import tools.jackson.databind.ObjectMapper;
2017
import tools.jackson.databind.json.JsonMapper;
2118
{{/useJackson3}}
2219

‎modules/openapi-generator/src/main/resources/Java/libraries/native/JSON.mustache‎

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,28 +2,22 @@
22

33
package {{invokerPackage}};
44

5-
{{^useJackson3}}
65
import com.fasterxml.jackson.annotation.*;
7-
import com.fasterxml.jackson.databind.*;
8-
import com.fasterxml.jackson.databind.json.JsonMapper;
6+
import {{jacksonPackage}}.databind.*;
7+
import {{jacksonPackage}}.databind.json.JsonMapper;
8+
{{^useJackson3}}
99
{{#openApiNullable}}
1010
import org.openapitools.jackson.nullable.JsonNullableModule;
1111
{{/openApiNullable}}
1212
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
13-
{{#joda}}
14-
import com.fasterxml.jackson.datatype.joda.JodaModule;
15-
{{/joda}}
1613
{{/useJackson3}}
1714
{{#useJackson3}}
18-
import com.fasterxml.jackson.annotation.*;
19-
import tools.jackson.databind.*;
2015
import tools.jackson.databind.cfg.DateTimeFeature;
2116
import tools.jackson.databind.cfg.EnumFeature;
22-
import tools.jackson.databind.json.JsonMapper;
17+
{{/useJackson3}}
2318
{{#joda}}
24-
import tools.jackson.datatype.joda.JodaModule;
19+
import {{jacksonPackage}}.datatype.joda.JodaModule;
2520
{{/joda}}
26-
{{/useJackson3}}
2721
{{#models.0}}
2822
import {{modelPackage}}.*;
2923
{{/models.0}}

‎modules/openapi-generator/src/main/resources/Java/libraries/native/anyof_model.mustache‎

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,31 +8,23 @@ import java.util.Collections;
88
import java.util.HashSet;
99

1010
{{^useJackson3}}
11-
import com.fasterxml.jackson.core.JsonGenerator;
12-
import com.fasterxml.jackson.core.JsonParser;
1311
import com.fasterxml.jackson.core.JsonProcessingException;
14-
import com.fasterxml.jackson.databind.DeserializationContext;
1512
import com.fasterxml.jackson.databind.JsonMappingException;
16-
import com.fasterxml.jackson.databind.JsonNode;
1713
import com.fasterxml.jackson.databind.SerializerProvider;
18-
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
19-
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
20-
import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
21-
import com.fasterxml.jackson.databind.ser.std.StdSerializer;
2214
{{/useJackson3}}
2315
{{#useJackson3}}
2416
import tools.jackson.core.JacksonException;
25-
import tools.jackson.core.JsonGenerator;
26-
import tools.jackson.core.JsonParser;
27-
import tools.jackson.databind.DeserializationContext;
2817
import tools.jackson.databind.DatabindException;
29-
import tools.jackson.databind.JsonNode;
3018
import tools.jackson.databind.SerializationContext;
31-
import tools.jackson.databind.annotation.JsonDeserialize;
32-
import tools.jackson.databind.annotation.JsonSerialize;
33-
import tools.jackson.databind.deser.std.StdDeserializer;
34-
import tools.jackson.databind.ser.std.StdSerializer;
3519
{{/useJackson3}}
20+
import {{jacksonPackage}}.core.JsonGenerator;
21+
import {{jacksonPackage}}.core.JsonParser;
22+
import {{jacksonPackage}}.databind.DeserializationContext;
23+
import {{jacksonPackage}}.databind.JsonNode;
24+
import {{jacksonPackage}}.databind.annotation.JsonDeserialize;
25+
import {{jacksonPackage}}.databind.annotation.JsonSerialize;
26+
import {{jacksonPackage}}.databind.deser.std.StdDeserializer;
27+
import {{jacksonPackage}}.databind.ser.std.StdSerializer;
3628
import {{invokerPackage}}.ApiClient;
3729
import {{invokerPackage}}.JSON;
3830

‎modules/openapi-generator/src/main/resources/Java/libraries/native/api.mustache‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,11 @@ import {{invokerPackage}}.Pair;
1111
import {{import}};
1212
{{/imports}}
1313

14-
{{^useJackson3}}
15-
import com.fasterxml.jackson.core.type.TypeReference;
16-
import com.fasterxml.jackson.databind.ObjectMapper;
17-
{{/useJackson3}}
1814
{{#useJackson3}}
1915
import tools.jackson.core.JacksonException;
20-
import tools.jackson.core.type.TypeReference;
21-
import tools.jackson.databind.ObjectMapper;
2216
{{/useJackson3}}
17+
import {{jacksonPackage}}.core.type.TypeReference;
18+
import {{jacksonPackage}}.databind.ObjectMapper;
2319

2420
{{#useBeanValidation}}
2521
import {{javaxPackage}}.validation.constraints.*;

‎modules/openapi-generator/src/main/resources/Java/libraries/native/build.gradle.mustache‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ ext {
8383
jackson_annotations_version = "2.21"
8484
{{/useJackson3}}
8585
{{#useJackson3}}
86-
jackson3_version = "3.0.4"
86+
jackson3_version = "3.1.0"
8787
jackson_annotations_version = "2.21"
8888
{{/useJackson3}}
8989
{{#useJakartaEe}}

‎modules/openapi-generator/src/main/resources/Java/libraries/native/model.mustache‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -58,12 +58,7 @@ import org.hibernate.validator.constraints.*;
5858
{{#model}}
5959
{{#oneOf}}
6060
{{#-first}}
61-
{{^useJackson3}}
62-
import com.fasterxml.jackson.core.type.TypeReference;
63-
{{/useJackson3}}
64-
{{#useJackson3}}
65-
import tools.jackson.core.type.TypeReference;
66-
{{/useJackson3}}
61+
import {{jacksonPackage}}.core.type.TypeReference;
6762
{{/-first}}
6863
{{/oneOf}}
6964

‎modules/openapi-generator/src/main/resources/Java/libraries/native/oneof_model.mustache‎

Lines changed: 9 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -8,34 +8,25 @@ import java.util.Collections;
88
import java.util.HashSet;
99

1010
{{^useJackson3}}
11-
import com.fasterxml.jackson.core.JsonGenerator;
12-
import com.fasterxml.jackson.core.JsonParser;
1311
import com.fasterxml.jackson.core.JsonProcessingException;
14-
import com.fasterxml.jackson.core.JsonToken;
15-
import com.fasterxml.jackson.databind.DeserializationContext;
1612
import com.fasterxml.jackson.databind.JsonMappingException;
17-
import com.fasterxml.jackson.databind.JsonNode;
1813
import com.fasterxml.jackson.databind.MapperFeature;
1914
import com.fasterxml.jackson.databind.SerializerProvider;
20-
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
21-
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
22-
import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
23-
import com.fasterxml.jackson.databind.ser.std.StdSerializer;
2415
{{/useJackson3}}
2516
{{#useJackson3}}
2617
import tools.jackson.core.JacksonException;
27-
import tools.jackson.core.JsonGenerator;
28-
import tools.jackson.core.JsonParser;
29-
import tools.jackson.core.JsonToken;
30-
import tools.jackson.databind.DeserializationContext;
3118
import tools.jackson.databind.DatabindException;
32-
import tools.jackson.databind.JsonNode;
3319
import tools.jackson.databind.SerializationContext;
34-
import tools.jackson.databind.annotation.JsonDeserialize;
35-
import tools.jackson.databind.annotation.JsonSerialize;
36-
import tools.jackson.databind.deser.std.StdDeserializer;
37-
import tools.jackson.databind.ser.std.StdSerializer;
3820
{{/useJackson3}}
21+
import {{jacksonPackage}}.core.JsonGenerator;
22+
import {{jacksonPackage}}.core.JsonParser;
23+
import {{jacksonPackage}}.core.JsonToken;
24+
import {{jacksonPackage}}.databind.DeserializationContext;
25+
import {{jacksonPackage}}.databind.JsonNode;
26+
import {{jacksonPackage}}.databind.annotation.JsonDeserialize;
27+
import {{jacksonPackage}}.databind.annotation.JsonSerialize;
28+
import {{jacksonPackage}}.databind.deser.std.StdDeserializer;
29+
import {{jacksonPackage}}.databind.ser.std.StdSerializer;
3930
import {{invokerPackage}}.ApiClient;
4031
import {{invokerPackage}}.JSON;
4132

0 commit comments

Comments
 (0)