Fix for [BUG] jaxrs-spec [server] oneOf, anyOf Polymorphism does not work

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

@@ -795,11 +795,13 @@ public void preprocessOpenAPI(OpenAPI openAPI) {
                             schemas.put(opId, requestSchema);
                         }
                         // process all response bodies
-                        for (Map.Entry<String, ApiResponse> ar : op.getValue().getResponses().entrySet()) {
-                            ApiResponse a = ModelUtils.getReferencedApiResponse(openAPI, ar.getValue());
-                            Schema responseSchema = ModelUtils.getSchemaFromResponse(a);
-                            if (responseSchema != null) {
-                                schemas.put(opId + ar.getKey(), responseSchema);
+                        if (op.getValue().getResponses() != null) {
+                            for (Map.Entry<String, ApiResponse> ar : op.getValue().getResponses().entrySet()) {
+                                ApiResponse a = ModelUtils.getReferencedApiResponse(openAPI, ar.getValue());
+                                Schema responseSchema = ModelUtils.getSchemaFromResponse(a);
+                                if (responseSchema != null) {
+                                    schemas.put(opId + ar.getKey(), responseSchema);
+                                }
                             }
                         }
                     }

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

@@ -1124,6 +1124,17 @@ public Map<String, Object> postProcessModels(Map<String, Object> objs) {
             }
         }
 
+        // add implements for serializable/parcelable to all models
+        List<Map<String, Object>> models = (List<Map<String, Object>>) objs.get("models");
+        for (Map<String, Object> mo : models) {
+            CodegenModel cm = (CodegenModel) mo.get("model");
+            cm.getVendorExtensions().putIfAbsent("implements", new ArrayList<String>()); // TODO: 5.0 Remove
+            cm.getVendorExtensions().putIfAbsent("x-implements", cm.getVendorExtensions().get("implements"));
+            if (this.serializableModel) {
+                ((ArrayList<String>) cm.getVendorExtensions().get("x-implements")).add("Serializable");
+            }
+        }
+
         return postProcessModelsEnum(objs);
     }
 
@@ -1214,6 +1225,17 @@ public void preprocessOpenAPI(OpenAPI openAPI) {
         }
     }
 
+    @Override
+    public void addImportsToOneOfInterface(List<Map<String, String>> imports) {
+        for (String i : Arrays.asList("JsonSubTypes", "JsonTypeInfo")) {
+            Map<String, String> oneImport = new HashMap<>();
+            oneImport.put("import", importMapping.get(i));
+            if (!imports.contains(oneImport)) {
+                imports.add(oneImport);
+            }
+        }
+    }
+
     private static String getAccept(OpenAPI openAPI, Operation operation) {
         String accepts = null;
         String defaultContentType = "application/json";
@@ -1727,7 +1749,7 @@ public void setAdditionalModelTypeAnnotations(final List<String> additionalModel
     protected void addAdditionPropertiesToCodeGenModel(CodegenModel codegenModel, Schema schema) {
         if (!supportsAdditionalPropertiesWithComposedSchema) {
             // The additional (undeclared) propertiees are modeled in Java as a HashMap.
-            // 
+            //
             // 1. supportsAdditionalPropertiesWithComposedSchema is set to false:
             //    The generated model class extends from the HashMap. That does not work
             //    with composed schemas that also use a discriminator because the model class

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

@@ -974,15 +974,4 @@ public String toApiVarName(String name) {
         }
         return apiVarName;
     }
-
-    @Override
-    public void addImportsToOneOfInterface(List<Map<String, String>> imports) {
-        for (String i : Arrays.asList("JsonSubTypes", "JsonTypeInfo")) {
-            Map<String, String> oneImport = new HashMap<>();
-            oneImport.put("import", importMapping.get(i));
-            if (!imports.contains(oneImport)) {
-                imports.add(oneImport);
-            }
-        }
-    }
 }

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

@@ -214,6 +214,11 @@ public void processOpts() {
         } else if(KUMULUZEE_LIBRARY.equals(library)) {
             supportingFiles.add(new SupportingFile("config.yaml.mustache", "src/main/resources", "config.yaml"));
         }
+
+        if(useJackson) {
+            useOneOfInterfaces = true;
+            addOneOfInterfaceImports = true;
+        }
     }
 
     @Override

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

@@ -15,6 +15,10 @@ import javax.validation.Valid;
 {{#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/spec/oneof_interface.mustache

@@ -0,0 +1,6 @@
+{{>additionalModelTypeAnnotations}}{{>generatedAnnotation}}{{>typeInfoAnnotation}}
+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/pojo.mustache

@@ -10,11 +10,11 @@ import com.fasterxml.jackson.annotation.JsonValue;
  * {{description}}
  **/{{/description}}
 {{#useSwaggerAnnotations}}{{#description}}@ApiModel(description = "{{{description}}}"){{/description}}{{/useSwaggerAnnotations}}
-{{>generatedAnnotation}}{{>additionalModelTypeAnnotations}}public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#serializableModel}}implements Serializable{{/serializableModel}} {
+{{>generatedAnnotation}}{{>additionalModelTypeAnnotations}}public class {{classname}} {{#parent}}extends {{{parent}}} {{/parent}}{{#vendorExtensions.x-implements}}{{#-first}}implements {{{.}}}{{/-first}}{{^-first}}, {{{.}}}{{/-first}}{{#-last}} {{/-last}}{{/vendorExtensions.x-implements}}{
   {{#vars}}{{#isEnum}}{{^isContainer}}
 
 {{>enumClass}}{{/isContainer}}{{#isContainer}}{{#mostInnerItems}}
- 
+
 {{>enumClass}}{{/mostInnerItems}}{{/isContainer}}{{/isEnum}}
   private {{#useBeanValidation}}@Valid {{/useBeanValidation}}{{{datatypeWithEnum}}} {{name}}{{#defaultValue}} = {{{.}}}{{/defaultValue}};{{/vars}}
 

modules/openapi-generator/src/test/java/org/openapitools/codegen/java/jaxrs/JavaJAXRSSpecServerCodegenTest.java

@@ -1,6 +1,7 @@
 package org.openapitools.codegen.java.jaxrs;
 
 import io.swagger.parser.OpenAPIParser;
+import io.swagger.v3.oas.models.Components;
 import io.swagger.v3.oas.models.OpenAPI;
 import io.swagger.v3.oas.models.Operation;
 import io.swagger.v3.oas.models.media.ArraySchema;
@@ -51,8 +52,7 @@ public void testInitialConfigValues() throws Exception {
         final JavaJAXRSSpecServerCodegen codegen = new JavaJAXRSSpecServerCodegen();
         codegen.processOpts();
 
-        OpenAPI openAPI = new OpenAPI();
-        openAPI.addServersItem(new Server().url("https://api.abcde.xy:8082/v2"));
+        final OpenAPI openAPI = createOpenApiWithServerUrl();
         codegen.preprocessOpenAPI(openAPI);
 
         Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.HIDE_GENERATION_TIMESTAMP), Boolean.FALSE);
@@ -101,8 +101,7 @@ public void testAdditionalPropertiesPutForConfigValues() throws Exception {
         codegen.additionalProperties().put(JavaJAXRSSpecServerCodegen.OPEN_API_SPEC_FILE_LOCATION, "openapi.yml");
         codegen.processOpts();
 
-        OpenAPI openAPI = new OpenAPI();
-        openAPI.addServersItem(new Server().url("https://api.abcde.xy:8082/v2"));
+        OpenAPI openAPI = createOpenApiWithServerUrl();
         codegen.preprocessOpenAPI(openAPI);
 
         Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.HIDE_GENERATION_TIMESTAMP), Boolean.TRUE);
@@ -396,4 +395,15 @@ public void addsImportForSetResponse() throws IOException {
 
         assertFileContains(path, "\nimport java.util.Set;\n");
     }
+
+    private OpenAPI createOpenApiWithServerUrl() {
+        final OpenAPI openAPI = new OpenAPI();
+        final Components components = new Components();
+        components.schemas(new HashMap<>());
+        openAPI.setComponents(components);
+
+        openAPI.addServersItem(new Server().url("https://api.abcde.xy:8082/v2"));
+
+        return openAPI;
+    }
 }

samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/AdditionalPropertiesAnyType.java

@@ -82,3 +82,5 @@ private String toIndentedString(Object o) {
 
 }
 
+
+

samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/AdditionalPropertiesArray.java

@@ -83,3 +83,5 @@ private String toIndentedString(Object o) {
 
 }
 
+
+

samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/AdditionalPropertiesBoolean.java

@@ -82,3 +82,5 @@ private String toIndentedString(Object o) {
 
 }
 
+
+

samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java

@@ -18,7 +18,7 @@
 
 
 
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class AdditionalPropertiesClass  implements Serializable {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class AdditionalPropertiesClass implements Serializable {
 
   private @Valid Map<String, String> mapString = new HashMap<String, String>();
   private @Valid Map<String, BigDecimal> mapNumber = new HashMap<String, BigDecimal>();
@@ -293,3 +293,5 @@ private String toIndentedString(Object o) {
 
 }
 
+
+

samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/AdditionalPropertiesInteger.java

@@ -82,3 +82,5 @@ private String toIndentedString(Object o) {
 
 }
 
+
+

samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/AdditionalPropertiesNumber.java

@@ -83,3 +83,5 @@ private String toIndentedString(Object o) {
 
 }
 
+
+

samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/AdditionalPropertiesObject.java

@@ -82,3 +82,5 @@ private String toIndentedString(Object o) {
 
 }
 
+
+

samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/AdditionalPropertiesString.java

@@ -82,3 +82,5 @@ private String toIndentedString(Object o) {
 
 }
 
+
+

samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Animal.java

@@ -22,7 +22,7 @@
 })
 
 
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class Animal  implements Serializable {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class Animal implements Serializable {
 
   private @Valid String className;
   private @Valid String color = "red";
@@ -109,3 +109,5 @@ private String toIndentedString(Object o) {
 
 }
 
+
+

samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java

@@ -17,7 +17,7 @@
 
 
 
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class ArrayOfArrayOfNumberOnly  implements Serializable {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class ArrayOfArrayOfNumberOnly implements Serializable {
 
   private @Valid List<List<BigDecimal>> arrayArrayNumber = new ArrayList<List<BigDecimal>>();
 
@@ -82,3 +82,5 @@ private String toIndentedString(Object o) {
 
 }
 
+
+

samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java

@@ -17,7 +17,7 @@
 
 
 
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class ArrayOfNumberOnly  implements Serializable {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class ArrayOfNumberOnly implements Serializable {
 
   private @Valid List<BigDecimal> arrayNumber = new ArrayList<BigDecimal>();
 
@@ -82,3 +82,5 @@ private String toIndentedString(Object o) {
 
 }
 
+
+

samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ArrayTest.java

@@ -17,7 +17,7 @@
 
 
 
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class ArrayTest  implements Serializable {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class ArrayTest implements Serializable {
 
   private @Valid List<String> arrayOfString = new ArrayList<String>();
   private @Valid List<List<Long>> arrayArrayOfInteger = new ArrayList<List<Long>>();
@@ -124,3 +124,5 @@ private String toIndentedString(Object o) {
 
 }
 
+
+

samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/BigCat.java

@@ -115,3 +115,5 @@ private String toIndentedString(Object o) {
 
 }
 
+
+

samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/BigCatAllOf.java

@@ -14,7 +14,7 @@
 
 
 
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class BigCatAllOf  implements Serializable {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class BigCatAllOf implements Serializable {
 
 
 public enum KindEnum {
@@ -112,3 +112,5 @@ private String toIndentedString(Object o) {
 
 }
 
+
+

samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Capitalization.java

@@ -14,7 +14,7 @@
 
 
 
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class Capitalization  implements Serializable {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class Capitalization implements Serializable {
 
   private @Valid String smallCamel;
   private @Valid String capitalCamel;
@@ -185,3 +185,5 @@ private String toIndentedString(Object o) {
 
 }
 
+
+

samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Cat.java

@@ -82,3 +82,5 @@ private String toIndentedString(Object o) {
 
 }
 
+
+

samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/CatAllOf.java

@@ -14,7 +14,7 @@
 
 
 
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class CatAllOf  implements Serializable {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class CatAllOf implements Serializable {
 
   private @Valid Boolean declawed;
 
@@ -79,3 +79,5 @@ private String toIndentedString(Object o) {
 
 }
 
+
+

samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Category.java

@@ -14,7 +14,7 @@
 
 
 
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class Category  implements Serializable {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class Category implements Serializable {
 
   private @Valid Long id;
   private @Valid String name = "default-name";
@@ -101,3 +101,5 @@ private String toIndentedString(Object o) {
 
 }
 
+
+

samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/ClassModel.java

@@ -16,7 +16,7 @@
  * Model for testing model with \"_class\" property
  **/
 @ApiModel(description = "Model for testing model with \"_class\" property")
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class ClassModel  implements Serializable {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class ClassModel implements Serializable {
 
   private @Valid String propertyClass;
 
@@ -81,3 +81,5 @@ private String toIndentedString(Object o) {
 
 }
 
+
+

samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Client.java

@@ -14,7 +14,7 @@
 
 
 
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class Client  implements Serializable {
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen")public class Client implements Serializable {
 
   private @Valid String client;
 
@@ -79,3 +79,5 @@ private String toIndentedString(Object o) {
 
 }
 
+
+

samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/Dog.java

@@ -82,3 +82,5 @@ private String toIndentedString(Object o) {
 
 }
 
+
+