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

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

Browse Source
This commit is contained in:
William Cheng
2019-10-04 15:02:58 +08:00
parent 3019b5a5e1 f955966b09
commit d4500b307f
1246 changed files with 29609 additions and 16734 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
samples/client/petstore/java/jersey2-java6/build.sbt
View File

@@ -13,9 +13,9 @@ lazy val root = (project in file(".")).
"org.glassfish.jersey.core" % "jersey-client" % "2.6",
"org.glassfish.jersey.media" % "jersey-media-multipart" % "2.6",
"org.glassfish.jersey.media" % "jersey-media-json-jackson" % "2.6",
"com.fasterxml.jackson.core" % "jackson-core" % "2.9.9" % "compile",
"com.fasterxml.jackson.core" % "jackson-annotations" % "2.9.9" % "compile",
"com.fasterxml.jackson.core" % "jackson-databind" % "2.9.9" % "compile",
"com.fasterxml.jackson.core" % "jackson-core" % "2.9.10" % "compile",
"com.fasterxml.jackson.core" % "jackson-annotations" % "2.9.10" % "compile",
"com.fasterxml.jackson.core" % "jackson-databind" % "2.9.10" % "compile",
"com.github.joschi.jackson" % "jackson-datatype-threetenbp" % "2.6.4" % "compile",
"com.brsanthu" % "migbase64" % "2.2",
"org.apache.commons" % "commons-lang3" % "3.6",

1
samples/client/petstore/java/jersey2-java6/docs/FormatTest.md
View File

@@ -19,6 +19,7 @@ Name | Type | Description | Notes
**dateTime** | [**OffsetDateTime**](OffsetDateTime.md) | | [optional]
**uuid** | [**UUID**](UUID.md) | | [optional]
**password** | **String** | |
**bigDecimal** | [**BigDecimal**](BigDecimal.md) | | [optional]

4
samples/client/petstore/java/jersey2-java6/pom.xml
View File

@@ -290,8 +290,8 @@
<jersey-version>2.6</jersey-version>
<commons_io_version>2.5</commons_io_version>
<commons_lang3_version>3.6</commons_lang3_version>
<jackson-version>2.9.9</jackson-version>
<jackson-databind-version>2.9.9</jackson-databind-version>
<jackson-version>2.9.10</jackson-version>
<jackson-databind-version>2.9.10</jackson-databind-version>
<jackson-databind-nullable-version>0.2.0</jackson-databind-nullable-version>
<threetenbp-version>2.6.4</threetenbp-version>
<maven-plugin-version>1.0.0</maven-plugin-version>

38
samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/FormatTest.java
View File

@@ -43,7 +43,8 @@ import com.fasterxml.jackson.annotation.JsonPropertyOrder;
FormatTest.JSON_PROPERTY_DATE,
FormatTest.JSON_PROPERTY_DATE_TIME,
FormatTest.JSON_PROPERTY_UUID,
FormatTest.JSON_PROPERTY_PASSWORD
FormatTest.JSON_PROPERTY_PASSWORD,
FormatTest.JSON_PROPERTY_BIG_DECIMAL
})
public class FormatTest {
@@ -86,6 +87,9 @@ public class FormatTest {
public static final String JSON_PROPERTY_PASSWORD = "password";
private String password;
public static final String JSON_PROPERTY_BIG_DECIMAL = "BigDecimal";
private BigDecimal bigDecimal;
public FormatTest integer(Integer integer) {
@@ -431,6 +435,32 @@ public class FormatTest {
}
public FormatTest bigDecimal(BigDecimal bigDecimal) {
this.bigDecimal = bigDecimal;
return this;
}
/**
* Get bigDecimal
* @return bigDecimal
**/
@javax.annotation.Nullable
@ApiModelProperty(value = "")
@JsonProperty(JSON_PROPERTY_BIG_DECIMAL)
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
public BigDecimal getBigDecimal() {
return bigDecimal;
}
public void setBigDecimal(BigDecimal bigDecimal) {
this.bigDecimal = bigDecimal;
}
@Override
public boolean equals(java.lang.Object o) {
if (this == o) {
@@ -452,12 +482,13 @@ public class FormatTest {
ObjectUtils.equals(this.date, formatTest.date) &&
ObjectUtils.equals(this.dateTime, formatTest.dateTime) &&
ObjectUtils.equals(this.uuid, formatTest.uuid) &&
ObjectUtils.equals(this.password, formatTest.password);
ObjectUtils.equals(this.password, formatTest.password) &&
ObjectUtils.equals(this.bigDecimal, formatTest.bigDecimal);
}
@Override
public int hashCode() {
return ObjectUtils.hashCodeMulti(integer, int32, int64, number, _float, _double, string, _byte, binary, date, dateTime, uuid, password);
return ObjectUtils.hashCodeMulti(integer, int32, int64, number, _float, _double, string, _byte, binary, date, dateTime, uuid, password, bigDecimal);
}
@@ -478,6 +509,7 @@ public class FormatTest {
sb.append(" dateTime: ").append(toIndentedString(dateTime)).append("\n");
sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n");
sb.append(" password: ").append(toIndentedString(password)).append("\n");
sb.append(" bigDecimal: ").append(toIndentedString(bigDecimal)).append("\n");
sb.append("}");
return sb.toString();
}