fix #17419 useOneOfInterfaces option for java clients & servers

modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java

@@ -317,6 +317,9 @@ apiTemplateFiles are for API outputs only (controllers/handlers).
     // whether or not the oneOf imports machinery should add oneOf interfaces as imports in implementing classes
     protected boolean addOneOfInterfaceImports = false;
     protected List<CodegenModel> addOneOfInterfaces = new ArrayList<>();
+    // set of all classnames that are oneOf interfaces (both synthetic property-level and component-level)
+    // populated during preprocessOpenAPI(), used by setParameterExampleValue() to avoid "new InterfaceType()"
+    protected Set<String> oneOfInterfaceNames = new HashSet<>();
 
     // flag to indicate whether to only update files whose contents have changed
     protected boolean enableMinimalUpdate = false;
@@ -1123,6 +1126,7 @@ public void preprocessOpenAPI(OpenAPI openAPI) {
                     } else {
                         // else this is a component schema, so we will just use that as the oneOf interface model
                         addOneOfNameExtension(s, n);
+                        oneOfInterfaceNames.add(n);
                     }
                 } else if (ModelUtils.isArraySchema(s)) {
                     Schema items = ModelUtils.getSchemaItems(s);
@@ -8624,6 +8628,7 @@ public void addOneOfInterfaceModel(Schema cs, String type) {
         cm.interfaceModels = new ArrayList<>();
 
         addOneOfInterfaces.add(cm);
+        oneOfInterfaceNames.add(type);
     }
 
     public void addImportsToOneOfInterface(List<Map<String, String>> imports) {

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java

@@ -1786,7 +1786,13 @@ public void setParameterExampleValue(CodegenParameter p) {
             example = type + ".fromValue(\"" + example + "\")";
         } else if (!languageSpecificPrimitives.contains(type)) {
             // type is a model class, e.g. User
-            example = "new " + type + "()";
+            // if useOneOfInterfaces is enabled and the type is a generated oneOf interface,
+            // we cannot instantiate it with 'new', so we use null instead
+            if (useOneOfInterfaces && oneOfInterfaceNames.contains(type)) {
+                example = "null";
+            } else {
+                example = "new " + type + "()";
+            }
         }
 
         if (example == null) {

modules/openapi-generator/src/main/resources/Java/libraries/jersey2/model.mustache

@@ -58,6 +58,6 @@ import com.fasterxml.jackson.core.type.TypeReference;
 {{/-first}}
 {{/oneOf}}
 
-{{#isEnum}}{{>modelEnum}}{{/isEnum}}{{^isEnum}}{{#oneOf}}{{#-first}}{{>oneof_model}}{{/-first}}{{/oneOf}}{{^oneOf}}{{#anyOf}}{{#-first}}{{>anyof_model}}{{/-first}}{{/anyOf}}{{^anyOf}}{{>pojo}}{{/anyOf}}{{/oneOf}}{{/isEnum}}
+{{#isEnum}}{{>modelEnum}}{{/isEnum}}{{^isEnum}}{{#vendorExtensions.x-is-one-of-interface}}{{>oneof_interface}}{{/vendorExtensions.x-is-one-of-interface}}{{^vendorExtensions.x-is-one-of-interface}}{{#oneOf}}{{#-first}}{{>oneof_model}}{{/-first}}{{/oneOf}}{{^oneOf}}{{#anyOf}}{{#-first}}{{>anyof_model}}{{/-first}}{{/anyOf}}{{^anyOf}}{{>pojo}}{{/anyOf}}{{/oneOf}}{{/vendorExtensions.x-is-one-of-interface}}{{/isEnum}}
 {{/model}}
 {{/models}}

modules/openapi-generator/src/main/resources/Java/libraries/jersey2/model_oneof_doc.mustache

@@ -13,7 +13,7 @@
 NOTE: this class is nullable.
 
 {{/isNullable}}
-## Example
+{{^vendorExtensions.x-is-one-of-interface}}## Example
 ```java
 // Import classes:
 import {{{package}}}.{{{classname}}};
@@ -35,4 +35,4 @@ public class Example {
         {{/oneOf}}
     }
 }
-```
+```{{/vendorExtensions.x-is-one-of-interface}}

modules/openapi-generator/src/main/resources/Java/libraries/jersey3/model.mustache

@@ -58,6 +58,6 @@ import com.fasterxml.jackson.core.type.TypeReference;
 {{/-first}}
 {{/oneOf}}
 
-{{#isEnum}}{{>modelEnum}}{{/isEnum}}{{^isEnum}}{{#oneOf}}{{#-first}}{{>oneof_model}}{{/-first}}{{/oneOf}}{{^oneOf}}{{#anyOf}}{{#-first}}{{>anyof_model}}{{/-first}}{{/anyOf}}{{^anyOf}}{{>pojo}}{{/anyOf}}{{/oneOf}}{{/isEnum}}
+{{#isEnum}}{{>modelEnum}}{{/isEnum}}{{^isEnum}}{{#vendorExtensions.x-is-one-of-interface}}{{>oneof_interface}}{{/vendorExtensions.x-is-one-of-interface}}{{^vendorExtensions.x-is-one-of-interface}}{{#oneOf}}{{#-first}}{{>oneof_model}}{{/-first}}{{/oneOf}}{{^oneOf}}{{#anyOf}}{{#-first}}{{>anyof_model}}{{/-first}}{{/anyOf}}{{^anyOf}}{{>pojo}}{{/anyOf}}{{/oneOf}}{{/vendorExtensions.x-is-one-of-interface}}{{/isEnum}}
 {{/model}}
 {{/models}}

modules/openapi-generator/src/main/resources/Java/libraries/jersey3/model_oneof_doc.mustache

@@ -13,7 +13,7 @@
 NOTE: this class is nullable.
 
 {{/isNullable}}
-## Example
+{{^vendorExtensions.x-is-one-of-interface}}## Example
 ```java
 // Import classes:
 import {{{package}}}.{{{classname}}};
@@ -35,4 +35,4 @@ public class Example {
         {{/oneOf}}
     }
 }
-```
+```{{/vendorExtensions.x-is-one-of-interface}}

modules/openapi-generator/src/main/resources/Java/libraries/microprofile/model.mustache

@@ -58,8 +58,12 @@ import {{rootJavaEEPackage}}.validation.Valid;
 
 {{/isEnum}}
 {{^isEnum}}
+{{#vendorExtensions.x-is-one-of-interface}}
+{{>oneof_interface}}
+{{/vendorExtensions.x-is-one-of-interface}}
+{{^vendorExtensions.x-is-one-of-interface}}
 {{>pojo}}
-
+{{/vendorExtensions.x-is-one-of-interface}}
 {{/isEnum}}
 {{/model}}
 {{/models}}

modules/openapi-generator/src/main/resources/Java/libraries/native/anyof_model.mustache

@@ -231,7 +231,7 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im
      * @return The actual instance of `{{{.}}}`
      * @throws ClassCastException if the instance is not `{{{.}}}`
      */
-    public {{{.}}} get{{{.}}}() throws ClassCastException {
+    public {{{.}}} get{{#sanitizeGeneric}}{{{.}}}{{/sanitizeGeneric}}() throws ClassCastException {
         return ({{{.}}})super.getActualInstance();
     }
 

modules/openapi-generator/src/main/resources/Java/libraries/native/model.mustache

@@ -62,6 +62,6 @@ import {{jacksonPackage}}.core.type.TypeReference;
 {{/-first}}
 {{/oneOf}}
 
-{{#isEnum}}{{>modelEnum}}{{/isEnum}}{{^isEnum}}{{#oneOf}}{{#-first}}{{>oneof_model}}{{/-first}}{{/oneOf}}{{^oneOf}}{{#anyOf}}{{#-first}}{{>anyof_model}}{{/-first}}{{/anyOf}}{{^anyOf}}{{>pojo}}{{/anyOf}}{{/oneOf}}{{/isEnum}}
+{{#isEnum}}{{>modelEnum}}{{/isEnum}}{{^isEnum}}{{#vendorExtensions.x-is-one-of-interface}}{{>oneof_interface}}{{/vendorExtensions.x-is-one-of-interface}}{{^vendorExtensions.x-is-one-of-interface}}{{#oneOf}}{{#-first}}{{>oneof_model}}{{/-first}}{{/oneOf}}{{^oneOf}}{{#anyOf}}{{#-first}}{{>anyof_model}}{{/-first}}{{/anyOf}}{{^anyOf}}{{>pojo}}{{/anyOf}}{{/oneOf}}{{/vendorExtensions.x-is-one-of-interface}}{{/isEnum}}
 {{/model}}
 {{/models}}

modules/openapi-generator/src/main/resources/Java/libraries/native/model_oneof_doc.mustache

@@ -13,7 +13,7 @@
 NOTE: this class is nullable.
 
 {{/isNullable}}
-## Example
+{{^vendorExtensions.x-is-one-of-interface}}## Example
 ```java
 // Import classes:
 import {{{package}}}.{{{classname}}};
@@ -35,4 +35,4 @@ public class Example {
         {{/oneOf}}
     }
 }
-```
+```{{/vendorExtensions.x-is-one-of-interface}}

modules/openapi-generator/src/main/resources/Java/libraries/native/oneof_model.mustache

@@ -279,7 +279,7 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im
      * @return The actual instance of `{{{.}}}`
      * @throws ClassCastException if the instance is not `{{{.}}}`
      */
-    public {{{.}}} get{{{.}}}() throws ClassCastException {
+    public {{{.}}} get{{#sanitizeGeneric}}{{{.}}}{{/sanitizeGeneric}}() throws ClassCastException {
         return ({{{.}}})super.getActualInstance();
     }
 

modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/JSON.mustache

@@ -131,7 +131,9 @@ public class JSON {
         {{#model}}
         {{^isEnum}}
         {{^hasChildren}}
+        {{^vendorExtensions.x-is-one-of-interface}}
         gsonBuilder.registerTypeAdapterFactory(new {{modelPackage}}.{{{classname}}}.CustomTypeAdapterFactory());
+        {{/vendorExtensions.x-is-one-of-interface}}
         {{/hasChildren}}
         {{/isEnum}}
         {{/model}}

modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/model.mustache

@@ -30,6 +30,6 @@ import org.hibernate.validator.constraints.*;
 
 {{#models}}
 {{#model}}
-{{#isEnum}}{{>modelEnum}}{{/isEnum}}{{^isEnum}}{{#oneOf}}{{#-first}}{{>oneof_model}}{{/-first}}{{/oneOf}}{{^oneOf}}{{#anyOf}}{{#-first}}{{>anyof_model}}{{/-first}}{{/anyOf}}{{^anyOf}}{{>pojo}}{{/anyOf}}{{/oneOf}}{{/isEnum}}
+{{#isEnum}}{{>modelEnum}}{{/isEnum}}{{^isEnum}}{{#vendorExtensions.x-is-one-of-interface}}{{>oneof_interface}}{{/vendorExtensions.x-is-one-of-interface}}{{^vendorExtensions.x-is-one-of-interface}}{{#oneOf}}{{#-first}}{{>oneof_model}}{{/-first}}{{/oneOf}}{{^oneOf}}{{#anyOf}}{{#-first}}{{>anyof_model}}{{/-first}}{{/anyOf}}{{^anyOf}}{{>pojo}}{{/anyOf}}{{/oneOf}}{{/vendorExtensions.x-is-one-of-interface}}{{/isEnum}}
 {{/model}}
 {{/models}}

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

@@ -0,0 +1,2 @@
+{{#additionalOneOfTypeAnnotations}}{{{.}}}
+{{/additionalOneOfTypeAnnotations}}

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

@@ -0,0 +1,2 @@
+{{#additionalOneOfTypeAnnotations}}{{{.}}}
+{{/additionalOneOfTypeAnnotations}}

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

@@ -15,6 +15,6 @@ import {{javaxPackage}}.validation.Valid;
  * {{.}}
  **/{{/description}}
 {{#isEnum}}{{>enumOuterClass}}{{/isEnum}}
-{{^isEnum}}{{>pojo}}{{/isEnum}}
+{{^isEnum}}{{#vendorExtensions.x-is-one-of-interface}}{{>oneof_interface}}{{/vendorExtensions.x-is-one-of-interface}}{{^vendorExtensions.x-is-one-of-interface}}{{>pojo}}{{/vendorExtensions.x-is-one-of-interface}}{{/isEnum}}
 {{/model}}
 {{/models}}

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

@@ -0,0 +1,6 @@
+{{>additionalOneOfTypeAnnotations}}{{>generatedAnnotation}}{{>typeInfoAnnotation}}{{>xmlAnnotation}}
+public interface {{classname}} {{#vendorExtensions.x-implements}}{{#-first}}extends {{{.}}}{{/-first}}{{^-first}}, {{{.}}}{{/-first}}{{/vendorExtensions.x-implements}} {
+    {{#discriminator}}
+    public {{propertyType}} {{propertyGetter}}();
+    {{/discriminator}}
+}

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

@@ -0,0 +1,6 @@
+{{#withXml}}
+
+@XmlRootElement({{#xmlNamespace}}namespace="{{.}}", {{/xmlNamespace}}name = "{{xmlName}}{{^xmlName}}{{classname}}{{/xmlName}}")
+@XmlAccessorType(XmlAccessType.FIELD)
+{{#jackson}}
+@JacksonXmlRootElement({{#xmlNamespace}}namespace="{{.}}", {{/xmlNamespace}}localName = "{{xmlName}}{{^xmlName}}{{classname}}{{/xmlName}}"){{/jackson}}{{/withXml}}

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

@@ -0,0 +1,2 @@
+{{#additionalOneOfTypeAnnotations}}{{{.}}}
+{{/additionalOneOfTypeAnnotations}}

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

@@ -17,8 +17,7 @@ import {{javaxPackage}}.validation.Valid;
 
 {{/isEnum}}
 {{^isEnum}}
-{{>pojo}}
-
+{{#vendorExtensions.x-is-one-of-interface}}{{>oneof_interface}}{{/vendorExtensions.x-is-one-of-interface}}{{^vendorExtensions.x-is-one-of-interface}}{{>pojo}}{{/vendorExtensions.x-is-one-of-interface}}
 {{/isEnum}}
 {{/model}}
 {{/models}}

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

@@ -0,0 +1,6 @@
+{{>additionalOneOfTypeAnnotations}}{{>generatedAnnotation}}{{>typeInfoAnnotation}}{{>xmlAnnotation}}
+public interface {{classname}} {{#vendorExtensions.x-implements}}{{#-first}}extends {{{.}}}{{/-first}}{{^-first}}, {{{.}}}{{/-first}}{{/vendorExtensions.x-implements}} {
+    {{#discriminator}}
+    public {{propertyType}} {{propertyGetter}}();
+    {{/discriminator}}
+}

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

@@ -0,0 +1,6 @@
+{{#withXml}}
+
+@XmlRootElement({{#xmlNamespace}}namespace="{{.}}", {{/xmlNamespace}}name = "{{xmlName}}{{^xmlName}}{{classname}}{{/xmlName}}")
+@XmlAccessorType(XmlAccessType.FIELD)
+{{#jackson}}
+@JacksonXmlRootElement({{#xmlNamespace}}namespace="{{.}}", {{/xmlNamespace}}localName = "{{xmlName}}{{^xmlName}}{{classname}}{{/xmlName}}"){{/jackson}}{{/withXml}}

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

@@ -0,0 +1,2 @@
+{{#additionalOneOfTypeAnnotations}}{{{.}}}
+{{/additionalOneOfTypeAnnotations}}

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

@@ -17,8 +17,7 @@ import {{javaxPackage}}.validation.Valid;
 
 {{/isEnum}}
 {{^isEnum}}
-{{>pojo}}
-
+{{#vendorExtensions.x-is-one-of-interface}}{{>oneof_interface}}{{/vendorExtensions.x-is-one-of-interface}}{{^vendorExtensions.x-is-one-of-interface}}{{>pojo}}{{/vendorExtensions.x-is-one-of-interface}}
 {{/isEnum}}
 {{/model}}
 {{/models}}

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

@@ -0,0 +1,6 @@
+{{>additionalOneOfTypeAnnotations}}{{>generatedAnnotation}}{{>typeInfoAnnotation}}{{>xmlAnnotation}}
+public interface {{classname}} {{#vendorExtensions.x-implements}}{{#-first}}extends {{{.}}}{{/-first}}{{^-first}}, {{{.}}}{{/-first}}{{/vendorExtensions.x-implements}} {
+    {{#discriminator}}
+    public {{propertyType}} {{propertyGetter}}();
+    {{/discriminator}}
+}

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

@@ -0,0 +1,6 @@
+{{#withXml}}
+
+@XmlRootElement({{#xmlNamespace}}namespace="{{.}}", {{/xmlNamespace}}name = "{{xmlName}}{{^xmlName}}{{classname}}{{/xmlName}}")
+@XmlAccessorType(XmlAccessType.FIELD)
+{{#jackson}}
+@JacksonXmlRootElement({{#xmlNamespace}}namespace="{{.}}", {{/xmlNamespace}}localName = "{{xmlName}}{{^xmlName}}{{classname}}{{/xmlName}}"){{/jackson}}{{/withXml}}

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

@@ -18,6 +18,6 @@ import {{javaxPackage}}.validation.Valid;
 
 {{#models}}
 {{#model}}
-{{#isEnum}}{{>modelEnum}}{{/isEnum}}{{^isEnum}}{{>pojo}}{{/isEnum}}
+{{#isEnum}}{{>modelEnum}}{{/isEnum}}{{^isEnum}}{{#vendorExtensions.x-is-one-of-interface}}{{>oneof_interface}}{{/vendorExtensions.x-is-one-of-interface}}{{^vendorExtensions.x-is-one-of-interface}}{{>pojo}}{{/vendorExtensions.x-is-one-of-interface}}{{/isEnum}}
 {{/model}}
 {{/models}}

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

@@ -0,0 +1,6 @@
+{{>additionalOneOfTypeAnnotations}}{{>generatedAnnotation}}{{>typeInfoAnnotation}}{{>xmlAnnotation}}
+public interface {{classname}} {{#vendorExtensions.x-implements}}{{#-first}}extends {{{.}}}{{/-first}}{{^-first}}, {{{.}}}{{/-first}}{{/vendorExtensions.x-implements}} {
+    {{#discriminator}}
+    public {{propertyType}} {{propertyGetter}}();
+    {{/discriminator}}
+}

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

@@ -0,0 +1,2 @@
+{{#additionalOneOfTypeAnnotations}}{{{.}}}
+{{/additionalOneOfTypeAnnotations}}

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

@@ -0,0 +1,2 @@
+{{#additionalOneOfTypeAnnotations}}{{{.}}}
+{{/additionalOneOfTypeAnnotations}}

modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/eap/model.mustache

@@ -18,8 +18,7 @@ import {{javaxPackage}}.validation.Valid;
 
 {{/isEnum}}
 {{^isEnum}}
-{{>pojo}}
-
+{{#vendorExtensions.x-is-one-of-interface}}{{>oneof_interface}}{{/vendorExtensions.x-is-one-of-interface}}{{^vendorExtensions.x-is-one-of-interface}}{{>pojo}}{{/vendorExtensions.x-is-one-of-interface}}
 {{/isEnum}}
 {{/model}}
 {{/models}}

modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/eap/oneof_interface.mustache

@@ -0,0 +1,6 @@
+{{>additionalOneOfTypeAnnotations}}{{>generatedAnnotation}}{{>typeInfoAnnotation}}{{>xmlAnnotation}}
+public interface {{classname}} {{#vendorExtensions.x-implements}}{{#-first}}extends {{{.}}}{{/-first}}{{^-first}}, {{{.}}}{{/-first}}{{/vendorExtensions.x-implements}} {
+    {{#discriminator}}
+    public {{propertyType}} {{propertyGetter}}();
+    {{/discriminator}}
+}

modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/eap/xmlAnnotation.mustache

@@ -0,0 +1,6 @@
+{{#withXml}}
+
+@XmlRootElement({{#xmlNamespace}}namespace="{{.}}", {{/xmlNamespace}}name = "{{xmlName}}{{^xmlName}}{{classname}}{{/xmlName}}")
+@XmlAccessorType(XmlAccessType.FIELD)
+{{#jackson}}
+@JacksonXmlRootElement({{#xmlNamespace}}namespace="{{.}}", {{/xmlNamespace}}localName = "{{xmlName}}{{^xmlName}}{{classname}}{{/xmlName}}"){{/jackson}}{{/withXml}}

modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/model.mustache

@@ -18,8 +18,7 @@ import {{javaxPackage}}.validation.Valid;
 
 {{/isEnum}}
 {{^isEnum}}
-{{>pojo}}
-
+{{#vendorExtensions.x-is-one-of-interface}}{{>oneof_interface}}{{/vendorExtensions.x-is-one-of-interface}}{{^vendorExtensions.x-is-one-of-interface}}{{>pojo}}{{/vendorExtensions.x-is-one-of-interface}}
 {{/isEnum}}
 {{/model}}
 {{/models}}

modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/oneof_interface.mustache

@@ -0,0 +1,6 @@
+{{>additionalOneOfTypeAnnotations}}{{>generatedAnnotation}}{{>typeInfoAnnotation}}{{>xmlAnnotation}}
+public interface {{classname}} {{#vendorExtensions.x-implements}}{{#-first}}extends {{{.}}}{{/-first}}{{^-first}}, {{{.}}}{{/-first}}{{/vendorExtensions.x-implements}} {
+    {{#discriminator}}
+    public {{propertyType}} {{propertyGetter}}();
+    {{/discriminator}}
+}

modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/xmlAnnotation.mustache

@@ -0,0 +1,6 @@
+{{#withXml}}
+
+@XmlRootElement({{#xmlNamespace}}namespace="{{.}}", {{/xmlNamespace}}name = "{{xmlName}}{{^xmlName}}{{classname}}{{/xmlName}}")
+@XmlAccessorType(XmlAccessType.FIELD)
+{{#jackson}}
+@JacksonXmlRootElement({{#xmlNamespace}}namespace="{{.}}", {{/xmlNamespace}}localName = "{{xmlName}}{{^xmlName}}{{classname}}{{/xmlName}}"){{/jackson}}{{/withXml}}

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

@@ -0,0 +1,2 @@
+{{#additionalOneOfTypeAnnotations}}{{{.}}}
+{{/additionalOneOfTypeAnnotations}}

modules/openapi-generator/src/main/resources/JavaJaxRS/spec/model.mustache

@@ -16,6 +16,6 @@ import {{javaxPackage}}.validation.Valid;
 {{>enumOuterClass}}
 
 {{/isEnum}}
-{{^isEnum}}{{>pojo}}{{/isEnum}}
+{{^isEnum}}{{#vendorExtensions.x-is-one-of-interface}}{{>oneof_interface}}{{/vendorExtensions.x-is-one-of-interface}}{{^vendorExtensions.x-is-one-of-interface}}{{>pojo}}{{/vendorExtensions.x-is-one-of-interface}}{{/isEnum}}
 {{/model}}
 {{/models}}

modules/openapi-generator/src/main/resources/JavaJaxRS/spec/oneof_interface.mustache

@@ -0,0 +1,6 @@
+{{>additionalOneOfTypeAnnotations}}{{>generatedAnnotation}}{{>typeInfoAnnotation}}{{>xmlAnnotation}}
+public interface {{classname}} {{#vendorExtensions.x-implements}}{{#-first}}extends {{{.}}}{{/-first}}{{^-first}}, {{{.}}}{{/-first}}{{/vendorExtensions.x-implements}} {
+    {{#discriminator}}
+    public {{propertyType}} {{propertyGetter}}();
+    {{/discriminator}}
+}

modules/openapi-generator/src/main/resources/JavaJaxRS/spec/xmlAnnotation.mustache

@@ -0,0 +1,6 @@
+{{#withXml}}
+
+@XmlRootElement({{#xmlNamespace}}namespace="{{.}}", {{/xmlNamespace}}name = "{{xmlName}}{{^xmlName}}{{classname}}{{/xmlName}}")
+@XmlAccessorType(XmlAccessType.FIELD)
+{{#jackson}}
+@JacksonXmlRootElement({{#xmlNamespace}}namespace="{{.}}", {{/xmlNamespace}}localName = "{{xmlName}}{{^xmlName}}{{classname}}{{/xmlName}}"){{/jackson}}{{/withXml}}

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

@@ -0,0 +1,6 @@
+{{#withXml}}
+
+@XmlRootElement({{#xmlNamespace}}namespace="{{.}}", {{/xmlNamespace}}name = "{{xmlName}}{{^xmlName}}{{classname}}{{/xmlName}}")
+@XmlAccessorType(XmlAccessType.FIELD)
+{{#jackson}}
+@JacksonXmlRootElement({{#xmlNamespace}}namespace="{{.}}", {{/xmlNamespace}}localName = "{{xmlName}}{{^xmlName}}{{classname}}{{/xmlName}}"){{/jackson}}{{/withXml}}

modules/openapi-generator/src/main/resources/JavaPlayFramework/additionalOneOfTypeAnnotations.mustache

@@ -0,0 +1,2 @@
+{{#additionalOneOfTypeAnnotations}}{{{.}}}
+{{/additionalOneOfTypeAnnotations}}

modules/openapi-generator/src/main/resources/JavaPlayFramework/model.mustache

@@ -15,8 +15,13 @@ import {{javaxPackage}}.validation.*;
 
 {{/isEnum}}
 {{^isEnum}}
+{{#vendorExtensions.x-is-one-of-interface}}
+{{>oneof_interface}}
+{{/vendorExtensions.x-is-one-of-interface}}
+{{^vendorExtensions.x-is-one-of-interface}}
 {{>pojo}}
 
+{{/vendorExtensions.x-is-one-of-interface}}
 {{/isEnum}}
 {{/model}}
 {{/models}}

modules/openapi-generator/src/main/resources/JavaPlayFramework/oneof_interface.mustache

@@ -0,0 +1,6 @@
+{{>additionalOneOfTypeAnnotations}}{{>generatedAnnotation}}{{>typeInfoAnnotation}}{{>xmlAnnotation}}
+public interface {{classname}} {{#vendorExtensions.x-implements}}{{#-first}}extends {{{.}}}{{/-first}}{{^-first}}, {{{.}}}{{/-first}}{{/vendorExtensions.x-implements}} {
+    {{#discriminator}}
+    public {{propertyType}} {{propertyGetter}}();
+    {{/discriminator}}
+}

modules/openapi-generator/src/main/resources/JavaPlayFramework/xmlAnnotation.mustache

@@ -0,0 +1,6 @@
+{{#withXml}}
+
+@XmlRootElement({{#xmlNamespace}}namespace="{{.}}", {{/xmlNamespace}}name = "{{xmlName}}{{^xmlName}}{{classname}}{{/xmlName}}")
+@XmlAccessorType(XmlAccessType.FIELD)
+{{#jackson}}
+@JacksonXmlRootElement({{#xmlNamespace}}namespace="{{.}}", {{/xmlNamespace}}localName = "{{xmlName}}{{^xmlName}}{{classname}}{{/xmlName}}"){{/jackson}}{{/withXml}}