forked from loafle/openapi-generator-original
Merge remote-tracking branch 'origin/master' into 6.3.x
This commit is contained in:
@@ -25,7 +25,6 @@ import javax.annotation.Generated;
|
||||
@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
|
||||
@Validated
|
||||
@Api(value = "another-fake", description = "the another-fake API")
|
||||
@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}")
|
||||
public interface AnotherFakeApi {
|
||||
|
||||
default Optional<NativeWebRequest> getRequest() {
|
||||
|
||||
@@ -28,6 +28,7 @@ import javax.annotation.Generated;
|
||||
|
||||
@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
|
||||
@Controller
|
||||
@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}")
|
||||
public class AnotherFakeApiController implements AnotherFakeApi {
|
||||
|
||||
private final NativeWebRequest request;
|
||||
|
||||
@@ -35,7 +35,6 @@ import javax.annotation.Generated;
|
||||
@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
|
||||
@Validated
|
||||
@Api(value = "fake", description = "the fake API")
|
||||
@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}")
|
||||
public interface FakeApi {
|
||||
|
||||
default Optional<NativeWebRequest> getRequest() {
|
||||
|
||||
@@ -38,6 +38,7 @@ import javax.annotation.Generated;
|
||||
|
||||
@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
|
||||
@Controller
|
||||
@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}")
|
||||
public class FakeApiController implements FakeApi {
|
||||
|
||||
private final NativeWebRequest request;
|
||||
|
||||
@@ -25,7 +25,6 @@ import javax.annotation.Generated;
|
||||
@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
|
||||
@Validated
|
||||
@Api(value = "fake_classname_test", description = "the fake_classname_test API")
|
||||
@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}")
|
||||
public interface FakeClassnameTestApi {
|
||||
|
||||
default Optional<NativeWebRequest> getRequest() {
|
||||
|
||||
@@ -28,6 +28,7 @@ import javax.annotation.Generated;
|
||||
|
||||
@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
|
||||
@Controller
|
||||
@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}")
|
||||
public class FakeClassnameTestApiController implements FakeClassnameTestApi {
|
||||
|
||||
private final NativeWebRequest request;
|
||||
|
||||
@@ -27,7 +27,6 @@ import javax.annotation.Generated;
|
||||
@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
|
||||
@Validated
|
||||
@Api(value = "pet", description = "Everything about your Pets")
|
||||
@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}")
|
||||
public interface PetApi {
|
||||
|
||||
default Optional<NativeWebRequest> getRequest() {
|
||||
|
||||
@@ -30,6 +30,7 @@ import javax.annotation.Generated;
|
||||
|
||||
@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
|
||||
@Controller
|
||||
@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}")
|
||||
public class PetApiController implements PetApi {
|
||||
|
||||
private final NativeWebRequest request;
|
||||
|
||||
@@ -26,7 +26,6 @@ import javax.annotation.Generated;
|
||||
@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
|
||||
@Validated
|
||||
@Api(value = "store", description = "Access to Petstore orders")
|
||||
@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}")
|
||||
public interface StoreApi {
|
||||
|
||||
default Optional<NativeWebRequest> getRequest() {
|
||||
|
||||
@@ -29,6 +29,7 @@ import javax.annotation.Generated;
|
||||
|
||||
@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
|
||||
@Controller
|
||||
@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}")
|
||||
public class StoreApiController implements StoreApi {
|
||||
|
||||
private final NativeWebRequest request;
|
||||
|
||||
@@ -27,7 +27,6 @@ import javax.annotation.Generated;
|
||||
@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
|
||||
@Validated
|
||||
@Api(value = "user", description = "Operations about user")
|
||||
@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}")
|
||||
public interface UserApi {
|
||||
|
||||
default Optional<NativeWebRequest> getRequest() {
|
||||
|
||||
@@ -30,6 +30,7 @@ import javax.annotation.Generated;
|
||||
|
||||
@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
|
||||
@Controller
|
||||
@RequestMapping("${openapi.openAPIPetstore.base-path:/v2}")
|
||||
public class UserApiController implements UserApi {
|
||||
|
||||
private final NativeWebRequest request;
|
||||
|
||||
@@ -0,0 +1,32 @@
|
||||
package org.openapitools.configuration;
|
||||
|
||||
import org.openapitools.model.EnumClass;
|
||||
import org.openapitools.model.OuterEnum;
|
||||
|
||||
import org.springframework.context.annotation.Bean;
|
||||
import org.springframework.context.annotation.Configuration;
|
||||
import org.springframework.core.convert.converter.Converter;
|
||||
|
||||
@Configuration
|
||||
public class EnumConverterConfiguration {
|
||||
|
||||
@Bean
|
||||
Converter<String, EnumClass> enumClassConverter() {
|
||||
return new Converter<String, EnumClass>() {
|
||||
@Override
|
||||
public EnumClass convert(String source) {
|
||||
return EnumClass.fromValue(source);
|
||||
}
|
||||
};
|
||||
}
|
||||
@Bean
|
||||
Converter<String, OuterEnum> outerEnumConverter() {
|
||||
return new Converter<String, OuterEnum>() {
|
||||
@Override
|
||||
public OuterEnum convert(String source) {
|
||||
return OuterEnum.fromValue(source);
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
}
|
||||
@@ -77,9 +77,9 @@ public class Model200Response {
|
||||
if (o == null || getClass() != o.getClass()) {
|
||||
return false;
|
||||
}
|
||||
Model200Response _200response = (Model200Response) o;
|
||||
return Objects.equals(this.name, _200response.name) &&
|
||||
Objects.equals(this.propertyClass, _200response.propertyClass);
|
||||
Model200Response _200Response = (Model200Response) o;
|
||||
return Objects.equals(this.name, _200Response.name) &&
|
||||
Objects.equals(this.propertyClass, _200Response.propertyClass);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -25,25 +25,25 @@ import javax.annotation.Generated;
|
||||
public class ModelList {
|
||||
|
||||
@JsonProperty("123-list")
|
||||
private String _123list;
|
||||
private String _123List;
|
||||
|
||||
public ModelList _123list(String _123list) {
|
||||
this._123list = _123list;
|
||||
public ModelList _123List(String _123List) {
|
||||
this._123List = _123List;
|
||||
return this;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get _123list
|
||||
* @return _123list
|
||||
* Get _123List
|
||||
* @return _123List
|
||||
*/
|
||||
|
||||
@ApiModelProperty(value = "")
|
||||
public String get123list() {
|
||||
return _123list;
|
||||
public String get123List() {
|
||||
return _123List;
|
||||
}
|
||||
|
||||
public void set123list(String _123list) {
|
||||
this._123list = _123list;
|
||||
public void set123List(String _123List) {
|
||||
this._123List = _123List;
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -55,19 +55,19 @@ public class ModelList {
|
||||
return false;
|
||||
}
|
||||
ModelList _list = (ModelList) o;
|
||||
return Objects.equals(this._123list, _list._123list);
|
||||
return Objects.equals(this._123List, _list._123List);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int hashCode() {
|
||||
return Objects.hash(_123list);
|
||||
return Objects.hash(_123List);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
StringBuilder sb = new StringBuilder();
|
||||
sb.append("class ModelList {\n");
|
||||
sb.append(" _123list: ").append(toIndentedString(_123list)).append("\n");
|
||||
sb.append(" _123List: ").append(toIndentedString(_123List)).append("\n");
|
||||
sb.append("}");
|
||||
return sb.toString();
|
||||
}
|
||||
|
||||
@@ -33,7 +33,7 @@ public class Name {
|
||||
private String property;
|
||||
|
||||
@JsonProperty("123Number")
|
||||
private Integer _123number;
|
||||
private Integer _123Number;
|
||||
|
||||
public Name name(Integer name) {
|
||||
this.name = name;
|
||||
@@ -92,23 +92,23 @@ public class Name {
|
||||
this.property = property;
|
||||
}
|
||||
|
||||
public Name _123number(Integer _123number) {
|
||||
this._123number = _123number;
|
||||
public Name _123Number(Integer _123Number) {
|
||||
this._123Number = _123Number;
|
||||
return this;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get _123number
|
||||
* @return _123number
|
||||
* Get _123Number
|
||||
* @return _123Number
|
||||
*/
|
||||
|
||||
@ApiModelProperty(readOnly = true, value = "")
|
||||
public Integer get123number() {
|
||||
return _123number;
|
||||
public Integer get123Number() {
|
||||
return _123Number;
|
||||
}
|
||||
|
||||
public void set123number(Integer _123number) {
|
||||
this._123number = _123number;
|
||||
public void set123Number(Integer _123Number) {
|
||||
this._123Number = _123Number;
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -123,12 +123,12 @@ public class Name {
|
||||
return Objects.equals(this.name, name.name) &&
|
||||
Objects.equals(this.snakeCase, name.snakeCase) &&
|
||||
Objects.equals(this.property, name.property) &&
|
||||
Objects.equals(this._123number, name._123number);
|
||||
Objects.equals(this._123Number, name._123Number);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int hashCode() {
|
||||
return Objects.hash(name, snakeCase, property, _123number);
|
||||
return Objects.hash(name, snakeCase, property, _123Number);
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -138,7 +138,7 @@ public class Name {
|
||||
sb.append(" name: ").append(toIndentedString(name)).append("\n");
|
||||
sb.append(" snakeCase: ").append(toIndentedString(snakeCase)).append("\n");
|
||||
sb.append(" property: ").append(toIndentedString(property)).append("\n");
|
||||
sb.append(" _123number: ").append(toIndentedString(_123number)).append("\n");
|
||||
sb.append(" _123Number: ").append(toIndentedString(_123Number)).append("\n");
|
||||
sb.append("}");
|
||||
return sb.toString();
|
||||
}
|
||||
|
||||
@@ -25,25 +25,25 @@ import javax.annotation.Generated;
|
||||
public class SpecialModelName {
|
||||
|
||||
@JsonProperty("$special[property.name]")
|
||||
private Long $specialPropertyName;
|
||||
private Long $SpecialPropertyName;
|
||||
|
||||
public SpecialModelName $specialPropertyName(Long $specialPropertyName) {
|
||||
this.$specialPropertyName = $specialPropertyName;
|
||||
public SpecialModelName $SpecialPropertyName(Long $SpecialPropertyName) {
|
||||
this.$SpecialPropertyName = $SpecialPropertyName;
|
||||
return this;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get $specialPropertyName
|
||||
* @return $specialPropertyName
|
||||
* Get $SpecialPropertyName
|
||||
* @return $SpecialPropertyName
|
||||
*/
|
||||
|
||||
@ApiModelProperty(value = "")
|
||||
public Long get$SpecialPropertyName() {
|
||||
return $specialPropertyName;
|
||||
return $SpecialPropertyName;
|
||||
}
|
||||
|
||||
public void set$SpecialPropertyName(Long $specialPropertyName) {
|
||||
this.$specialPropertyName = $specialPropertyName;
|
||||
public void set$SpecialPropertyName(Long $SpecialPropertyName) {
|
||||
this.$SpecialPropertyName = $SpecialPropertyName;
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -54,20 +54,20 @@ public class SpecialModelName {
|
||||
if (o == null || getClass() != o.getClass()) {
|
||||
return false;
|
||||
}
|
||||
SpecialModelName $specialModelName = (SpecialModelName) o;
|
||||
return Objects.equals(this.$specialPropertyName, $specialModelName.$specialPropertyName);
|
||||
SpecialModelName $SpecialModelName = (SpecialModelName) o;
|
||||
return Objects.equals(this.$SpecialPropertyName, $SpecialModelName.$SpecialPropertyName);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int hashCode() {
|
||||
return Objects.hash($specialPropertyName);
|
||||
return Objects.hash($SpecialPropertyName);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
StringBuilder sb = new StringBuilder();
|
||||
sb.append("class SpecialModelName {\n");
|
||||
sb.append(" $specialPropertyName: ").append(toIndentedString($specialPropertyName)).append("\n");
|
||||
sb.append(" $SpecialPropertyName: ").append(toIndentedString($SpecialPropertyName)).append("\n");
|
||||
sb.append("}");
|
||||
return sb.toString();
|
||||
}
|
||||
|
||||
@@ -2111,6 +2111,7 @@ components:
|
||||
status:
|
||||
description: Updated status of the pet
|
||||
type: string
|
||||
type: object
|
||||
uploadFile_request:
|
||||
properties:
|
||||
additionalMetadata:
|
||||
@@ -2120,6 +2121,7 @@ components:
|
||||
description: file to upload
|
||||
format: binary
|
||||
type: string
|
||||
type: object
|
||||
testEnumParameters_request:
|
||||
properties:
|
||||
enum_form_string_array:
|
||||
@@ -2139,6 +2141,7 @@ components:
|
||||
- -efg
|
||||
- (xyz)
|
||||
type: string
|
||||
type: object
|
||||
testEndpointParameters_request:
|
||||
properties:
|
||||
integer:
|
||||
@@ -2211,6 +2214,7 @@ components:
|
||||
- double
|
||||
- number
|
||||
- pattern_without_delimiter
|
||||
type: object
|
||||
testJsonFormData_request:
|
||||
properties:
|
||||
param:
|
||||
@@ -2222,6 +2226,7 @@ components:
|
||||
required:
|
||||
- param
|
||||
- param2
|
||||
type: object
|
||||
uploadFileWithRequiredFile_request:
|
||||
properties:
|
||||
additionalMetadata:
|
||||
@@ -2233,6 +2238,7 @@ components:
|
||||
type: string
|
||||
required:
|
||||
- requiredFile
|
||||
type: object
|
||||
Dog_allOf:
|
||||
properties:
|
||||
breed:
|
||||
|
||||
Reference in New Issue
Block a user