loafle/openapi-generator-original
3
0
Fork 1
mirror of https://github.com/OpenAPITools/openapi-generator.git synced 2025-12-03 00:43:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/5.3.x' into 6.0.x

Browse Source
This commit is contained in:
William Cheng
2021-07-12 17:11:35 +08:00
parent 702e274659 39fbf53150
commit 35f933b27f
3874 changed files with 120282 additions and 21640 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
samples/server/petstore/springboot-beanvalidation-no-nullable/.openapi-generator/VERSION
View File

@@ -1 +1,5 @@
6.0.0-SNAPSHOT
<<<<<<< HEAD
6.0.0-SNAPSHOT
=======
5.3.0-SNAPSHOT
>>>>>>> origin/5.3.x

4
samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/AnotherFakeApi.java
View File

@@ -1,5 +1,9 @@
/**
<<<<<<< HEAD
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.0.0-SNAPSHOT).
=======
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.3.0-SNAPSHOT).
>>>>>>> origin/5.3.x
* https://openapi-generator.tech
* Do not edit the class manually.
*/

4
samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeApi.java
View File

@@ -1,5 +1,9 @@
/**
<<<<<<< HEAD
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.0.0-SNAPSHOT).
=======
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.3.0-SNAPSHOT).
>>>>>>> origin/5.3.x
* https://openapi-generator.tech
* Do not edit the class manually.
*/

4
samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeClassnameTestApi.java
View File

@@ -1,5 +1,9 @@
/**
<<<<<<< HEAD
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.0.0-SNAPSHOT).
=======
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.3.0-SNAPSHOT).
>>>>>>> origin/5.3.x
* https://openapi-generator.tech
* Do not edit the class manually.
*/

4
samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/PetApi.java
View File

@@ -1,5 +1,9 @@
/**
<<<<<<< HEAD
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.0.0-SNAPSHOT).
=======
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.3.0-SNAPSHOT).
>>>>>>> origin/5.3.x
* https://openapi-generator.tech
* Do not edit the class manually.
*/

4
samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/StoreApi.java
View File

@@ -1,5 +1,9 @@
/**
<<<<<<< HEAD
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.0.0-SNAPSHOT).
=======
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.3.0-SNAPSHOT).
>>>>>>> origin/5.3.x
* https://openapi-generator.tech
* Do not edit the class manually.
*/

4
samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/UserApi.java
View File

@@ -1,5 +1,9 @@
/**
<<<<<<< HEAD
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (6.0.0-SNAPSHOT).
=======
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.3.0-SNAPSHOT).
>>>>>>> origin/5.3.x
* https://openapi-generator.tech
* Do not edit the class manually.
*/

8
samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/FormatTest.java
View File

@@ -43,7 +43,7 @@ public class FormatTest {
private byte[] _byte;
@JsonProperty("binary")
private org.springframework.web.multipart.MultipartFile binary;
private org.springframework.core.io.Resource binary;
@JsonProperty("date")
@org.springframework.format.annotation.DateTimeFormat(iso = org.springframework.format.annotation.DateTimeFormat.ISO.DATE)
@@ -235,7 +235,7 @@ public class FormatTest {
this._byte = _byte;
}
public FormatTest binary(org.springframework.web.multipart.MultipartFile binary) {
public FormatTest binary(org.springframework.core.io.Resource binary) {
this.binary = binary;
return this;
}
@@ -248,11 +248,11 @@ public class FormatTest {
@Valid
public org.springframework.web.multipart.MultipartFile getBinary() {
public org.springframework.core.io.Resource getBinary() {
return binary;
}
public void setBinary(org.springframework.web.multipart.MultipartFile binary) {
public void setBinary(org.springframework.core.io.Resource binary) {
this.binary = binary;
}