Skip to content

Commit 1a45ab5

Browse files
committed
bump jackson version to 2.9.9 in java feign
1 parent b2113e7 commit 1a45ab5

Some content is hidden

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

52 files changed

+975
-919
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.0.6-SNAPSHOT
1+
3.0.11-SNAPSHOT

samples/client/petstore/java/feign/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ if(hasProperty('target') && target == 'android') {
9595

9696
ext {
9797
swagger_annotations_version = "2.0.0"
98-
jackson_version = "2.8.7"
98+
jackson_version = "2.9.9"
9999
threepane_version = "2.6.4"
100100
feign_version = "9.4.0"
101101
feign_form_version = "2.1.0"

samples/client/petstore/java/feign/build.sbt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ lazy val root = (project in file(".")).
1414
"com.netflix.feign" % "feign-jackson" % "9.4.0" % "compile",
1515
"com.netflix.feign" % "feign-slf4j" % "9.4.0" % "compile",
1616
"io.github.openfeign.form" % "feign-form" % "2.1.0" % "compile",
17-
"com.fasterxml.jackson.core" % "jackson-core" % "2.8.7" % "compile",
18-
"com.fasterxml.jackson.core" % "jackson-annotations" % "2.8.7" % "compile",
19-
"com.fasterxml.jackson.core" % "jackson-databind" % "2.8.7" % "compile",
20-
"com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.8.7" % "compile",
17+
"com.fasterxml.jackson.core" % "jackson-core" % "2.9.9" % "compile",
18+
"com.fasterxml.jackson.core" % "jackson-annotations" % "2.9.9" % "compile",
19+
"com.fasterxml.jackson.core" % "jackson-databind" % "2.9.9" % "compile",
20+
"com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.9.9" % "compile",
2121
"org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.2" % "compile",
2222
"com.brsanthu" % "migbase64" % "2.2" % "compile",
2323
"junit" % "junit" % "4.12" % "test",

samples/client/petstore/java/feign/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@
255255
<swagger-core-version>2.0.0</swagger-core-version>
256256
<feign-version>9.4.0</feign-version>
257257
<feign-form-version>2.1.0</feign-form-version>
258-
<jackson-version>2.8.9</jackson-version>
258+
<jackson-version>2.9.9</jackson-version>
259259
<jackson-threetenbp-version>2.6.4</jackson-threetenbp-version>
260260
<junit-version>4.12</junit-version>
261261
<maven-plugin-version>1.0.0</maven-plugin-version>

samples/client/petstore/java/feign/src/main/java/io/swagger/client/api/AnimalApi.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ public interface AnimalApi extends ApiClient.Api {
2020
*/
2121
@RequestLine("POST /animal")
2222
@Headers({
23+
"Content-Type: application/json",
2324
"Accept: */*",
2425
})
2526
void addAnimal(Animal body);
@@ -31,6 +32,7 @@ public interface AnimalApi extends ApiClient.Api {
3132
*/
3233
@RequestLine("DELETE /animal/{animalId}")
3334
@Headers({
35+
"Content-Type: application/json",
3436
"Accept: */*",
3537
"api_key: {apiKey}"
3638
})
@@ -43,7 +45,7 @@ public interface AnimalApi extends ApiClient.Api {
4345
*/
4446
@RequestLine("GET /animal/{animalId}")
4547
@Headers({
46-
"Accept: */*",
48+
"Accept: application/json",
4749
})
4850
Animal getAnimalById(@Param("animalId") Long animalId);
4951
/**
@@ -53,6 +55,7 @@ public interface AnimalApi extends ApiClient.Api {
5355
*/
5456
@RequestLine("PUT /animal")
5557
@Headers({
58+
"Content-Type: application/json",
5659
"Accept: */*",
5760
})
5861
void updateAnimal(Animal body);
@@ -65,6 +68,7 @@ public interface AnimalApi extends ApiClient.Api {
6568
*/
6669
@RequestLine("POST /animal/{animalId}")
6770
@Headers({
71+
"Content-Type: application/x-www-form-urlencoded",
6872
"Accept: */*",
6973
})
7074
void updateAnimalWithForm(@Param("animalId") Long animalId, @Param("name") String name, @Param("status") String status);

samples/client/petstore/java/feign/src/main/java/io/swagger/client/api/AnotherFakeApi.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ public interface AnotherFakeApi extends ApiClient.Api {
2121
*/
2222
@RequestLine("PATCH /another-fake/dummy")
2323
@Headers({
24-
"Accept: */*",
24+
"Content-Type: application/json",
25+
"Accept: application/json",
2526
})
2627
Client testSpecialTags(Client body);
2728
}

samples/client/petstore/java/feign/src/main/java/io/swagger/client/api/DogApi.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ public interface DogApi extends ApiClient.Api {
2020
*/
2121
@RequestLine("POST /dog")
2222
@Headers({
23+
"Content-Type: application/json",
2324
"Accept: */*",
2425
})
2526
void addDog(Dog body);
@@ -31,6 +32,7 @@ public interface DogApi extends ApiClient.Api {
3132
*/
3233
@RequestLine("DELETE /dog/{dogId}")
3334
@Headers({
35+
"Content-Type: application/json",
3436
"Accept: */*",
3537
"api_key: {apiKey}"
3638
})
@@ -43,7 +45,7 @@ public interface DogApi extends ApiClient.Api {
4345
*/
4446
@RequestLine("GET /dog/{dogId}")
4547
@Headers({
46-
"Accept: */*",
48+
"Accept: application/json",
4749
})
4850
Dog getDogById(@Param("dogId") Long dogId);
4951
/**
@@ -53,6 +55,7 @@ public interface DogApi extends ApiClient.Api {
5355
*/
5456
@RequestLine("PUT /dog")
5557
@Headers({
58+
"Content-Type: application/json",
5659
"Accept: */*",
5760
})
5861
void updateDog(Dog body);
@@ -65,6 +68,7 @@ public interface DogApi extends ApiClient.Api {
6568
*/
6669
@RequestLine("POST /dog/{dogId}")
6770
@Headers({
71+
"Content-Type: application/x-www-form-urlencoded",
6872
"Accept: */*",
6973
})
7074
void updateDogWithForm(@Param("animalId") Long animalId, @Param("name") String name, @Param("status") String status);

samples/client/petstore/java/feign/src/main/java/io/swagger/client/api/FakeApi.java

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ public interface FakeApi extends ApiClient.Api {
2727
*/
2828
@RequestLine("POST /fake/outer/boolean")
2929
@Headers({
30+
"Content-Type: */*",
3031
"Accept: */*",
3132
})
3233
Boolean fakeOuterBooleanSerialize(Boolean body);
@@ -38,6 +39,7 @@ public interface FakeApi extends ApiClient.Api {
3839
*/
3940
@RequestLine("POST /fake/outer/composite")
4041
@Headers({
42+
"Content-Type: */*",
4143
"Accept: */*",
4244
})
4345
OuterComposite fakeOuterCompositeSerialize(OuterComposite body);
@@ -49,6 +51,7 @@ public interface FakeApi extends ApiClient.Api {
4951
*/
5052
@RequestLine("POST /fake/outer/number")
5153
@Headers({
54+
"Content-Type: */*",
5255
"Accept: */*",
5356
})
5457
BigDecimal fakeOuterNumberSerialize(BigDecimal body);
@@ -60,6 +63,7 @@ public interface FakeApi extends ApiClient.Api {
6063
*/
6164
@RequestLine("POST /fake/outer/string")
6265
@Headers({
66+
"Content-Type: */*",
6367
"Accept: */*",
6468
})
6569
String fakeOuterStringSerialize(String body);
@@ -71,7 +75,8 @@ public interface FakeApi extends ApiClient.Api {
7175
*/
7276
@RequestLine("PATCH /fake")
7377
@Headers({
74-
"Accept: */*",
78+
"Content-Type: application/json",
79+
"Accept: application/json",
7580
})
7681
Client testClientModel(Client body);
7782
/**
@@ -81,6 +86,7 @@ public interface FakeApi extends ApiClient.Api {
8186
*/
8287
@RequestLine("POST /fake")
8388
@Headers({
89+
"Content-Type: application/xml; charset&#x3D;utf-8",
8490
"Accept: */*",
8591
})
8692
void testEndpointParameters(Body2 body);
@@ -153,6 +159,7 @@ public TestEnumParametersQueryParams enumQueryInteger(final Integer value) {
153159
*/
154160
@RequestLine("POST /fake/enum/form")
155161
@Headers({
162+
"Content-Type: */*",
156163
"Accept: */*",
157164
})
158165
void testEnumRequestBody(Body4 body);
@@ -163,6 +170,7 @@ public TestEnumParametersQueryParams enumQueryInteger(final Integer value) {
163170
*/
164171
@RequestLine("POST /fake/inline-additionalProperties")
165172
@Headers({
173+
"Content-Type: application/json",
166174
"Accept: */*",
167175
})
168176
void testInlineAdditionalProperties(Map<String, String> body);
@@ -173,6 +181,7 @@ public TestEnumParametersQueryParams enumQueryInteger(final Integer value) {
173181
*/
174182
@RequestLine("POST /fake/jsonFormData")
175183
@Headers({
184+
"Content-Type: application/json",
176185
"Accept: */*",
177186
})
178187
void testJsonFormData(Body5 body);

samples/client/petstore/java/feign/src/main/java/io/swagger/client/api/FakeClassnameTags123Api.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ public interface FakeClassnameTags123Api extends ApiClient.Api {
2121
*/
2222
@RequestLine("PATCH /fake_classname_test")
2323
@Headers({
24-
"Accept: */*",
24+
"Content-Type: application/json",
25+
"Accept: application/json",
2526
})
2627
Client testClassname(Client body);
2728
}

samples/client/petstore/java/feign/src/main/java/io/swagger/client/api/PetApi.java

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ public interface PetApi extends ApiClient.Api {
2222
*/
2323
@RequestLine("POST /pet")
2424
@Headers({
25+
"Content-Type: application/json",
2526
"Accept: */*",
2627
})
2728
void addPet(Pet body);
@@ -33,6 +34,7 @@ public interface PetApi extends ApiClient.Api {
3334
*/
3435
@RequestLine("DELETE /pet/{petId}")
3536
@Headers({
37+
"Content-Type: application/json",
3638
"Accept: */*",
3739
"api_key: {apiKey}"
3840
})
@@ -45,7 +47,7 @@ public interface PetApi extends ApiClient.Api {
4547
*/
4648
@RequestLine("GET /pet/findByStatus?status={status}")
4749
@Headers({
48-
"Accept: */*",
50+
"Accept: application/json",
4951
})
5052
List<Pet> findPetsByStatus(@Param("status") List<String> status);
5153

@@ -68,6 +70,7 @@ public interface PetApi extends ApiClient.Api {
6870
@RequestLine("GET /pet/findByStatus?status={status}")
6971
@Headers({
7072
"Content-Type: */*",
73+
"Accept: application/json",
7174
})
7275
List<Pet> findPetsByStatus(@QueryMap(encoded=true) Map<String, Object> queryParams);
7376

@@ -89,7 +92,7 @@ public FindPetsByStatusQueryParams status(final List<String> value) {
8992
*/
9093
@RequestLine("GET /pet/findByTags?tags={tags}")
9194
@Headers({
92-
"Accept: */*",
95+
"Accept: application/json",
9396
})
9497
List<Pet> findPetsByTags(@Param("tags") List<String> tags);
9598

@@ -112,6 +115,7 @@ public FindPetsByStatusQueryParams status(final List<String> value) {
112115
@RequestLine("GET /pet/findByTags?tags={tags}")
113116
@Headers({
114117
"Content-Type: */*",
118+
"Accept: application/json",
115119
})
116120
List<Pet> findPetsByTags(@QueryMap(encoded=true) Map<String, Object> queryParams);
117121

@@ -133,7 +137,7 @@ public FindPetsByTagsQueryParams tags(final List<String> value) {
133137
*/
134138
@RequestLine("GET /pet/{petId}")
135139
@Headers({
136-
"Accept: */*",
140+
"Accept: application/json",
137141
})
138142
Pet getPetById(@Param("petId") Long petId);
139143
/**
@@ -143,6 +147,7 @@ public FindPetsByTagsQueryParams tags(final List<String> value) {
143147
*/
144148
@RequestLine("PUT /pet")
145149
@Headers({
150+
"Content-Type: application/json",
146151
"Accept: */*",
147152
})
148153
void updatePet(Pet body);
@@ -155,6 +160,7 @@ public FindPetsByTagsQueryParams tags(final List<String> value) {
155160
*/
156161
@RequestLine("POST /pet/{petId}")
157162
@Headers({
163+
"Content-Type: application/x-www-form-urlencoded",
158164
"Accept: */*",
159165
})
160166
void updatePetWithForm(@Param("petId") Long petId, @Param("name") String name, @Param("status") String status);
@@ -168,7 +174,8 @@ public FindPetsByTagsQueryParams tags(final List<String> value) {
168174
*/
169175
@RequestLine("POST /pet/{petId}/uploadImage")
170176
@Headers({
171-
"Accept: */*",
177+
"Content-Type: multipart/form-data",
178+
"Accept: application/json",
172179
})
173180
ModelApiResponse uploadFile(@Param("petId") Long petId, @Param("additionalMetadata") String additionalMetadata, @Param("file") File file);
174181
}

0 commit comments

Comments
 (0)