jlengrand/openapi-generator
1
0
Fork 0
mirror of https://github.com/jlengrand/openapi-generator.git synced 2026-05-11 15:54:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
William Cheng
2018-10-26 18:41:58 +08:00
parent 30062afc7c 9422dea149
commit 4a47acce19
755 changed files with 23905 additions and 2474 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
samples/client/petstore/java/feign/build.gradle
View File

@@ -95,7 +95,8 @@ if(hasProperty('target') && target == 'android') {
ext {
swagger_annotations_version = "1.5.21"
jackson_version = "2.8.7"
jackson_version = "2.8.11"
jackson_databind_version = "2.8.11.2"
threepane_version = "2.6.4"
feign_version = "9.4.0"
feign_form_version = "2.1.0"
@@ -111,7 +112,7 @@ dependencies {
compile "io.github.openfeign.form:feign-form:$feign_form_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.github.joschi.jackson:jackson-datatype-threetenbp:$threepane_version"
compile "org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:$oltu_version"
compile "com.brsanthu:migbase64:2.2"

7
samples/client/petstore/java/feign/build.sbt
View File

@@ -14,10 +14,11 @@ lazy val root = (project in file(".")).
"io.github.openfeign" % "feign-jackson" % "9.4.0" % "compile",
"io.github.openfeign" % "feign-slf4j" % "9.4.0" % "compile",
"io.github.openfeign.form" % "feign-form" % "2.1.0" % "compile",
"com.fasterxml.jackson.core" % "jackson-core" % "2.8.7" % "compile",
"com.fasterxml.jackson.core" % "jackson-annotations" % "2.8.7" % "compile",
"com.fasterxml.jackson.core" % "jackson-databind" % "2.8.7" % "compile",
"com.fasterxml.jackson.core" % "jackson-core" % "2.8.11" % "compile",
"com.fasterxml.jackson.core" % "jackson-annotations" % "2.8.11" % "compile",
"com.fasterxml.jackson.core" % "jackson-databind" % "2.8.11.2" % "compile",
"com.fasterxml.jackson.datatype" % "jackson-datatype-joda" % "2.8.7" % "compile",
"com.github.joschi.jackson" % "jackson-datatype-threetenbp" % "2.6.4" % "compile",
"org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1" % "compile",
"com.brsanthu" % "migbase64" % "2.2" % "compile",
"junit" % "junit" % "4.12" % "test",

5
samples/client/petstore/java/feign/pom.xml
View File

@@ -228,7 +228,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.github.joschi.jackson</groupId>
@@ -269,7 +269,8 @@
<swagger-annotations-version>1.5.21</swagger-annotations-version>
<feign-version>9.4.0</feign-version>
<feign-form-version>2.1.0</feign-form-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>
<junit-version>4.12</junit-version>
<maven-plugin-version>1.0.0</maven-plugin-version>

4
samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Category.java
View File

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