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

@@ -1032,20 +1032,48 @@ public class FakeApi {
localVarRequestBuilder.header("Accept", "application/json");
List<NameValuePair> formValues = new ArrayList<>();
formValues.add(new BasicNameValuePair("integer", integer.toString()));
formValues.add(new BasicNameValuePair("int32", int32.toString()));
formValues.add(new BasicNameValuePair("int64", int64.toString()));
formValues.add(new BasicNameValuePair("number", number.toString()));
formValues.add(new BasicNameValuePair("float", _float.toString()));
formValues.add(new BasicNameValuePair("double", _double.toString()));
formValues.add(new BasicNameValuePair("string", string.toString()));
formValues.add(new BasicNameValuePair("pattern_without_delimiter", patternWithoutDelimiter.toString()));
formValues.add(new BasicNameValuePair("byte", _byte.toString()));
formValues.add(new BasicNameValuePair("binary", binary.toString()));
formValues.add(new BasicNameValuePair("date", date.toString()));
formValues.add(new BasicNameValuePair("dateTime", dateTime.toString()));
formValues.add(new BasicNameValuePair("password", password.toString()));
formValues.add(new BasicNameValuePair("callback", paramCallback.toString()));
if (integer != null) {
formValues.add(new BasicNameValuePair("integer", integer.toString()));
}
if (int32 != null) {
formValues.add(new BasicNameValuePair("int32", int32.toString()));
}
if (int64 != null) {
formValues.add(new BasicNameValuePair("int64", int64.toString()));
}
if (number != null) {
formValues.add(new BasicNameValuePair("number", number.toString()));
}
if (_float != null) {
formValues.add(new BasicNameValuePair("float", _float.toString()));
}
if (_double != null) {
formValues.add(new BasicNameValuePair("double", _double.toString()));
}
if (string != null) {
formValues.add(new BasicNameValuePair("string", string.toString()));
}
if (patternWithoutDelimiter != null) {
formValues.add(new BasicNameValuePair("pattern_without_delimiter", patternWithoutDelimiter.toString()));
}
if (_byte != null) {
formValues.add(new BasicNameValuePair("byte", _byte.toString()));
}
if (binary != null) {
formValues.add(new BasicNameValuePair("binary", binary.toString()));
}
if (date != null) {
formValues.add(new BasicNameValuePair("date", date.toString()));
}
if (dateTime != null) {
formValues.add(new BasicNameValuePair("dateTime", dateTime.toString()));
}
if (password != null) {
formValues.add(new BasicNameValuePair("password", password.toString()));
}
if (paramCallback != null) {
formValues.add(new BasicNameValuePair("callback", paramCallback.toString()));
}
HttpEntity entity = new UrlEncodedFormEntity(formValues, java.nio.charset.StandardCharsets.UTF_8);
ByteArrayOutputStream formOutputStream = new ByteArrayOutputStream();
try {
@@ -1172,9 +1200,13 @@ public class FakeApi {
List<NameValuePair> formValues = new ArrayList<>();
for (int i=0; i < enumFormStringArray.size(); i++) {
formValues.add(new BasicNameValuePair("enum_form_string_array", enumFormStringArray.get(i).toString()));
if (enumFormStringArray.get(i) != null) {
formValues.add(new BasicNameValuePair("enum_form_string_array", enumFormStringArray.get(i).toString()));
}
}
if (enumFormString != null) {
formValues.add(new BasicNameValuePair("enum_form_string", enumFormString.toString()));
}
formValues.add(new BasicNameValuePair("enum_form_string", enumFormString.toString()));
HttpEntity entity = new UrlEncodedFormEntity(formValues, java.nio.charset.StandardCharsets.UTF_8);
ByteArrayOutputStream formOutputStream = new ByteArrayOutputStream();
try {
@@ -1585,8 +1617,12 @@ public class FakeApi {
localVarRequestBuilder.header("Accept", "application/json");
List<NameValuePair> formValues = new ArrayList<>();
formValues.add(new BasicNameValuePair("param", param.toString()));
formValues.add(new BasicNameValuePair("param2", param2.toString()));
if (param != null) {
formValues.add(new BasicNameValuePair("param", param.toString()));
}
if (param2 != null) {
formValues.add(new BasicNameValuePair("param2", param2.toString()));
}
HttpEntity entity = new UrlEncodedFormEntity(formValues, java.nio.charset.StandardCharsets.UTF_8);
ByteArrayOutputStream formOutputStream = new ByteArrayOutputStream();
try {

View File

@@ -724,8 +724,12 @@ public class PetApi {
localVarRequestBuilder.header("Accept", "application/json");
List<NameValuePair> formValues = new ArrayList<>();
formValues.add(new BasicNameValuePair("name", name.toString()));
formValues.add(new BasicNameValuePair("status", status.toString()));
if (name != null) {
formValues.add(new BasicNameValuePair("name", name.toString()));
}
if (status != null) {
formValues.add(new BasicNameValuePair("status", status.toString()));
}
HttpEntity entity = new UrlEncodedFormEntity(formValues, java.nio.charset.StandardCharsets.UTF_8);
ByteArrayOutputStream formOutputStream = new ByteArrayOutputStream();
try {

View File

@@ -28,8 +28,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;

View File

@@ -40,7 +40,7 @@ import com.fasterxml.jackson.annotation.JsonPropertyOrder;
@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() {
}

View File

@@ -40,7 +40,7 @@ import com.fasterxml.jackson.annotation.JsonPropertyOrder;
@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() {
}

View File

@@ -42,13 +42,13 @@ import com.fasterxml.jackson.annotation.JsonPropertyOrder;
@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() {
}

View File

@@ -78,6 +78,18 @@ public class Cat extends Animal {
}
@Override
public Cat className(String className) {
this.setClassName(className);
return this;
}
@Override
public Cat color(String color) {
this.setColor(color);
return this;
}
/**
* Return true if this Cat object is equal to o.
*/

View File

@@ -78,6 +78,18 @@ public class Dog extends Animal {
}
@Override
public Dog className(String className) {
this.setClassName(className);
return this;
}
@Override
public Dog color(String color) {
this.setColor(color);
return this;
}
/**
* Return true if this Dog object is equal to o.
*/

View File

@@ -65,7 +65,7 @@ public class Drawing extends HashMap<String, Fruit> {
private JsonNullable<NullableShape> nullableShape = JsonNullable.<NullableShape>undefined();
public static final String JSON_PROPERTY_SHAPES = "shapes";
private List<Shape> shapes = new ArrayList<>();
private List<Shape> shapes;
public Drawing() {
}

View File

@@ -113,7 +113,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() {
}

View File

@@ -44,7 +44,7 @@ public class FileSchemaTestClass {
private ModelFile _file;
public static final String JSON_PROPERTY_FILES = "files";
private List<ModelFile> files = new ArrayList<>();
private List<ModelFile> files;
public FileSchemaTestClass() {
}

View File

@@ -28,8 +28,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.ChildCat;
import org.openapitools.client.model.ParentPet;
import com.fasterxml.jackson.annotation.JsonPropertyOrder;

View File

@@ -87,7 +87,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();

View File

@@ -53,7 +53,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() {
}

View File

@@ -28,7 +28,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.ChildCat;
import org.openapitools.client.model.GrandparentAnimal;
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
@@ -53,6 +52,12 @@ public class ParentPet extends GrandparentAnimal {
public ParentPet() {
}
@Override
public ParentPet petType(String petType) {
this.setPetType(petType);
return this;
}
/**
* Return true if this ParentPet object is equal to o.
*/

View File

@@ -58,7 +58,7 @@ public class Pet {
private List<String> photoUrls = new ArrayList<>();
public static final String JSON_PROPERTY_TAGS = "tags";
private List<Tag> tags = new ArrayList<>();
private List<Tag> tags;
/**
* pet status in the store
@@ -184,6 +184,9 @@ public class Pet {
}
public Pet addPhotoUrlsItem(String photoUrlsItem) {
if (this.photoUrls == null) {
this.photoUrls = new ArrayList<>();
}
this.photoUrls.add(photoUrlsItem);
return this;
}