Skip to content

always use @JacksonXmlElementWrapper and read xml data from reference… #5371

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
jzrebiec wants to merge 2 commits into from
Closed

always use @JacksonXmlElementWrapper and read xml data from reference… #5371

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5b72d97
always use @JacksonXmlElementWrapper and read xml data from reference…
jzrebiec Feb 19, 2020
6a7b60a
small fix & run ./bin/utils/ensure-up-to-date --batch
jzrebiec Feb 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 26 additions & 14 deletions modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3027,14 +3027,6 @@ public CodegenProperty fromProperty(String name, Schema p) {
property.isNullable = p.getNullable();
}

if (p.getXml() != null) {
if (p.getXml().getAttribute() != null) {
property.isXmlAttribute = p.getXml().getAttribute();
}
property.xmlPrefix = p.getXml().getPrefix();
property.xmlName = p.getXml().getName();
property.xmlNamespace = p.getXml().getNamespace();
}
if (p.getExtensions() != null && !p.getExtensions().isEmpty()) {
property.getVendorExtensions().putAll(p.getExtensions());
}
Expand Down Expand Up @@ -3199,6 +3191,32 @@ public CodegenProperty fromProperty(String name, Schema p) {
property.isNullable = referencedSchema.getNullable();
}

final XML referencedSchemaXml = referencedSchema.getXml();

if (referencedSchemaXml != null) {
property.xmlName = referencedSchemaXml.getName();
property.xmlNamespace = referencedSchemaXml.getNamespace();
property.xmlPrefix = referencedSchemaXml.getPrefix();
if (referencedSchemaXml.getAttribute() != null) {
property.isXmlAttribute = referencedSchemaXml.getAttribute();
}
if (referencedSchemaXml.getWrapped() != null) {
property.isXmlWrapped = referencedSchemaXml.getWrapped();
}
}

if (p.getXml() != null) {
if (p.getXml().getAttribute() != null) {
property.isXmlAttribute = p.getXml().getAttribute();
}
if (p.getXml().getWrapped() != null) {
property.isXmlWrapped = p.getXml().getWrapped();
}
property.xmlPrefix = p.getXml().getPrefix();
property.xmlName = p.getXml().getName();
property.xmlNamespace = p.getXml().getNamespace();
}

property.dataType = getTypeDeclaration(p);
property.dataFormat = p.getFormat();
property.baseType = getSchemaType(p);
Expand All @@ -3220,12 +3238,6 @@ public CodegenProperty fromProperty(String name, Schema p) {
property.containerType = "array";
}
property.baseType = getSchemaType(p);
if (p.getXml() != null) {
property.isXmlWrapped = p.getXml().getWrapped() == null ? false : p.getXml().getWrapped();
property.xmlPrefix = p.getXml().getPrefix();
property.xmlNamespace = p.getXml().getNamespace();
property.xmlName = p.getXml().getName();
}

// handle inner property
property.maxItems = p.getMaxItems();
Expand Down
5 changes: 2 additions & 3 deletions modules/openapi-generator/src/main/resources/Java/jackson_annotations.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,8 @@
@JacksonXmlProperty({{#isXmlAttribute}}isAttribute = true, {{/isXmlAttribute}}{{#xmlNamespace}}namespace="{{xmlNamespace}}", {{/xmlNamespace}}localName = "{{#xmlName}}{{xmlName}}{{/xmlName}}{{^xmlName}}{{baseName}}{{/xmlName}}")
{{/isContainer}}
{{#isContainer}}
{{#isXmlWrapped}}
// items.xmlName={{items.xmlName}}
@JacksonXmlElementWrapper(useWrapping = {{isXmlWrapped}}, {{#xmlNamespace}}namespace="{{xmlNamespace}}", {{/xmlNamespace}}localName = "{{#items.xmlName}}{{items.xmlName}}{{/items.xmlName}}{{^items.xmlName}}{{items.baseName}}{{/items.xmlName}}")
{{/isXmlWrapped}}
@JacksonXmlProperty({{#xmlNamespace}}namespace="{{xmlNamespace}}", {{/xmlNamespace}}localName = "{{#items.xmlName}}{{items.xmlName}}{{/items.xmlName}}{{^items.xmlName}}{{#xmlName}}{{xmlName}}{{/xmlName}}{{^xmlName}}{{baseName}}{{/xmlName}}{{/items.xmlName}}")
@JacksonXmlElementWrapper(useWrapping = {{isXmlWrapped}}{{#xmlNamespace}}, namespace="{{xmlNamespace}}"{{/xmlNamespace}}{{#isXmlWrapped}}, localName = "{{#xmlName}}{{xmlName}}{{/xmlName}}{{^xmlName}}{{baseName}}{{/xmlName}}"{{/isXmlWrapped}})
{{/isContainer}}
{{/withXml}}
5 changes: 3 additions & 2 deletions ...api-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1238,14 +1238,15 @@ definitions:
type: array
uniqueItems: true
xml:
name: photoUrl
wrapped: true
items:
type: string
xml:
name: photoUrl
tags:
type: array
xml:
name: tag
name: tags
wrapped: true
items:
$ref: '#/definitions/Tag'
Expand Down
5 changes: 3 additions & 2 deletions samples/client/petstore/go-experimental/go-petstore/api/openapi.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1325,17 +1325,18 @@ components:
photoUrls:
items:
type: string
xml:
name: photoUrl
type: array
uniqueItems: true
xml:
name: photoUrl
wrapped: true
tags:
items:
$ref: '#/components/schemas/Tag'
type: array
xml:
name: tag
name: tags
wrapped: true
status:
description: pet status in the store
Expand Down
5 changes: 3 additions & 2 deletions samples/client/petstore/go/go-petstore-withXml/api/openapi.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1325,17 +1325,18 @@ components:
photoUrls:
items:
type: string
xml:
name: photoUrl
type: array
uniqueItems: true
xml:
name: photoUrl
wrapped: true
tags:
items:
$ref: '#/components/schemas/Tag'
type: array
xml:
name: tag
name: tags
wrapped: true
status:
description: pet status in the store
Expand Down
5 changes: 3 additions & 2 deletions samples/client/petstore/go/go-petstore/api/openapi.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1325,17 +1325,18 @@ components:
photoUrls:
items:
type: string
xml:
name: photoUrl
type: array
uniqueItems: true
xml:
name: photoUrl
wrapped: true
tags:
items:
$ref: '#/components/schemas/Tag'
type: array
xml:
name: tag
name: tags
wrapped: true
status:
description: pet status in the store
Expand Down
5 changes: 3 additions & 2 deletions samples/client/petstore/haskell-http-client/openapi.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1325,17 +1325,18 @@ components:
photoUrls:
items:
type: string
xml:
name: photoUrl
type: array
uniqueItems: true
xml:
name: photoUrl
wrapped: true
tags:
items:
$ref: '#/components/schemas/Tag'
type: array
xml:
name: tag
name: tags
wrapped: true
status:
description: pet status in the store
Expand Down
5 changes: 3 additions & 2 deletions samples/client/petstore/java/feign/api/openapi.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1386,17 +1386,18 @@ components:
photoUrls:
items:
type: string
xml:
name: photoUrl
type: array
uniqueItems: true
xml:
name: photoUrl
wrapped: true
tags:
items:
$ref: '#/components/schemas/Tag'
type: array
xml:
name: tag
name: tags
wrapped: true
status:
description: pet status in the store
Expand Down
5 changes: 3 additions & 2 deletions samples/client/petstore/java/google-api-client/api/openapi.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1386,17 +1386,18 @@ components:
photoUrls:
items:
type: string
xml:
name: photoUrl
type: array
uniqueItems: true
xml:
name: photoUrl
wrapped: true
tags:
items:
$ref: '#/components/schemas/Tag'
type: array
xml:
name: tag
name: tags
wrapped: true
status:
description: pet status in the store
Expand Down
5 changes: 3 additions & 2 deletions samples/client/petstore/java/jersey1/api/openapi.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1386,17 +1386,18 @@ components:
photoUrls:
items:
type: string
xml:
name: photoUrl
type: array
uniqueItems: true
xml:
name: photoUrl
wrapped: true
tags:
items:
$ref: '#/components/schemas/Tag'
type: array
xml:
name: tag
name: tags
wrapped: true
status:
description: pet status in the store
Expand Down
5 changes: 3 additions & 2 deletions samples/client/petstore/java/jersey2-java8/api/openapi.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1386,17 +1386,18 @@ components:
photoUrls:
items:
type: string
xml:
name: photoUrl
type: array
uniqueItems: true
xml:
name: photoUrl
wrapped: true
tags:
items:
$ref: '#/components/schemas/Tag'
type: array
xml:
name: tag
name: tags
wrapped: true
status:
description: pet status in the store
Expand Down
5 changes: 3 additions & 2 deletions samples/client/petstore/java/native-async/api/openapi.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1386,17 +1386,18 @@ components:
photoUrls:
items:
type: string
xml:
name: photoUrl
type: array
uniqueItems: true
xml:
name: photoUrl
wrapped: true
tags:
items:
$ref: '#/components/schemas/Tag'
type: array
xml:
name: tag
name: tags
wrapped: true
status:
description: pet status in the store
Expand Down
5 changes: 3 additions & 2 deletions samples/client/petstore/java/native/api/openapi.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1386,17 +1386,18 @@ components:
photoUrls:
items:
type: string
xml:
name: photoUrl
type: array
uniqueItems: true
xml:
name: photoUrl
wrapped: true
tags:
items:
$ref: '#/components/schemas/Tag'
type: array
xml:
name: tag
name: tags
wrapped: true
status:
description: pet status in the store
Expand Down
5 changes: 3 additions & 2 deletions samples/client/petstore/java/okhttp-gson-parcelableModel/api/openapi.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1386,17 +1386,18 @@ components:
photoUrls:
items:
type: string
xml:
name: photoUrl
type: array
uniqueItems: true
xml:
name: photoUrl
wrapped: true
tags:
items:
$ref: '#/components/schemas/Tag'
type: array
xml:
name: tag
name: tags
wrapped: true
status:
description: pet status in the store
Expand Down
5 changes: 3 additions & 2 deletions samples/client/petstore/java/okhttp-gson/api/openapi.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1386,17 +1386,18 @@ components:
photoUrls:
items:
type: string
xml:
name: photoUrl
type: array
uniqueItems: true
xml:
name: photoUrl
wrapped: true
tags:
items:
$ref: '#/components/schemas/Tag'
type: array
xml:
name: tag
name: tags
wrapped: true
status:
description: pet status in the store
Expand Down
5 changes: 3 additions & 2 deletions samples/client/petstore/java/rest-assured-jackson/api/openapi.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1386,17 +1386,18 @@ components:
photoUrls:
items:
type: string
xml:
name: photoUrl
type: array
uniqueItems: true
xml:
name: photoUrl
wrapped: true
tags:
items:
$ref: '#/components/schemas/Tag'
type: array
xml:
name: tag
name: tags
wrapped: true
status:
description: pet status in the store
Expand Down
5 changes: 3 additions & 2 deletions samples/client/petstore/java/rest-assured/api/openapi.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1386,17 +1386,18 @@ components:
photoUrls:
items:
type: string
xml:
name: photoUrl
type: array
uniqueItems: true
xml:
name: photoUrl
wrapped: true
tags:
items:
$ref: '#/components/schemas/Tag'
type: array
xml:
name: tag
name: tags
wrapped: true
status:
description: pet status in the store
Expand Down
Loading