Merge remote-tracking branch 'origin/4.3.x'

Author: wing328

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}}

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}}
 }

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}}
+}

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;
 

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}}

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}}"),