[Java][client] oneof support for jackson clients

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

@@ -10,6 +10,8 @@
 public class CodegenDiscriminator {
     private String propertyName;
     private String propertyBaseName;
+    private String propertyGetter;
+    private String propertyType;
     private Map<String, String> mapping;
     private Set<MappedModel> mappedModels = new LinkedHashSet<>();
 
@@ -21,6 +23,14 @@ public void setPropertyName(String propertyName) {
         this.propertyName = propertyName;
     }
 
+    public String getPropertyGetter() {
+        return propertyGetter;
+    }
+
+    public void setPropertyGetter(String propertyGetter) {
+        this.propertyGetter = propertyGetter;
+    }
+
     public String getPropertyBaseName() {
         return propertyBaseName;
     }
@@ -29,6 +39,14 @@ public void setPropertyBaseName(String propertyBaseName) {
         this.propertyBaseName = propertyBaseName;
     }
 
+    public String getPropertyType() {
+        return propertyType;
+    }
+
+    public void setPropertyType(String propertyType) {
+        this.propertyType = propertyType;
+    }
+
     public Map<String, String> getMapping() {
         return mapping;
     }

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

@@ -1654,6 +1654,10 @@ public String toAnyOfName(List<String> names, ComposedSchema composedSchema) {
      */
     @SuppressWarnings("static-method")
     public String toOneOfName(List<String> names, ComposedSchema composedSchema) {
+        Map<String, Object> exts = composedSchema.getExtensions();
+        if (exts != null && exts.containsKey("x-oneOf-name")) {
+            return (String) exts.get("x-oneOf-name");
+        }
         return "oneOf<" + String.join(",", names) + ">";
     }
 
@@ -2117,13 +2121,16 @@ public int compare(CodegenProperty one, CodegenProperty another) {
         return m;
     }
 
-    private CodegenDiscriminator createDiscriminator(String schemaName, Schema schema) {
+    protected CodegenDiscriminator createDiscriminator(String schemaName, Schema schema) {
         if (schema.getDiscriminator() == null) {
             return null;
         }
         CodegenDiscriminator discriminator = new CodegenDiscriminator();
         discriminator.setPropertyName(toVarName(schema.getDiscriminator().getPropertyName()));
         discriminator.setPropertyBaseName(schema.getDiscriminator().getPropertyName());
+        discriminator.setPropertyGetter(toGetter(discriminator.getPropertyName()));
+        // FIXME: for now, we assume that the discriminator property is String
+        discriminator.setPropertyType(typeMapping.get("string"));
         discriminator.setMapping(schema.getDiscriminator().getMapping());
         if (schema.getDiscriminator().getMapping() != null && !schema.getDiscriminator().getMapping().isEmpty()) {
             for (Entry<String, String> e : schema.getDiscriminator().getMapping().entrySet()) {

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

@@ -42,6 +42,6 @@ import org.hibernate.validator.constraints.*;
 
 {{#models}}
 {{#model}}
-{{#isEnum}}{{>modelEnum}}{{/isEnum}}{{^isEnum}}{{>pojo}}{{/isEnum}}
+{{#isEnum}}{{>modelEnum}}{{/isEnum}}{{^isEnum}}{{#vendorExtensions.isOneOfInterface}}{{>oneof_interface}}{{/vendorExtensions.isOneOfInterface}}{{^vendorExtensions.isOneOfInterface}}{{>pojo}}{{/vendorExtensions.isOneOfInterface}}{{/isEnum}}
 {{/model}}
 {{/models}}

modules/openapi-generator/src/main/resources/Java/model_test.mustache

@@ -21,6 +21,7 @@ import java.util.Map;
 public class {{classname}}Test {
     {{#models}}
     {{#model}}
+    {{^vendorExtensions.isOneOfInterface}}
     {{^isEnum}}
     private final {{classname}} model = new {{classname}}();
 
@@ -43,6 +44,7 @@ public class {{classname}}Test {
     }
 
     {{/allVars}}
+    {{/vendorExtensions.isOneOfInterface}}
     {{/model}}
     {{/models}}
 }

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

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

modules/openapi-generator/src/main/resources/Java/pojo.mustache

@@ -10,7 +10,7 @@
 })
 {{/jackson}}
 {{>additionalModelTypeAnnotations}}{{>generatedAnnotation}}{{#discriminator}}{{>typeInfoAnnotation}}{{/discriminator}}{{>xmlAnnotation}}
-public class {{classname}} {{#parent}}extends {{{parent}}} {{/parent}}{{#parcelableModel}}implements Parcelable {{#serializableModel}}, Serializable {{/serializableModel}}{{/parcelableModel}}{{^parcelableModel}}{{#serializableModel}}implements Serializable {{/serializableModel}}{{/parcelableModel}}{
+public class {{classname}} {{#parent}}extends {{{parent}}} {{/parent}}{{#vendorExtensions.implements}}{{#-first}}implements {{{.}}}{{/-first}}{{^-first}}, {{{.}}}{{/-first}}{{#-last}} {{/-last}}{{/vendorExtensions.implements}}{
 {{#serializableModel}}
   private static final long serialVersionUID = 1L;
 

modules/openapi-generator/src/main/resources/Java/pojo_doc.mustache

@@ -1,7 +1,8 @@
-# {{classname}}
+# {{#vendorExtensions.isOneOfInterface}}Interface {{/vendorExtensions.isOneOfInterface}}{{classname}}
 
 {{#description}}{{&description}}
 {{/description}}
+{{^vendorExtensions.isOneOfInterface}}
 ## Properties
 
 Name | Type | Description | Notes
@@ -17,3 +18,19 @@ Name | Value
 ---- | -----{{#allowableValues}}{{#enumVars}}
 {{name}} | {{value}}{{/enumVars}}{{/allowableValues}}
 {{/isEnum}}{{/vars}}
+{{#vendorExtensions.implements.0}}
+
+## Implemented Interfaces
+
+{{#vendorExtensions.implements}}
+* {{{.}}}
+{{/vendorExtensions.implements}}
+{{/vendorExtensions.implements.0}}
+{{/vendorExtensions.isOneOfInterface}}
+{{#vendorExtensions.isOneOfInterface}}
+## Implementing Classes
+
+{{#oneOf}}
+* {{{.}}}
+{{/oneOf}}
+{{/vendorExtensions.isOneOfInterface}}

modules/openapi-generator/src/main/resources/Java/typeInfoAnnotation.mustache

@@ -1,6 +1,6 @@
 {{#jackson}}
 
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "{{{discriminator.propertyBaseName}}}", visible = true)
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "{{{discriminator.propertyBaseName}}}", visible = true)
 @JsonSubTypes({
   {{#discriminator.mappedModels}}
   @JsonSubTypes.Type(value = {{modelName}}.class, name = "{{^vendorExtensions.x-discriminator-value}}{{mappingName}}{{/vendorExtensions.x-discriminator-value}}{{#vendorExtensions.x-discriminator-value}}{{{vendorExtensions.x-discriminator-value}}}{{/vendorExtensions.x-discriminator-value}}"),

samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Animal.java

@@ -34,7 +34,7 @@
 })
 @javax.annotation.concurrent.Immutable
 
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "className", visible = true)
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "className", visible = true)
 @JsonSubTypes({
   @JsonSubTypes.Type(value = Dog.class, name = "Dog"),
   @JsonSubTypes.Type(value = Cat.class, name = "Cat"),

samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Animal.java

@@ -33,7 +33,7 @@
   Animal.JSON_PROPERTY_COLOR
 })
 
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "className", visible = true)
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "className", visible = true)
 @JsonSubTypes({
   @JsonSubTypes.Type(value = Dog.class, name = "Dog"),
   @JsonSubTypes.Type(value = Cat.class, name = "Cat"),

samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Animal.java

@@ -33,7 +33,7 @@
   Animal.JSON_PROPERTY_COLOR
 })
 
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "className", visible = true)
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "className", visible = true)
 @JsonSubTypes({
   @JsonSubTypes.Type(value = Dog.class, name = "Dog"),
   @JsonSubTypes.Type(value = Cat.class, name = "Cat"),

samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Animal.java

@@ -33,7 +33,7 @@
   Animal.JSON_PROPERTY_COLOR
 })
 
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "className", visible = true)
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "className", visible = true)
 @JsonSubTypes({
   @JsonSubTypes.Type(value = Dog.class, name = "Dog"),
   @JsonSubTypes.Type(value = Cat.class, name = "Cat"),

samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/Animal.java

@@ -32,7 +32,7 @@
   Animal.JSON_PROPERTY_COLOR
 })
 
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "className", visible = true)
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "className", visible = true)
 @JsonSubTypes({
   @JsonSubTypes.Type(value = Dog.class, name = "Dog"),
   @JsonSubTypes.Type(value = Cat.class, name = "Cat"),

samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Animal.java

@@ -33,7 +33,7 @@
   Animal.JSON_PROPERTY_COLOR
 })
 
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "className", visible = true)
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "className", visible = true)
 @JsonSubTypes({
   @JsonSubTypes.Type(value = Dog.class, name = "Dog"),
   @JsonSubTypes.Type(value = Cat.class, name = "Cat"),

samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/Animal.java

@@ -33,7 +33,7 @@
   Animal.JSON_PROPERTY_COLOR
 })
 
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "className", visible = true)
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "className", visible = true)
 @JsonSubTypes({
   @JsonSubTypes.Type(value = Dog.class, name = "Dog"),
   @JsonSubTypes.Type(value = Cat.class, name = "Cat"),

samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Animal.java

@@ -33,7 +33,7 @@
   Animal.JSON_PROPERTY_COLOR
 })
 
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "className", visible = true)
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "className", visible = true)
 @JsonSubTypes({
   @JsonSubTypes.Type(value = Dog.class, name = "Dog"),
   @JsonSubTypes.Type(value = Cat.class, name = "Cat"),

samples/client/petstore/java/okhttp-gson-parcelableModel/docs/AdditionalPropertiesAnyType.md

@@ -9,4 +9,8 @@ Name | Type | Description | Notes
 **name** | **String** |  |  [optional]
 
 
+## Implemented Interfaces
+
+* Parcelable
+
 

samples/client/petstore/java/okhttp-gson-parcelableModel/docs/AdditionalPropertiesArray.md

@@ -9,4 +9,8 @@ Name | Type | Description | Notes
 **name** | **String** |  |  [optional]
 
 
+## Implemented Interfaces
+
+* Parcelable
+
 

samples/client/petstore/java/okhttp-gson-parcelableModel/docs/AdditionalPropertiesBoolean.md

@@ -9,4 +9,8 @@ Name | Type | Description | Notes
 **name** | **String** |  |  [optional]
 
 
+## Implemented Interfaces
+
+* Parcelable
+
 

samples/client/petstore/java/okhttp-gson-parcelableModel/docs/AdditionalPropertiesClass.md

@@ -19,4 +19,8 @@ Name | Type | Description | Notes
 **anytype3** | [**Object**](.md) |  |  [optional]
 
 
+## Implemented Interfaces
+
+* Parcelable
+
 

samples/client/petstore/java/okhttp-gson-parcelableModel/docs/AdditionalPropertiesInteger.md

@@ -9,4 +9,8 @@ Name | Type | Description | Notes
 **name** | **String** |  |  [optional]
 
 
+## Implemented Interfaces
+
+* Parcelable
+
 

samples/client/petstore/java/okhttp-gson-parcelableModel/docs/AdditionalPropertiesNumber.md

@@ -9,4 +9,8 @@ Name | Type | Description | Notes
 **name** | **String** |  |  [optional]
 
 
+## Implemented Interfaces
+
+* Parcelable
+
 

samples/client/petstore/java/okhttp-gson-parcelableModel/docs/AdditionalPropertiesObject.md

@@ -9,4 +9,8 @@ Name | Type | Description | Notes
 **name** | **String** |  |  [optional]
 
 
+## Implemented Interfaces
+
+* Parcelable
+
 

samples/client/petstore/java/okhttp-gson-parcelableModel/docs/AdditionalPropertiesString.md

@@ -9,4 +9,8 @@ Name | Type | Description | Notes
 **name** | **String** |  |  [optional]
 
 
+## Implemented Interfaces
+
+* Parcelable
+
 

samples/client/petstore/java/okhttp-gson-parcelableModel/docs/Animal.md

@@ -10,4 +10,8 @@ Name | Type | Description | Notes
 **color** | **String** |  |  [optional]
 
 
+## Implemented Interfaces
+
+* Parcelable
+
 

samples/client/petstore/java/okhttp-gson-parcelableModel/docs/ArrayOfArrayOfNumberOnly.md

@@ -9,4 +9,8 @@ Name | Type | Description | Notes
 **arrayArrayNumber** | [**List<List<BigDecimal>>**](List.md) |  |  [optional]
 
 
+## Implemented Interfaces
+
+* Parcelable
+
 

samples/client/petstore/java/okhttp-gson-parcelableModel/docs/ArrayOfNumberOnly.md

@@ -9,4 +9,8 @@ Name | Type | Description | Notes
 **arrayNumber** | [**List<BigDecimal>**](BigDecimal.md) |  |  [optional]
 
 
+## Implemented Interfaces
+
+* Parcelable
+
 

samples/client/petstore/java/okhttp-gson-parcelableModel/docs/ArrayTest.md

@@ -11,4 +11,8 @@ Name | Type | Description | Notes
 **arrayArrayOfModel** | [**List<List<ReadOnlyFirst>>**](List.md) |  |  [optional]
 
 
+## Implemented Interfaces
+
+* Parcelable
+
 

samples/client/petstore/java/okhttp-gson-parcelableModel/docs/BigCat.md

@@ -20,4 +20,8 @@ LEOPARDS | "leopards"
 JAGUARS | "jaguars"
 
 
+## Implemented Interfaces
+
+* Parcelable
+
 

samples/client/petstore/java/okhttp-gson-parcelableModel/docs/BigCatAllOf.md

@@ -20,4 +20,8 @@ LEOPARDS | "leopards"
 JAGUARS | "jaguars"
 
 
+## Implemented Interfaces
+
+* Parcelable
+
 

samples/client/petstore/java/okhttp-gson-parcelableModel/docs/Capitalization.md

@@ -14,4 +14,8 @@ Name | Type | Description | Notes
 **ATT_NAME** | **String** | Name of the pet  |  [optional]
 
 
+## Implemented Interfaces
+
+* Parcelable
+
 

samples/client/petstore/java/okhttp-gson-parcelableModel/docs/Cat.md

@@ -9,4 +9,8 @@ Name | Type | Description | Notes
 **declawed** | **Boolean** |  |  [optional]
 
 
+## Implemented Interfaces
+
+* Parcelable
+
 

samples/client/petstore/java/okhttp-gson-parcelableModel/docs/CatAllOf.md

@@ -9,4 +9,8 @@ Name | Type | Description | Notes
 **declawed** | **Boolean** |  |  [optional]
 
 
+## Implemented Interfaces
+
+* Parcelable
+
 

samples/client/petstore/java/okhttp-gson-parcelableModel/docs/Category.md

@@ -10,4 +10,8 @@ Name | Type | Description | Notes
 **name** | **String** |  | 
 
 
+## Implemented Interfaces
+
+* Parcelable
+
 

samples/client/petstore/java/okhttp-gson-parcelableModel/docs/ClassModel.md

@@ -10,4 +10,8 @@ Name | Type | Description | Notes
 **propertyClass** | **String** |  |  [optional]
 
 
+## Implemented Interfaces
+
+* Parcelable
+
 

samples/client/petstore/java/okhttp-gson-parcelableModel/docs/Client.md

@@ -9,4 +9,8 @@ Name | Type | Description | Notes
 **client** | **String** |  |  [optional]
 
 
+## Implemented Interfaces
+
+* Parcelable
+