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

13
samples/client/petstore/java/resteasy/build.gradle
View File

@@ -93,12 +93,12 @@ if(hasProperty('target') && target == 'android') {
}
ext {
swagger_annotations_version = "1.5.18"
jackson_version = "2.8.6"
swagger_annotations_version = "1.5.21"
jackson_version = "2.8.11"
jackson_databind_version = "2.8.11.2"
threetenbp_version = "2.6.4"
jersey_version = "2.22.2"
resteasy_version = "3.1.3.Final"
jodatime_version = "2.9.4"
jodatime_version = "2.9.9"
junit_version = "4.12"
}
@@ -107,12 +107,9 @@ dependencies {
compile "org.jboss.resteasy:resteasy-client:$resteasy_version"
compile "org.jboss.resteasy:resteasy-multipart-provider:$resteasy_version"
compile "org.jboss.resteasy:resteasy-jackson2-provider:$resteasy_version"
compile "org.glassfish.jersey.core:jersey-client:$jersey_version"
compile "org.glassfish.jersey.media:jersey-media-multipart:$jersey_version"
compile "org.glassfish.jersey.media:jersey-media-json-jackson:$jersey_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:$threetenbp_version"
compile "com.fasterxml.jackson.datatype:jackson-datatype-joda:$jackson_version"
compile "joda-time:joda-time:$jodatime_version"

25
samples/client/petstore/java/resteasy/build.sbt
View File

@@ -9,20 +9,17 @@ lazy val root = (project in file(".")).
publishArtifact in (Compile, packageDoc) := false,
resolvers += Resolver.mavenLocal,
libraryDependencies ++= Seq(
"io.swagger" % "swagger-annotations" % "1.5.18",
"org.glassfish.jersey.core" % "jersey-client" % "2.22.2",
"org.glassfish.jersey.media" % "jersey-media-multipart" % "2.22.2",
"org.glassfish.jersey.media" % "jersey-media-json-jackson" % "2.22.2",
"org.jboss.resteasy" % "resteasy-client" % "3.1.3.Final",
"org.jboss.resteasy" % "resteasy-multipart-provider" % "3.1.3.Final",
"org.jboss.resteasy" % "resteasy-jackson2-provider" % "3.1.3.Final",
"com.fasterxml.jackson.core" % "jackson-core" % "2.8.6",
"com.fasterxml.jackson.core" % "jackson-annotations" % "2.8.6",
"com.fasterxml.jackson.core" % "jackson-databind" % "2.8.6",
"com.github.joschi.jackson" % "jackson-datatype-threetenbp" % "2.6.4",
"com.fasterxml.jackson.datatype" % "jackson-datatype-joda" % "2.7.5",
"joda-time" % "joda-time" % "2.9.4",
"com.brsanthu" % "migbase64" % "2.2",
"io.swagger" % "swagger-annotations" % "1.5.21" % "compile",
"org.jboss.resteasy" % "resteasy-client" % "3.1.3.Final" % "compile",
"org.jboss.resteasy" % "resteasy-multipart-provider" % "3.1.3.Final" % "compile",
"org.jboss.resteasy" % "resteasy-jackson2-provider" % "3.1.3.Final" % "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.github.joschi.jackson" % "jackson-datatype-threetenbp" % "2.6.4" % "compile",
"com.fasterxml.jackson.datatype" % "jackson-datatype-joda" % "2.7.5" % "compile",
"joda-time" % "joda-time" % "2.9.9" % "compile",
"com.brsanthu" % "migbase64" % "2.2" % "compile",
"junit" % "junit" % "4.12" % "test",
"com.novocode" % "junit-interface" % "0.10" % "test"
)

2
samples/client/petstore/java/resteasy/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/resteasy/pom.xml
View File

@@ -168,7 +168,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.datatype</groupId>
@@ -215,7 +215,8 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<swagger-annotations-version>1.5.21</swagger-annotations-version>
<resteasy-version>3.1.3.Final</resteasy-version>
<jackson-version>2.8.6</jackson-version>
<jackson-version>2.8.11</jackson-version>
<jackson-databind-version>2.8.11</jackson-databind-version>
<threetenbp-version>2.6.4</threetenbp-version>
<jodatime-version>2.9.9</jodatime-version>
<maven-plugin-version>1.0.0</maven-plugin-version>

4
samples/client/petstore/java/resteasy/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;
}