[JAVA] [SPRING] [PKMST] [MICRONAUT] XML wireformat: Fix Jackson useWrapping=false, JAXB+Jackson namespaces (#18870)

* Fix XML annotations on model properties (JavaSpring)

* generate JAXB annotations for attributes and elements

* generate wrapper annotations (JAXB and Jackson)

* use XML config from items for annotations of containers

* Add test for Jackson XML wrapper correctness

* Add additional test cases to cover all xml applications in spec

Test now covers all use cases described in
- https://web.archive.org/web/20240424203304/https://swagger.io/docs/specification/data-models/representing-xml/
- https://spec.openapis.org/oas/v3.0.0#xml-arrays

* Fix basename used instead of xmlName when items.xmlName is unset

See last example in spec: https://spec.openapis.org/oas/v3.0.0#xml-arrays

* Harmonize spacing between Annotation attribute name and value

* Refactor and group JAXB vs. Jackson XML annotations, only generate latter if enabled

This is in line with the way the class annotations in `xmlAnnotations.mustache`
are rendered – which only renders the `@Jackson`… xml annotations if
additionalProperty jackson is true.

Also reorder annotation attributes in the following order:
- localName/name
- namespace (optional)
- isAttribute/useWrapping (optional)

* Explicitly render `useWrapping = true` to @JacksonXmlElementWrapper

This was slightly inspired by @jzrebiec via PR #5371.

Wrapping is the default since Jackson 2.1 – so explicitly rendering
this will:
- make generated model work out-of-the-box in Jackson 2.0 for instance
- ensure the models still work if the local `XmlWrapper` was
  configured with `useXmlWrapper(false)`

* Move xml test spec to java resources folder (not spring specific)

* Make test class name match class-under-test

This makes discovery & cross-navigation in IDE easier.

* Add complete xml annotations test for Java generators

* Fix Java PKMST generator not generating @JacksonXmlElementWrapper

* Fix Java microprofile generator missing @JacksonXmlRootElement

* Fix Java microprofile generator not using wrapper annotations and namespaces

* Fix Java Micronaut Client creating invalid (unclosed) @XmlAttribute annotations

* Fix Micronaut Client using wrong localName for @JacksonXmlElementWrapper

* Fix Micronaut client rendering @JacksonXmlProperty annotation twice

* Make Java Micronaut render @JacksonXmlElementWrapper(useWrapping=false) for non-wrapped elements

* Fix Jackson element using `xml.name` when it should be `items.xml.name`

Closes #5989
Closes #3223
Relates to #9371

* Fix JAXB element using `baseName` instead of `xmlName` when items.xmlName is unset

* Remove XML generation debug output from templates

* Remove redundant newline between XML class annotations and class

Brings the SpringCodegen in line with other Java Codegen's

* Remove redundant newline between XML setter annotations and setter

* Fix multiline JavaDoc block indentation and format

* Simplify / condense xml annotation template into single lines

May look a bit more complex, but cuts out a lot of repetitiveness.
Also reorders annotation attributes in the following order:
- localName/name
- namespace (optional)
- isAttribute/useWrapping (optional)

* Harmonize spacing between Annotation attribute name and value

* Remove unused jackson_annotations partial

Was not referenced anywhere in java-helidon resources folder

---------

Co-authored-by: Christian Schuster <christian@dnup.de>
This commit is contained in:
Philzen
2024-06-15 17:02:32 +02:00
committed by GitHub
parent 13facdaab5
commit 642b1a3a95
2726 changed files with 20424 additions and 20024 deletions

View File

@@ -36,7 +36,7 @@ public class AdditionalPropertiesAnyType {
/**
* Get name
* @return name
*/
*/
@ApiModelProperty(value = "")
@JsonProperty("name")

View File

@@ -37,7 +37,7 @@ public class AdditionalPropertiesArray {
/**
* Get name
* @return name
*/
*/
@ApiModelProperty(value = "")
@JsonProperty("name")

View File

@@ -36,7 +36,7 @@ public class AdditionalPropertiesBoolean {
/**
* Get name
* @return name
*/
*/
@ApiModelProperty(value = "")
@JsonProperty("name")

View File

@@ -75,7 +75,7 @@ public class AdditionalPropertiesClass {
/**
* Get mapString
* @return mapString
*/
*/
@ApiModelProperty(value = "")
@JsonProperty("map_string")
@@ -103,7 +103,7 @@ public class AdditionalPropertiesClass {
/**
* Get mapNumber
* @return mapNumber
*/
*/
@Valid
@ApiModelProperty(value = "")
@JsonProperty("map_number")
@@ -131,7 +131,7 @@ public class AdditionalPropertiesClass {
/**
* Get mapInteger
* @return mapInteger
*/
*/
@ApiModelProperty(value = "")
@JsonProperty("map_integer")
@@ -159,7 +159,7 @@ public class AdditionalPropertiesClass {
/**
* Get mapBoolean
* @return mapBoolean
*/
*/
@ApiModelProperty(value = "")
@JsonProperty("map_boolean")
@@ -187,7 +187,7 @@ public class AdditionalPropertiesClass {
/**
* Get mapArrayInteger
* @return mapArrayInteger
*/
*/
@Valid
@ApiModelProperty(value = "")
@JsonProperty("map_array_integer")
@@ -215,7 +215,7 @@ public class AdditionalPropertiesClass {
/**
* Get mapArrayAnytype
* @return mapArrayAnytype
*/
*/
@Valid
@ApiModelProperty(value = "")
@JsonProperty("map_array_anytype")
@@ -243,7 +243,7 @@ public class AdditionalPropertiesClass {
/**
* Get mapMapString
* @return mapMapString
*/
*/
@Valid
@ApiModelProperty(value = "")
@JsonProperty("map_map_string")
@@ -271,7 +271,7 @@ public class AdditionalPropertiesClass {
/**
* Get mapMapAnytype
* @return mapMapAnytype
*/
*/
@Valid
@ApiModelProperty(value = "")
@JsonProperty("map_map_anytype")
@@ -291,7 +291,7 @@ public class AdditionalPropertiesClass {
/**
* Get anytype1
* @return anytype1
*/
*/
@ApiModelProperty(value = "")
@JsonProperty("anytype_1")
@@ -311,7 +311,7 @@ public class AdditionalPropertiesClass {
/**
* Get anytype2
* @return anytype2
*/
*/
@ApiModelProperty(value = "")
@JsonProperty("anytype_2")
@@ -331,7 +331,7 @@ public class AdditionalPropertiesClass {
/**
* Get anytype3
* @return anytype3
*/
*/
@ApiModelProperty(value = "")
@JsonProperty("anytype_3")

View File

@@ -36,7 +36,7 @@ public class AdditionalPropertiesInteger {
/**
* Get name
* @return name
*/
*/
@ApiModelProperty(value = "")
@JsonProperty("name")

View File

@@ -37,7 +37,7 @@ public class AdditionalPropertiesNumber {
/**
* Get name
* @return name
*/
*/
@ApiModelProperty(value = "")
@JsonProperty("name")

View File

@@ -37,7 +37,7 @@ public class AdditionalPropertiesObject {
/**
* Get name
* @return name
*/
*/
@ApiModelProperty(value = "")
@JsonProperty("name")

View File

@@ -36,7 +36,7 @@ public class AdditionalPropertiesString {
/**
* Get name
* @return name
*/
*/
@ApiModelProperty(value = "")
@JsonProperty("name")

View File

@@ -59,7 +59,7 @@ public class Animal {
/**
* Get className
* @return className
*/
*/
@NotNull
@ApiModelProperty(required = true, value = "")
@JsonProperty("className")
@@ -79,7 +79,7 @@ public class Animal {
/**
* Get color
* @return color
*/
*/
@ApiModelProperty(value = "")
@JsonProperty("color")

View File

@@ -45,7 +45,7 @@ public class ArrayOfArrayOfNumberOnly {
/**
* Get arrayArrayNumber
* @return arrayArrayNumber
*/
*/
@Valid
@ApiModelProperty(value = "")
@JsonProperty("ArrayArrayNumber")

View File

@@ -45,7 +45,7 @@ public class ArrayOfNumberOnly {
/**
* Get arrayNumber
* @return arrayNumber
*/
*/
@Valid
@ApiModelProperty(value = "")
@JsonProperty("ArrayNumber")

View File

@@ -51,7 +51,7 @@ public class ArrayTest {
/**
* Get arrayOfString
* @return arrayOfString
*/
*/
@ApiModelProperty(value = "")
@JsonProperty("array_of_string")
@@ -79,7 +79,7 @@ public class ArrayTest {
/**
* Get arrayArrayOfInteger
* @return arrayArrayOfInteger
*/
*/
@Valid
@ApiModelProperty(value = "")
@JsonProperty("array_array_of_integer")
@@ -107,7 +107,7 @@ public class ArrayTest {
/**
* Get arrayArrayOfModel
* @return arrayArrayOfModel
*/
*/
@Valid
@ApiModelProperty(value = "")
@JsonProperty("array_array_of_model")

View File

@@ -88,7 +88,7 @@ public class BigCat extends Cat {
/**
* Get kind
* @return kind
*/
*/
@ApiModelProperty(value = "")
@JsonProperty("kind")

View File

@@ -42,7 +42,7 @@ public class Capitalization {
/**
* Get smallCamel
* @return smallCamel
*/
*/
@ApiModelProperty(value = "")
@JsonProperty("smallCamel")
@@ -62,7 +62,7 @@ public class Capitalization {
/**
* Get capitalCamel
* @return capitalCamel
*/
*/
@ApiModelProperty(value = "")
@JsonProperty("CapitalCamel")
@@ -82,7 +82,7 @@ public class Capitalization {
/**
* Get smallSnake
* @return smallSnake
*/
*/
@ApiModelProperty(value = "")
@JsonProperty("small_Snake")
@@ -102,7 +102,7 @@ public class Capitalization {
/**
* Get capitalSnake
* @return capitalSnake
*/
*/
@ApiModelProperty(value = "")
@JsonProperty("Capital_Snake")
@@ -122,7 +122,7 @@ public class Capitalization {
/**
* Get scAETHFlowPoints
* @return scAETHFlowPoints
*/
*/
@ApiModelProperty(value = "")
@JsonProperty("SCA_ETH_Flow_Points")
@@ -142,7 +142,7 @@ public class Capitalization {
/**
* Name of the pet
* @return ATT_NAME
*/
*/
@ApiModelProperty(value = "Name of the pet ")
@JsonProperty("ATT_NAME")

View File

@@ -56,7 +56,7 @@ public class Cat extends Animal {
/**
* Get declawed
* @return declawed
*/
*/
@ApiModelProperty(value = "")
@JsonProperty("declawed")

View File

@@ -45,7 +45,7 @@ public class Category {
/**
* Get id
* @return id
*/
*/
@ApiModelProperty(value = "")
@JsonProperty("id")
@@ -65,7 +65,7 @@ public class Category {
/**
* Get name
* @return name
*/
*/
@NotNull
@ApiModelProperty(required = true, value = "")
@JsonProperty("name")

View File

@@ -40,7 +40,7 @@ public class ChildWithNullable extends ParentWithNullable {
/**
* Get otherProperty
* @return otherProperty
*/
*/
@ApiModelProperty(value = "")
@JsonProperty("otherProperty")

View File

@@ -33,7 +33,7 @@ public class ClassModel {
/**
* Get propertyClass
* @return propertyClass
*/
*/
@ApiModelProperty(value = "")
@JsonProperty("_class")

View File

@@ -32,7 +32,7 @@ public class Client {
/**
* Get client
* @return client
*/
*/
@ApiModelProperty(value = "")
@JsonProperty("client")

View File

@@ -67,7 +67,7 @@ public class ContainerDefaultValue {
/**
* Get nullableArray
* @return nullableArray
*/
*/
@ApiModelProperty(value = "")
@JsonProperty("nullable_array")
@@ -95,7 +95,7 @@ public class ContainerDefaultValue {
/**
* Get nullableRequiredArray
* @return nullableRequiredArray
*/
*/
@NotNull
@ApiModelProperty(required = true, value = "")
@JsonProperty("nullable_required_array")
@@ -123,7 +123,7 @@ public class ContainerDefaultValue {
/**
* Get requiredArray
* @return requiredArray
*/
*/
@NotNull
@ApiModelProperty(required = true, value = "")
@JsonProperty("required_array")
@@ -151,7 +151,7 @@ public class ContainerDefaultValue {
/**
* Get nullableArrayWithDefault
* @return nullableArrayWithDefault
*/
*/
@ApiModelProperty(value = "")
@JsonProperty("nullable_array_with_default")

View File

@@ -48,7 +48,7 @@ public class Dog extends Animal {
/**
* Get breed
* @return breed
*/
*/
@ApiModelProperty(value = "")
@JsonProperty("breed")

View File

@@ -109,7 +109,7 @@ public class EnumArrays {
/**
* Get justSymbol
* @return justSymbol
*/
*/
@ApiModelProperty(value = "")
@JsonProperty("just_symbol")
@@ -137,7 +137,7 @@ public class EnumArrays {
/**
* Get arrayEnum
* @return arrayEnum
*/
*/
@ApiModelProperty(value = "")
@JsonProperty("array_enum")

View File

@@ -199,7 +199,7 @@ public class EnumTest {
/**
* Get enumString
* @return enumString
*/
*/
@ApiModelProperty(value = "")
@JsonProperty("enum_string")
@@ -219,7 +219,7 @@ public class EnumTest {
/**
* Get enumStringRequired
* @return enumStringRequired
*/
*/
@NotNull
@ApiModelProperty(required = true, value = "")
@JsonProperty("enum_string_required")
@@ -239,7 +239,7 @@ public class EnumTest {
/**
* Get enumInteger
* @return enumInteger
*/
*/
@ApiModelProperty(value = "")
@JsonProperty("enum_integer")
@@ -259,7 +259,7 @@ public class EnumTest {
/**
* Get enumNumber
* @return enumNumber
*/
*/
@ApiModelProperty(value = "")
@JsonProperty("enum_number")
@@ -279,7 +279,7 @@ public class EnumTest {
/**
* Get outerEnum
* @return outerEnum
*/
*/
@Valid
@ApiModelProperty(value = "")
@JsonProperty("outerEnum")

View File

@@ -33,7 +33,7 @@ public class File {
/**
* Test capitalization
* @return sourceURI
*/
*/
@ApiModelProperty(value = "Test capitalization")
@JsonProperty("sourceURI")

View File

@@ -39,7 +39,7 @@ public class FileSchemaTestClass {
/**
* Get file
* @return file
*/
*/
@Valid
@ApiModelProperty(value = "")
@JsonProperty("file")
@@ -67,7 +67,7 @@ public class FileSchemaTestClass {
/**
* Get files
* @return files
*/
*/
@Valid
@ApiModelProperty(value = "")
@JsonProperty("files")

View File

@@ -84,7 +84,7 @@ public class FormatTest {
* minimum: 10
* maximum: 100
* @return integer
*/
*/
@Min(10) @Max(100)
@ApiModelProperty(value = "")
@JsonProperty("integer")
@@ -106,7 +106,7 @@ public class FormatTest {
* minimum: 20
* maximum: 200
* @return int32
*/
*/
@Min(20) @Max(200)
@ApiModelProperty(value = "")
@JsonProperty("int32")
@@ -126,7 +126,7 @@ public class FormatTest {
/**
* Get int64
* @return int64
*/
*/
@ApiModelProperty(value = "")
@JsonProperty("int64")
@@ -148,7 +148,7 @@ public class FormatTest {
* minimum: 32.1
* maximum: 543.2
* @return number
*/
*/
@NotNull @Valid @DecimalMin("32.1") @DecimalMax("543.2")
@ApiModelProperty(required = true, value = "")
@JsonProperty("number")
@@ -170,7 +170,7 @@ public class FormatTest {
* minimum: 54.3
* maximum: 987.6
* @return _float
*/
*/
@DecimalMin("54.3") @DecimalMax("987.6")
@ApiModelProperty(value = "")
@JsonProperty("float")
@@ -192,7 +192,7 @@ public class FormatTest {
* minimum: 67.8
* maximum: 123.4
* @return _double
*/
*/
@DecimalMin("67.8") @DecimalMax("123.4")
@ApiModelProperty(value = "")
@JsonProperty("double")
@@ -212,7 +212,7 @@ public class FormatTest {
/**
* Get string
* @return string
*/
*/
@Pattern(regexp = "/[a-z]/i")
@ApiModelProperty(value = "")
@JsonProperty("string")
@@ -232,7 +232,7 @@ public class FormatTest {
/**
* Get _byte
* @return _byte
*/
*/
@NotNull
@ApiModelProperty(required = true, value = "")
@JsonProperty("byte")
@@ -252,7 +252,7 @@ public class FormatTest {
/**
* Get binary
* @return binary
*/
*/
@Valid
@ApiModelProperty(value = "")
@JsonProperty("binary")
@@ -272,7 +272,7 @@ public class FormatTest {
/**
* Get date
* @return date
*/
*/
@NotNull @Valid
@ApiModelProperty(required = true, value = "")
@JsonProperty("date")
@@ -292,7 +292,7 @@ public class FormatTest {
/**
* Get dateTime
* @return dateTime
*/
*/
@Valid
@ApiModelProperty(value = "")
@JsonProperty("dateTime")
@@ -312,7 +312,7 @@ public class FormatTest {
/**
* Get uuid
* @return uuid
*/
*/
@Valid
@ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "")
@JsonProperty("uuid")
@@ -332,7 +332,7 @@ public class FormatTest {
/**
* Get password
* @return password
*/
*/
@NotNull @Size(min = 10, max = 64)
@ApiModelProperty(required = true, value = "")
@JsonProperty("password")
@@ -352,7 +352,7 @@ public class FormatTest {
/**
* Get bigDecimal
* @return bigDecimal
*/
*/
@Valid
@ApiModelProperty(value = "")
@JsonProperty("BigDecimal")

View File

@@ -36,7 +36,7 @@ public class HasOnlyReadOnly {
/**
* Get bar
* @return bar
*/
*/
@ApiModelProperty(readOnly = true, value = "")
@JsonProperty("bar")
@@ -56,7 +56,7 @@ public class HasOnlyReadOnly {
/**
* Get foo
* @return foo
*/
*/
@ApiModelProperty(readOnly = true, value = "")
@JsonProperty("foo")

View File

@@ -88,7 +88,7 @@ public class MapTest {
/**
* Get mapMapOfString
* @return mapMapOfString
*/
*/
@Valid
@ApiModelProperty(value = "")
@JsonProperty("map_map_of_string")
@@ -116,7 +116,7 @@ public class MapTest {
/**
* Get mapOfEnumString
* @return mapOfEnumString
*/
*/
@ApiModelProperty(value = "")
@JsonProperty("map_of_enum_string")
@@ -144,7 +144,7 @@ public class MapTest {
/**
* Get directMap
* @return directMap
*/
*/
@ApiModelProperty(value = "")
@JsonProperty("direct_map")
@@ -172,7 +172,7 @@ public class MapTest {
/**
* Get indirectMap
* @return indirectMap
*/
*/
@ApiModelProperty(value = "")
@JsonProperty("indirect_map")

View File

@@ -44,7 +44,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
/**
* Get uuid
* @return uuid
*/
*/
@Valid
@ApiModelProperty(value = "")
@JsonProperty("uuid")
@@ -64,7 +64,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
/**
* Get dateTime
* @return dateTime
*/
*/
@Valid
@ApiModelProperty(value = "")
@JsonProperty("dateTime")
@@ -92,7 +92,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
/**
* Get map
* @return map
*/
*/
@Valid
@ApiModelProperty(value = "")
@JsonProperty("map")

View File

@@ -37,7 +37,7 @@ public class Model200Response {
/**
* Get name
* @return name
*/
*/
@ApiModelProperty(value = "")
@JsonProperty("name")
@@ -57,7 +57,7 @@ public class Model200Response {
/**
* Get propertyClass
* @return propertyClass
*/
*/
@ApiModelProperty(value = "")
@JsonProperty("class")

View File

@@ -38,7 +38,7 @@ public class ModelApiResponse {
/**
* Get code
* @return code
*/
*/
@ApiModelProperty(value = "")
@JsonProperty("code")
@@ -58,7 +58,7 @@ public class ModelApiResponse {
/**
* Get type
* @return type
*/
*/
@ApiModelProperty(value = "")
@JsonProperty("type")
@@ -78,7 +78,7 @@ public class ModelApiResponse {
/**
* Get message
* @return message
*/
*/
@ApiModelProperty(value = "")
@JsonProperty("message")

View File

@@ -34,7 +34,7 @@ public class ModelList {
/**
* Get _123list
* @return _123list
*/
*/
@ApiModelProperty(value = "")
@JsonProperty("123-list")

View File

@@ -35,7 +35,7 @@ public class ModelReturn {
/**
* Get _return
* @return _return
*/
*/
@ApiModelProperty(value = "")
@JsonProperty("return")

View File

@@ -50,7 +50,7 @@ public class Name {
/**
* Get name
* @return name
*/
*/
@NotNull
@ApiModelProperty(required = true, value = "")
@JsonProperty("name")
@@ -70,7 +70,7 @@ public class Name {
/**
* Get snakeCase
* @return snakeCase
*/
*/
@ApiModelProperty(readOnly = true, value = "")
@JsonProperty("snake_case")
@@ -90,7 +90,7 @@ public class Name {
/**
* Get property
* @return property
*/
*/
@ApiModelProperty(value = "")
@JsonProperty("property")
@@ -110,7 +110,7 @@ public class Name {
/**
* Get _123number
* @return _123number
*/
*/
@ApiModelProperty(readOnly = true, value = "")
@JsonProperty("123Number")

View File

@@ -46,7 +46,7 @@ public class NullableMapProperty {
/**
* Get languageValues
* @return languageValues
*/
*/
@ApiModelProperty(value = "")
@JsonProperty("languageValues")

View File

@@ -33,7 +33,7 @@ public class NumberOnly {
/**
* Get justNumber
* @return justNumber
*/
*/
@Valid
@ApiModelProperty(value = "")
@JsonProperty("JustNumber")

View File

@@ -83,7 +83,7 @@ public class Order {
/**
* Get id
* @return id
*/
*/
@ApiModelProperty(value = "")
@JsonProperty("id")
@@ -103,7 +103,7 @@ public class Order {
/**
* Get petId
* @return petId
*/
*/
@ApiModelProperty(value = "")
@JsonProperty("petId")
@@ -123,7 +123,7 @@ public class Order {
/**
* Get quantity
* @return quantity
*/
*/
@ApiModelProperty(value = "")
@JsonProperty("quantity")
@@ -143,7 +143,7 @@ public class Order {
/**
* Get shipDate
* @return shipDate
*/
*/
@Valid
@ApiModelProperty(value = "")
@JsonProperty("shipDate")
@@ -163,7 +163,7 @@ public class Order {
/**
* Order Status
* @return status
*/
*/
@ApiModelProperty(value = "Order Status")
@JsonProperty("status")
@@ -183,7 +183,7 @@ public class Order {
/**
* Get complete
* @return complete
*/
*/
@ApiModelProperty(value = "")
@JsonProperty("complete")

View File

@@ -37,7 +37,7 @@ public class OuterComposite {
/**
* Get myNumber
* @return myNumber
*/
*/
@Valid
@ApiModelProperty(value = "")
@JsonProperty("my_number")
@@ -57,7 +57,7 @@ public class OuterComposite {
/**
* Get myString
* @return myString
*/
*/
@ApiModelProperty(value = "")
@JsonProperty("my_string")
@@ -77,7 +77,7 @@ public class OuterComposite {
/**
* Get myBoolean
* @return myBoolean
*/
*/
@ApiModelProperty(value = "")
@JsonProperty("my_boolean")

View File

@@ -83,7 +83,7 @@ public class ParentWithNullable {
/**
* Get type
* @return type
*/
*/
@ApiModelProperty(value = "")
@JsonProperty("type")
@@ -103,7 +103,7 @@ public class ParentWithNullable {
/**
* Get nullableProperty
* @return nullableProperty
*/
*/
@ApiModelProperty(value = "")
@JsonProperty("nullableProperty")

View File

@@ -103,7 +103,7 @@ public class Pet {
/**
* Get id
* @return id
*/
*/
@ApiModelProperty(value = "")
@JsonProperty("id")
@@ -123,7 +123,7 @@ public class Pet {
/**
* Get category
* @return category
*/
*/
@Valid
@ApiModelProperty(value = "")
@JsonProperty("category")
@@ -143,7 +143,7 @@ public class Pet {
/**
* Get name
* @return name
*/
*/
@NotNull
@ApiModelProperty(example = "doggie", required = true, value = "")
@JsonProperty("name")
@@ -171,7 +171,7 @@ public class Pet {
/**
* Get photoUrls
* @return photoUrls
*/
*/
@NotNull
@ApiModelProperty(required = true, value = "")
@JsonProperty("photoUrls")
@@ -200,7 +200,7 @@ public class Pet {
/**
* Get tags
* @return tags
*/
*/
@Valid
@ApiModelProperty(value = "")
@JsonProperty("tags")
@@ -221,7 +221,7 @@ public class Pet {
* pet status in the store
* @return status
* @deprecated
*/
*/
@ApiModelProperty(value = "pet status in the store")
@JsonProperty("status")
@@ -232,7 +232,7 @@ public class Pet {
/**
* @deprecated
*/
*/
@Deprecated
public void setStatus(StatusEnum status) {
this.status = status;

View File

@@ -34,7 +34,7 @@ public class ReadOnlyFirst {
/**
* Get bar
* @return bar
*/
*/
@ApiModelProperty(readOnly = true, value = "")
@JsonProperty("bar")
@@ -54,7 +54,7 @@ public class ReadOnlyFirst {
/**
* Get baz
* @return baz
*/
*/
@ApiModelProperty(value = "")
@JsonProperty("baz")

View File

@@ -38,7 +38,7 @@ public class ResponseObjectWithDifferentFieldNames {
/**
* Get normalPropertyName
* @return normalPropertyName
*/
*/
@ApiModelProperty(value = "")
@JsonProperty("normalPropertyName")
@@ -58,7 +58,7 @@ public class ResponseObjectWithDifferentFieldNames {
/**
* Get UPPER_CASE_PROPERTY_SNAKE
* @return UPPER_CASE_PROPERTY_SNAKE
*/
*/
@ApiModelProperty(value = "")
@JsonProperty("UPPER_CASE_PROPERTY_SNAKE")
@@ -78,7 +78,7 @@ public class ResponseObjectWithDifferentFieldNames {
/**
* Get lowerCasePropertyDashes
* @return lowerCasePropertyDashes
*/
*/
@ApiModelProperty(value = "")
@JsonProperty("lower-case-property-dashes")
@@ -98,7 +98,7 @@ public class ResponseObjectWithDifferentFieldNames {
/**
* Get propertyNameWithSpaces
* @return propertyNameWithSpaces
*/
*/
@ApiModelProperty(value = "")
@JsonProperty("property name with spaces")

View File

@@ -34,7 +34,7 @@ public class SpecialModelName {
/**
* Get $specialPropertyName
* @return $specialPropertyName
*/
*/
@ApiModelProperty(value = "")
@JsonProperty("$special[property.name]")

View File

@@ -34,7 +34,7 @@ public class Tag {
/**
* Get id
* @return id
*/
*/
@ApiModelProperty(value = "")
@JsonProperty("id")
@@ -54,7 +54,7 @@ public class Tag {
/**
* Get name
* @return name
*/
*/
@ApiModelProperty(value = "")
@JsonProperty("name")

View File

@@ -60,7 +60,7 @@ public class TypeHolderDefault {
/**
* Get stringItem
* @return stringItem
*/
*/
@NotNull
@ApiModelProperty(required = true, value = "")
@JsonProperty("string_item")
@@ -80,7 +80,7 @@ public class TypeHolderDefault {
/**
* Get numberItem
* @return numberItem
*/
*/
@NotNull @Valid
@ApiModelProperty(required = true, value = "")
@JsonProperty("number_item")
@@ -100,7 +100,7 @@ public class TypeHolderDefault {
/**
* Get integerItem
* @return integerItem
*/
*/
@NotNull
@ApiModelProperty(required = true, value = "")
@JsonProperty("integer_item")
@@ -120,7 +120,7 @@ public class TypeHolderDefault {
/**
* Get boolItem
* @return boolItem
*/
*/
@NotNull
@ApiModelProperty(required = true, value = "")
@JsonProperty("bool_item")
@@ -148,7 +148,7 @@ public class TypeHolderDefault {
/**
* Get arrayItem
* @return arrayItem
*/
*/
@NotNull
@ApiModelProperty(required = true, value = "")
@JsonProperty("array_item")

View File

@@ -63,7 +63,7 @@ public class TypeHolderExample {
/**
* Get stringItem
* @return stringItem
*/
*/
@NotNull
@ApiModelProperty(example = "what", required = true, value = "")
@JsonProperty("string_item")
@@ -83,7 +83,7 @@ public class TypeHolderExample {
/**
* Get numberItem
* @return numberItem
*/
*/
@NotNull @Valid
@ApiModelProperty(example = "1.234", required = true, value = "")
@JsonProperty("number_item")
@@ -103,7 +103,7 @@ public class TypeHolderExample {
/**
* Get floatItem
* @return floatItem
*/
*/
@NotNull
@ApiModelProperty(example = "1.234", required = true, value = "")
@JsonProperty("float_item")
@@ -123,7 +123,7 @@ public class TypeHolderExample {
/**
* Get integerItem
* @return integerItem
*/
*/
@NotNull
@ApiModelProperty(example = "-2", required = true, value = "")
@JsonProperty("integer_item")
@@ -143,7 +143,7 @@ public class TypeHolderExample {
/**
* Get boolItem
* @return boolItem
*/
*/
@NotNull
@ApiModelProperty(example = "true", required = true, value = "")
@JsonProperty("bool_item")
@@ -171,7 +171,7 @@ public class TypeHolderExample {
/**
* Get arrayItem
* @return arrayItem
*/
*/
@NotNull
@ApiModelProperty(example = "[0,1,2,3]", required = true, value = "")
@JsonProperty("array_item")

View File

@@ -46,7 +46,7 @@ public class User {
/**
* Get id
* @return id
*/
*/
@ApiModelProperty(value = "")
@JsonProperty("id")
@@ -66,7 +66,7 @@ public class User {
/**
* Get username
* @return username
*/
*/
@ApiModelProperty(value = "")
@JsonProperty("username")
@@ -86,7 +86,7 @@ public class User {
/**
* Get firstName
* @return firstName
*/
*/
@ApiModelProperty(value = "")
@JsonProperty("firstName")
@@ -106,7 +106,7 @@ public class User {
/**
* Get lastName
* @return lastName
*/
*/
@ApiModelProperty(value = "")
@JsonProperty("lastName")
@@ -126,7 +126,7 @@ public class User {
/**
* Get email
* @return email
*/
*/
@ApiModelProperty(value = "")
@JsonProperty("email")
@@ -146,7 +146,7 @@ public class User {
/**
* Get password
* @return password
*/
*/
@ApiModelProperty(value = "")
@JsonProperty("password")
@@ -166,7 +166,7 @@ public class User {
/**
* Get phone
* @return phone
*/
*/
@ApiModelProperty(value = "")
@JsonProperty("phone")
@@ -186,7 +186,7 @@ public class User {
/**
* User Status
* @return userStatus
*/
*/
@ApiModelProperty(value = "User Status")
@JsonProperty("userStatus")

View File

@@ -101,7 +101,7 @@ public class XmlItem {
/**
* Get attributeString
* @return attributeString
*/
*/
@ApiModelProperty(example = "string", value = "")
@JsonProperty("attribute_string")
@@ -121,7 +121,7 @@ public class XmlItem {
/**
* Get attributeNumber
* @return attributeNumber
*/
*/
@Valid
@ApiModelProperty(example = "1.234", value = "")
@JsonProperty("attribute_number")
@@ -141,7 +141,7 @@ public class XmlItem {
/**
* Get attributeInteger
* @return attributeInteger
*/
*/
@ApiModelProperty(example = "-2", value = "")
@JsonProperty("attribute_integer")
@@ -161,7 +161,7 @@ public class XmlItem {
/**
* Get attributeBoolean
* @return attributeBoolean
*/
*/
@ApiModelProperty(example = "true", value = "")
@JsonProperty("attribute_boolean")
@@ -189,7 +189,7 @@ public class XmlItem {
/**
* Get wrappedArray
* @return wrappedArray
*/
*/
@ApiModelProperty(value = "")
@JsonProperty("wrapped_array")
@@ -209,7 +209,7 @@ public class XmlItem {
/**
* Get nameString
* @return nameString
*/
*/
@ApiModelProperty(example = "string", value = "")
@JsonProperty("name_string")
@@ -229,7 +229,7 @@ public class XmlItem {
/**
* Get nameNumber
* @return nameNumber
*/
*/
@Valid
@ApiModelProperty(example = "1.234", value = "")
@JsonProperty("name_number")
@@ -249,7 +249,7 @@ public class XmlItem {
/**
* Get nameInteger
* @return nameInteger
*/
*/
@ApiModelProperty(example = "-2", value = "")
@JsonProperty("name_integer")
@@ -269,7 +269,7 @@ public class XmlItem {
/**
* Get nameBoolean
* @return nameBoolean
*/
*/
@ApiModelProperty(example = "true", value = "")
@JsonProperty("name_boolean")
@@ -297,7 +297,7 @@ public class XmlItem {
/**
* Get nameArray
* @return nameArray
*/
*/
@ApiModelProperty(value = "")
@JsonProperty("name_array")
@@ -325,7 +325,7 @@ public class XmlItem {
/**
* Get nameWrappedArray
* @return nameWrappedArray
*/
*/
@ApiModelProperty(value = "")
@JsonProperty("name_wrapped_array")
@@ -345,7 +345,7 @@ public class XmlItem {
/**
* Get prefixString
* @return prefixString
*/
*/
@ApiModelProperty(example = "string", value = "")
@JsonProperty("prefix_string")
@@ -365,7 +365,7 @@ public class XmlItem {
/**
* Get prefixNumber
* @return prefixNumber
*/
*/
@Valid
@ApiModelProperty(example = "1.234", value = "")
@JsonProperty("prefix_number")
@@ -385,7 +385,7 @@ public class XmlItem {
/**
* Get prefixInteger
* @return prefixInteger
*/
*/
@ApiModelProperty(example = "-2", value = "")
@JsonProperty("prefix_integer")
@@ -405,7 +405,7 @@ public class XmlItem {
/**
* Get prefixBoolean
* @return prefixBoolean
*/
*/
@ApiModelProperty(example = "true", value = "")
@JsonProperty("prefix_boolean")
@@ -433,7 +433,7 @@ public class XmlItem {
/**
* Get prefixArray
* @return prefixArray
*/
*/
@ApiModelProperty(value = "")
@JsonProperty("prefix_array")
@@ -461,7 +461,7 @@ public class XmlItem {
/**
* Get prefixWrappedArray
* @return prefixWrappedArray
*/
*/
@ApiModelProperty(value = "")
@JsonProperty("prefix_wrapped_array")
@@ -481,7 +481,7 @@ public class XmlItem {
/**
* Get namespaceString
* @return namespaceString
*/
*/
@ApiModelProperty(example = "string", value = "")
@JsonProperty("namespace_string")
@@ -501,7 +501,7 @@ public class XmlItem {
/**
* Get namespaceNumber
* @return namespaceNumber
*/
*/
@Valid
@ApiModelProperty(example = "1.234", value = "")
@JsonProperty("namespace_number")
@@ -521,7 +521,7 @@ public class XmlItem {
/**
* Get namespaceInteger
* @return namespaceInteger
*/
*/
@ApiModelProperty(example = "-2", value = "")
@JsonProperty("namespace_integer")
@@ -541,7 +541,7 @@ public class XmlItem {
/**
* Get namespaceBoolean
* @return namespaceBoolean
*/
*/
@ApiModelProperty(example = "true", value = "")
@JsonProperty("namespace_boolean")
@@ -569,7 +569,7 @@ public class XmlItem {
/**
* Get namespaceArray
* @return namespaceArray
*/
*/
@ApiModelProperty(value = "")
@JsonProperty("namespace_array")
@@ -597,7 +597,7 @@ public class XmlItem {
/**
* Get namespaceWrappedArray
* @return namespaceWrappedArray
*/
*/
@ApiModelProperty(value = "")
@JsonProperty("namespace_wrapped_array")
@@ -617,7 +617,7 @@ public class XmlItem {
/**
* Get prefixNsString
* @return prefixNsString
*/
*/
@ApiModelProperty(example = "string", value = "")
@JsonProperty("prefix_ns_string")
@@ -637,7 +637,7 @@ public class XmlItem {
/**
* Get prefixNsNumber
* @return prefixNsNumber
*/
*/
@Valid
@ApiModelProperty(example = "1.234", value = "")
@JsonProperty("prefix_ns_number")
@@ -657,7 +657,7 @@ public class XmlItem {
/**
* Get prefixNsInteger
* @return prefixNsInteger
*/
*/
@ApiModelProperty(example = "-2", value = "")
@JsonProperty("prefix_ns_integer")
@@ -677,7 +677,7 @@ public class XmlItem {
/**
* Get prefixNsBoolean
* @return prefixNsBoolean
*/
*/
@ApiModelProperty(example = "true", value = "")
@JsonProperty("prefix_ns_boolean")
@@ -705,7 +705,7 @@ public class XmlItem {
/**
* Get prefixNsArray
* @return prefixNsArray
*/
*/
@ApiModelProperty(value = "")
@JsonProperty("prefix_ns_array")
@@ -733,7 +733,7 @@ public class XmlItem {
/**
* Get prefixNsWrappedArray
* @return prefixNsWrappedArray
*/
*/
@ApiModelProperty(value = "")
@JsonProperty("prefix_ns_wrapped_array")