[Bug][Java/Spring] OAS3 related bugfixes and enhancements (#11526)

* Content mediatype is hardcoded in api.mustache #11511

* Generate Samples

* OAS3 incorrect data type when providing a default value #11367

* Generate Samples

* Fix JsonTypeName annotation handling in Java and JavaSpring

* Generate Samples

* getIsClassnameSanitized: use null safe equals
This commit is contained in:
cachescrubber
2022-02-05 10:29:58 +01:00
committed by GitHub
parent e177a4b757
commit 194b3fda26
987 changed files with 2033 additions and 1285 deletions

View File

@@ -33,7 +33,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName;
@JsonPropertyOrder({
AdditionalPropertiesAnyType.JSON_PROPERTY_NAME
})
@JsonTypeName("AdditionalPropertiesAnyType")
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
public class AdditionalPropertiesAnyType extends HashMap<String, Object> {
public static final String JSON_PROPERTY_NAME = "name";

View File

@@ -34,7 +34,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName;
@JsonPropertyOrder({
AdditionalPropertiesArray.JSON_PROPERTY_NAME
})
@JsonTypeName("AdditionalPropertiesArray")
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
public class AdditionalPropertiesArray extends HashMap<String, List> {
public static final String JSON_PROPERTY_NAME = "name";

View File

@@ -33,7 +33,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName;
@JsonPropertyOrder({
AdditionalPropertiesBoolean.JSON_PROPERTY_NAME
})
@JsonTypeName("AdditionalPropertiesBoolean")
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> {
public static final String JSON_PROPERTY_NAME = "name";

View File

@@ -45,7 +45,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName;
AdditionalPropertiesClass.JSON_PROPERTY_ANYTYPE2,
AdditionalPropertiesClass.JSON_PROPERTY_ANYTYPE3
})
@JsonTypeName("AdditionalPropertiesClass")
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
public class AdditionalPropertiesClass {
public static final String JSON_PROPERTY_MAP_STRING = "map_string";

View File

@@ -33,7 +33,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName;
@JsonPropertyOrder({
AdditionalPropertiesInteger.JSON_PROPERTY_NAME
})
@JsonTypeName("AdditionalPropertiesInteger")
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
public class AdditionalPropertiesInteger extends HashMap<String, Integer> {
public static final String JSON_PROPERTY_NAME = "name";

View File

@@ -34,7 +34,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName;
@JsonPropertyOrder({
AdditionalPropertiesNumber.JSON_PROPERTY_NAME
})
@JsonTypeName("AdditionalPropertiesNumber")
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> {
public static final String JSON_PROPERTY_NAME = "name";

View File

@@ -33,7 +33,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName;
@JsonPropertyOrder({
AdditionalPropertiesObject.JSON_PROPERTY_NAME
})
@JsonTypeName("AdditionalPropertiesObject")
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
public class AdditionalPropertiesObject extends HashMap<String, Map> {
public static final String JSON_PROPERTY_NAME = "name";

View File

@@ -33,7 +33,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName;
@JsonPropertyOrder({
AdditionalPropertiesString.JSON_PROPERTY_NAME
})
@JsonTypeName("AdditionalPropertiesString")
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
public class AdditionalPropertiesString extends HashMap<String, String> {
public static final String JSON_PROPERTY_NAME = "name";

View File

@@ -37,7 +37,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName;
Animal.JSON_PROPERTY_CLASS_NAME,
Animal.JSON_PROPERTY_COLOR
})
@JsonTypeName("Animal")
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "className", visible = true)
@JsonSubTypes({

View File

@@ -34,7 +34,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName;
@JsonPropertyOrder({
ArrayOfArrayOfNumberOnly.JSON_PROPERTY_ARRAY_ARRAY_NUMBER
})
@JsonTypeName("ArrayOfArrayOfNumberOnly")
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
public class ArrayOfArrayOfNumberOnly {
public static final String JSON_PROPERTY_ARRAY_ARRAY_NUMBER = "ArrayArrayNumber";

View File

@@ -34,7 +34,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName;
@JsonPropertyOrder({
ArrayOfNumberOnly.JSON_PROPERTY_ARRAY_NUMBER
})
@JsonTypeName("ArrayOfNumberOnly")
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
public class ArrayOfNumberOnly {
public static final String JSON_PROPERTY_ARRAY_NUMBER = "ArrayNumber";

View File

@@ -36,7 +36,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName;
ArrayTest.JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER,
ArrayTest.JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL
})
@JsonTypeName("ArrayTest")
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
public class ArrayTest {
public static final String JSON_PROPERTY_ARRAY_OF_STRING = "array_of_string";

View File

@@ -35,7 +35,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName;
@JsonPropertyOrder({
BigCat.JSON_PROPERTY_KIND
})
@JsonTypeName("BigCat")
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "className", visible = true)

View File

@@ -36,7 +36,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName;
Capitalization.JSON_PROPERTY_SC_A_E_T_H_FLOW_POINTS,
Capitalization.JSON_PROPERTY_A_T_T_N_A_M_E
})
@JsonTypeName("Capitalization")
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
public class Capitalization {
public static final String JSON_PROPERTY_SMALL_CAMEL = "smallCamel";

View File

@@ -36,7 +36,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName;
@JsonPropertyOrder({
Cat.JSON_PROPERTY_DECLAWED
})
@JsonTypeName("Cat")
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "className", visible = true)
@JsonSubTypes({

View File

@@ -32,7 +32,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName;
Category.JSON_PROPERTY_ID,
Category.JSON_PROPERTY_NAME
})
@JsonTypeName("Category")
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
public class Category {
public static final String JSON_PROPERTY_ID = "id";

View File

@@ -32,7 +32,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName;
@JsonPropertyOrder({
ClassModel.JSON_PROPERTY_PROPERTY_CLASS
})
@JsonTypeName("ClassModel")
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
public class ClassModel {
public static final String JSON_PROPERTY_PROPERTY_CLASS = "_class";

View File

@@ -31,7 +31,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName;
@JsonPropertyOrder({
Client.JSON_PROPERTY_CLIENT
})
@JsonTypeName("Client")
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
public class Client {
public static final String JSON_PROPERTY_CLIENT = "client";

View File

@@ -35,7 +35,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName;
@JsonPropertyOrder({
Dog.JSON_PROPERTY_BREED
})
@JsonTypeName("Dog")
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "className", visible = true)

View File

@@ -34,7 +34,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName;
EnumArrays.JSON_PROPERTY_JUST_SYMBOL,
EnumArrays.JSON_PROPERTY_ARRAY_ENUM
})
@JsonTypeName("EnumArrays")
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
public class EnumArrays {
/**

View File

@@ -35,7 +35,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName;
FileSchemaTestClass.JSON_PROPERTY_FILE,
FileSchemaTestClass.JSON_PROPERTY_FILES
})
@JsonTypeName("FileSchemaTestClass")
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
public class FileSchemaTestClass {
public static final String JSON_PROPERTY_FILE = "file";

View File

@@ -37,7 +37,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName;
MapTest.JSON_PROPERTY_DIRECT_MAP,
MapTest.JSON_PROPERTY_INDIRECT_MAP
})
@JsonTypeName("MapTest")
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
public class MapTest {
public static final String JSON_PROPERTY_MAP_MAP_OF_STRING = "map_map_of_string";

View File

@@ -39,7 +39,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName;
MixedPropertiesAndAdditionalPropertiesClass.JSON_PROPERTY_DATE_TIME,
MixedPropertiesAndAdditionalPropertiesClass.JSON_PROPERTY_MAP
})
@JsonTypeName("MixedPropertiesAndAdditionalPropertiesClass")
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
public class MixedPropertiesAndAdditionalPropertiesClass {
public static final String JSON_PROPERTY_UUID = "uuid";

View File

@@ -35,7 +35,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName;
Name.JSON_PROPERTY_PROPERTY,
Name.JSON_PROPERTY_123NUMBER
})
@JsonTypeName("Name")
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
public class Name {
public static final String JSON_PROPERTY_NAME = "name";

View File

@@ -32,7 +32,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName;
@JsonPropertyOrder({
NumberOnly.JSON_PROPERTY_JUST_NUMBER
})
@JsonTypeName("NumberOnly")
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
public class NumberOnly {
public static final String JSON_PROPERTY_JUST_NUMBER = "JustNumber";

View File

@@ -37,7 +37,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName;
Order.JSON_PROPERTY_STATUS,
Order.JSON_PROPERTY_COMPLETE
})
@JsonTypeName("Order")
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
public class Order {
public static final String JSON_PROPERTY_ID = "id";

View File

@@ -34,7 +34,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName;
OuterComposite.JSON_PROPERTY_MY_STRING,
OuterComposite.JSON_PROPERTY_MY_BOOLEAN
})
@JsonTypeName("OuterComposite")
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
public class OuterComposite {
public static final String JSON_PROPERTY_MY_NUMBER = "my_number";

View File

@@ -43,7 +43,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName;
Pet.JSON_PROPERTY_TAGS,
Pet.JSON_PROPERTY_STATUS
})
@JsonTypeName("Pet")
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
public class Pet {
public static final String JSON_PROPERTY_ID = "id";

View File

@@ -32,7 +32,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName;
ReadOnlyFirst.JSON_PROPERTY_BAR,
ReadOnlyFirst.JSON_PROPERTY_BAZ
})
@JsonTypeName("ReadOnlyFirst")
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
public class ReadOnlyFirst {
public static final String JSON_PROPERTY_BAR = "bar";

View File

@@ -32,7 +32,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName;
Tag.JSON_PROPERTY_ID,
Tag.JSON_PROPERTY_NAME
})
@JsonTypeName("Tag")
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
public class Tag {
public static final String JSON_PROPERTY_ID = "id";

View File

@@ -38,7 +38,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName;
TypeHolderDefault.JSON_PROPERTY_BOOL_ITEM,
TypeHolderDefault.JSON_PROPERTY_ARRAY_ITEM
})
@JsonTypeName("TypeHolderDefault")
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
public class TypeHolderDefault {
public static final String JSON_PROPERTY_STRING_ITEM = "string_item";

View File

@@ -39,7 +39,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName;
TypeHolderExample.JSON_PROPERTY_BOOL_ITEM,
TypeHolderExample.JSON_PROPERTY_ARRAY_ITEM
})
@JsonTypeName("TypeHolderExample")
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
public class TypeHolderExample {
public static final String JSON_PROPERTY_STRING_ITEM = "string_item";

View File

@@ -38,7 +38,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName;
User.JSON_PROPERTY_PHONE,
User.JSON_PROPERTY_USER_STATUS
})
@JsonTypeName("User")
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
public class User {
public static final String JSON_PROPERTY_ID = "id";

View File

@@ -62,7 +62,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName;
XmlItem.JSON_PROPERTY_PREFIX_NS_ARRAY,
XmlItem.JSON_PROPERTY_PREFIX_NS_WRAPPED_ARRAY
})
@JsonTypeName("XmlItem")
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
public class XmlItem {
public static final String JSON_PROPERTY_ATTRIBUTE_STRING = "attribute_string";