Skip to content

Commit 0e01283

Browse files
kuFEARkuFEAR
committed
Merge remote-tracking branch 'base_origin/master' into kotlin_client_fix_list_and_fix_retrofit_path
# Conflicts: # samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/models/Pet.kt
2 parents 5b871fe + 2c37217 commit 0e01283

File tree

88 files changed

+346
-191
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

88 files changed

+346
-191
lines changed

‎bin/openapi3/elm.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,6 @@ fi
2727

2828
# if you've executed sbt assembly previously it will use that instead.
2929
export JAVA_OPTS="${JAVA_OPTS} -Xmx1024M -DloggerPath=conf/log4j.properties"
30-
ags="generate -i modules/openapi-generator/src/test/resources/3_0/elm.yaml -g elm -t modules/openapi-generator/src/main/resources/elm -o samples/openapi3/client/elm --skip-validate-spec $@"
30+
ags="generate -i modules/openapi-generator/src/test/resources/3_0/elm.yaml -g elm -t modules/openapi-generator/src/main/resources/elm -o samples/openapi3/client/elm $@"
3131

3232
java $JAVA_OPTS -jar $executable $ags

‎docs/generators/kotlin-spring.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ sidebar_label: kotlin-spring
3333
|swaggerAnnotations|generate swagger annotations to go alongside controllers and models| |false|
3434
|title|server title name or client service name| |OpenAPI Kotlin Spring|
3535
|useBeanValidation|Use BeanValidation API annotations to validate data types| |true|
36+
|useTags|Whether to use tags for creating interface and controller class names| |false|
3637

3738
## IMPORT MAPPING
3839

‎modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -25,23 +25,7 @@
2525
import com.samskivert.mustache.Mustache;
2626
import com.samskivert.mustache.Mustache.Compiler;
2727
import com.samskivert.mustache.Mustache.Lambda;
28-
import io.swagger.v3.core.util.Json;
29-
import io.swagger.v3.oas.models.OpenAPI;
30-
import io.swagger.v3.oas.models.Operation;
31-
import io.swagger.v3.oas.models.PathItem;
32-
import io.swagger.v3.oas.models.callbacks.Callback;
33-
import io.swagger.v3.oas.models.examples.Example;
34-
import io.swagger.v3.oas.models.headers.Header;
35-
import io.swagger.v3.oas.models.media.*;
36-
import io.swagger.v3.oas.models.parameters.*;
37-
import io.swagger.v3.oas.models.responses.ApiResponse;
38-
import io.swagger.v3.oas.models.responses.ApiResponses;
39-
import io.swagger.v3.oas.models.security.OAuthFlow;
40-
import io.swagger.v3.oas.models.security.OAuthFlows;
41-
import io.swagger.v3.oas.models.security.SecurityScheme;
42-
import io.swagger.v3.oas.models.servers.Server;
43-
import io.swagger.v3.oas.models.servers.ServerVariable;
44-
import io.swagger.v3.parser.util.SchemaTypeUtil;
28+
4529
import org.apache.commons.lang3.ObjectUtils;
4630
import org.apache.commons.lang3.StringEscapeUtils;
4731
import org.apache.commons.lang3.StringUtils;
@@ -59,7 +43,6 @@
5943
import org.openapitools.codegen.templating.mustache.*;
6044
import org.openapitools.codegen.utils.ModelUtils;
6145
import org.openapitools.codegen.utils.OneOfImplementorAdditionalData;
62-
import org.openapitools.codegen.utils.SemVer;
6346
import org.slf4j.Logger;
6447
import org.slf4j.LoggerFactory;
6548

@@ -73,6 +56,24 @@
7356
import java.util.stream.Collectors;
7457
import java.util.stream.Stream;
7558

59+
import io.swagger.v3.core.util.Json;
60+
import io.swagger.v3.oas.models.OpenAPI;
61+
import io.swagger.v3.oas.models.Operation;
62+
import io.swagger.v3.oas.models.PathItem;
63+
import io.swagger.v3.oas.models.callbacks.Callback;
64+
import io.swagger.v3.oas.models.examples.Example;
65+
import io.swagger.v3.oas.models.headers.Header;
66+
import io.swagger.v3.oas.models.media.*;
67+
import io.swagger.v3.oas.models.parameters.*;
68+
import io.swagger.v3.oas.models.responses.ApiResponse;
69+
import io.swagger.v3.oas.models.responses.ApiResponses;
70+
import io.swagger.v3.oas.models.security.OAuthFlow;
71+
import io.swagger.v3.oas.models.security.OAuthFlows;
72+
import io.swagger.v3.oas.models.security.SecurityScheme;
73+
import io.swagger.v3.oas.models.servers.Server;
74+
import io.swagger.v3.oas.models.servers.ServerVariable;
75+
import io.swagger.v3.parser.util.SchemaTypeUtil;
76+
7677
import static org.openapitools.codegen.utils.OnceLogger.once;
7778
import static org.openapitools.codegen.utils.StringUtils.*;
7879

@@ -5594,9 +5595,9 @@ protected String getCollectionFormat(Parameter parameter) {
55945595
} else if (Parameter.StyleEnum.SIMPLE.equals(parameter.getStyle())) {
55955596
return "csv";
55965597
} else if (Parameter.StyleEnum.PIPEDELIMITED.equals(parameter.getStyle())) {
5597-
return "pipe";
5598+
return "pipes";
55985599
} else if (Parameter.StyleEnum.SPACEDELIMITED.equals(parameter.getStyle())) {
5599-
return "space";
5600+
return "ssv";
56005601
} else {
56015602
return null;
56025603
}

‎modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinSpringServerCodegen.java

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,9 @@
1818

1919
import com.google.common.collect.ImmutableMap.Builder;
2020
import com.samskivert.mustache.Mustache;
21-
import com.samskivert.mustache.Template;
2221
import com.samskivert.mustache.Mustache.Lambda;
22+
import com.samskivert.mustache.Template;
2323

24-
import io.swagger.v3.oas.models.OpenAPI;
25-
import io.swagger.v3.oas.models.Operation;
26-
import io.swagger.v3.oas.models.media.Schema;
2724
import org.openapitools.codegen.*;
2825
import org.openapitools.codegen.languages.features.BeanValidationFeatures;
2926
import org.openapitools.codegen.meta.features.*;
@@ -37,7 +34,9 @@
3734
import java.net.URL;
3835
import java.util.*;
3936
import java.util.regex.Matcher;
40-
import java.util.stream.Collectors;
37+
38+
import io.swagger.v3.oas.models.OpenAPI;
39+
import io.swagger.v3.oas.models.Operation;
4140

4241
import static org.openapitools.codegen.utils.StringUtils.camelize;
4342

@@ -66,6 +65,7 @@ public class KotlinSpringServerCodegen extends AbstractKotlinCodegen
6665
public static final String REACTIVE = "reactive";
6766
public static final String INTERFACE_ONLY = "interfaceOnly";
6867
public static final String DELEGATE_PATTERN = "delegatePattern";
68+
public static final String USE_TAGS = "useTags";
6969

7070
private String basePackage;
7171
private String invokerPackage;
@@ -81,6 +81,7 @@ public class KotlinSpringServerCodegen extends AbstractKotlinCodegen
8181
private boolean reactive = false;
8282
private boolean interfaceOnly = false;
8383
private boolean delegatePattern = false;
84+
protected boolean useTags = false;
8485

8586
public KotlinSpringServerCodegen() {
8687
super();
@@ -152,6 +153,7 @@ public KotlinSpringServerCodegen() {
152153
addSwitch(REACTIVE, "use coroutines for reactive behavior", reactive);
153154
addSwitch(INTERFACE_ONLY, "Whether to generate only API interface stubs without the server files.", interfaceOnly);
154155
addSwitch(DELEGATE_PATTERN, "Whether to generate the server files using the delegate pattern", delegatePattern);
156+
addSwitch(USE_TAGS, "Whether to use tags for creating interface and controller class names", useTags);
155157
supportedLibraries.put(SPRING_BOOT, "Spring-boot Server application.");
156158
setLibrary(SPRING_BOOT);
157159

@@ -245,6 +247,10 @@ public void setDelegatePattern(boolean delegatePattern) {
245247
this.delegatePattern = delegatePattern;
246248
}
247249

250+
public void setUseTags(boolean useTags) {
251+
this.useTags = useTags;
252+
}
253+
248254
@Override
249255
public void setUseBeanValidation(boolean useBeanValidation) {
250256
this.useBeanValidation = useBeanValidation;
@@ -369,6 +375,10 @@ public void processOpts() {
369375
}
370376
}
371377

378+
if (additionalProperties.containsKey(USE_TAGS)) {
379+
this.setUseTags(Boolean.parseBoolean(additionalProperties.get(USE_TAGS).toString()));
380+
}
381+
372382
modelTemplateFiles.put("model.mustache", ".kt");
373383

374384
if (!this.interfaceOnly && this.delegatePattern) {
@@ -440,7 +450,7 @@ protected Builder<String, Lambda> addMustacheLambdas() {
440450

441451
@Override
442452
public void addOperationToGroup(String tag, String resourcePath, Operation operation, CodegenOperation co, Map<String, List<CodegenOperation>> operations) {
443-
if (library.equals(SPRING_BOOT) && this.delegatePattern) {
453+
if (library.equals(SPRING_BOOT) && !useTags) {
444454
String basePath = resourcePath;
445455
if (basePath.startsWith("/")) {
446456
basePath = basePath.substring(1);

‎modules/openapi-generator/src/main/resources/cpp-pistache-server/api-source.mustache

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,9 @@ void {{classname}}::{{operationIdSnakeCase}}_handler(const Pistache::Rest::Reque
8888
//send a 400 error
8989
response.send(Pistache::Http::Code::Bad_Request, e.what());
9090
return;
91+
} catch (Pistache::Http::HttpError &e) {
92+
response.send(static_cast<Pistache::Http::Code>(e.code()), e.what());
93+
return;
9194
} catch (std::exception &e) {
9295
//send a 500 error
9396
response.send(Pistache::Http::Code::Internal_Server_Error, e.what());

‎modules/openapi-generator/src/main/resources/kotlin-client/data_class_opt_var.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
@SerializedName("{{{vendorExtensions.x-base-name-literal}}}")
1010
{{/gson}}
1111
{{#jackson}}
12-
@JsonProperty("{{{vendorExtensions.x-base-name-literal}}}")
12+
@field:JsonProperty("{{{vendorExtensions.x-base-name-literal}}}")
1313
{{/jackson}}
1414
{{/multiplatform}}
1515
{{#deprecated}}

‎modules/openapi-generator/src/main/resources/kotlin-client/data_class_req_var.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
@SerializedName("{{{vendorExtensions.x-base-name-literal}}}")
1010
{{/gson}}
1111
{{#jackson}}
12-
@JsonProperty("{{{vendorExtensions.x-base-name-literal}}}")
12+
@field:JsonProperty("{{{vendorExtensions.x-base-name-literal}}}")
1313
{{/jackson}}
1414
{{/multiplatform}}
1515
{{#deprecated}}

‎modules/openapi-generator/src/main/resources/kotlin-spring/dataClassOptVar.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
{{^isReadOnly}}@get:NotNull{{/isReadOnly}} {{/required}}{{>beanValidationModel}}{{/useBeanValidation}}{{#swaggerAnnotations}}
33
@ApiModelProperty({{#example}}example = "{{{example}}}", {{/example}}{{#required}}required = {{required}}, {{/required}}{{#isReadOnly}}readOnly = {{{isReadOnly}}}, {{/isReadOnly}}value = "{{{description}}}"){{/swaggerAnnotations}}{{#deprecated}}
44
@Deprecated(message = ""){{/deprecated}}
5-
@JsonProperty("{{{baseName}}}"){{#isInherited}} override{{/isInherited}} {{>modelMutable}} {{{name}}}: {{#isEnum}}{{#isListContainer}}{{baseType}}<{{/isListContainer}}{{classname}}.{{nameInCamelCase}}{{#isListContainer}}>{{/isListContainer}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{/isEnum}}? = {{#defaultvalue}}{{defaultvalue}}{{/defaultvalue}}{{^defaultvalue}}null{{/defaultvalue}}
5+
@field:JsonProperty("{{{baseName}}}"){{#isInherited}} override{{/isInherited}} {{>modelMutable}} {{{name}}}: {{#isEnum}}{{#isListContainer}}{{baseType}}<{{/isListContainer}}{{classname}}.{{nameInCamelCase}}{{#isListContainer}}>{{/isListContainer}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{/isEnum}}? = {{#defaultvalue}}{{defaultvalue}}{{/defaultvalue}}{{^defaultvalue}}null{{/defaultvalue}}

‎modules/openapi-generator/src/main/resources/kotlin-spring/dataClassReqVar.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{{#useBeanValidation}}{{#required}}
22
{{^isReadOnly}}@get:NotNull{{/isReadOnly}} {{/required}}{{>beanValidationModel}}{{/useBeanValidation}}{{#swaggerAnnotations}}
33
@ApiModelProperty({{#example}}example = "{{{example}}}", {{/example}}{{#required}}required = {{required}}, {{/required}}{{#isReadOnly}}readOnly = {{{isReadOnly}}}, {{/isReadOnly}}value = "{{{description}}}"){{/swaggerAnnotations}}
4-
@JsonProperty("{{{baseName}}}"){{#isInherited}} override{{/isInherited}} {{>modelMutable}} {{{name}}}: {{#isEnum}}{{#isListContainer}}{{baseType}}<{{/isListContainer}}{{classname}}.{{nameInCamelCase}}{{#isListContainer}}>{{/isListContainer}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{/isEnum}}{{#isReadOnly}}? = {{#defaultvalue}}{{defaultvalue}}{{/defaultvalue}}{{^defaultvalue}}null{{/defaultvalue}}{{/isReadOnly}}
4+
@field:JsonProperty("{{{baseName}}}"){{#isInherited}} override{{/isInherited}} {{>modelMutable}} {{{name}}}: {{#isEnum}}{{#isListContainer}}{{baseType}}<{{/isListContainer}}{{classname}}.{{nameInCamelCase}}{{#isListContainer}}>{{/isListContainer}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{/isEnum}}{{#isReadOnly}}? = {{#defaultvalue}}{{defaultvalue}}{{/defaultvalue}}{{^defaultvalue}}null{{/defaultvalue}}{{/isReadOnly}}

‎modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/spring/KotlinSpringServerCodegenTest.java

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package org.openapitools.codegen.kotlin.spring;
22

33
import com.fasterxml.jackson.annotation.JsonProperty;
4+
import com.google.common.collect.testing.Helpers;
45
import io.swagger.parser.OpenAPIParser;
56
import io.swagger.v3.oas.models.OpenAPI;
67
import io.swagger.v3.oas.models.info.Info;
@@ -21,6 +22,7 @@
2122
import java.io.File;
2223
import java.nio.file.Files;
2324
import java.util.Collections;
25+
import java.util.List;
2426

2527
public class KotlinSpringServerCodegenTest {
2628

@@ -183,4 +185,28 @@ public void testDelegatePattern() {
183185

184186
Assert.assertTrue(codegen.supportingFiles().stream().anyMatch(supportingFile -> supportingFile.templateFile.equals("apiUtil.mustache")));
185187
}
188+
189+
@Test(description = "test delegate with tags")
190+
public void delegateWithTags() throws Exception {
191+
File output = Files.createTempDirectory("test").toFile().getCanonicalFile(); //may be move to /build
192+
KotlinSpringServerCodegen codegen = new KotlinSpringServerCodegen();
193+
codegen.setOutputDir(output.getAbsolutePath());
194+
codegen.additionalProperties().put(KotlinSpringServerCodegen.DELEGATE_PATTERN, true);
195+
codegen.additionalProperties().put(KotlinSpringServerCodegen.USE_TAGS, true);
196+
197+
List<File> files = new DefaultGenerator()
198+
.opts(
199+
new ClientOptInput()
200+
.openAPI(TestUtils.parseSpec("src/test/resources/3_0/kotlin/issue5497-use-tags-kotlin.yaml"))
201+
.config(codegen)
202+
)
203+
.generate();
204+
205+
Helpers.assertContainsAllOf(files,
206+
new File(output, "src/main/kotlin/org/openapitools/api/TestV1ApiController.kt"),
207+
new File(output, "src/main/kotlin/org/openapitools/api/TestV1ApiDelegate.kt"),
208+
new File(output, "src/main/kotlin/org/openapitools/api/TestV2ApiController.kt"),
209+
new File(output, "src/main/kotlin/org/openapitools/api/TestV2ApiDelegate.kt")
210+
);
211+
}
186212
}

‎modules/openapi-generator/src/test/resources/3_0/elm.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,14 +64,17 @@ paths:
6464
parameters:
6565
- name: string
6666
in: path
67+
required: true
6768
schema:
6869
type: string
6970
- name: integer
7071
in: path
72+
required: true
7173
schema:
7274
type: integer
7375
- name: enumeration
7476
in: path
77+
required: true
7578
schema:
7679
type: string
7780
enum: [a, b, c]

‎modules/openapi-generator/src/test/resources/3_0/kotlin/issue5497-use-tags-kotlin.yaml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
openapi: "3.0.1"
2+
info:
3+
title: test
4+
version: "1.0"
5+
6+
paths:
7+
8+
/api/v1/test:
9+
get:
10+
tags: [Test v1]
11+
operationId: test1
12+
responses:
13+
200:
14+
description: OK
15+
16+
/api/v2/test:
17+
get:
18+
tags: [Test v2]
19+
operationId: test2
20+
responses:
21+
200:
22+
description: OK

‎samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Api/FakeApi.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2671,7 +2671,7 @@ public Org.OpenAPITools.Client.ApiResponse<Object> TestQueryParameterCollectionF
26712671

26722672
localVarRequestOptions.QueryParameters.Add(Org.OpenAPITools.Client.ClientUtils.ParameterToMultiMap("csv", "pipe", pipe));
26732673
localVarRequestOptions.QueryParameters.Add(Org.OpenAPITools.Client.ClientUtils.ParameterToMultiMap("csv", "ioutil", ioutil));
2674-
localVarRequestOptions.QueryParameters.Add(Org.OpenAPITools.Client.ClientUtils.ParameterToMultiMap("space", "http", http));
2674+
localVarRequestOptions.QueryParameters.Add(Org.OpenAPITools.Client.ClientUtils.ParameterToMultiMap("ssv", "http", http));
26752675
localVarRequestOptions.QueryParameters.Add(Org.OpenAPITools.Client.ClientUtils.ParameterToMultiMap("csv", "url", url));
26762676
localVarRequestOptions.QueryParameters.Add(Org.OpenAPITools.Client.ClientUtils.ParameterToMultiMap("multi", "context", context));
26772677

@@ -2754,7 +2754,7 @@ public async System.Threading.Tasks.Task TestQueryParameterCollectionFormatAsync
27542754

27552755
localVarRequestOptions.QueryParameters.Add(Org.OpenAPITools.Client.ClientUtils.ParameterToMultiMap("csv", "pipe", pipe));
27562756
localVarRequestOptions.QueryParameters.Add(Org.OpenAPITools.Client.ClientUtils.ParameterToMultiMap("csv", "ioutil", ioutil));
2757-
localVarRequestOptions.QueryParameters.Add(Org.OpenAPITools.Client.ClientUtils.ParameterToMultiMap("space", "http", http));
2757+
localVarRequestOptions.QueryParameters.Add(Org.OpenAPITools.Client.ClientUtils.ParameterToMultiMap("ssv", "http", http));
27582758
localVarRequestOptions.QueryParameters.Add(Org.OpenAPITools.Client.ClientUtils.ParameterToMultiMap("csv", "url", url));
27592759
localVarRequestOptions.QueryParameters.Add(Org.OpenAPITools.Client.ClientUtils.ParameterToMultiMap("multi", "context", context));
27602760

‎samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Api/FakeApi.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2671,7 +2671,7 @@ public Org.OpenAPITools.Client.ApiResponse<Object> TestQueryParameterCollectionF
26712671

26722672
localVarRequestOptions.QueryParameters.Add(Org.OpenAPITools.Client.ClientUtils.ParameterToMultiMap("csv", "pipe", pipe));
26732673
localVarRequestOptions.QueryParameters.Add(Org.OpenAPITools.Client.ClientUtils.ParameterToMultiMap("csv", "ioutil", ioutil));
2674-
localVarRequestOptions.QueryParameters.Add(Org.OpenAPITools.Client.ClientUtils.ParameterToMultiMap("space", "http", http));
2674+
localVarRequestOptions.QueryParameters.Add(Org.OpenAPITools.Client.ClientUtils.ParameterToMultiMap("ssv", "http", http));
26752675
localVarRequestOptions.QueryParameters.Add(Org.OpenAPITools.Client.ClientUtils.ParameterToMultiMap("csv", "url", url));
26762676
localVarRequestOptions.QueryParameters.Add(Org.OpenAPITools.Client.ClientUtils.ParameterToMultiMap("multi", "context", context));
26772677

@@ -2754,7 +2754,7 @@ public async System.Threading.Tasks.Task TestQueryParameterCollectionFormatAsync
27542754

27552755
localVarRequestOptions.QueryParameters.Add(Org.OpenAPITools.Client.ClientUtils.ParameterToMultiMap("csv", "pipe", pipe));
27562756
localVarRequestOptions.QueryParameters.Add(Org.OpenAPITools.Client.ClientUtils.ParameterToMultiMap("csv", "ioutil", ioutil));
2757-
localVarRequestOptions.QueryParameters.Add(Org.OpenAPITools.Client.ClientUtils.ParameterToMultiMap("space", "http", http));
2757+
localVarRequestOptions.QueryParameters.Add(Org.OpenAPITools.Client.ClientUtils.ParameterToMultiMap("ssv", "http", http));
27582758
localVarRequestOptions.QueryParameters.Add(Org.OpenAPITools.Client.ClientUtils.ParameterToMultiMap("csv", "url", url));
27592759
localVarRequestOptions.QueryParameters.Add(Org.OpenAPITools.Client.ClientUtils.ParameterToMultiMap("multi", "context", context));
27602760

‎samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Api/FakeApi.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3004,7 +3004,7 @@ public ApiResponse<Object> TestQueryParameterCollectionFormatWithHttpInfo (List<
30043004

30053005
if (pipe != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("csv", "pipe", pipe)); // query parameter
30063006
if (ioutil != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("csv", "ioutil", ioutil)); // query parameter
3007-
if (http != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("space", "http", http)); // query parameter
3007+
if (http != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("ssv", "http", http)); // query parameter
30083008
if (url != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("csv", "url", url)); // query parameter
30093009
if (context != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("multi", "context", context)); // query parameter
30103010

@@ -3095,7 +3095,7 @@ public ApiResponse<Object> TestQueryParameterCollectionFormatWithHttpInfo (List<
30953095

30963096
if (pipe != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("csv", "pipe", pipe)); // query parameter
30973097
if (ioutil != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("csv", "ioutil", ioutil)); // query parameter
3098-
if (http != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("space", "http", http)); // query parameter
3098+
if (http != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("ssv", "http", http)); // query parameter
30993099
if (url != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("csv", "url", url)); // query parameter
31003100
if (context != null) localVarQueryParams.AddRange(this.Configuration.ApiClient.ParameterToKeyValuePairs("multi", "context", context)); // query parameter
31013101

‎samples/client/petstore/go-experimental/go-petstore/api_fake.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1710,7 +1710,7 @@ func (r apiTestQueryParameterCollectionFormatRequest) Execute() (*_nethttp.Respo
17101710

17111711
localVarQueryParams.Add("pipe", parameterToString(*r.pipe, "csv"))
17121712
localVarQueryParams.Add("ioutil", parameterToString(*r.ioutil, "csv"))
1713-
localVarQueryParams.Add("http", parameterToString(*r.http, "space"))
1713+
localVarQueryParams.Add("http", parameterToString(*r.http, "ssv"))
17141714
localVarQueryParams.Add("url", parameterToString(*r.url, "csv"))
17151715
{
17161716
t := *r.context

0 commit comments

Comments
 (0)