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

@@ -1507,6 +1507,9 @@ components:
- $ref: '#/components/schemas/Cat_allOf'
Animal:
discriminator:
mapping:
DOG: '#/components/schemas/Dog'
CAT: '#/components/schemas/Cat'
propertyName: className
properties:
className:

View File

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

View File

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

View File

@@ -23,8 +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.Cat;
import org.openapitools.client.model.Dog;
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
import com.fasterxml.jackson.annotation.JsonTypeName;
@@ -42,8 +40,8 @@ import com.fasterxml.jackson.annotation.JsonTypeName;
)
@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "className", visible = true)
@JsonSubTypes({
@JsonSubTypes.Type(value = Cat.class, name = "Cat"),
@JsonSubTypes.Type(value = Dog.class, name = "Dog"),
@JsonSubTypes.Type(value = Cat.class, name = "CAT"),
@JsonSubTypes.Type(value = Dog.class, name = "DOG"),
})
public class Animal {
@@ -107,7 +105,6 @@ public class Animal {
this.color = color;
}
@Override
public boolean equals(Object o) {
if (this == o) {

View File

@@ -35,7 +35,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName;
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
public class ArrayOfArrayOfNumberOnly {
public static final String JSON_PROPERTY_ARRAY_ARRAY_NUMBER = "ArrayArrayNumber";
private List<List<BigDecimal>> arrayArrayNumber = new ArrayList<>();
private List<List<BigDecimal>> arrayArrayNumber;
public ArrayOfArrayOfNumberOnly() {
}
@@ -73,7 +73,6 @@ public class ArrayOfArrayOfNumberOnly {
this.arrayArrayNumber = arrayArrayNumber;
}
@Override
public boolean equals(Object o) {
if (this == o) {

View File

@@ -35,7 +35,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName;
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
public class ArrayOfNumberOnly {
public static final String JSON_PROPERTY_ARRAY_NUMBER = "ArrayNumber";
private List<BigDecimal> arrayNumber = new ArrayList<>();
private List<BigDecimal> arrayNumber;
public ArrayOfNumberOnly() {
}
@@ -73,7 +73,6 @@ public class ArrayOfNumberOnly {
this.arrayNumber = arrayNumber;
}
@Override
public boolean equals(Object o) {
if (this == o) {

View File

@@ -37,13 +37,13 @@ import com.fasterxml.jackson.annotation.JsonTypeName;
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
public class ArrayTest {
public static final String JSON_PROPERTY_ARRAY_OF_STRING = "array_of_string";
private List<String> arrayOfString = new ArrayList<>();
private List<String> arrayOfString;
public static final String JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER = "array_array_of_integer";
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";
private List<List<ReadOnlyFirst>> arrayArrayOfModel = new ArrayList<>();
private List<List<ReadOnlyFirst>> arrayArrayOfModel;
public ArrayTest() {
}
@@ -149,7 +149,6 @@ public class ArrayTest {
this.arrayArrayOfModel = arrayArrayOfModel;
}
@Override
public boolean equals(Object o) {
if (this == o) {

View File

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

View File

@@ -73,6 +73,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

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -73,6 +73,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

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

View File

@@ -108,7 +108,7 @@ public class EnumArrays {
}
public static final String JSON_PROPERTY_ARRAY_ENUM = "array_enum";
private List<ArrayEnumEnum> arrayEnum = new ArrayList<>();
private List<ArrayEnumEnum> arrayEnum;
public EnumArrays() {
}
@@ -172,7 +172,6 @@ public class EnumArrays {
this.arrayEnum = arrayEnum;
}
@Override
public boolean equals(Object o) {
if (this == o) {

View File

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

View File

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

View File

@@ -39,7 +39,7 @@ public class FileSchemaTestClass {
private File file;
public static final String JSON_PROPERTY_FILES = "files";
private List<File> files = new ArrayList<>();
private List<File> files;
public FileSchemaTestClass() {
}
@@ -103,7 +103,6 @@ public class FileSchemaTestClass {
this.files = files;
}
@Override
public boolean equals(Object o) {
if (this == o) {

View File

@@ -62,7 +62,6 @@ public class Foo {
this.bar = bar;
}
@Override
public boolean equals(Object o) {
if (this == o) {

View File

@@ -64,7 +64,6 @@ public class FooGetDefaultResponse {
this.string = string;
}
@Override
public boolean equals(Object o) {
if (this == o) {

View File

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

View File

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

View File

@@ -74,7 +74,6 @@ public class HealthCheckResult {
this.nullableMessage = JsonNullable.<String>of(nullableMessage);
}
@Override
public boolean equals(Object o) {
if (this == o) {

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -78,7 +78,7 @@ public class NullableClass extends HashMap<String, Object> {
private JsonNullable<List<Object>> arrayAndItemsNullableProp = JsonNullable.<List<Object>>undefined();
public static final String JSON_PROPERTY_ARRAY_ITEMS_NULLABLE = "array_items_nullable";
private List<Object> arrayItemsNullable = new ArrayList<>();
private List<Object> arrayItemsNullable;
public static final String JSON_PROPERTY_OBJECT_NULLABLE_PROP = "object_nullable_prop";
private JsonNullable<Map<String, Object>> objectNullableProp = JsonNullable.<Map<String, Object>>undefined();
@@ -548,7 +548,6 @@ public class NullableClass extends HashMap<String, Object> {
this.objectItemsNullable = objectItemsNullable;
}
@Override
public boolean equals(Object o) {
if (this == o) {

View File

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

View File

@@ -48,7 +48,7 @@ public class ObjectWithDeprecatedFields {
private DeprecatedObject deprecatedRef;
public static final String JSON_PROPERTY_BARS = "bars";
private List<String> bars = new ArrayList<>();
private List<String> bars;
public ObjectWithDeprecatedFields() {
}
@@ -170,7 +170,6 @@ public class ObjectWithDeprecatedFields {
this.bars = bars;
}
@Override
public boolean equals(Object o) {
if (this == o) {

View File

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

View File

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

View File

@@ -63,7 +63,6 @@ public class OuterObjectWithEnumProperty {
this.value = value;
}
@Override
public boolean equals(Object o) {
if (this == o) {

View File

@@ -56,7 +56,7 @@ public class Pet {
private Set<String> photoUrls = new LinkedHashSet<>();
public static final String JSON_PROPERTY_TAGS = "tags";
private List<Tag> tags = new ArrayList<>();
private List<Tag> tags;
/**
* pet status in the store
@@ -186,6 +186,9 @@ public class Pet {
}
public Pet addPhotoUrlsItem(String photoUrlsItem) {
if (this.photoUrls == null) {
this.photoUrls = new LinkedHashSet<>();
}
this.photoUrls.add(photoUrlsItem);
return this;
}
@@ -270,7 +273,6 @@ public class Pet {
this.status = status;
}
@Override
public boolean equals(Object o) {
if (this == o) {

View File

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

View File

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

View File

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

View File

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