[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

@@ -34,6 +34,7 @@ import org.openapitools.client.JSON;
@JsonPropertyOrder({
ChildSchemaAllOf.JSON_PROPERTY_PROP1
})
@JsonTypeName("ChildSchema_allOf")
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
public class ChildSchemaAllOf {
public static final String JSON_PROPERTY_PROP1 = "prop1";

View File

@@ -43,9 +43,9 @@ import org.openapitools.client.JSON;
@JsonPropertyOrder({
MySchemaNameCharacters.JSON_PROPERTY_PROP2
})
@JsonTypeName("MySchemaName._-Characters")
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "objectType", visible = true)
@JsonTypeName("MySchemaName._-Characters")
public class MySchemaNameCharacters extends Parent {
public static final String JSON_PROPERTY_PROP2 = "prop2";

View File

@@ -34,6 +34,7 @@ import org.openapitools.client.JSON;
@JsonPropertyOrder({
MySchemaNameCharactersAllOf.JSON_PROPERTY_PROP2
})
@JsonTypeName("MySchemaName___Characters_allOf")
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
public class MySchemaNameCharactersAllOf {
public static final String JSON_PROPERTY_PROP2 = "prop2";

View File

@@ -35,6 +35,7 @@ import org.openapitools.client.JSON;
Apple.JSON_PROPERTY_CULTIVAR,
Apple.JSON_PROPERTY_ORIGIN
})
@JsonTypeName("apple")
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
public class Apple {
public static final String JSON_PROPERTY_CULTIVAR = "cultivar";

View File

@@ -35,6 +35,7 @@ import org.openapitools.client.JSON;
AppleReq.JSON_PROPERTY_CULTIVAR,
AppleReq.JSON_PROPERTY_MEALY
})
@JsonTypeName("appleReq")
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
public class AppleReq {
public static final String JSON_PROPERTY_CULTIVAR = "cultivar";

View File

@@ -35,6 +35,7 @@ import org.openapitools.client.JSON;
@JsonPropertyOrder({
Banana.JSON_PROPERTY_LENGTH_CM
})
@JsonTypeName("banana")
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
public class Banana {
public static final String JSON_PROPERTY_LENGTH_CM = "lengthCm";

View File

@@ -36,6 +36,7 @@ import org.openapitools.client.JSON;
BananaReq.JSON_PROPERTY_LENGTH_CM,
BananaReq.JSON_PROPERTY_SWEET
})
@JsonTypeName("bananaReq")
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
public class BananaReq {
public static final String JSON_PROPERTY_LENGTH_CM = "lengthCm";

View File

@@ -34,6 +34,7 @@ import org.openapitools.client.JSON;
@JsonPropertyOrder({
CatAllOf.JSON_PROPERTY_DECLAWED
})
@JsonTypeName("Cat_allOf")
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
public class CatAllOf {
public static final String JSON_PROPERTY_DECLAWED = "declawed";

View File

@@ -37,6 +37,7 @@ import org.openapitools.client.JSON;
ChildCatAllOf.JSON_PROPERTY_NAME,
ChildCatAllOf.JSON_PROPERTY_PET_TYPE
})
@JsonTypeName("ChildCat_allOf")
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
public class ChildCatAllOf {
public static final String JSON_PROPERTY_NAME = "name";

View File

@@ -34,6 +34,7 @@ import org.openapitools.client.JSON;
@JsonPropertyOrder({
DogAllOf.JSON_PROPERTY_BREED
})
@JsonTypeName("Dog_allOf")
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
public class DogAllOf {
public static final String JSON_PROPERTY_BREED = "breed";

View File

@@ -50,6 +50,7 @@ import org.openapitools.client.JSON;
EnumTest.JSON_PROPERTY_OUTER_ENUM_DEFAULT_VALUE,
EnumTest.JSON_PROPERTY_OUTER_ENUM_INTEGER_DEFAULT_VALUE
})
@JsonTypeName("Enum_Test")
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
public class EnumTest {
/**

View File

@@ -54,6 +54,7 @@ import org.openapitools.client.JSON;
FormatTest.JSON_PROPERTY_PATTERN_WITH_DIGITS,
FormatTest.JSON_PROPERTY_PATTERN_WITH_DIGITS_AND_DELIMITER
})
@JsonTypeName("format_test")
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
public class FormatTest {
public static final String JSON_PROPERTY_INTEGER = "integer";

View File

@@ -35,6 +35,7 @@ import org.openapitools.client.JSON;
HasOnlyReadOnly.JSON_PROPERTY_BAR,
HasOnlyReadOnly.JSON_PROPERTY_FOO
})
@JsonTypeName("hasOnlyReadOnly")
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
public class HasOnlyReadOnly {
public static final String JSON_PROPERTY_BAR = "bar";

View File

@@ -35,6 +35,7 @@ import org.openapitools.client.JSON;
@JsonPropertyOrder({
InlineResponseDefault.JSON_PROPERTY_STRING
})
@JsonTypeName("inline_response_default")
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
public class InlineResponseDefault {
public static final String JSON_PROPERTY_STRING = "string";

View File

@@ -36,6 +36,7 @@ import org.openapitools.client.JSON;
Model200Response.JSON_PROPERTY_NAME,
Model200Response.JSON_PROPERTY_PROPERTY_CLASS
})
@JsonTypeName("200_response")
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
public class Model200Response {
public static final String JSON_PROPERTY_NAME = "name";

View File

@@ -36,6 +36,7 @@ import org.openapitools.client.JSON;
ModelApiResponse.JSON_PROPERTY_TYPE,
ModelApiResponse.JSON_PROPERTY_MESSAGE
})
@JsonTypeName("ApiResponse")
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
public class ModelApiResponse {
public static final String JSON_PROPERTY_CODE = "code";

View File

@@ -35,6 +35,7 @@ import org.openapitools.client.JSON;
@JsonPropertyOrder({
ModelFile.JSON_PROPERTY_SOURCE_U_R_I
})
@JsonTypeName("File")
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
public class ModelFile {
public static final String JSON_PROPERTY_SOURCE_U_R_I = "sourceURI";

View File

@@ -34,6 +34,7 @@ import org.openapitools.client.JSON;
@JsonPropertyOrder({
ModelList.JSON_PROPERTY_123LIST
})
@JsonTypeName("List")
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
public class ModelList {
public static final String JSON_PROPERTY_123LIST = "123-list";

View File

@@ -35,6 +35,7 @@ import org.openapitools.client.JSON;
@JsonPropertyOrder({
ModelReturn.JSON_PROPERTY_RETURN
})
@JsonTypeName("Return")
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
public class ModelReturn {
public static final String JSON_PROPERTY_RETURN = "return";

View File

@@ -35,6 +35,7 @@ import org.openapitools.client.JSON;
SpecialModelName.JSON_PROPERTY_$_SPECIAL_PROPERTY_NAME,
SpecialModelName.JSON_PROPERTY_SPECIAL_MODEL_NAME
})
@JsonTypeName("_special_model.name_")
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
public class SpecialModelName {
public static final String JSON_PROPERTY_$_SPECIAL_PROPERTY_NAME = "$special[property.name]";

View File

@@ -36,6 +36,7 @@ import org.openapitools.client.JSON;
Whale.JSON_PROPERTY_HAS_TEETH,
Whale.JSON_PROPERTY_CLASS_NAME
})
@JsonTypeName("whale")
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
public class Whale {
public static final String JSON_PROPERTY_HAS_BALEEN = "hasBaleen";

View File

@@ -39,6 +39,7 @@ import org.openapitools.client.JSON;
Zebra.JSON_PROPERTY_TYPE,
Zebra.JSON_PROPERTY_CLASS_NAME
})
@JsonTypeName("zebra")
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
public class Zebra {
/**