Skip to content

Commit cc58290

Browse files
committed
fixed templates and map binary to file.
1 parent 638408d commit cc58290

File tree

3 files changed

+28
-8
lines changed

3 files changed

+28
-8
lines changed

src/main/java/io/swagger/codegen/v3/generators/go/AbstractGoCodegen.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ public AbstractGoCodegen() {
9292
typeMapping.put("file", "*os.File");
9393
// map binary to string as a workaround
9494
// the correct solution is to use []byte
95-
typeMapping.put("binary", "string");
95+
typeMapping.put("binary", "*os.File");
9696
typeMapping.put("ByteArray", "string");
9797
typeMapping.put("object", "interface{}");
9898
typeMapping.put("UUID", "string");
@@ -255,7 +255,7 @@ public String getTypeDeclaration(Schema schema) {
255255
} else {
256256
prefix = SchemaHandler.ANY_OF_PREFFIX;
257257
}
258-
return "[]" + toModelName(prefix + schema.getExtensions().get("x-schema-name")) + SchemaHandler.ARRAY_ITEMS_SUFFIX;
258+
return "[]" + toModelName(prefix + schema.getExtensions().remove("x-schema-name")) + SchemaHandler.ARRAY_ITEMS_SUFFIX;
259259
} else {
260260
return "[]" + getTypeDeclaration(inner);
261261
}

src/main/resources/handlebars/go/api.mustache

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,22 @@ type {{classname}}Service service
3434
*/
3535
{{#hasOptionalParams}}
3636

37-
type {{{classname}}}{{{nickname}}}Opts struct { {{#parameters}}{{^required}}
38-
{{#isPrimitiveType}} {{vendorExtensions.x-exportParamName}} optional.{{vendorExtensions.x-optionalDataType}}{{/isPrimitiveType}}{{^isPrimitiveType}} {{vendorExtensions.x-exportParamName}} optional.Interface{{/isPrimitiveType}}{{/required}}{{/parameters}}
37+
type {{{classname}}}{{{nickname}}}Opts struct {
38+
{{#parameters}}
39+
{{^required}}
40+
{{#isPrimitiveType}}
41+
{{#isFile}}
42+
{{vendorExtensions.x-exportParamName}} optional.Interface
43+
{{/isFile}}
44+
{{^isFile}}
45+
{{vendorExtensions.x-exportParamName}} optional.{{vendorExtensions.x-optionalDataType}}
46+
{{/isFile}}
47+
{{/isPrimitiveType}}
48+
{{^isPrimitiveType}}
49+
{{vendorExtensions.x-exportParamName}} optional.Interface
50+
{{/isPrimitiveType}}
51+
{{/required}}
52+
{{/parameters}}
3953
}
4054

4155
{{/hasOptionalParams}}

src/main/resources/handlebars/go/model.mustache

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,16 @@
11
{{>partial_header}}
22
package {{packageName}}
3-
{{#models}}{{#imports}}
4-
import ({{/imports}}{{#imports}}
5-
"{{import}}"{{/imports}}{{#imports}}
3+
{{#models}}
4+
{{#imports}}
5+
{{#@first}}
6+
import (
7+
{{/@first}}
8+
"{{import}}"
9+
{{#@last}}
610
)
7-
{{/imports}}{{#model}}{{#isEnum}}{{#description}}// {{{classname}}} : {{{description}}}{{/description}}
11+
{{/@last}}
12+
{{/imports}}
13+
{{#model}}{{#isEnum}}{{#description}}// {{{classname}}} : {{{description}}}{{/description}}
814
type {{{classname}}} {{^format}}{{dataType}}{{/format}}{{#format}}{{{format}}}{{/format}}
915

1016
// List of {{{name}}}

0 commit comments

Comments
 (0)