Skip to content

Commit 8f7a982

Browse files
thorstenhirschthorstenhirsch
committed
upgrade to jackson 3.0.4, fix whitespaces
1 parent 2a9e1e6 commit 8f7a982

292 files changed

Lines changed: 47877 additions & 8 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.

‎docs/generators/java-microprofile.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
9797
|useBeanValidation|Use BeanValidation API annotations| |false|
9898
|useEnumCaseInsensitive|Use `equalsIgnoreCase` when String for enum comparison| |false|
9999
|useGzipFeature|Send gzip-encoded requests| |false|
100+
|useJackson3|Use Jackson 3 instead of Jackson 2 for JSON processing. Only supported for 'native' library.| |false|
100101
|useJakartaEe|whether to use Jakarta EE namespace instead of javax| |false|
101102
|useOneOfDiscriminatorLookup|Use the discriminator's mapping in oneOf to speed up the model lookup. IMPORTANT: Validation (e.g. one and only one match in oneOf's schemas) will be skipped. Only jersey2, jersey3, native, okhttp-gson support this option.| |false|
102103
|useOneOfInterfaces|whether to use a java interface to describe a set of oneOf options, where each option is a class that implements the interface| |false|

‎docs/generators/java.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
9797
|useBeanValidation|Use BeanValidation API annotations| |false|
9898
|useEnumCaseInsensitive|Use `equalsIgnoreCase` when String for enum comparison| |false|
9999
|useGzipFeature|Send gzip-encoded requests| |false|
100+
|useJackson3|Use Jackson 3 instead of Jackson 2 for JSON processing. Only supported for 'native' library.| |false|
100101
|useJakartaEe|whether to use Jakarta EE namespace instead of javax| |false|
101102
|useOneOfDiscriminatorLookup|Use the discriminator's mapping in oneOf to speed up the model lookup. IMPORTANT: Validation (e.g. one and only one match in oneOf's schemas) will be skipped. Only jersey2, jersey3, native, okhttp-gson support this option.| |false|
102103
|useOneOfInterfaces|whether to use a java interface to describe a set of oneOf options, where each option is a class that implements the interface| |false|

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,12 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im
9696
}
9797

9898
{{/anyOf}}
99-
{{^useJackson3}}throw new IOException("Failed deserialization for {{classname}}: no match found");{{/useJackson3}}
100-
{{#useJackson3}}throw new JsonMappingException(jp, "Failed deserialization for {{classname}}: no match found");{{/useJackson3}}
99+
{{^useJackson3}}
100+
throw new IOException("Failed deserialization for {{classname}}: no match found");
101+
{{/useJackson3}}
102+
{{#useJackson3}}
103+
throw new JsonMappingException(jp, "Failed deserialization for {{classname}}: no match found");
104+
{{/useJackson3}}
101105
}
102106

103107
/**

‎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
@@ -76,7 +76,7 @@ ext {
7676
jackson_version = "2.19.2"
7777
{{/useJackson3}}
7878
{{#useJackson3}}
79-
jackson3_version = "3.0.0-rc4"
79+
jackson3_version = "3.0.4"
8080
{{/useJackson3}}
8181
{{#useJakartaEe}}
8282
jakarta_annotation_version = "2.1.1"

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

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,12 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im
9191

9292
{{/discriminator}}
9393
{{/useOneOfDiscriminatorLookup}}
94-
{{^useJackson3}}boolean typeCoercion = ctxt.isEnabled(MapperFeature.ALLOW_COERCION_OF_SCALARS);{{/useJackson3}}
95-
{{#useJackson3}}boolean typeCoercion = false; // MapperFeature.ALLOW_COERCION_OF_SCALARS was removed in Jackson 3{{/useJackson3}}
94+
{{^useJackson3}}
95+
boolean typeCoercion = ctxt.isEnabled(MapperFeature.ALLOW_COERCION_OF_SCALARS);
96+
{{/useJackson3}}
97+
{{#useJackson3}}
98+
boolean typeCoercion = false; // MapperFeature.ALLOW_COERCION_OF_SCALARS was removed in Jackson 3
99+
{{/useJackson3}}
96100
int match = 0;
97101
JsonToken token = tree.traverse(jp.getCodec()).nextToken();
98102
{{#oneOf}}
@@ -131,8 +135,12 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im
131135
ret.setActualInstance(deserialized);
132136
return ret;
133137
}
134-
{{^useJackson3}}throw new IOException(String.format(java.util.Locale.ROOT, "Failed deserialization for {{classname}}: %d classes match result, expected 1", match));{{/useJackson3}}
135-
{{#useJackson3}}throw new JsonMappingException(jp, String.format(java.util.Locale.ROOT, "Failed deserialization for {{classname}}: %d classes match result, expected 1", match));{{/useJackson3}}
138+
{{^useJackson3}}
139+
throw new IOException(String.format(java.util.Locale.ROOT, "Failed deserialization for {{classname}}: %d classes match result, expected 1", match));
140+
{{/useJackson3}}
141+
{{#useJackson3}}
142+
throw new JsonMappingException(jp, String.format(java.util.Locale.ROOT, "Failed deserialization for {{classname}}: %d classes match result, expected 1", match));
143+
{{/useJackson3}}
136144
}
137145

138146
/**

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -329,7 +329,7 @@
329329
<jackson-databind-nullable-version>0.2.9</jackson-databind-nullable-version>
330330
{{/useJackson3}}
331331
{{#useJackson3}}
332-
<jackson3-version>3.0.0-rc4</jackson3-version>
332+
<jackson3-version>3.0.4</jackson3-version>
333333
{{/useJackson3}}
334334
{{#useJakartaEe}}
335335
<jakarta-annotation-version>2.1.1</jakarta-annotation-version>

‎samples/client/petstore/java/native-jackson3/.github/workflows/maven.yml‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
# This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time
2+
# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
3+
#
4+
# This file is auto-generated by OpenAPI Generator (https://openapi-generator.tech)
5+
6+
name: Java CI with Maven
7+
8+
on:
9+
push:
10+
branches: [ main, master ]
11+
pull_request:
12+
branches: [ main, master ]
13+
14+
jobs:
15+
build:
16+
name: Build OpenAPI Petstore
17+
runs-on: ubuntu-latest
18+
strategy:
19+
matrix:
20+
java: [ 17, 21 ]
21+
steps:
22+
- uses: actions/checkout@v4
23+
- name: Set up JDK
24+
uses: actions/setup-java@v4
25+
with:
26+
java-version: ${{ matrix.java }}
27+
distribution: 'temurin'
28+
cache: maven
29+
- name: Build with Maven
30+
run: mvn -B package --no-transfer-progress --file pom.xml

‎samples/client/petstore/java/native-jackson3/.gitignore‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
*.class
2+
3+
# Mobile Tools for Java (J2ME)
4+
.mtj.tmp/
5+
6+
# Package Files #
7+
*.jar
8+
*.war
9+
*.ear
10+
11+
# exclude jar for gradle wrapper
12+
!gradle/wrapper/*.jar
13+
14+
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
15+
hs_err_pid*
16+
17+
# build files
18+
**/target
19+
target
20+
.gradle
21+
build

‎samples/client/petstore/java/native-jackson3/.openapi-generator-ignore‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
# OpenAPI Generator Ignore
2+
# Generated by openapi-generator https://github.com/openapitools/openapi-generator
3+
4+
# Use this file to prevent files from being overwritten by the generator.
5+
# The patterns follow closely to .gitignore or .dockerignore.
6+
7+
# As an example, the C# client generator defines ApiClient.cs.
8+
# You can make changes and tell OpenAPI Generator to ignore just this file by uncommenting the following line:
9+
#ApiClient.cs
10+
11+
# You can match any string of characters against a directory, file or extension with a single asterisk (*):
12+
#foo/*/qux
13+
# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux
14+
15+
# You can recursively match patterns against a directory, file or extension with a double asterisk (**):
16+
#foo/**/qux
17+
# This matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux
18+
19+
# You can also negate patterns with an exclamation (!).
20+
# For example, you can ignore all files in a docs folder with the file extension .md:
21+
#docs/*.md
22+
# Then explicitly reverse the ignore rule for a single file:
23+
#!docs/README.md

‎samples/client/petstore/java/native-jackson3/.openapi-generator/FILES‎

Lines changed: 198 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,198 @@
1+
.github/workflows/maven.yml
2+
.gitignore
3+
.travis.yml
4+
README.md
5+
api/openapi.yaml
6+
build.gradle
7+
build.sbt
8+
docs/AdditionalPropertiesClass.md
9+
docs/AllOfRefToDouble.md
10+
docs/AllOfRefToFloat.md
11+
docs/AllOfRefToLong.md
12+
docs/Animal.md
13+
docs/AnotherFakeApi.md
14+
docs/Apple.md
15+
docs/AppleReq.md
16+
docs/ArrayOfArrayOfNumberOnly.md
17+
docs/ArrayOfNumberOnly.md
18+
docs/ArrayTest.md
19+
docs/Banana.md
20+
docs/BananaReq.md
21+
docs/BasquePig.md
22+
docs/Capitalization.md
23+
docs/Cat.md
24+
docs/Category.md
25+
docs/ChildCat.md
26+
docs/ClassModel.md
27+
docs/Client.md
28+
docs/ComplexQuadrilateral.md
29+
docs/DanishPig.md
30+
docs/DefaultApi.md
31+
docs/DeprecatedObject.md
32+
docs/Dog.md
33+
docs/Drawing.md
34+
docs/EnumArrays.md
35+
docs/EnumClass.md
36+
docs/EnumTest.md
37+
docs/EquilateralTriangle.md
38+
docs/FakeApi.md
39+
docs/FakeBigDecimalMap200Response.md
40+
docs/FakeClassnameTags123Api.md
41+
docs/FileSchemaTestClass.md
42+
docs/Foo.md
43+
docs/FooGetDefaultResponse.md
44+
docs/FormatTest.md
45+
docs/Fruit.md
46+
docs/FruitReq.md
47+
docs/GmFruit.md
48+
docs/GrandparentAnimal.md
49+
docs/HasOnlyReadOnly.md
50+
docs/HealthCheckResult.md
51+
docs/IsoscelesTriangle.md
52+
docs/Mammal.md
53+
docs/MapTest.md
54+
docs/MixedPropertiesAndAdditionalPropertiesClass.md
55+
docs/Model200Response.md
56+
docs/ModelApiResponse.md
57+
docs/ModelFile.md
58+
docs/ModelList.md
59+
docs/ModelReturn.md
60+
docs/Name.md
61+
docs/NullableClass.md
62+
docs/NullableShape.md
63+
docs/NumberOnly.md
64+
docs/ObjectWithDeprecatedFields.md
65+
docs/Order.md
66+
docs/OuterComposite.md
67+
docs/OuterEnum.md
68+
docs/OuterEnumDefaultValue.md
69+
docs/OuterEnumInteger.md
70+
docs/OuterEnumIntegerDefaultValue.md
71+
docs/ParentPet.md
72+
docs/Pet.md
73+
docs/PetApi.md
74+
docs/Pig.md
75+
docs/Quadrilateral.md
76+
docs/QuadrilateralInterface.md
77+
docs/ReadOnlyFirst.md
78+
docs/ScaleneTriangle.md
79+
docs/Shape.md
80+
docs/ShapeInterface.md
81+
docs/ShapeOrNull.md
82+
docs/SimpleQuadrilateral.md
83+
docs/SpecialModelName.md
84+
docs/StoreApi.md
85+
docs/Tag.md
86+
docs/TestInlineFreeformAdditionalPropertiesRequest.md
87+
docs/Triangle.md
88+
docs/TriangleInterface.md
89+
docs/User.md
90+
docs/UserApi.md
91+
docs/Whale.md
92+
docs/Zebra.md
93+
git_push.sh
94+
gradle.properties
95+
gradle/wrapper/gradle-wrapper.jar
96+
gradle/wrapper/gradle-wrapper.properties
97+
gradlew
98+
gradlew.bat
99+
pom.xml
100+
settings.gradle
101+
src/main/AndroidManifest.xml
102+
src/main/java/org/openapitools/client/ApiClient.java
103+
src/main/java/org/openapitools/client/ApiException.java
104+
src/main/java/org/openapitools/client/ApiResponse.java
105+
src/main/java/org/openapitools/client/Configuration.java
106+
src/main/java/org/openapitools/client/JSON.java
107+
src/main/java/org/openapitools/client/Pair.java
108+
src/main/java/org/openapitools/client/RFC3339DateFormat.java
109+
src/main/java/org/openapitools/client/RFC3339InstantDeserializer.java
110+
src/main/java/org/openapitools/client/RFC3339JavaTimeModule.java
111+
src/main/java/org/openapitools/client/ServerConfiguration.java
112+
src/main/java/org/openapitools/client/ServerVariable.java
113+
src/main/java/org/openapitools/client/api/AnotherFakeApi.java
114+
src/main/java/org/openapitools/client/api/DefaultApi.java
115+
src/main/java/org/openapitools/client/api/FakeApi.java
116+
src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java
117+
src/main/java/org/openapitools/client/api/PetApi.java
118+
src/main/java/org/openapitools/client/api/StoreApi.java
119+
src/main/java/org/openapitools/client/api/UserApi.java
120+
src/main/java/org/openapitools/client/model/AbstractOpenApiSchema.java
121+
src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
122+
src/main/java/org/openapitools/client/model/AllOfRefToDouble.java
123+
src/main/java/org/openapitools/client/model/AllOfRefToFloat.java
124+
src/main/java/org/openapitools/client/model/AllOfRefToLong.java
125+
src/main/java/org/openapitools/client/model/Animal.java
126+
src/main/java/org/openapitools/client/model/Apple.java
127+
src/main/java/org/openapitools/client/model/AppleReq.java
128+
src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
129+
src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
130+
src/main/java/org/openapitools/client/model/ArrayTest.java
131+
src/main/java/org/openapitools/client/model/Banana.java
132+
src/main/java/org/openapitools/client/model/BananaReq.java
133+
src/main/java/org/openapitools/client/model/BasquePig.java
134+
src/main/java/org/openapitools/client/model/Capitalization.java
135+
src/main/java/org/openapitools/client/model/Cat.java
136+
src/main/java/org/openapitools/client/model/Category.java
137+
src/main/java/org/openapitools/client/model/ChildCat.java
138+
src/main/java/org/openapitools/client/model/ClassModel.java
139+
src/main/java/org/openapitools/client/model/Client.java
140+
src/main/java/org/openapitools/client/model/ComplexQuadrilateral.java
141+
src/main/java/org/openapitools/client/model/DanishPig.java
142+
src/main/java/org/openapitools/client/model/DeprecatedObject.java
143+
src/main/java/org/openapitools/client/model/Dog.java
144+
src/main/java/org/openapitools/client/model/Drawing.java
145+
src/main/java/org/openapitools/client/model/EnumArrays.java
146+
src/main/java/org/openapitools/client/model/EnumClass.java
147+
src/main/java/org/openapitools/client/model/EnumTest.java
148+
src/main/java/org/openapitools/client/model/EquilateralTriangle.java
149+
src/main/java/org/openapitools/client/model/FakeBigDecimalMap200Response.java
150+
src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
151+
src/main/java/org/openapitools/client/model/Foo.java
152+
src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java
153+
src/main/java/org/openapitools/client/model/FormatTest.java
154+
src/main/java/org/openapitools/client/model/Fruit.java
155+
src/main/java/org/openapitools/client/model/FruitReq.java
156+
src/main/java/org/openapitools/client/model/GmFruit.java
157+
src/main/java/org/openapitools/client/model/GrandparentAnimal.java
158+
src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
159+
src/main/java/org/openapitools/client/model/HealthCheckResult.java
160+
src/main/java/org/openapitools/client/model/IsoscelesTriangle.java
161+
src/main/java/org/openapitools/client/model/Mammal.java
162+
src/main/java/org/openapitools/client/model/MapTest.java
163+
src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
164+
src/main/java/org/openapitools/client/model/Model200Response.java
165+
src/main/java/org/openapitools/client/model/ModelApiResponse.java
166+
src/main/java/org/openapitools/client/model/ModelFile.java
167+
src/main/java/org/openapitools/client/model/ModelList.java
168+
src/main/java/org/openapitools/client/model/ModelReturn.java
169+
src/main/java/org/openapitools/client/model/Name.java
170+
src/main/java/org/openapitools/client/model/NullableClass.java
171+
src/main/java/org/openapitools/client/model/NullableShape.java
172+
src/main/java/org/openapitools/client/model/NumberOnly.java
173+
src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java
174+
src/main/java/org/openapitools/client/model/Order.java
175+
src/main/java/org/openapitools/client/model/OuterComposite.java
176+
src/main/java/org/openapitools/client/model/OuterEnum.java
177+
src/main/java/org/openapitools/client/model/OuterEnumDefaultValue.java
178+
src/main/java/org/openapitools/client/model/OuterEnumInteger.java
179+
src/main/java/org/openapitools/client/model/OuterEnumIntegerDefaultValue.java
180+
src/main/java/org/openapitools/client/model/ParentPet.java
181+
src/main/java/org/openapitools/client/model/Pet.java
182+
src/main/java/org/openapitools/client/model/Pig.java
183+
src/main/java/org/openapitools/client/model/Quadrilateral.java
184+
src/main/java/org/openapitools/client/model/QuadrilateralInterface.java
185+
src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
186+
src/main/java/org/openapitools/client/model/ScaleneTriangle.java
187+
src/main/java/org/openapitools/client/model/Shape.java
188+
src/main/java/org/openapitools/client/model/ShapeInterface.java
189+
src/main/java/org/openapitools/client/model/ShapeOrNull.java
190+
src/main/java/org/openapitools/client/model/SimpleQuadrilateral.java
191+
src/main/java/org/openapitools/client/model/SpecialModelName.java
192+
src/main/java/org/openapitools/client/model/Tag.java
193+
src/main/java/org/openapitools/client/model/TestInlineFreeformAdditionalPropertiesRequest.java
194+
src/main/java/org/openapitools/client/model/Triangle.java
195+
src/main/java/org/openapitools/client/model/TriangleInterface.java
196+
src/main/java/org/openapitools/client/model/User.java
197+
src/main/java/org/openapitools/client/model/Whale.java
198+
src/main/java/org/openapitools/client/model/Zebra.java

0 commit comments

Comments
 (0)