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

Avoid using import mapping in model generation (#11217)

Browse Source 
* remove import mapping logic in model generation, better handle of file, list

* add new files for file, list

* fix some tests

* update tests, doc

* skip file as reserved word in feign client

* add new files

* remove file from reserved word list in spring generator
This commit is contained in:
William Cheng
2022-01-16 23:57:53 +08:00
committed by GitHub
parent 3f4e7d8263
commit 33bce99b8e
382 changed files with 7655 additions and 1348 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/PetApi.java
View File

@@ -421,12 +421,12 @@ public class PetApi {
* <p><b>200</b> - successful operation
* @param petId ID of pet to update (required)
* @param additionalMetadata Additional data to pass to server (optional)
* @param file file to upload (optional)
* @param _file file to upload (optional)
* @return ModelApiResponse
* @throws RestClientException if an error occurs while attempting to invoke the API
*/
public ModelApiResponse uploadFile(Long petId, String additionalMetadata, File file) throws RestClientException {
return uploadFileWithHttpInfo(petId, additionalMetadata, file).getBody();
public ModelApiResponse uploadFile(Long petId, String additionalMetadata, File _file) throws RestClientException {
return uploadFileWithHttpInfo(petId, additionalMetadata, _file).getBody();
}
/**
@@ -435,11 +435,11 @@ public class PetApi {
* <p><b>200</b> - successful operation
* @param petId ID of pet to update (required)
* @param additionalMetadata Additional data to pass to server (optional)
* @param file file to upload (optional)
* @param _file file to upload (optional)
* @return ResponseEntity&lt;ModelApiResponse&gt;
* @throws RestClientException if an error occurs while attempting to invoke the API
*/
public ResponseEntity<ModelApiResponse> uploadFileWithHttpInfo(Long petId, String additionalMetadata, File file) throws RestClientException {
public ResponseEntity<ModelApiResponse> uploadFileWithHttpInfo(Long petId, String additionalMetadata, File _file) throws RestClientException {
Object postBody = null;
// verify the required parameter 'petId' is set
@@ -458,8 +458,8 @@ public class PetApi {
if (additionalMetadata != null)
formParams.add("additionalMetadata", additionalMetadata);
if (file != null)
formParams.add("file", new FileSystemResource(file));
if (_file != null)
formParams.add("file", new FileSystemResource(_file));
final String[] localVarAccepts = {
"application/json"

37
samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
View File

@@ -24,6 +24,7 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.util.ArrayList;
import java.util.List;
import org.openapitools.client.model.ModelFile;
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
import com.fasterxml.jackson.annotation.JsonTypeName;
import com.fasterxml.jackson.dataformat.xml.annotation.*;
@@ -44,27 +45,27 @@ import javax.xml.bind.annotation.*;
public class FileSchemaTestClass {
public static final String JSON_PROPERTY_FILE = "file";
@XmlElement(name = "file")
private java.io.File file;
private ModelFile _file;
public static final String JSON_PROPERTY_FILES = "files";
// Is a container wrapped=false
// items.name=files items.baseName=files items.xmlName= items.xmlNamespace=
// items.example= items.type=java.io.File
// items.example= items.type=ModelFile
@XmlElement(name = "files")
private List<java.io.File> files = null;
private List<ModelFile> files = null;
public FileSchemaTestClass() {
}
public FileSchemaTestClass file(java.io.File file) {
public FileSchemaTestClass _file(ModelFile _file) {
this.file = file;
this._file = _file;
return this;
}
/**
* Get file
* @return file
* Get _file
* @return _file
**/
@javax.annotation.Nullable
@ApiModelProperty(value = "")
@@ -72,26 +73,26 @@ public class FileSchemaTestClass {
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@JacksonXmlProperty(localName = "file")
public java.io.File getFile() {
return file;
public ModelFile getFile() {
return _file;
}
@JsonProperty(JSON_PROPERTY_FILE)
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@JacksonXmlProperty(localName = "file")
public void setFile(java.io.File file) {
this.file = file;
public void setFile(ModelFile _file) {
this._file = _file;
}
public FileSchemaTestClass files(List<java.io.File> files) {
public FileSchemaTestClass files(List<ModelFile> files) {
this.files = files;
return this;
}
public FileSchemaTestClass addFilesItem(java.io.File filesItem) {
public FileSchemaTestClass addFilesItem(ModelFile filesItem) {
if (this.files == null) {
this.files = new ArrayList<>();
}
@@ -108,14 +109,14 @@ public class FileSchemaTestClass {
@JsonProperty(JSON_PROPERTY_FILES)
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
public List<java.io.File> getFiles() {
public List<ModelFile> getFiles() {
return files;
}
@JsonProperty(JSON_PROPERTY_FILES)
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
public void setFiles(List<java.io.File> files) {
public void setFiles(List<ModelFile> files) {
this.files = files;
}
@@ -129,20 +130,20 @@ public class FileSchemaTestClass {
return false;
}
FileSchemaTestClass fileSchemaTestClass = (FileSchemaTestClass) o;
return Objects.equals(this.file, fileSchemaTestClass.file) &&
return Objects.equals(this._file, fileSchemaTestClass._file) &&
Objects.equals(this.files, fileSchemaTestClass.files);
}
@Override
public int hashCode() {
return Objects.hash(file, files);
return Objects.hash(_file, files);
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append("class FileSchemaTestClass {\n");
sb.append(" file: ").append(toIndentedString(file)).append("\n");
sb.append(" _file: ").append(toIndentedString(_file)).append("\n");
sb.append(" files: ").append(toIndentedString(files)).append("\n");
sb.append("}");
return sb.toString();