[Spring] openapi-generator generates an incorrect stub for types named "Resource (#8178)

* Initial push for fix #1680

* fix yaml

* update samples

Co-authored-by: JBurgess <joel.burgess@gmail.com>
This commit is contained in:
William Cheng
2020-12-14 20:16:25 +08:00
committed by GitHub
parent 24fda2ab59
commit c974c512ff
76 changed files with 74 additions and 149 deletions

View File

@@ -13,7 +13,6 @@ import java.util.Map;
import org.openapitools.model.ModelApiResponse;
import java.time.OffsetDateTime;
import org.openapitools.model.OuterComposite;
import org.springframework.core.io.Resource;
import org.openapitools.model.User;
import org.openapitools.model.XmlItem;
import io.swagger.annotations.*;

View File

@@ -7,7 +7,6 @@ package org.openapitools.api;
import org.openapitools.model.ModelApiResponse;
import org.openapitools.model.Pet;
import org.springframework.core.io.Resource;
import java.util.Set;
import io.swagger.annotations.*;
import org.springframework.http.HttpStatus;

View File

@@ -9,7 +9,6 @@ import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.OffsetDateTime;
import java.util.UUID;
import org.springframework.core.io.Resource;
import org.openapitools.jackson.nullable.JsonNullable;
import javax.validation.Valid;
import javax.validation.constraints.*;
@@ -44,7 +43,7 @@ public class FormatTest {
private byte[] _byte;
@JsonProperty("binary")
private Resource binary;
private org.springframework.core.io.Resource binary;
@JsonProperty("date")
@org.springframework.format.annotation.DateTimeFormat(iso = org.springframework.format.annotation.DateTimeFormat.ISO.DATE)
@@ -236,7 +235,7 @@ public class FormatTest {
this._byte = _byte;
}
public FormatTest binary(Resource binary) {
public FormatTest binary(org.springframework.core.io.Resource binary) {
this.binary = binary;
return this;
}
@@ -249,11 +248,11 @@ public class FormatTest {
@Valid
public Resource getBinary() {
public org.springframework.core.io.Resource getBinary() {
return binary;
}
public void setBinary(Resource binary) {
public void setBinary(org.springframework.core.io.Resource binary) {
this.binary = binary;
}