mirror of
https://github.com/OpenAPITools/openapi-generator.git
synced 2025-12-09 21:26:11 +00:00
Merge remote-tracking branch 'origin/master' into 5.4.x
This commit is contained in:
WILLIAM CHENG
@@ -1,5 +1,6 @@
|
||||
apply plugin: 'idea'
|
||||
apply plugin: 'eclipse'
|
||||
apply plugin: 'com.diffplug.spotless'
|
||||
|
||||
group = 'org.openapitools'
|
||||
version = '1.0.0'
|
||||
@@ -11,6 +12,7 @@ buildscript {
|
||||
dependencies {
|
||||
classpath 'com.android.tools.build:gradle:2.3.+'
|
||||
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
|
||||
classpath 'com.diffplug.spotless:spotless-plugin-gradle:5.17.1'
|
||||
}
|
||||
}
|
||||
|
||||
@@ -127,3 +129,27 @@ dependencies {
|
||||
javadoc {
|
||||
options.tags = [ "http.response.details:a:Http Response Details" ]
|
||||
}
|
||||
|
||||
// Use spotless plugin to automatically format code, remove unused import, etc
|
||||
// To apply changes directly to the file, run `gradlew spotlessApply`
|
||||
// Ref: https://github.com/diffplug/spotless/tree/main/plugin-gradle
|
||||
spotless {
|
||||
// comment out below to run spotless as part of the `check` task
|
||||
enforceCheck false
|
||||
|
||||
format 'misc', {
|
||||
// define the files (e.g. '*.gradle', '*.md') to apply `misc` to
|
||||
target '.gitignore'
|
||||
// define the steps to apply to those files
|
||||
trimTrailingWhitespace()
|
||||
indentWithSpaces() // Takes an integer argument if you don't like 4
|
||||
endWithNewline()
|
||||
}
|
||||
java {
|
||||
// don't need to set target, it is inferred from java
|
||||
// apply a specific flavor of google-java-format
|
||||
googleJavaFormat('1.8').aosp().reflowLongStrings()
|
||||
removeUnusedImports()
|
||||
importOrder()
|
||||
}
|
||||
}
|
||||
|
||||
@@ -183,6 +183,46 @@
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
<!-- Use spotless plugin to automatically format code, remove unused import, etc
|
||||
To apply changes directly to the file, run `mvn spotless:apply`
|
||||
Ref: https://github.com/diffplug/spotless/tree/main/plugin-maven
|
||||
-->
|
||||
<plugin>
|
||||
<groupId>com.diffplug.spotless</groupId>
|
||||
<artifactId>spotless-maven-plugin</artifactId>
|
||||
<version>${spotless.version}</version>
|
||||
<configuration>
|
||||
<formats>
|
||||
<!-- you can define as many formats as you want, each is independent -->
|
||||
<format>
|
||||
<!-- define the files to apply to -->
|
||||
<includes>
|
||||
<include>.gitignore</include>
|
||||
</includes>
|
||||
<!-- define the steps to apply to those files -->
|
||||
<trimTrailingWhitespace/>
|
||||
<endWithNewline/>
|
||||
<indent>
|
||||
<spaces>true</spaces> <!-- or <tabs>true</tabs> -->
|
||||
<spacesPerTab>4</spacesPerTab> <!-- optional, default is 4 -->
|
||||
</indent>
|
||||
</format>
|
||||
</formats>
|
||||
<!-- define a language-specific format -->
|
||||
<java>
|
||||
<!-- no need to specify files, inferred automatically, but you can if you want -->
|
||||
|
||||
<!-- apply a specific flavor of google-java-format and reflow long strings -->
|
||||
<googleJavaFormat>
|
||||
<version>1.8</version>
|
||||
<style>AOSP</style>
|
||||
<reflowLongStrings>true</reflowLongStrings>
|
||||
</googleJavaFormat>
|
||||
<removeUnusedImports/>
|
||||
<importOrder/>
|
||||
</java>
|
||||
</configuration>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
|
||||
@@ -306,5 +346,6 @@
|
||||
<jakarta-annotation-version>1.3.5</jakarta-annotation-version>
|
||||
<junit-version>4.13.2</junit-version>
|
||||
<scribejava-apis-version>8.3.1</scribejava-apis-version>
|
||||
<spotless.version>2.17.3</spotless.version>
|
||||
</properties>
|
||||
</project>
|
||||
|
||||
@@ -43,6 +43,8 @@ public class AdditionalPropertiesAnyType {
|
||||
public static final String JSON_PROPERTY_NAME = "name";
|
||||
private String name;
|
||||
|
||||
public AdditionalPropertiesAnyType() {
|
||||
}
|
||||
|
||||
public AdditionalPropertiesAnyType name(String name) {
|
||||
this.name = name;
|
||||
|
||||
@@ -44,6 +44,8 @@ public class AdditionalPropertiesArray {
|
||||
public static final String JSON_PROPERTY_NAME = "name";
|
||||
private String name;
|
||||
|
||||
public AdditionalPropertiesArray() {
|
||||
}
|
||||
|
||||
public AdditionalPropertiesArray name(String name) {
|
||||
this.name = name;
|
||||
|
||||
@@ -43,6 +43,8 @@ public class AdditionalPropertiesBoolean {
|
||||
public static final String JSON_PROPERTY_NAME = "name";
|
||||
private String name;
|
||||
|
||||
public AdditionalPropertiesBoolean() {
|
||||
}
|
||||
|
||||
public AdditionalPropertiesBoolean name(String name) {
|
||||
this.name = name;
|
||||
|
||||
@@ -83,6 +83,8 @@ public class AdditionalPropertiesClass {
|
||||
public static final String JSON_PROPERTY_ANYTYPE3 = "anytype_3";
|
||||
private Object anytype3;
|
||||
|
||||
public AdditionalPropertiesClass() {
|
||||
}
|
||||
|
||||
public AdditionalPropertiesClass mapString(Map<String, String> mapString) {
|
||||
this.mapString = mapString;
|
||||
|
||||
@@ -43,6 +43,8 @@ public class AdditionalPropertiesInteger {
|
||||
public static final String JSON_PROPERTY_NAME = "name";
|
||||
private String name;
|
||||
|
||||
public AdditionalPropertiesInteger() {
|
||||
}
|
||||
|
||||
public AdditionalPropertiesInteger name(String name) {
|
||||
this.name = name;
|
||||
|
||||
@@ -44,6 +44,8 @@ public class AdditionalPropertiesNumber {
|
||||
public static final String JSON_PROPERTY_NAME = "name";
|
||||
private String name;
|
||||
|
||||
public AdditionalPropertiesNumber() {
|
||||
}
|
||||
|
||||
public AdditionalPropertiesNumber name(String name) {
|
||||
this.name = name;
|
||||
|
||||
@@ -44,6 +44,8 @@ public class AdditionalPropertiesObject {
|
||||
public static final String JSON_PROPERTY_NAME = "name";
|
||||
private String name;
|
||||
|
||||
public AdditionalPropertiesObject() {
|
||||
}
|
||||
|
||||
public AdditionalPropertiesObject name(String name) {
|
||||
this.name = name;
|
||||
|
||||
@@ -43,6 +43,8 @@ public class AdditionalPropertiesString {
|
||||
public static final String JSON_PROPERTY_NAME = "name";
|
||||
private String name;
|
||||
|
||||
public AdditionalPropertiesString() {
|
||||
}
|
||||
|
||||
public AdditionalPropertiesString name(String name) {
|
||||
this.name = name;
|
||||
|
||||
@@ -55,6 +55,8 @@ public class Animal {
|
||||
public static final String JSON_PROPERTY_COLOR = "color";
|
||||
private String color = "red";
|
||||
|
||||
public Animal() {
|
||||
}
|
||||
|
||||
public Animal className(String className) {
|
||||
this.className = className;
|
||||
|
||||
@@ -42,6 +42,8 @@ public class ArrayOfArrayOfNumberOnly {
|
||||
public static final String JSON_PROPERTY_ARRAY_ARRAY_NUMBER = "ArrayArrayNumber";
|
||||
private List<List<BigDecimal>> arrayArrayNumber = null;
|
||||
|
||||
public ArrayOfArrayOfNumberOnly() {
|
||||
}
|
||||
|
||||
public ArrayOfArrayOfNumberOnly arrayArrayNumber(List<List<BigDecimal>> arrayArrayNumber) {
|
||||
this.arrayArrayNumber = arrayArrayNumber;
|
||||
|
||||
@@ -42,6 +42,8 @@ public class ArrayOfNumberOnly {
|
||||
public static final String JSON_PROPERTY_ARRAY_NUMBER = "ArrayNumber";
|
||||
private List<BigDecimal> arrayNumber = null;
|
||||
|
||||
public ArrayOfNumberOnly() {
|
||||
}
|
||||
|
||||
public ArrayOfNumberOnly arrayNumber(List<BigDecimal> arrayNumber) {
|
||||
this.arrayNumber = arrayNumber;
|
||||
|
||||
@@ -50,6 +50,8 @@ public class ArrayTest {
|
||||
public static final String JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL = "array_array_of_model";
|
||||
private List<List<ReadOnlyFirst>> arrayArrayOfModel = null;
|
||||
|
||||
public ArrayTest() {
|
||||
}
|
||||
|
||||
public ArrayTest arrayOfString(List<String> arrayOfString) {
|
||||
this.arrayOfString = arrayOfString;
|
||||
|
||||
@@ -84,6 +84,8 @@ public class BigCat extends Cat {
|
||||
public static final String JSON_PROPERTY_KIND = "kind";
|
||||
private KindEnum kind;
|
||||
|
||||
public BigCat() {
|
||||
}
|
||||
|
||||
public BigCat kind(KindEnum kind) {
|
||||
this.kind = kind;
|
||||
|
||||
@@ -78,6 +78,8 @@ public class BigCatAllOf {
|
||||
public static final String JSON_PROPERTY_KIND = "kind";
|
||||
private KindEnum kind;
|
||||
|
||||
public BigCatAllOf() {
|
||||
}
|
||||
|
||||
public BigCatAllOf kind(KindEnum kind) {
|
||||
this.kind = kind;
|
||||
|
||||
@@ -59,6 +59,8 @@ public class Capitalization {
|
||||
public static final String JSON_PROPERTY_A_T_T_N_A_M_E = "ATT_NAME";
|
||||
private String ATT_NAME;
|
||||
|
||||
public Capitalization() {
|
||||
}
|
||||
|
||||
public Capitalization smallCamel(String smallCamel) {
|
||||
this.smallCamel = smallCamel;
|
||||
|
||||
@@ -49,6 +49,8 @@ public class Cat extends Animal {
|
||||
public static final String JSON_PROPERTY_DECLAWED = "declawed";
|
||||
private Boolean declawed;
|
||||
|
||||
public Cat() {
|
||||
}
|
||||
|
||||
public Cat declawed(Boolean declawed) {
|
||||
this.declawed = declawed;
|
||||
|
||||
@@ -39,6 +39,8 @@ public class CatAllOf {
|
||||
public static final String JSON_PROPERTY_DECLAWED = "declawed";
|
||||
private Boolean declawed;
|
||||
|
||||
public CatAllOf() {
|
||||
}
|
||||
|
||||
public CatAllOf declawed(Boolean declawed) {
|
||||
this.declawed = declawed;
|
||||
|
||||
@@ -43,6 +43,8 @@ public class Category {
|
||||
public static final String JSON_PROPERTY_NAME = "name";
|
||||
private String name = "default-name";
|
||||
|
||||
public Category() {
|
||||
}
|
||||
|
||||
public Category id(Long id) {
|
||||
this.id = id;
|
||||
|
||||
@@ -40,6 +40,8 @@ public class ClassModel {
|
||||
public static final String JSON_PROPERTY_PROPERTY_CLASS = "_class";
|
||||
private String propertyClass;
|
||||
|
||||
public ClassModel() {
|
||||
}
|
||||
|
||||
public ClassModel propertyClass(String propertyClass) {
|
||||
this.propertyClass = propertyClass;
|
||||
|
||||
@@ -39,6 +39,8 @@ public class Client {
|
||||
public static final String JSON_PROPERTY_CLIENT = "client";
|
||||
private String client;
|
||||
|
||||
public Client() {
|
||||
}
|
||||
|
||||
public Client client(String client) {
|
||||
this.client = client;
|
||||
|
||||
@@ -45,6 +45,8 @@ public class Dog extends Animal {
|
||||
public static final String JSON_PROPERTY_BREED = "breed";
|
||||
private String breed;
|
||||
|
||||
public Dog() {
|
||||
}
|
||||
|
||||
public Dog breed(String breed) {
|
||||
this.breed = breed;
|
||||
|
||||
@@ -39,6 +39,8 @@ public class DogAllOf {
|
||||
public static final String JSON_PROPERTY_BREED = "breed";
|
||||
private String breed;
|
||||
|
||||
public DogAllOf() {
|
||||
}
|
||||
|
||||
public DogAllOf breed(String breed) {
|
||||
this.breed = breed;
|
||||
|
||||
@@ -115,6 +115,8 @@ public class EnumArrays {
|
||||
public static final String JSON_PROPERTY_ARRAY_ENUM = "array_enum";
|
||||
private List<ArrayEnumEnum> arrayEnum = null;
|
||||
|
||||
public EnumArrays() {
|
||||
}
|
||||
|
||||
public EnumArrays justSymbol(JustSymbolEnum justSymbol) {
|
||||
this.justSymbol = justSymbol;
|
||||
|
||||
@@ -200,6 +200,8 @@ public class EnumTest {
|
||||
public static final String JSON_PROPERTY_OUTER_ENUM = "outerEnum";
|
||||
private OuterEnum outerEnum;
|
||||
|
||||
public EnumTest() {
|
||||
}
|
||||
|
||||
public EnumTest enumString(EnumStringEnum enumString) {
|
||||
this.enumString = enumString;
|
||||
|
||||
@@ -45,6 +45,8 @@ public class FileSchemaTestClass {
|
||||
public static final String JSON_PROPERTY_FILES = "files";
|
||||
private List<java.io.File> files = null;
|
||||
|
||||
public FileSchemaTestClass() {
|
||||
}
|
||||
|
||||
public FileSchemaTestClass file(java.io.File file) {
|
||||
this.file = file;
|
||||
|
||||
@@ -96,6 +96,8 @@ public class FormatTest {
|
||||
public static final String JSON_PROPERTY_BIG_DECIMAL = "BigDecimal";
|
||||
private BigDecimal bigDecimal;
|
||||
|
||||
public FormatTest() {
|
||||
}
|
||||
|
||||
public FormatTest integer(Integer integer) {
|
||||
this.integer = integer;
|
||||
|
||||
@@ -43,6 +43,18 @@ public class HasOnlyReadOnly {
|
||||
public static final String JSON_PROPERTY_FOO = "foo";
|
||||
private String foo;
|
||||
|
||||
public HasOnlyReadOnly() {
|
||||
}
|
||||
|
||||
@JsonCreator
|
||||
public HasOnlyReadOnly(
|
||||
@JsonProperty(JSON_PROPERTY_BAR) String bar,
|
||||
@JsonProperty(JSON_PROPERTY_FOO) String foo
|
||||
) {
|
||||
this();
|
||||
this.bar = bar;
|
||||
this.foo = foo;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get bar
|
||||
|
||||
@@ -89,6 +89,8 @@ public class MapTest {
|
||||
public static final String JSON_PROPERTY_INDIRECT_MAP = "indirect_map";
|
||||
private Map<String, Boolean> indirectMap = null;
|
||||
|
||||
public MapTest() {
|
||||
}
|
||||
|
||||
public MapTest mapMapOfString(Map<String, Map<String, String>> mapMapOfString) {
|
||||
this.mapMapOfString = mapMapOfString;
|
||||
|
||||
@@ -53,6 +53,8 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
|
||||
public static final String JSON_PROPERTY_MAP = "map";
|
||||
private Map<String, Animal> map = null;
|
||||
|
||||
public MixedPropertiesAndAdditionalPropertiesClass() {
|
||||
}
|
||||
|
||||
public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
|
||||
this.uuid = uuid;
|
||||
|
||||
@@ -44,6 +44,8 @@ public class Model200Response {
|
||||
public static final String JSON_PROPERTY_PROPERTY_CLASS = "class";
|
||||
private String propertyClass;
|
||||
|
||||
public Model200Response() {
|
||||
}
|
||||
|
||||
public Model200Response name(Integer name) {
|
||||
this.name = name;
|
||||
|
||||
@@ -47,6 +47,8 @@ public class ModelApiResponse {
|
||||
public static final String JSON_PROPERTY_MESSAGE = "message";
|
||||
private String message;
|
||||
|
||||
public ModelApiResponse() {
|
||||
}
|
||||
|
||||
public ModelApiResponse code(Integer code) {
|
||||
this.code = code;
|
||||
|
||||
@@ -40,6 +40,8 @@ public class ModelReturn {
|
||||
public static final String JSON_PROPERTY_RETURN = "return";
|
||||
private Integer _return;
|
||||
|
||||
public ModelReturn() {
|
||||
}
|
||||
|
||||
public ModelReturn _return(Integer _return) {
|
||||
this._return = _return;
|
||||
|
||||
@@ -52,6 +52,18 @@ public class Name {
|
||||
public static final String JSON_PROPERTY_123NUMBER = "123Number";
|
||||
private Integer _123number;
|
||||
|
||||
public Name() {
|
||||
}
|
||||
|
||||
@JsonCreator
|
||||
public Name(
|
||||
@JsonProperty(JSON_PROPERTY_SNAKE_CASE) Integer snakeCase,
|
||||
@JsonProperty(JSON_PROPERTY_123NUMBER) Integer _123number
|
||||
) {
|
||||
this();
|
||||
this.snakeCase = snakeCase;
|
||||
this._123number = _123number;
|
||||
}
|
||||
|
||||
public Name name(Integer name) {
|
||||
this.name = name;
|
||||
|
||||
@@ -40,6 +40,8 @@ public class NumberOnly {
|
||||
public static final String JSON_PROPERTY_JUST_NUMBER = "JustNumber";
|
||||
private BigDecimal justNumber;
|
||||
|
||||
public NumberOnly() {
|
||||
}
|
||||
|
||||
public NumberOnly justNumber(BigDecimal justNumber) {
|
||||
this.justNumber = justNumber;
|
||||
|
||||
@@ -97,6 +97,8 @@ public class Order {
|
||||
public static final String JSON_PROPERTY_COMPLETE = "complete";
|
||||
private Boolean complete = false;
|
||||
|
||||
public Order() {
|
||||
}
|
||||
|
||||
public Order id(Long id) {
|
||||
this.id = id;
|
||||
|
||||
@@ -48,6 +48,8 @@ public class OuterComposite {
|
||||
public static final String JSON_PROPERTY_MY_BOOLEAN = "my_boolean";
|
||||
private Boolean myBoolean;
|
||||
|
||||
public OuterComposite() {
|
||||
}
|
||||
|
||||
public OuterComposite myNumber(BigDecimal myNumber) {
|
||||
this.myNumber = myNumber;
|
||||
|
||||
@@ -22,6 +22,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
|
||||
import com.fasterxml.jackson.annotation.JsonCreator;
|
||||
import com.fasterxml.jackson.annotation.JsonTypeName;
|
||||
import com.fasterxml.jackson.annotation.JsonValue;
|
||||
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import java.util.ArrayList;
|
||||
@@ -102,6 +103,8 @@ public class Pet {
|
||||
public static final String JSON_PROPERTY_STATUS = "status";
|
||||
private StatusEnum status;
|
||||
|
||||
public Pet() {
|
||||
}
|
||||
|
||||
public Pet id(Long id) {
|
||||
this.id = id;
|
||||
@@ -205,6 +208,7 @@ public class Pet {
|
||||
}
|
||||
|
||||
|
||||
@JsonDeserialize(as = LinkedHashSet.class)
|
||||
@JsonProperty(JSON_PROPERTY_PHOTO_URLS)
|
||||
@JsonInclude(value = JsonInclude.Include.ALWAYS)
|
||||
public void setPhotoUrls(Set<String> photoUrls) {
|
||||
|
||||
@@ -43,6 +43,16 @@ public class ReadOnlyFirst {
|
||||
public static final String JSON_PROPERTY_BAZ = "baz";
|
||||
private String baz;
|
||||
|
||||
public ReadOnlyFirst() {
|
||||
}
|
||||
|
||||
@JsonCreator
|
||||
public ReadOnlyFirst(
|
||||
@JsonProperty(JSON_PROPERTY_BAR) String bar
|
||||
) {
|
||||
this();
|
||||
this.bar = bar;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get bar
|
||||
|
||||
@@ -39,6 +39,8 @@ public class SpecialModelName {
|
||||
public static final String JSON_PROPERTY_$_SPECIAL_PROPERTY_NAME = "$special[property.name]";
|
||||
private Long $specialPropertyName;
|
||||
|
||||
public SpecialModelName() {
|
||||
}
|
||||
|
||||
public SpecialModelName $specialPropertyName(Long $specialPropertyName) {
|
||||
this.$specialPropertyName = $specialPropertyName;
|
||||
|
||||
@@ -43,6 +43,8 @@ public class Tag {
|
||||
public static final String JSON_PROPERTY_NAME = "name";
|
||||
private String name;
|
||||
|
||||
public Tag() {
|
||||
}
|
||||
|
||||
public Tag id(Long id) {
|
||||
this.id = id;
|
||||
|
||||
@@ -58,6 +58,8 @@ public class TypeHolderDefault {
|
||||
public static final String JSON_PROPERTY_ARRAY_ITEM = "array_item";
|
||||
private List<Integer> arrayItem = new ArrayList<>();
|
||||
|
||||
public TypeHolderDefault() {
|
||||
}
|
||||
|
||||
public TypeHolderDefault stringItem(String stringItem) {
|
||||
this.stringItem = stringItem;
|
||||
|
||||
@@ -62,6 +62,8 @@ public class TypeHolderExample {
|
||||
public static final String JSON_PROPERTY_ARRAY_ITEM = "array_item";
|
||||
private List<Integer> arrayItem = new ArrayList<>();
|
||||
|
||||
public TypeHolderExample() {
|
||||
}
|
||||
|
||||
public TypeHolderExample stringItem(String stringItem) {
|
||||
this.stringItem = stringItem;
|
||||
|
||||
@@ -67,6 +67,8 @@ public class User {
|
||||
public static final String JSON_PROPERTY_USER_STATUS = "userStatus";
|
||||
private Integer userStatus;
|
||||
|
||||
public User() {
|
||||
}
|
||||
|
||||
public User id(Long id) {
|
||||
this.id = id;
|
||||
|
||||
@@ -154,6 +154,8 @@ public class XmlItem {
|
||||
public static final String JSON_PROPERTY_PREFIX_NS_WRAPPED_ARRAY = "prefix_ns_wrapped_array";
|
||||
private List<Integer> prefixNsWrappedArray = null;
|
||||
|
||||
public XmlItem() {
|
||||
}
|
||||
|
||||
public XmlItem attributeString(String attributeString) {
|
||||
this.attributeString = attributeString;
|
||||
|
||||
Reference in New Issue
Block a user