Interface with custom discriminator test

Author: OsztosA

src/test/java/io/swagger/codegen/v3/generators/GeneratorRunner.java

@@ -13,6 +13,8 @@
 import java.io.InputStream;
 import java.nio.file.Files;
 import java.util.List;
+import java.util.function.Consumer;
+import java.util.function.Supplier;
 
 /**
  *
@@ -28,14 +30,22 @@ public static List<File> runGenerator(
         boolean v2Spec,
         boolean yaml,
         boolean flattenInlineComposedSchema,
-        String outFolder
+        String outFolder,
+        Consumer<Options> optionsCustomizer
     ) throws Exception {
 
         String path = outFolder;
         if (StringUtils.isBlank(path)) {
             path = getTmpFolder().getAbsolutePath();
         }
         GenerationRequest request = new GenerationRequest();
+
+        Options option = new Options()
+            .flattenInlineComposedSchema(flattenInlineComposedSchema)
+            .outputDir(path);
+
+        optionsCustomizer.accept(option);
+
         request
             .codegenVersion(codegenVersion) // use V2 to target Swagger/OpenAPI 2.x Codegen version
             .type(GenerationRequest.Type.CLIENT)
@@ -44,9 +54,7 @@ public static List<File> runGenerator(
                 yaml, // YAML file, use false for JSON
                 v2Spec)) // OpenAPI 3.x - use true for Swagger/OpenAPI 2.x definitions
             .options(
-                new Options()
-                    .flattenInlineComposedSchema(flattenInlineComposedSchema)
-                    .outputDir(path)
+                option
             );
 
         List<File> files = new GeneratorService().generationRequest(request).generate();

src/test/java/io/swagger/codegen/v3/generators/java/GeneratorResultTestJava.java

@@ -6,7 +6,11 @@
 import org.testng.annotations.Test;
 
 import java.io.File;
+import java.nio.file.Files;
+import java.nio.file.Paths;
 import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 public class GeneratorResultTestJava {
 
@@ -29,11 +33,59 @@ public void testJavaGenerator_OneOf() throws Exception {
             v2Spec,
             yaml,
             flattenInlineComposedSchema,
-            outFolder);
+            outFolder, options -> {});
 
         Assert.assertFalse(files.isEmpty());
         for (File f: files) {
             // TODO test stuff
         }
     }
+
+    @Test
+    public void interfaceWithCustomDiscriminator() throws Exception {
+
+        String name = "java";
+        String specPath = "3_0_0/sample_interface_with_discriminator.json";
+        GenerationRequest.CodegenVersion codegenVersion = GenerationRequest.CodegenVersion.V3;
+        boolean v2Spec = false; // 3.0 spec
+        boolean yaml = false;
+        boolean flattenInlineComposedSchema = true;
+        String outFolder = null; // temporary folder
+
+
+        List<File> files = GeneratorRunner.runGenerator(
+            name,
+            specPath,
+            codegenVersion,
+            v2Spec,
+            yaml,
+            flattenInlineComposedSchema,
+            outFolder,
+            options -> options.setLibrary("resttemplate"));
+
+
+
+        File interfaceFile = files.stream().filter(f -> f.getName().equals("Item.java")).findAny().orElseThrow(() -> new RuntimeException("No interface generated"));
+
+        String interfaceContent = new String(Files.readAllBytes(Paths.get(interfaceFile.toURI())));
+
+        Pattern typeInfoPattern = Pattern.compile( 	"(.*)(@JsonTypeInfo\\()(.*)(}\\))(.*)", Pattern.DOTALL);
+
+        Matcher matcher = typeInfoPattern.matcher(interfaceContent);
+
+        Assert.assertTrue(matcher.matches(), "No JsonTypeInfo generated into the interface file");
+
+        String generatedTypeinfoLines = matcher.group(2)+matcher.group(3)+matcher.group(4);
+
+        Assert.assertEquals( generatedTypeinfoLines,"@JsonTypeInfo(\n" +
+            "  use = JsonTypeInfo.Id.NAME,\n" +
+            "  include = JsonTypeInfo.As.PROPERTY,\n" +
+            "  property = \"aCustomProperty\")\n" +
+            "@JsonSubTypes({\n" +
+            "  @JsonSubTypes.Type(value = ClassA.class, name = \"typeA\"),\n" +
+            "  @JsonSubTypes.Type(value = ClassB.class, name = \"typeB\"),\n" +
+            "  @JsonSubTypes.Type(value = ClassC.class, name = \"typeC\")\n" +
+            "})", "Wrong json subtypes generated");
+
+    }
 }

src/test/resources/3_0_0/sample_interface_with_discriminator.json

@@ -0,0 +1,118 @@
+{
+  "openapi": "3.0.3",
+  "info": {
+    "title": "Title",
+    "description": "Title",
+    "version": "1.0.0"
+  },
+  "paths": {
+    "/sampleObjectResponse": {
+      "get": {
+        "tags": [
+          "Sample"
+        ],
+        "responses": {
+          "200": {
+            "description": "Returns requested data",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/sampleResponse"
+                }
+              }
+            }
+          }
+
+        }
+      }
+
+    }
+  },
+  "components": {
+    "schemas": {
+      "sampleResponse": {
+        "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/item"
+            }
+      },
+      "item": {
+        "discriminator": {
+          "propertyName": "aCustomProperty",
+          "mapping": {
+            "typeA": "#/components/schemas/classA",
+            "typeB": "#/components/schemas/classB",
+            "typeC": "#/components/schemas/classC"
+          }
+        },
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/classA"
+          },
+          {
+            "$ref": "#/components/schemas/classB"
+          },
+          {
+            "$ref": "#/components/schemas/classC"
+          }
+        ]
+      },
+      "classA": {
+        "type": "object",
+        "properties": {
+          "aaa": {
+            "type": "string"
+          }
+        },
+        "allOf": [
+          {
+            "$ref": "#/components/schemas/baseClass"
+          }
+        ]
+      },
+      "classB": {
+        "type": "object",
+        "properties": {
+          "bbb": {
+            "type": "string"
+          }
+        },
+        "allOf": [
+          {
+            "$ref": "#/components/schemas/baseClass"
+          }
+        ]
+      },
+      "classC": {
+        "type": "object",
+        "properties": {
+          "ccc": {
+            "type": "string"
+          }
+        },
+        "allOf": [
+          {
+            "$ref": "#/components/schemas/baseClass"
+          }
+        ]
+      },
+      "baseClass": {
+
+        "properties": {
+          "id": {
+            "type": "integer"
+          },
+          "name": {
+            "type": "string"
+          }
+        }
+      }
+    }
+  },
+  "tags": [
+    {
+      "name": "Sample",
+      "description": "Sample"
+    }
+  ]
+}