Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

package org.openapitools.codegen.languages;

import com.fasterxml.jackson.databind.node.ArrayNode;
import com.google.common.collect.Iterables;
import com.samskivert.mustache.Mustache;
import io.swagger.v3.oas.models.media.Schema;
Expand Down Expand Up @@ -440,6 +441,17 @@ public String toDefaultValue(Schema p) {
return null;
}

if (ModelUtils.isArraySchema(p)) {
StringJoiner joinedDefaultValues = new StringJoiner(", ");
Object defaultValues = p.getDefault();
if (defaultValues instanceof ArrayNode) {
for (var value : (ArrayNode) defaultValues) {
joinedDefaultValues.add(value.toString());
}
return "{" + joinedDefaultValues + "}";
}
}

return super.toDefaultValue(p);
}

Expand Down
12 changes: 10 additions & 2 deletions modules/openapi-generator/src/main/resources/go/api.mustache
Original file line number Diff line number Diff line change
Expand Up @@ -217,8 +217,16 @@ func (a *{{{classname}}}Service) {{nickname}}Execute(r {{#structPrefix}}{{&class
parameterAddToHeaderOrQuery(localVarQueryParams, "{{{baseName}}}", r.{{paramName}}, "{{style}}", "{{collectionFormat}}")
{{/isCollectionFormatMulti}}
{{#defaultValue}}} else {
var defaultValue {{{dataType}}} = {{{.}}}
r.{{paramName}} = &defaultValue
{{#isArray}}
var defaultValue {{{dataType}}} = {{{dataType}}}{{{.}}}
parameterAddToHeaderOrQuery(localVarQueryParams, "{{{baseName}}}", defaultValue, "{{style}}", "{{collectionFormat}}")
r.{{paramName}} = &defaultValue
{{/isArray}}
{{^isArray}}
var defaultValue {{{dataType}}} = {{{.}}}
parameterAddToHeaderOrQuery(localVarQueryParams, "{{{baseName}}}", defaultValue, "{{style}}", "{{collectionFormat}}")
r.{{paramName}} = &defaultValue
{{/isArray}}
{{/defaultValue}}}
{{/required}}
{{/queryParams}}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -418,4 +418,24 @@ public void testXmlOptionsBeingUsed() throws IOException {

TestUtils.assertFileContains(Paths.get(output + "/model_pet.go"), "tags>tag");
}

@Test
public void testArrayDefaultValue() throws IOException {
File output = Files.createTempDirectory("test").toFile();
output.deleteOnExit();

final CodegenConfigurator configurator = new CodegenConfigurator()
.setGeneratorName("go")
.setInputSpec("src/test/resources/3_1/issue_21077.yaml")
.setOutputDir(output.getAbsolutePath().replace("\\", "/"));

DefaultGenerator generator = new DefaultGenerator();
List<File> files = generator.opts(configurator.toClientOptInput()).generate();
files.forEach(File::deleteOnExit);
Path apiPath = Paths.get(output + "/api_default.go");
String defaultArrayString = "var defaultValue []interface{} = []interface{}{\"test1\", \"test2\", 1}";
String defaultValueString = "var defaultValue string = \"test3\"";
TestUtils.assertFileContains(apiPath, defaultArrayString);
TestUtils.assertFileContains(apiPath, defaultValueString);
}
}
29 changes: 29 additions & 0 deletions modules/openapi-generator/src/test/resources/3_1/issue_21077.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
openapi: 3.1.0

info:
title: Test
version: "1.0"

paths:
/a:
post:
summary: Test
requestBody:
content:
application/json:
schema:
type: string
parameters:
- name: "arrayparam"
in: query
schema:
type: array
default: ["test1", "test2", 1]
- name: "stringparam"
in: query
schema:
type: string
default: "test3"
responses:
200:
description: Ok
8 changes: 4 additions & 4 deletions samples/client/echo_api/go-external-refs/docs/DefaultValue.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@

Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
**ArrayStringEnumRefDefault** | Pointer to [**[]StringEnumRef**](StringEnumRef.md) | | [optional] [default to ["success","failure"]]
**ArrayStringEnumDefault** | Pointer to **[]string** | | [optional] [default to ["success","failure"]]
**ArrayStringDefault** | Pointer to **[]string** | | [optional] [default to ["failure","skipped"]]
**ArrayIntegerDefault** | Pointer to **[]int32** | | [optional] [default to [1,3]]
**ArrayStringEnumRefDefault** | Pointer to [**[]StringEnumRef**](StringEnumRef.md) | | [optional] [default to {"success", "failure"}]
**ArrayStringEnumDefault** | Pointer to **[]string** | | [optional] [default to {"success", "failure"}]
**ArrayStringDefault** | Pointer to **[]string** | | [optional] [default to {"failure", "skipped"}]
**ArrayIntegerDefault** | Pointer to **[]int32** | | [optional] [default to {1, 3}]
**ArrayString** | Pointer to **[]string** | | [optional]
**ArrayStringNullable** | Pointer to **[]string** | | [optional]
**ArrayStringExtensionNullable** | Pointer to **[]string** | | [optional]
Expand Down
2 changes: 1 addition & 1 deletion samples/client/echo_api/go-external-refs/docs/Query.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
**Id** | Pointer to **int64** | Query | [optional]
**Outcomes** | Pointer to **[]string** | | [optional] [default to ["SUCCESS","FAILURE"]]
**Outcomes** | Pointer to **[]string** | | [optional] [default to {"SUCCESS", "FAILURE"}]

## Methods

Expand Down
8 changes: 4 additions & 4 deletions samples/client/echo_api/go/docs/DefaultValue.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@

Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
**ArrayStringEnumRefDefault** | Pointer to [**[]StringEnumRef**](StringEnumRef.md) | | [optional] [default to ["success","failure"]]
**ArrayStringEnumDefault** | Pointer to **[]string** | | [optional] [default to ["success","failure"]]
**ArrayStringDefault** | Pointer to **[]string** | | [optional] [default to ["failure","skipped"]]
**ArrayIntegerDefault** | Pointer to **[]int32** | | [optional] [default to [1,3]]
**ArrayStringEnumRefDefault** | Pointer to [**[]StringEnumRef**](StringEnumRef.md) | | [optional] [default to {"success", "failure"}]
**ArrayStringEnumDefault** | Pointer to **[]string** | | [optional] [default to {"success", "failure"}]
**ArrayStringDefault** | Pointer to **[]string** | | [optional] [default to {"failure", "skipped"}]
**ArrayIntegerDefault** | Pointer to **[]int32** | | [optional] [default to {1, 3}]
**ArrayString** | Pointer to **[]string** | | [optional]
**ArrayStringNullable** | Pointer to **[]string** | | [optional]
**ArrayStringExtensionNullable** | Pointer to **[]string** | | [optional]
Expand Down
2 changes: 1 addition & 1 deletion samples/client/echo_api/go/docs/Query.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
**Id** | Pointer to **int64** | Query | [optional]
**Outcomes** | Pointer to **[]string** | | [optional] [default to ["SUCCESS","FAILURE"]]
**Outcomes** | Pointer to **[]string** | | [optional] [default to {"SUCCESS", "FAILURE"}]

## Methods

Expand Down
5 changes: 3 additions & 2 deletions samples/client/petstore/go/go-petstore/api_fake.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions samples/openapi3/client/petstore/go/go-petstore/api_fake.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading