Merge pull request #694 from swagger-api/new_generators_tweaks

HugoMario · web-flow · commit 92b71d309d7d · 2020-06-09T17:13:38.000-05:00
New generators tweaks
diff --git a/pom.xml b/pom.xml
@@ -253,7 +253,7 @@
     </dependencies>
     <properties>
         <swagger-codegen-version>3.0.21-SNAPSHOT</swagger-codegen-version>
-        <swagger-parser-version>2.0.20</swagger-parser-version>
+        <swagger-parser-version>2.0.21-SNAPSHOT</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>
diff --git a/src/main/java/io/swagger/codegen/v3/generators/DefaultCodegenConfig.java b/src/main/java/io/swagger/codegen/v3/generators/DefaultCodegenConfig.java
@@ -266,13 +266,17 @@ public Map<String, Object> postProcessAllModels(Map<String, Object> processedMod
                 allModels.put(modelName, codegenModel);
             }
         }
+        postProcessAllCodegenModels(allModels);
+        return processedModels;
+    }
+
+    protected void postProcessAllCodegenModels(Map<String, CodegenModel> allModels) {
         if (supportsInheritance) {
             for (String name : allModels.keySet()) {
                 final CodegenModel codegenModel = allModels.get(name);
                 fixUpParentAndInterfaces(codegenModel, allModels);
             }
         }
-        return processedModels;
     }
 
     /**
@@ -2410,6 +2414,9 @@ public CodegenParameter fromParameter(Parameter parameter, Set<String> imports)
                     inner = new StringSchema().description("//TODO automatically added by swagger-codegen");
                     arraySchema.setItems(inner);
 
+                } else if (isObjectSchema(inner)) {
+                    //fixme: codegenParameter.getVendorExtensions().put(CodegenConstants.HAS_INNER_OBJECT_NAME, Boolean.TRUE);
+                    codegenParameter.getVendorExtensions().put("x-has-inner-object", Boolean.TRUE);
                 }
 
                 collectionFormat = getCollectionFormat(parameter);
@@ -2662,6 +2669,9 @@ else if (schema instanceof ArraySchema) {
             if (inner == null) {
                 inner = new StringSchema().description("//TODO automatically added by swagger-codegen");
                 arraySchema.setItems(inner);
+            } else if (isObjectSchema(inner)) {
+                //fixme: codegenParameter.getVendorExtensions().put(CodegenConstants.HAS_INNER_OBJECT_NAME, Boolean.TRUE);
+                codegenParameter.getVendorExtensions().put("x-has-inner-object", Boolean.TRUE);
             }
 
             CodegenProperty codegenProperty = fromProperty("property", schema);
diff --git a/src/main/java/io/swagger/codegen/v3/generators/go/AbstractGoCodegen.java b/src/main/java/io/swagger/codegen/v3/generators/go/AbstractGoCodegen.java
@@ -9,10 +9,12 @@
 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.SchemaHandler;
 import io.swagger.codegen.v3.generators.util.OpenAPIUtil;
 import io.swagger.v3.core.util.Yaml;
 import io.swagger.v3.oas.models.OpenAPI;
 import io.swagger.v3.oas.models.media.ArraySchema;
+import io.swagger.v3.oas.models.media.ComposedSchema;
 import io.swagger.v3.oas.models.media.MapSchema;
 import io.swagger.v3.oas.models.media.Schema;
 import org.apache.commons.lang3.StringUtils;
@@ -90,7 +92,7 @@ public AbstractGoCodegen() {
         typeMapping.put("file", "*os.File");
         // map binary to string as a workaround
         // the correct solution is to use []byte
-        typeMapping.put("binary", "string");
+        typeMapping.put("binary", "*os.File");
         typeMapping.put("ByteArray", "string");
         typeMapping.put("object", "interface{}");
         typeMapping.put("UUID", "string");
@@ -243,12 +245,32 @@ public String getTypeDeclaration(Schema schema) {
         if(schema instanceof ArraySchema) {
             ArraySchema arraySchema = (ArraySchema) schema;
             Schema inner = arraySchema.getItems();
-            return "[]" + getTypeDeclaration(inner);
+            if (inner instanceof ComposedSchema && schema.getExtensions() != null && schema.getExtensions().containsKey("x-schema-name")) {
+                final ComposedSchema composedSchema = (ComposedSchema) inner;
+                final String prefix;
+                if (composedSchema.getAllOf() != null && !composedSchema.getAllOf().isEmpty()) {
+                    prefix = SchemaHandler.ALL_OF_PREFFIX;
+                } else if (composedSchema.getOneOf() != null && !composedSchema.getOneOf().isEmpty()) {
+                    prefix = SchemaHandler.ONE_OF_PREFFIX;
+                } else {
+                    prefix = SchemaHandler.ANY_OF_PREFFIX;
+                }
+                return "[]" + toModelName(prefix + schema.getExtensions().remove("x-schema-name")) + SchemaHandler.ARRAY_ITEMS_SUFFIX;
+            } else {
+                return "[]" + getTypeDeclaration(inner);
+            }
         } else if (schema instanceof MapSchema && hasSchemaProperties(schema)) {
             MapSchema mapSchema = (MapSchema) schema;
             Schema inner = (Schema) mapSchema.getAdditionalProperties();
 
             return getSchemaType(schema) + "[string]" + getTypeDeclaration(inner);
+        } else if (schema.get$ref() != null) {
+            final String simpleRefName = OpenAPIUtil.getSimpleRef(schema.get$ref());
+            final Schema refSchema = OpenAPIUtil.getSchemaFromName(simpleRefName, this.openAPI);
+            if (refSchema != null && (refSchema instanceof ArraySchema || refSchema instanceof MapSchema)) {
+                refSchema.addExtension("x-schema-name", simpleRefName);
+                return getTypeDeclaration(refSchema);
+            }
         }
         // Not using the supertype invocation, because we want to UpperCamelize
         // the type.
@@ -271,7 +293,7 @@ public String getSchemaType(Schema schema) {
 
         if (schema.get$ref() != null) {
             final Schema refSchema = OpenAPIUtil.getSchemaFromName(schemaType, this.openAPI);
-            if (refSchema != null && !isObjectSchema(refSchema)) {
+            if (refSchema != null && !isObjectSchema(refSchema) && refSchema.getEnum() == null) {
                 schemaType = super.getSchemaType(refSchema);
             }
         }
@@ -547,7 +569,7 @@ public CodegenModel fromModel(String name, Schema schema, Map<String, Schema> al
         if (!getBooleanValue(codegenModel, CodegenConstants.IS_ALIAS_EXT_NAME)) {
             boolean isAlias = schema instanceof ArraySchema
                     || schema instanceof MapSchema
-                    || (!isObjectSchema(schema));
+                    || (!isObjectSchema(schema) && schema.getEnum() == null);
 
             codegenModel.getVendorExtensions().put(CodegenConstants.IS_ALIAS_EXT_NAME, isAlias);
         }
diff --git a/src/main/java/io/swagger/codegen/v3/generators/typescript/TypeScriptFetchClientCodegen.java b/src/main/java/io/swagger/codegen/v3/generators/typescript/TypeScriptFetchClientCodegen.java
@@ -3,6 +3,8 @@
 import java.io.File;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.Map;
+import java.util.Set;
 
 import io.swagger.codegen.v3.CliOption;
 import io.swagger.codegen.v3.CodegenConstants;
@@ -15,6 +17,8 @@
 import io.swagger.v3.oas.models.media.MapSchema;
 import io.swagger.v3.oas.models.media.ObjectSchema;
 import io.swagger.v3.oas.models.media.Schema;
+import io.swagger.v3.oas.models.parameters.Parameter;
+import io.swagger.v3.oas.models.parameters.RequestBody;
 import io.swagger.v3.parser.util.SchemaTypeUtil;
 
 import org.apache.commons.lang3.StringUtils;
@@ -116,6 +120,29 @@ public String getTypeDeclaration(Schema propertySchema) {
         }
     }
 
+    @Override
+    public CodegenParameter fromParameter(Parameter parameter, Set<String> imports) {
+        final CodegenParameter codegenParameter = super.fromParameter(parameter, imports);
+        if (parameter.getSchema() != null && isObjectSchema(parameter.getSchema())) {
+            //fixme: codegenParameter.getVendorExtensions().put(CodegenConstants.IS_OBJECT_EXT_NAME, Boolean.TRUE);
+            codegenParameter.getVendorExtensions().put("x-is-object", Boolean.TRUE);
+        }
+        return codegenParameter;
+    }
+
+    @Override
+    public CodegenParameter fromRequestBody(RequestBody body, String name, Schema schema, Map<String, Schema> schemas, Set<String> imports) {
+        final CodegenParameter codegenParameter = super.fromRequestBody(body, name, schema, schemas, imports);
+        if (schema == null) {
+            schema = getSchemaFromBody(body);
+        }
+        if (schema != null && isObjectSchema(schema)) {
+            //fixme: codegenParameter.getVendorExtensions().put(CodegenConstants.IS_OBJECT_EXT_NAME, Boolean.TRUE);
+            codegenParameter.getVendorExtensions().put("x-is-object", Boolean.TRUE);
+        }
+        return codegenParameter;
+    }
+
     @Override
     public String getSchemaType(Schema schema) {
         String swaggerType = super.getSchemaType(schema);
diff --git a/src/main/resources/handlebars/JavaSpring/api.mustache b/src/main/resources/handlebars/JavaSpring/api.mustache
@@ -135,4 +135,5 @@ public interface {{classname}} {
 {{/contents}}
 {{/operation}}
 }
-{{/operations}}
+{{/operations}}
+
diff --git a/src/main/resources/handlebars/go/api.mustache b/src/main/resources/handlebars/go/api.mustache
@@ -34,8 +34,22 @@ type {{classname}}Service service
 */
 {{#hasOptionalParams}}
 
-type {{{classname}}}{{{nickname}}}Opts struct { {{#parameters}}{{^required}}
-{{#isPrimitiveType}}	{{vendorExtensions.x-exportParamName}} optional.{{vendorExtensions.x-optionalDataType}}{{/isPrimitiveType}}{{^isPrimitiveType}}	{{vendorExtensions.x-exportParamName}} optional.Interface{{/isPrimitiveType}}{{/required}}{{/parameters}}
+type {{{classname}}}{{{nickname}}}Opts struct {
+{{#parameters}}
+{{^required}}
+{{#isPrimitiveType}}
+{{#isFile}}
+    {{vendorExtensions.x-exportParamName}} optional.Interface
+{{/isFile}}
+{{^isFile}}
+    {{vendorExtensions.x-exportParamName}} optional.{{vendorExtensions.x-optionalDataType}}
+{{/isFile}}
+{{/isPrimitiveType}}
+{{^isPrimitiveType}}
+    {{vendorExtensions.x-exportParamName}} optional.Interface
+{{/isPrimitiveType}}
+{{/required}}
+{{/parameters}}
 }
 
 {{/hasOptionalParams}}
diff --git a/src/main/resources/handlebars/go/model.mustache b/src/main/resources/handlebars/go/model.mustache
@@ -1,10 +1,16 @@
 {{>partial_header}}
 package {{packageName}}
-{{#models}}{{#imports}}
-import ({{/imports}}{{#imports}}
-	"{{import}}"{{/imports}}{{#imports}}
+{{#models}}
+{{#imports}}
+{{#@first}}
+import (
+{{/@first}}
+	"{{import}}"
+{{#@last}}
 )
-{{/imports}}{{#model}}{{#isEnum}}{{#description}}// {{{classname}}} : {{{description}}}{{/description}}
+{{/@last}}
+{{/imports}}
+{{#model}}{{#isEnum}}{{#description}}// {{{classname}}} : {{{description}}}{{/description}}
 type {{{classname}}} {{^format}}{{dataType}}{{/format}}{{#format}}{{{format}}}{{/format}}
 
 // List of {{{name}}}
diff --git a/src/main/resources/handlebars/typescript-fetch/api_test.mustache b/src/main/resources/handlebars/typescript-fetch/api_test.mustache
@@ -15,12 +15,26 @@ describe("{{classname}}", () => {
   });
 
 {{#operation}}
+{{#contents}}
+{{#@first}}
   test("{{operationId}}", () => {
-    {{#allParams}}
-    const {{{paramName}}}: {{^isPrimitiveType}}api.{{/isPrimitiveType}}{{{dataType}}} = {{>api_test_default_value}}
-    {{/allParams}}
-    return expect(instance.{{operationId}}({{#allParams}}{{{paramName}}}, {{/allParams}}{})).resolves.toBe(null)
+    {{#parameters}}
+    {{#isObject}}
+    const {{{paramName}}}: api.{{{dataType}}} = {{>api_test_default_value}}
+    {{/isObject}}
+    {{^isObject}}
+    {{#hasInnerObject}}
+    const {{{paramName}}}: Array<api.{{{baseType}}}> = {{>api_test_default_value}}
+    {{/hasInnerObject}}
+    {{^hasInnerObject}}
+    const {{{paramName}}}: {{{dataType}}} = {{>api_test_default_value}}
+    {{/hasInnerObject}}
+    {{/isObject}}
+    {{/parameters}}
+    return expect(instance.{{operationId}}({{#parameters}}{{{paramName}}}, {{/parameters}}{})).resolves.toBe(null)
   })
+{{/@first}}
+{{/contents}}
 {{/operation}}
 })
 
diff --git a/src/main/resources/handlebars/typescript-fetch/modelEnum.mustache b/src/main/resources/handlebars/typescript-fetch/modelEnum.mustache
@@ -6,7 +6,7 @@
 export enum {{classname}} {
 {{#allowableValues}}
 {{#enumVars}}
-    {{{name}}} = <any> {{{value}}}{{^-last}},{{/-last}}
+    {{{name}}} = <any> {{{value}}}{{^@last}},{{/@last}}
 {{/enumVars}}
 {{/allowableValues}}
 }

Original file line number	Diff line number	Diff line change
`@@ -266,13 +266,17 @@ public Map<String, Object> postProcessAllModels(Map<String, Object> processedMod`
`266`	`266`	`allModels.put(modelName, codegenModel);`
`267`	`267`	`}`
`268`	`268`	`}`
	`269`	`+ postProcessAllCodegenModels(allModels);`
	`270`	`+ return processedModels;`
	`271`	`+ }`
	`272`	`+`
	`273`	`+ protected void postProcessAllCodegenModels(Map<String, CodegenModel> allModels) {`
`269`	`274`	`if (supportsInheritance) {`
`270`	`275`	`for (String name : allModels.keySet()) {`
`271`	`276`	`final CodegenModel codegenModel = allModels.get(name);`
`272`	`277`	`fixUpParentAndInterfaces(codegenModel, allModels);`
`273`	`278`	`}`
`274`	`279`	`}`
`275`		`- return processedModels;`
`276`	`280`	`}`
`277`	`281`
`278`	`282`	`/**`
`@@ -2410,6 +2414,9 @@ public CodegenParameter fromParameter(Parameter parameter, Set<String> imports)`
`2410`	`2414`	`inner = new StringSchema().description("//TODO automatically added by swagger-codegen");`
`2411`	`2415`	`arraySchema.setItems(inner);`
`2412`	`2416`
	`2417`	`+ } else if (isObjectSchema(inner)) {`
	`2418`	`+ //fixme: codegenParameter.getVendorExtensions().put(CodegenConstants.HAS_INNER_OBJECT_NAME, Boolean.TRUE);`
	`2419`	`+ codegenParameter.getVendorExtensions().put("x-has-inner-object", Boolean.TRUE);`
`2413`	`2420`	`}`
`2414`	`2421`
`2415`	`2422`	`collectionFormat = getCollectionFormat(parameter);`
`@@ -2662,6 +2669,9 @@ else if (schema instanceof ArraySchema) {`
`2662`	`2669`	`if (inner == null) {`
`2663`	`2670`	`inner = new StringSchema().description("//TODO automatically added by swagger-codegen");`
`2664`	`2671`	`arraySchema.setItems(inner);`
	`2672`	`+ } else if (isObjectSchema(inner)) {`
	`2673`	`+ //fixme: codegenParameter.getVendorExtensions().put(CodegenConstants.HAS_INNER_OBJECT_NAME, Boolean.TRUE);`
	`2674`	`+ codegenParameter.getVendorExtensions().put("x-has-inner-object", Boolean.TRUE);`
`2665`	`2675`	`}`
`2666`	`2676`
`2667`	`2677`	`CodegenProperty codegenProperty = fromProperty("property", schema);`
Original file line number	Diff line number	Diff line change
`@@ -135,4 +135,5 @@ public interface {{classname}} {`
`135`	`135`	`{{/contents}}`
`136`	`136`	`{{/operation}}`
`137`	`137`	`}`
`138`		`-{{/operations}}`
	`138`	`+{{/operations}}`
	`139`	`+`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`export enum {{classname}} {`
`7`	`7`	`{{#allowableValues}}`
`8`	`8`	`{{#enumVars}}`
`9`		`- {{{name}}} = <any> {{{value}}}{{^-last}},{{/-last}}`
	`9`	`+ {{{name}}} = <any> {{{value}}}{{^@last}},{{/@last}}`
`10`	`10`	`{{/enumVars}}`
`11`	`11`	`{{/allowableValues}}`
`12`	`12`	`}`