loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

Merge remote-tracking branch 'origin/master' into 5.0.x

Browse Source
This commit is contained in:
William Cheng
2020-02-04 15:31:10 +08:00
parent 607f5a1c0a e45a1d03c0
commit 100b01844a
1179 changed files with 58478 additions and 9334 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/ApiClient.java
View File

@@ -563,7 +563,7 @@ public class ApiClient {
entity = Entity.entity(form, MediaType.APPLICATION_FORM_URLENCODED_TYPE);
} else {
// We let jersey handle the serialization
entity = Entity.entity(obj, contentType);
entity = Entity.entity(obj == null ? Entity.text("") : obj, contentType);
}
return entity;
}
@@ -716,7 +716,7 @@ public class ApiClient {
}
}
Entity<?> entity = (body == null) ? Entity.json("") : serialize(body, formParams, contentType);
Entity<?> entity = serialize(body, formParams, contentType);
Response response = null;

2
samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Animal.java
View File

@@ -33,7 +33,7 @@ import com.fasterxml.jackson.annotation.JsonPropertyOrder;
Animal.JSON_PROPERTY_COLOR
})
@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "className", visible = true)
@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "className", visible = true)
@JsonSubTypes({
@JsonSubTypes.Type(value = Dog.class, name = "Dog"),
@JsonSubTypes.Type(value = Cat.class, name = "Cat"),