Merge branch 'master' into patch-1

Author: HugoMario

pom.xml

@@ -12,7 +12,7 @@
 
     <groupId>io.swagger.codegen.v3</groupId>
     <artifactId>swagger-codegen-generators</artifactId>
-    <version>1.0.19-SNAPSHOT</version>
+    <version>1.0.21-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <build>
@@ -252,9 +252,9 @@
         </dependency>
     </dependencies>
     <properties>
-        <swagger-codegen-version>3.0.19-SNAPSHOT</swagger-codegen-version>
-        <swagger-parser-version>2.0.19-SNAPSHOT</swagger-parser-version>
-        <swagger-core-version>2.1.2-SNAPSHOT</swagger-core-version>
+        <swagger-codegen-version>3.0.21-SNAPSHOT</swagger-codegen-version>
+        <swagger-parser-version>2.0.20</swagger-parser-version>
+        <swagger-core-version>2.1.2</swagger-core-version>
         <jackson-version>2.10.3</jackson-version>
         <scala-version>2.11.1</scala-version>
         <felix-version>3.3.0</felix-version>

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

@@ -78,6 +78,9 @@
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -106,7 +109,6 @@
 import static io.swagger.codegen.v3.generators.CodegenHelper.getTypeMappings;
 import static io.swagger.codegen.v3.generators.CodegenHelper.initalizeSpecialCharacterMapping;
 import static io.swagger.codegen.v3.generators.handlebars.ExtensionHelper.getBooleanValue;
-import static io.swagger.codegen.v3.utils.ModelUtils.processCodegenModels;
 
 public abstract class DefaultCodegenConfig implements CodegenConfig {
     private static final Logger LOGGER = LoggerFactory.getLogger(DefaultCodegenConfig.class);
@@ -265,11 +267,47 @@ public Map<String, Object> postProcessAllModels(Map<String, Object> processedMod
             }
         }
         if (supportsInheritance) {
-            processCodegenModels(allModels);
+            for (String name : allModels.keySet()) {
+                final CodegenModel codegenModel = allModels.get(name);
+                fixUpParentAndInterfaces(codegenModel, allModels);
+            }
         }
         return processedModels;
     }
 
+    /**
+     * Fix up all parent and interface CodegenModel references.
+     * @param allModels
+     */
+    protected void fixUpParentAndInterfaces(CodegenModel codegenModel, Map<String, CodegenModel> allModels) {
+        if (codegenModel.parent != null) {
+            codegenModel.parentModel = allModels.get(codegenModel.parent);
+        }
+        if (codegenModel.interfaces != null && !codegenModel.interfaces.isEmpty()) {
+            codegenModel.interfaceModels = new ArrayList<CodegenModel>(codegenModel.interfaces.size());
+            for (String intf : codegenModel.interfaces) {
+                CodegenModel intfModel = allModels.get(intf);
+                if (intfModel != null) {
+                    codegenModel.interfaceModels.add(intfModel);
+                }
+            }
+        }
+        CodegenModel parent = codegenModel.parentModel;
+        // if a discriminator exists on the parent, don't add this child to the inheritance hierarchy
+        // TODO Determine what to do if the parent discriminator name == the grandparent discriminator name
+        while (parent != null) {
+            if (parent.children == null) {
+                parent.children = new ArrayList<CodegenModel>();
+            }
+            parent.children.add(codegenModel);
+            if (parent.discriminator == null) {
+                parent = allModels.get(parent.parent);
+            } else {
+                parent = null;
+            }
+        }
+    }
+
     // override with any special post-processing
     @SuppressWarnings("static-method")
     public Map<String, Object> postProcessModels(Map<String, Object> objs) {
@@ -1241,6 +1279,9 @@ public String toModelName(final String name) {
      * @return Codegen Model object
      */
     public CodegenModel fromModel(String name, Schema schema) {
+        if (openAPI != null && openAPI.getComponents() != null && openAPI.getComponents().getSchemas() != null) {
+            return fromModel(name, schema, openAPI.getComponents().getSchemas());
+        }
         return fromModel(name, schema, null);
     }
 
@@ -2059,6 +2100,11 @@ public CodegenOperation fromOperation(String path, String httpMethod, Operation
                 Schema schema = body.getContent().get(contentType).getSchema();
                 if (schema != null && StringUtils.isNotBlank(schema.get$ref())) {
                     schemaName = OpenAPIUtil.getSimpleRef(schema.get$ref());
+                    try {
+                        schemaName = URLDecoder.decode(schemaName, StandardCharsets.UTF_8.name());
+                    } catch (UnsupportedEncodingException e) {
+                        LOGGER.error("Could not decoded string: " + schemaName, e);
+                    }
                     schema = schemas.get(schemaName);
                 }
                 final CodegenContent codegenContent = new CodegenContent(contentType);
@@ -2133,31 +2179,6 @@ public CodegenOperation fromOperation(String path, String httpMethod, Operation
                     param = getParameterFromRef(param.get$ref(), openAPI);
                 }
                 CodegenParameter codegenParameter = fromParameter(param, imports);
-                // rename parameters to make sure all of them have unique names
-                if (ensureUniqueParams) {
-                    while (true) {
-                        boolean exists = false;
-                        for (CodegenParameter cp : allParams) {
-                            if (codegenParameter.paramName != null && codegenParameter.paramName.equals(cp.paramName)) {
-                                exists = true;
-                                break;
-                            }
-                        }
-                        if (exists) {
-                            codegenParameter.paramName = generateNextName(codegenParameter.paramName);
-                        } else {
-                            break;
-                        }
-                    }
-                }
-
-                // set isPrimitiveType and baseType for allParams
-                /*if (languageSpecificPrimitives.contains(p.baseType)) {
-                    p.isPrimitiveType = true;
-                    p.baseType = getSwaggerType(p);
-                }*/
-
-
                 allParams.add(codegenParameter);
                 // Issue #2561 (neilotoole) : Moved setting of is<Type>Param flags
                 // from here to fromParameter().
@@ -2170,9 +2191,7 @@ public CodegenOperation fromOperation(String path, String httpMethod, Operation
                 } else if (param instanceof CookieParameter || "cookie".equalsIgnoreCase(param.getIn())) {
                     cookieParams.add(codegenParameter.copy());
                 }
-                if (!codegenParameter.required) {
-                    codegenOperation.getVendorExtensions().put(CodegenConstants.HAS_OPTIONAL_PARAMS_EXT_NAME, Boolean.TRUE);
-                } else {
+                if (codegenParameter.required) {
                     requiredParams.add(codegenParameter.copy());
                 }
             }
@@ -2219,6 +2238,10 @@ public int compare(CodegenParameter one, CodegenParameter another) {
         boolean hasRequiredParams = codegenOperation.requiredParams.size() > 0;
         codegenOperation.getVendorExtensions().put(CodegenConstants.HAS_REQUIRED_PARAMS_EXT_NAME, hasRequiredParams);
 
+        boolean hasOptionalParams = codegenOperation.allParams.stream()
+                .anyMatch(codegenParameter -> !codegenParameter.required);
+        codegenOperation.getVendorExtensions().put(CodegenConstants.HAS_OPTIONAL_PARAMS_EXT_NAME, hasOptionalParams);
+
         // set Restful Flag
         codegenOperation.getVendorExtensions().put(CodegenConstants.IS_RESTFUL_SHOW_EXT_NAME, codegenOperation.getIsRestfulShow());
         codegenOperation.getVendorExtensions().put(CodegenConstants.IS_RESTFUL_INDEX_EXT_NAME, codegenOperation.getIsRestfulIndex());
@@ -4216,6 +4239,10 @@ protected void configuresParameterForMediaType(CodegenOperation codegenOperation
         }
         this.addCodegenContentParemeters(codegenOperation, codegenContents);
         for (CodegenContent content : codegenContents) {
+            if (ensureUniqueParams) {
+                ensureUniqueParameters(content.getParameters());
+            }
+
             Collections.sort(content.getParameters(), (CodegenParameter one, CodegenParameter another) -> {
                     if (one.required == another.required){
                         return 0;
@@ -4250,6 +4277,20 @@ protected void addCodegenContentParemeters(CodegenOperation codegenOperation, Li
         }
     }
 
+    protected void ensureUniqueParameters(List<CodegenParameter> codegenParameters) {
+        if (codegenParameters == null || codegenParameters.isEmpty()) {
+            return;
+        }
+        for (CodegenParameter codegenParameter : codegenParameters) {
+            long count = codegenParameters.stream()
+                    .filter(codegenParam -> codegenParam.paramName.equals(codegenParameter.paramName))
+                    .count();
+            if (count > 1l) {
+                codegenParameter.paramName = generateNextName(codegenParameter.paramName);
+            }
+        }
+    }
+
     protected void setParameterNullable(CodegenParameter parameter, CodegenProperty property) {
         parameter.nullable = property.nullable;
     }

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

@@ -17,6 +17,7 @@
 
 public class SchemaHandler implements ISchemaHandler {
 
+    public static final String ALL_OF_PREFFIX = "AllOf";
     public static final String ONE_OF_PREFFIX = "OneOf";
     public static final String ANY_OF_PREFFIX = "AnyOf";
     public static final String ARRAY_ITEMS_SUFFIX = "Items";
@@ -99,7 +100,13 @@ protected CodegenModel processComposedSchema(String name, ComposedSchema compose
     }
 
     protected CodegenModel processComposedSchema(String codegenModelName, CodegenProperty codegenProperty, ComposedSchema composedSchema, Map<String, CodegenModel> allModels) {
-        List<Schema> schemas = composedSchema.getOneOf();
+        List<Schema> schemas = composedSchema.getAllOf();
+        if (schemas != null && !schemas.isEmpty()) {
+            final CodegenModel composedModel = codegenConfig.fromModel(ALL_OF_PREFFIX + codegenModelName, composedSchema);
+            this.updatePropertyDataType(codegenProperty, composedModel);
+            return composedModel;
+        }
+        schemas = composedSchema.getOneOf();
         CodegenModel composedModel = this.createComposedModel(ONE_OF_PREFFIX + codegenModelName, schemas);
         if (composedModel == null) {
             schemas = composedSchema.getAnyOf();
@@ -109,17 +116,17 @@ protected CodegenModel processComposedSchema(String codegenModelName, CodegenPro
             }
         }
         this.addInterfaces(schemas, composedModel, allModels);
-        codegenProperty.datatype = composedModel.getClassname();
-        codegenProperty.datatypeWithEnum = composedModel.getClassname();
-        codegenProperty.baseType = composedModel.getClassname();
-        codegenProperty.complexType = composedModel.getClassname();
+        this.updatePropertyDataType(codegenProperty, composedModel);
         return composedModel;
     }
 
     protected CodegenModel processArrayItemSchema(CodegenModel codegenModel, ArraySchema arraySchema, Map<String, CodegenModel> allModels) {
         final Schema itemsSchema = arraySchema.getItems();
         if (itemsSchema instanceof ComposedSchema) {
             final CodegenModel composedModel = this.processComposedSchema(codegenModel.name + ARRAY_ITEMS_SUFFIX, (ComposedSchema) itemsSchema, allModels);
+            if (composedModel == null) {
+                return null;
+            }
             this.updateArrayModel(codegenModel, composedModel.name, arraySchema);
             return composedModel;
         }
@@ -221,4 +228,11 @@ protected void updateArrayModel(CodegenModel codegenModel, String schemaName, Ar
 
         arraySchema.setItems(items);
     }
+
+    private void updatePropertyDataType(CodegenProperty codegenProperty, CodegenModel composedModel) {
+        codegenProperty.datatype = composedModel.getClassname();
+        codegenProperty.datatypeWithEnum = composedModel.getClassname();
+        codegenProperty.baseType = composedModel.getClassname();
+        codegenProperty.complexType = composedModel.getClassname();
+    }
 }

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

@@ -8,7 +8,6 @@
 import io.swagger.codegen.v3.CodegenModel;
 import io.swagger.codegen.v3.CodegenOperation;
 import io.swagger.codegen.v3.CodegenProperty;
-import io.swagger.codegen.v3.ISchemaHandler;
 import io.swagger.codegen.v3.generators.DefaultCodegenConfig;
 import io.swagger.codegen.v3.generators.handlebars.csharp.CsharpHelper;
 import io.swagger.codegen.v3.generators.handlebars.lambda.CamelCaseLambda;
@@ -536,6 +535,7 @@ public void updateCodegenPropertyEnum(CodegenProperty var) {
     public Map<String, Object> postProcessOperations(Map<String, Object> objs) {
         super.postProcessOperations(objs);
         if (objs != null) {
+            boolean hasAuthMethods = false;
             Map<String, Object> operations = (Map<String, Object>) objs.get("operations");
             if (operations != null) {
                 List<CodegenOperation> ops = (List<CodegenOperation>) operations.get("operation");
@@ -584,8 +584,12 @@ public Map<String, Object> postProcessOperations(Map<String, Object> objs) {
                     }
 
                     processOperation(operation);
+                    if (getBooleanValue(operation, CodegenConstants.HAS_AUTH_METHODS_EXT_NAME)) {
+                        hasAuthMethods = true;
+                    }
                 }
             }
+            objs.put("hasAuthMethods", hasAuthMethods);
         }
 
         return objs;