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

This commit is contained in:
William Cheng
2023-04-12 17:51:47 +08:00
5414 changed files with 134722 additions and 66020 deletions

View File

@@ -66,7 +66,7 @@ if(hasProperty('target') && target == 'android') {
task sourcesJar(type: Jar) {
from android.sourceSets.main.java.srcDirs
classifier = 'sources'
archiveClassifier = 'sources'
}
artifacts {
@@ -91,24 +91,22 @@ if(hasProperty('target') && target == 'android') {
}
task execute(type:JavaExec) {
main = System.getProperty('mainClass')
mainClass = System.getProperty('mainClass')
classpath = sourceSets.main.runtimeClasspath
}
}
ext {
swagger_annotations_version = "1.6.9"
jackson_version = "2.14.1"
jackson_databind_version = "2.14.1"
jackson_databind_nullable_version = "0.2.6"
jakarta_annotation_version = "1.3.5"
spring_web_version = "5.3.24"
jakarta_annotation_version = "1.3.5"
jodatime_version = "2.9.9"
junit_version = "4.13.2"
}
dependencies {
implementation "io.swagger:swagger-annotations:$swagger_annotations_version"
implementation "com.google.code.findbugs:jsr305:3.0.2"
implementation "org.springframework:spring-web:$spring_web_version"
implementation "org.springframework:spring-context:$spring_web_version"

View File

@@ -64,7 +64,6 @@ import org.openapitools.client.auth.ApiKeyAuth;
import org.openapitools.client.auth.OAuth;
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
@Component("org.openapitools.client.ApiClient")
public class ApiClient extends JavaTimeFormatter {
public enum CollectionFormat {
CSV(","), TSV("\t"), SSV(" "), PIPES("|"), MULTI(null);
@@ -98,7 +97,6 @@ public class ApiClient extends JavaTimeFormatter {
init();
}
@Autowired
public ApiClient(RestTemplate restTemplate) {
this.restTemplate = restTemplate;
init();

View File

@@ -26,7 +26,6 @@ import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity;
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
@Component("org.openapitools.client.api.AnotherFakeApi")
public class AnotherFakeApi {
private ApiClient apiClient;
@@ -34,7 +33,6 @@ public class AnotherFakeApi {
this(new ApiClient());
}
@Autowired
public AnotherFakeApi(ApiClient apiClient) {
this.apiClient = apiClient;
}

View File

@@ -34,7 +34,6 @@ import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity;
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
@Component("org.openapitools.client.api.FakeApi")
public class FakeApi {
private ApiClient apiClient;
@@ -42,7 +41,6 @@ public class FakeApi {
this(new ApiClient());
}
@Autowired
public FakeApi(ApiClient apiClient) {
this.apiClient = apiClient;
}

View File

@@ -26,7 +26,6 @@ import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity;
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
@Component("org.openapitools.client.api.FakeClassnameTags123Api")
public class FakeClassnameTags123Api {
private ApiClient apiClient;
@@ -34,7 +33,6 @@ public class FakeClassnameTags123Api {
this(new ApiClient());
}
@Autowired
public FakeClassnameTags123Api(ApiClient apiClient) {
this.apiClient = apiClient;
}

View File

@@ -29,7 +29,6 @@ import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity;
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
@Component("org.openapitools.client.api.PetApi")
public class PetApi {
private ApiClient apiClient;
@@ -37,7 +36,6 @@ public class PetApi {
this(new ApiClient());
}
@Autowired
public PetApi(ApiClient apiClient) {
this.apiClient = apiClient;
}

View File

@@ -26,7 +26,6 @@ import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity;
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
@Component("org.openapitools.client.api.StoreApi")
public class StoreApi {
private ApiClient apiClient;
@@ -34,7 +33,6 @@ public class StoreApi {
this(new ApiClient());
}
@Autowired
public StoreApi(ApiClient apiClient) {
this.apiClient = apiClient;
}

View File

@@ -27,7 +27,6 @@ import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity;
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
@Component("org.openapitools.client.api.UserApi")
public class UserApi {
private ApiClient apiClient;
@@ -35,7 +34,6 @@ public class UserApi {
this(new ApiClient());
}
@Autowired
public UserApi(ApiClient apiClient) {
this.apiClient = apiClient;
}

View File

@@ -75,7 +75,6 @@ public class AdditionalPropertiesAnyType extends HashMap<String, Object> {
this.name = name;
}
@Override
public boolean equals(Object o) {
if (this == o) {

View File

@@ -76,7 +76,6 @@ public class AdditionalPropertiesArray extends HashMap<String, List> {
this.name = name;
}
@Override
public boolean equals(Object o) {
if (this == o) {

View File

@@ -75,7 +75,6 @@ public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> {
this.name = name;
}
@Override
public boolean equals(Object o) {
if (this == o) {

View File

@@ -478,7 +478,6 @@ public class AdditionalPropertiesClass {
this.anytype3 = anytype3;
}
@Override
public boolean equals(Object o) {
if (this == o) {

View File

@@ -75,7 +75,6 @@ public class AdditionalPropertiesInteger extends HashMap<String, Integer> {
this.name = name;
}
@Override
public boolean equals(Object o) {
if (this == o) {

View File

@@ -76,7 +76,6 @@ public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> {
this.name = name;
}
@Override
public boolean equals(Object o) {
if (this == o) {

View File

@@ -75,7 +75,6 @@ public class AdditionalPropertiesObject extends HashMap<String, Map> {
this.name = name;
}
@Override
public boolean equals(Object o) {
if (this == o) {

View File

@@ -75,7 +75,6 @@ public class AdditionalPropertiesString extends HashMap<String, String> {
this.name = name;
}
@Override
public boolean equals(Object o) {
if (this == o) {

View File

@@ -23,9 +23,6 @@ import com.fasterxml.jackson.annotation.JsonSubTypes;
import com.fasterxml.jackson.annotation.JsonTypeInfo;
import com.fasterxml.jackson.annotation.JsonTypeName;
import com.fasterxml.jackson.annotation.JsonValue;
import org.openapitools.client.model.BigCat;
import org.openapitools.client.model.Cat;
import org.openapitools.client.model.Dog;
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
import com.fasterxml.jackson.annotation.JsonTypeName;
import com.fasterxml.jackson.dataformat.xml.annotation.*;
@@ -122,7 +119,6 @@ public class Animal {
this.color = color;
}
@Override
public boolean equals(Object o) {
if (this == o) {

View File

@@ -46,7 +46,7 @@ public class ArrayOfArrayOfNumberOnly {
// items.name=arrayArrayNumber items.baseName=arrayArrayNumber items.xmlName= items.xmlNamespace=
// items.example= items.type=List&lt;BigDecimal&gt;
@XmlElement(name = "arrayArrayNumber")
private List<List<BigDecimal>> arrayArrayNumber = new ArrayList<>();
private List<List<BigDecimal>> arrayArrayNumber;
public ArrayOfArrayOfNumberOnly() {
}
@@ -84,7 +84,6 @@ public class ArrayOfArrayOfNumberOnly {
this.arrayArrayNumber = arrayArrayNumber;
}
@Override
public boolean equals(Object o) {
if (this == o) {

View File

@@ -46,7 +46,7 @@ public class ArrayOfNumberOnly {
// items.name=arrayNumber items.baseName=arrayNumber items.xmlName= items.xmlNamespace=
// items.example= items.type=BigDecimal
@XmlElement(name = "arrayNumber")
private List<BigDecimal> arrayNumber = new ArrayList<>();
private List<BigDecimal> arrayNumber;
public ArrayOfNumberOnly() {
}
@@ -84,7 +84,6 @@ public class ArrayOfNumberOnly {
this.arrayNumber = arrayNumber;
}
@Override
public boolean equals(Object o) {
if (this == o) {

View File

@@ -48,21 +48,21 @@ public class ArrayTest {
// items.name=arrayOfString items.baseName=arrayOfString items.xmlName= items.xmlNamespace=
// items.example= items.type=String
@XmlElement(name = "arrayOfString")
private List<String> arrayOfString = new ArrayList<>();
private List<String> arrayOfString;
public static final String JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER = "array_array_of_integer";
// Is a container wrapped=false
// items.name=arrayArrayOfInteger items.baseName=arrayArrayOfInteger items.xmlName= items.xmlNamespace=
// items.example= items.type=List&lt;Long&gt;
@XmlElement(name = "arrayArrayOfInteger")
private List<List<Long>> arrayArrayOfInteger = new ArrayList<>();
private List<List<Long>> arrayArrayOfInteger;
public static final String JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL = "array_array_of_model";
// Is a container wrapped=false
// items.name=arrayArrayOfModel items.baseName=arrayArrayOfModel items.xmlName= items.xmlNamespace=
// items.example= items.type=List&lt;ReadOnlyFirst&gt;
@XmlElement(name = "arrayArrayOfModel")
private List<List<ReadOnlyFirst>> arrayArrayOfModel = new ArrayList<>();
private List<List<ReadOnlyFirst>> arrayArrayOfModel;
public ArrayTest() {
}
@@ -168,7 +168,6 @@ public class ArrayTest {
this.arrayArrayOfModel = arrayArrayOfModel;
}
@Override
public boolean equals(Object o) {
if (this == o) {

View File

@@ -128,6 +128,17 @@ public class BigCat extends Cat {
this.kind = kind;
}
@Override
public BigCat className(String className) {
this.setClassName(className);
return this;
}
@Override
public BigCat color(String color) {
this.setColor(color);
return this;
}
@Override
public boolean equals(Object o) {

View File

@@ -118,7 +118,6 @@ public class BigCatAllOf {
this.kind = kind;
}
@Override
public boolean equals(Object o) {
if (this == o) {

View File

@@ -237,7 +237,6 @@ public class Capitalization {
this.ATT_NAME = ATT_NAME;
}
@Override
public boolean equals(Object o) {
if (this == o) {

View File

@@ -24,7 +24,6 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo;
import com.fasterxml.jackson.annotation.JsonTypeName;
import com.fasterxml.jackson.annotation.JsonValue;
import org.openapitools.client.model.Animal;
import org.openapitools.client.model.BigCat;
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
import com.fasterxml.jackson.annotation.JsonTypeName;
import com.fasterxml.jackson.dataformat.xml.annotation.*;
@@ -87,6 +86,17 @@ public class Cat extends Animal {
this.declawed = declawed;
}
@Override
public Cat className(String className) {
this.setClassName(className);
return this;
}
@Override
public Cat color(String color) {
this.setColor(color);
return this;
}
@Override
public boolean equals(Object o) {

View File

@@ -73,7 +73,6 @@ public class CatAllOf {
this.declawed = declawed;
}
@Override
public boolean equals(Object o) {
if (this == o) {

View File

@@ -105,7 +105,6 @@ public class Category {
this.name = name;
}
@Override
public boolean equals(Object o) {
if (this == o) {

View File

@@ -72,7 +72,6 @@ public class ClassModel {
this.propertyClass = propertyClass;
}
@Override
public boolean equals(Object o) {
if (this == o) {

View File

@@ -72,7 +72,6 @@ public class Client {
this.client = client;
}
@Override
public boolean equals(Object o) {
if (this == o) {

View File

@@ -83,6 +83,17 @@ public class Dog extends Animal {
this.breed = breed;
}
@Override
public Dog className(String className) {
this.setClassName(className);
return this;
}
@Override
public Dog color(String color) {
this.setColor(color);
return this;
}
@Override
public boolean equals(Object o) {

View File

@@ -73,7 +73,6 @@ public class DogAllOf {
this.breed = breed;
}
@Override
public boolean equals(Object o) {
if (this == o) {

View File

@@ -128,7 +128,7 @@ public class EnumArrays {
// items.name=arrayEnum items.baseName=arrayEnum items.xmlName= items.xmlNamespace=
// items.example= items.type=String
@XmlElement(name = "arrayEnum")
private List<ArrayEnumEnum> arrayEnum = new ArrayList<>();
private List<ArrayEnumEnum> arrayEnum;
public EnumArrays() {
}
@@ -194,7 +194,6 @@ public class EnumArrays {
this.arrayEnum = arrayEnum;
}
@Override
public boolean equals(Object o) {
if (this == o) {

View File

@@ -368,7 +368,6 @@ public class EnumTest {
this.outerEnum = outerEnum;
}
@Override
public boolean equals(Object o) {
if (this == o) {

View File

@@ -51,7 +51,7 @@ public class FileSchemaTestClass {
// items.name=files items.baseName=files items.xmlName= items.xmlNamespace=
// items.example= items.type=ModelFile
@XmlElement(name = "files")
private List<ModelFile> files = new ArrayList<>();
private List<ModelFile> files;
public FileSchemaTestClass() {
}
@@ -117,7 +117,6 @@ public class FileSchemaTestClass {
this.files = files;
}
@Override
public boolean equals(Object o) {
if (this == o) {

View File

@@ -518,7 +518,6 @@ public class FormatTest {
this.bigDecimal = bigDecimal;
}
@Override
public boolean equals(Object o) {
if (this == o) {

View File

@@ -82,7 +82,6 @@ public class HasOnlyReadOnly {
@Override
public boolean equals(Object o) {
if (this == o) {

View File

@@ -248,7 +248,6 @@ public class MapTest {
this.indirectMap = indirectMap;
}
@Override
public boolean equals(Object o) {
if (this == o) {

View File

@@ -153,7 +153,6 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
this.map = map;
}
@Override
public boolean equals(Object o) {
if (this == o) {

View File

@@ -106,7 +106,6 @@ public class Model200Response {
this.propertyClass = propertyClass;
}
@Override
public boolean equals(Object o) {
if (this == o) {

View File

@@ -139,7 +139,6 @@ public class ModelApiResponse {
this.message = message;
}
@Override
public boolean equals(Object o) {
if (this == o) {

View File

@@ -73,7 +73,6 @@ public class ModelFile {
this.sourceURI = sourceURI;
}
@Override
public boolean equals(Object o) {
if (this == o) {

View File

@@ -73,7 +73,6 @@ public class ModelList {
this._123list = _123list;
}
@Override
public boolean equals(Object o) {
if (this == o) {

View File

@@ -73,7 +73,6 @@ public class ModelReturn {
this._return = _return;
}
@Override
public boolean equals(Object o) {
if (this == o) {

View File

@@ -147,7 +147,6 @@ public class Name {
@Override
public boolean equals(Object o) {
if (this == o) {

View File

@@ -73,7 +73,6 @@ public class NumberOnly {
this.justNumber = justNumber;
}
@Override
public boolean equals(Object o) {
if (this == o) {

View File

@@ -281,7 +281,6 @@ public class Order {
this.complete = complete;
}
@Override
public boolean equals(Object o) {
if (this == o) {

View File

@@ -139,7 +139,6 @@ public class OuterComposite {
this.myBoolean = myBoolean;
}
@Override
public boolean equals(Object o) {
if (this == o) {

View File

@@ -76,7 +76,7 @@ public class Pet {
// items.example= items.type=Tag
@XmlElement(name = "tags")
@XmlElementWrapper(name = "tag")
private List<Tag> tags = new ArrayList<>();
private List<Tag> tags;
/**
* pet status in the store
@@ -218,6 +218,9 @@ public class Pet {
}
public Pet addPhotoUrlsItem(String photoUrlsItem) {
if (this.photoUrls == null) {
this.photoUrls = new LinkedHashSet<>();
}
this.photoUrls.add(photoUrlsItem);
return this;
}
@@ -312,7 +315,6 @@ public class Pet {
this.status = status;
}
@Override
public boolean equals(Object o) {
if (this == o) {

View File

@@ -93,7 +93,6 @@ public class ReadOnlyFirst {
this.baz = baz;
}
@Override
public boolean equals(Object o) {
if (this == o) {

View File

@@ -73,7 +73,6 @@ public class SpecialModelName {
this.$specialPropertyName = $specialPropertyName;
}
@Override
public boolean equals(Object o) {
if (this == o) {

View File

@@ -105,7 +105,6 @@ public class Tag {
this.name = name;
}
@Override
public boolean equals(Object o) {
if (this == o) {

View File

@@ -190,6 +190,9 @@ public class TypeHolderDefault {
}
public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) {
if (this.arrayItem == null) {
this.arrayItem = new ArrayList<>();
}
this.arrayItem.add(arrayItemItem);
return this;
}
@@ -213,7 +216,6 @@ public class TypeHolderDefault {
this.arrayItem = arrayItem;
}
@Override
public boolean equals(Object o) {
if (this == o) {

View File

@@ -223,6 +223,9 @@ public class TypeHolderExample {
}
public TypeHolderExample addArrayItemItem(Integer arrayItemItem) {
if (this.arrayItem == null) {
this.arrayItem = new ArrayList<>();
}
this.arrayItem.add(arrayItemItem);
return this;
}
@@ -246,7 +249,6 @@ public class TypeHolderExample {
this.arrayItem = arrayItem;
}
@Override
public boolean equals(Object o) {
if (this == o) {

View File

@@ -303,7 +303,6 @@ public class User {
this.userStatus = userStatus;
}
@Override
public boolean equals(Object o) {
if (this == o) {

View File

@@ -91,7 +91,7 @@ public class XmlItem {
// items.example= items.type=Integer
@XmlElement(name = "wrappedArray")
@XmlElementWrapper(name = "wrapped_array")
private List<Integer> wrappedArray = new ArrayList<>();
private List<Integer> wrappedArray;
public static final String JSON_PROPERTY_NAME_STRING = "name_string";
@XmlElement(name = "xml_name_string")
@@ -114,7 +114,7 @@ public class XmlItem {
// items.name=nameArray items.baseName=nameArray items.xmlName=xml_name_array_item items.xmlNamespace=
// items.example= items.type=Integer
@XmlElement(name = "xml_name_array_item")
private List<Integer> nameArray = new ArrayList<>();
private List<Integer> nameArray;
public static final String JSON_PROPERTY_NAME_WRAPPED_ARRAY = "name_wrapped_array";
// Is a container wrapped=true
@@ -122,7 +122,7 @@ public class XmlItem {
// items.example= items.type=Integer
@XmlElement(name = "xml_name_wrapped_array_item")
@XmlElementWrapper(name = "xml_name_wrapped_array")
private List<Integer> nameWrappedArray = new ArrayList<>();
private List<Integer> nameWrappedArray;
public static final String JSON_PROPERTY_PREFIX_STRING = "prefix_string";
@XmlElement(name = "prefix_string")
@@ -145,7 +145,7 @@ public class XmlItem {
// items.name=prefixArray items.baseName=prefixArray items.xmlName= items.xmlNamespace=
// items.example= items.type=Integer
@XmlElement(name = "prefixArray")
private List<Integer> prefixArray = new ArrayList<>();
private List<Integer> prefixArray;
public static final String JSON_PROPERTY_PREFIX_WRAPPED_ARRAY = "prefix_wrapped_array";
// Is a container wrapped=true
@@ -153,7 +153,7 @@ public class XmlItem {
// items.example= items.type=Integer
@XmlElement(name = "prefixWrappedArray")
@XmlElementWrapper(name = "prefix_wrapped_array")
private List<Integer> prefixWrappedArray = new ArrayList<>();
private List<Integer> prefixWrappedArray;
public static final String JSON_PROPERTY_NAMESPACE_STRING = "namespace_string";
@XmlElement(namespace="http://a.com/schema", name = "namespace_string")
@@ -176,7 +176,7 @@ public class XmlItem {
// items.name=namespaceArray items.baseName=namespaceArray items.xmlName= items.xmlNamespace=http://e.com/schema
// items.example= items.type=Integer
@XmlElement(namespace="http://e.com/schema", name = "namespaceArray")
private List<Integer> namespaceArray = new ArrayList<>();
private List<Integer> namespaceArray;
public static final String JSON_PROPERTY_NAMESPACE_WRAPPED_ARRAY = "namespace_wrapped_array";
// Is a container wrapped=true
@@ -184,7 +184,7 @@ public class XmlItem {
// items.example= items.type=Integer
@XmlElement(namespace="http://g.com/schema", name = "namespaceWrappedArray")
@XmlElementWrapper(namespace="http://f.com/schema", name = "namespace_wrapped_array")
private List<Integer> namespaceWrappedArray = new ArrayList<>();
private List<Integer> namespaceWrappedArray;
public static final String JSON_PROPERTY_PREFIX_NS_STRING = "prefix_ns_string";
@XmlElement(namespace="http://a.com/schema", name = "prefix_ns_string")
@@ -207,7 +207,7 @@ public class XmlItem {
// items.name=prefixNsArray items.baseName=prefixNsArray items.xmlName= items.xmlNamespace=http://e.com/schema
// items.example= items.type=Integer
@XmlElement(namespace="http://e.com/schema", name = "prefixNsArray")
private List<Integer> prefixNsArray = new ArrayList<>();
private List<Integer> prefixNsArray;
public static final String JSON_PROPERTY_PREFIX_NS_WRAPPED_ARRAY = "prefix_ns_wrapped_array";
// Is a container wrapped=true
@@ -215,7 +215,7 @@ public class XmlItem {
// items.example= items.type=Integer
@XmlElement(namespace="http://g.com/schema", name = "prefixNsWrappedArray")
@XmlElementWrapper(namespace="http://f.com/schema", name = "prefix_ns_wrapped_array")
private List<Integer> prefixNsWrappedArray = new ArrayList<>();
private List<Integer> prefixNsWrappedArray;
public XmlItem() {
}
@@ -1105,7 +1105,6 @@ public class XmlItem {
this.prefixNsWrappedArray = prefixNsWrappedArray;
}
@Override
public boolean equals(Object o) {
if (this == o) {