Skip to content

Commit 57f1e63

Browse files
Nicklas2751Nicklas2751
committed
fix (JAVA HELIDON JAXRS MICRONAUT MICROPROFILE PLAY PKMST): fix useOneOfInterfaces not generating interfaces for java server helidon, jaxrs, micronaut, microprofile, play and pkmst (#17419)
1 parent 433e06a commit 57f1e63

File tree

57 files changed

+616
-11
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+616
-11
lines changed

‎modules/openapi-generator/src/main/resources/JavaJaxRS/additionalOneOfTypeAnnotations.mustache‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
{{#additionalOneOfTypeAnnotations}}{{{.}}}
2+
{{/additionalOneOfTypeAnnotations}}

‎modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-cdi/additionalOneOfTypeAnnotations.mustache‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
{{#additionalOneOfTypeAnnotations}}{{{.}}}
2+
{{/additionalOneOfTypeAnnotations}}

‎modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-cdi/model.mustache‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,13 @@ import {{javaxPackage}}.validation.Valid;
1515
* {{.}}
1616
**/{{/description}}
1717
{{#isEnum}}{{>enumOuterClass}}{{/isEnum}}
18-
{{^isEnum}}{{>pojo}}{{/isEnum}}
18+
{{^isEnum}}
19+
{{#vendorExtensions.x-is-one-of-interface}}
20+
{{>oneof_interface}}
21+
{{/vendorExtensions.x-is-one-of-interface}}
22+
{{^vendorExtensions.x-is-one-of-interface}}
23+
{{>pojo}}
24+
{{/vendorExtensions.x-is-one-of-interface}}
25+
{{/isEnum}}
1926
{{/model}}
2027
{{/models}}

‎modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-cdi/oneof_interface.mustache‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{{>additionalOneOfTypeAnnotations}}{{>generatedAnnotation}}{{>typeInfoAnnotation}}{{>xmlAnnotation}}
2+
public interface {{classname}} {{#vendorExtensions.x-implements}}{{#-first}}extends {{{.}}}{{/-first}}{{^-first}}, {{{.}}}{{/-first}}{{/vendorExtensions.x-implements}} {
3+
{{#discriminator}}
4+
public {{propertyType}} {{propertyGetter}}();
5+
{{/discriminator}}
6+
}

‎modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-cdi/xmlAnnotation.mustache‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{{#withXml}}
2+
3+
@XmlRootElement({{#xmlNamespace}}namespace="{{.}}", {{/xmlNamespace}}name = "{{xmlName}}{{^xmlName}}{{classname}}{{/xmlName}}")
4+
@XmlAccessorType(XmlAccessType.FIELD)
5+
{{#jackson}}
6+
@JacksonXmlRootElement({{#xmlNamespace}}namespace="{{.}}", {{/xmlNamespace}}localName = "{{xmlName}}{{^xmlName}}{{classname}}{{/xmlName}}"){{/jackson}}{{/withXml}}

‎modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-ext/additionalOneOfTypeAnnotations.mustache‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
{{#additionalOneOfTypeAnnotations}}{{{.}}}
2+
{{/additionalOneOfTypeAnnotations}}

‎modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-ext/model.mustache‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,12 @@ import {{javaxPackage}}.validation.Valid;
1616
{{>enumOuterClass}}
1717
{{/isEnum}}
1818
{{^isEnum}}
19+
{{#vendorExtensions.x-is-one-of-interface}}
20+
{{>oneof_interface}}
21+
{{/vendorExtensions.x-is-one-of-interface}}
22+
{{^vendorExtensions.x-is-one-of-interface}}
1923
{{>pojo}}
24+
{{/vendorExtensions.x-is-one-of-interface}}
2025
{{/isEnum}}
2126
{{/model}}
2227
{{/models}}

‎modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-ext/oneof_interface.mustache‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{{>additionalOneOfTypeAnnotations}}{{>generatedAnnotation}}{{>typeInfoAnnotation}}{{>xmlAnnotation}}
2+
public interface {{classname}} {{#vendorExtensions.x-implements}}{{#-first}}extends {{{.}}}{{/-first}}{{^-first}}, {{{.}}}{{/-first}}{{/vendorExtensions.x-implements}} {
3+
{{#discriminator}}
4+
public {{propertyType}} {{propertyGetter}}();
5+
{{/discriminator}}
6+
}

‎modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-ext/xmlAnnotation.mustache‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{{#withXml}}
2+
3+
@XmlRootElement({{#xmlNamespace}}namespace="{{.}}", {{/xmlNamespace}}name = "{{xmlName}}{{^xmlName}}{{classname}}{{/xmlName}}")
4+
@XmlAccessorType(XmlAccessType.FIELD)
5+
{{#jackson}}
6+
@JacksonXmlRootElement({{#xmlNamespace}}namespace="{{.}}", {{/xmlNamespace}}localName = "{{xmlName}}{{^xmlName}}{{classname}}{{/xmlName}}"){{/jackson}}{{/withXml}}

‎modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/additionalOneOfTypeAnnotations.mustache‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
{{#additionalOneOfTypeAnnotations}}{{{.}}}
2+
{{/additionalOneOfTypeAnnotations}}

0 commit comments

Comments
 (0)