Merge branch 'master' into master

Author: HugoMario

pom.xml

@@ -12,7 +12,7 @@
 
     <groupId>io.swagger.codegen.v3</groupId>
     <artifactId>swagger-codegen-generators</artifactId>
-    <version>1.0.23-SNAPSHOT</version>
+    <version>1.0.24-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <build>
@@ -252,8 +252,8 @@
         </dependency>
     </dependencies>
     <properties>
-        <swagger-codegen-version>3.0.23-SNAPSHOT</swagger-codegen-version>
-        <swagger-parser-version>2.0.23-SNAPSHOT</swagger-parser-version>
+        <swagger-codegen-version>3.0.24-SNAPSHOT</swagger-codegen-version>
+        <swagger-parser-version>2.0.23</swagger-parser-version>
         <swagger-core-version>2.1.4</swagger-core-version>
         <jackson-version>2.10.3</jackson-version>
         <scala-version>2.11.1</scala-version>

src/main/java/io/swagger/codegen/v3/generators/DefaultCodegenConfig.java

@@ -1333,6 +1333,8 @@ public CodegenModel fromModel(String name, Schema schema, Map<String, Schema> al
         }
         codegenModel.getVendorExtensions().put(CodegenConstants.IS_ALIAS_EXT_NAME, typeAliases.containsKey(name));
 
+        codegenModel.discriminator = schema.getDiscriminator();
+
         if (schema.getXml() != null) {
             codegenModel.xmlPrefix = schema.getXml().getPrefix();
             codegenModel.xmlNamespace = schema.getXml().getNamespace();
@@ -1398,11 +1400,8 @@ else if (schema instanceof ComposedSchema) {
             // interfaces (intermediate models)
             if (allOf != null && !allOf.isEmpty()) {
 
-                if (schema.getDiscriminator() != null) {
-                    codegenModel.discriminator = schema.getDiscriminator();
-                    if (codegenModel.discriminator != null && codegenModel.discriminator.getPropertyName() != null) {
-                        codegenModel.discriminator.setPropertyName(toVarName(codegenModel.discriminator.getPropertyName()));
-                    }
+                if (codegenModel.discriminator != null && codegenModel.discriminator.getPropertyName() != null) {
+                    codegenModel.discriminator.setPropertyName(toVarName(codegenModel.discriminator.getPropertyName()));
                 }
 
                 for (int i = 0; i < allOf.size(); i++) {

src/main/java/io/swagger/codegen/v3/generators/dotnet/AbstractCSharpCodegen.java

@@ -752,7 +752,7 @@ public String getSchemaType(Schema propertySchema) {
 
         if (propertySchema.get$ref() != null) {
             final Schema refSchema = OpenAPIUtil.getSchemaFromName(swaggerType, this.openAPI);
-            if (refSchema != null && !isObjectSchema(refSchema) && refSchema.getEnum() == null) {
+            if (refSchema != null && !isObjectSchema(refSchema) && !(refSchema instanceof ArraySchema || refSchema instanceof MapSchema) && refSchema.getEnum() == null) {
                 swaggerType = super.getSchemaType(refSchema);
             }
         }

src/main/resources/handlebars/pythonFlaskConnexion/requirements.mustache

@@ -1,4 +1,4 @@
-connexion == 2.2.0
+connexion == 2.6.0
 python_dateutil == 2.6.0
 {{#supportPython2}}
 typing == 3.5.2.2

src/main/resources/handlebars/pythonFlaskConnexion/test-requirements.mustache

@@ -1,6 +1,7 @@
-flask_testing==0.6.1
+flask_testing==0.8.0
 coverage>=4.0.3
 nose>=1.3.7
 pluggy>=0.3.1
 py>=1.4.31
 randomize>=0.13
+tox==3.20.1

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

@@ -0,0 +1,42 @@
+package io.swagger.codegen.v3.generators.java;
+
+import io.swagger.codegen.v3.ClientOptInput;
+import io.swagger.codegen.v3.DefaultGenerator;
+import io.swagger.codegen.v3.config.CodegenConfigurator;
+import org.apache.commons.io.FileUtils;
+import org.junit.rules.TemporaryFolder;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+import java.io.File;
+
+public class JavaPolymorphicAnnotationCodegenTest {
+
+    private TemporaryFolder folder = new TemporaryFolder();
+
+    @Test(description = "verify that jackson-polymorphism annotations are generated")
+    public void testParameterOrders() throws Exception {
+        this.folder.create();
+        final File output = this.folder.getRoot();
+
+        final CodegenConfigurator configurator = new CodegenConfigurator()
+            .setLang("spring")
+            .setInputSpecURL("src/test/resources/3_0_0/polymorphicSchema.yaml")
+            .setOutputDir(output.getAbsolutePath());
+
+        final ClientOptInput clientOptInput = configurator.toClientOptInput();
+        new DefaultGenerator().opts(clientOptInput).generate();
+
+        final File petControllerFile = new File(output, "/src/main/java/io/swagger/model/PolymorphicResponse.java");
+        final String content = FileUtils.readFileToString(petControllerFile);
+
+        Assert.assertTrue(content.contains(
+            "@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = \"type\", visible = true )\n" +
+                "@JsonSubTypes({\n" +
+                "        @JsonSubTypes.Type(value = Error.class, name = \"Error\"),\n" +
+                "        @JsonSubTypes.Type(value = Success.class, name = \"Success\"),\n" +
+                "})"));
+
+        this.folder.delete();
+    }
+}

src/test/resources/3_0_0/polymorphicSchema.yaml

@@ -0,0 +1,63 @@
+openapi: 3.0.3
+info:
+  description: This is a simple API
+  version: "1.0.0"
+  title: Simple Inventory API
+servers:
+  - description: test definition
+    url: /
+paths:
+  /provision:
+    get:
+      tags:
+        - provision
+      summary: inheritanceTest
+      operationId: provision
+      description: inheritanceTest
+      responses:
+        200:
+          description: default response
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/PolymorphicResponse'
+
+components:
+  schemas:
+    PolymorphicResponse:
+      type: object
+      required:
+        - type
+      properties:
+        type:
+          type: string
+          enum:
+            - Success
+            - Error
+          description: the descriminator
+      discriminator:
+        propertyName: type
+    Success:
+      allOf:
+        - $ref: '#/components/schemas/PolymorphicResponse'
+        - type: object
+          required:
+            - target
+          properties:
+            target:
+              type: string
+              description: some target value
+            dialogId:
+              type: string
+              format: uuid
+              description: some dialogId
+    Error:
+      allOf:
+        - $ref: '#/components/schemas/PolymorphicResponse'
+        - type: object
+          required:
+            - message
+          properties:
+            message:
+              type: string
+              description: the message describing the error