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

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

Browse Source
This commit is contained in:
William Cheng
2018-10-26 21:04:25 +08:00
parent a3dc5ecc20 6b41260755
commit 3482a0a993
757 changed files with 23913 additions and 2474 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
samples/client/petstore/java/resttemplate-withXml/build.gradle
View File

@@ -95,7 +95,8 @@ if(hasProperty('target') && target == 'android') {
ext {
swagger_annotations_version = "1.5.21"
jackson_version = "2.8.9"
jackson_version = "2.8.11"
jackson_databind_version = "2.8.11.2"
spring_web_version = "4.3.9.RELEASE"
jodatime_version = "2.9.9"
junit_version = "4.12"
@@ -107,7 +108,7 @@ dependencies {
compile "org.springframework:spring-web:$spring_web_version"
compile "com.fasterxml.jackson.core:jackson-core:$jackson_version"
compile "com.fasterxml.jackson.core:jackson-annotations:$jackson_version"
compile "com.fasterxml.jackson.core:jackson-databind:$jackson_version"
compile "com.fasterxml.jackson.core:jackson-databind:$jackson_databind_version"
compile "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:$jackson_version"
compile "com.github.joschi.jackson:jackson-datatype-threetenbp:$jackson_threeten_version"
compile "com.fasterxml.jackson.dataformat:jackson-dataformat-xml:$jackson_version"

2
samples/client/petstore/java/resttemplate-withXml/docs/Category.md
View File

@@ -5,7 +5,7 @@
Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
**id** | **Long** | | [optional]
**name** | **String** | | [optional]
**name** | **String** | |

5
samples/client/petstore/java/resttemplate-withXml/pom.xml
View File

@@ -222,7 +222,7 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${jackson-version}</version>
<version>${jackson-databind-version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.jaxrs</groupId>
@@ -255,7 +255,8 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<swagger-annotations-version>1.5.21</swagger-annotations-version>
<spring-web-version>4.3.9.RELEASE</spring-web-version>
<jackson-version>2.8.9</jackson-version>
<jackson-version>2.8.11</jackson-version>
<jackson-databind-version>2.8.11.2</jackson-databind-version>
<jackson-threetenbp-version>2.6.4</jackson-threetenbp-version>
<maven-plugin-version>1.0.0</maven-plugin-version>
<junit-version>4.12</junit-version>

4
samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Category.java
View File

@@ -39,7 +39,7 @@ public class Category {
@JsonProperty("name")
@JacksonXmlProperty(localName = "name")
@XmlElement(name = "name")
private String name;
private String name = "default-name";
public Category id(Long id) {
this.id = id;
@@ -68,7 +68,7 @@ public class Category {
* Get name
* @return name
**/
@ApiModelProperty(value = "")
@ApiModelProperty(required = true, value = "")
public String getName() {
return name;
}