Skip to content

Commit 5b871fe

Browse files
kuFEARkuFEAR
committed
Fix merge conflict with master
1 parent 93a373d commit 5b871fe

File tree

7 files changed

+277
-277
lines changed

7 files changed

+277
-277
lines changed

‎samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/docs/FakeApi.md

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,21 @@ All URIs are relative to *http://petstore.swagger.io:80/v2*
44

55
Method | HTTP request | Description
66
------------- | ------------- | -------------
7-
[**fakeHealthGet**](FakeApi.md#fakeHealthGet) | **GET** /fake/health | Health check endpoint
8-
[**fakeHttpSignatureTest**](FakeApi.md#fakeHttpSignatureTest) | **GET** /fake/http-signature-test | test http signature authentication
9-
[**fakeOuterBooleanSerialize**](FakeApi.md#fakeOuterBooleanSerialize) | **POST** /fake/outer/boolean |
10-
[**fakeOuterCompositeSerialize**](FakeApi.md#fakeOuterCompositeSerialize) | **POST** /fake/outer/composite |
11-
[**fakeOuterNumberSerialize**](FakeApi.md#fakeOuterNumberSerialize) | **POST** /fake/outer/number |
12-
[**fakeOuterStringSerialize**](FakeApi.md#fakeOuterStringSerialize) | **POST** /fake/outer/string |
13-
[**testBodyWithFileSchema**](FakeApi.md#testBodyWithFileSchema) | **PUT** /fake/body-with-file-schema |
14-
[**testBodyWithQueryParams**](FakeApi.md#testBodyWithQueryParams) | **PUT** /fake/body-with-query-params |
15-
[**testClientModel**](FakeApi.md#testClientModel) | **PATCH** /fake | To test \"client\" model
16-
[**testEndpointParameters**](FakeApi.md#testEndpointParameters) | **POST** /fake | Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트
17-
[**testEnumParameters**](FakeApi.md#testEnumParameters) | **GET** /fake | To test enum parameters
18-
[**testGroupParameters**](FakeApi.md#testGroupParameters) | **DELETE** /fake | Fake endpoint to test group parameters (optional)
19-
[**testInlineAdditionalProperties**](FakeApi.md#testInlineAdditionalProperties) | **POST** /fake/inline-additionalProperties | test inline additionalProperties
20-
[**testJsonFormData**](FakeApi.md#testJsonFormData) | **GET** /fake/jsonFormData | test json serialization of form data
21-
[**testQueryParameterCollectionFormat**](FakeApi.md#testQueryParameterCollectionFormat) | **PUT** /fake/test-query-paramters |
7+
[**fakeHealthGet**](FakeApi.md#fakeHealthGet) | **GET** fake/health | Health check endpoint
8+
[**fakeHttpSignatureTest**](FakeApi.md#fakeHttpSignatureTest) | **GET** fake/http-signature-test | test http signature authentication
9+
[**fakeOuterBooleanSerialize**](FakeApi.md#fakeOuterBooleanSerialize) | **POST** fake/outer/boolean |
10+
[**fakeOuterCompositeSerialize**](FakeApi.md#fakeOuterCompositeSerialize) | **POST** fake/outer/composite |
11+
[**fakeOuterNumberSerialize**](FakeApi.md#fakeOuterNumberSerialize) | **POST** fake/outer/number |
12+
[**fakeOuterStringSerialize**](FakeApi.md#fakeOuterStringSerialize) | **POST** fake/outer/string |
13+
[**testBodyWithFileSchema**](FakeApi.md#testBodyWithFileSchema) | **PUT** fake/body-with-file-schema |
14+
[**testBodyWithQueryParams**](FakeApi.md#testBodyWithQueryParams) | **PUT** fake/body-with-query-params |
15+
[**testClientModel**](FakeApi.md#testClientModel) | **PATCH** fake | To test \"client\" model
16+
[**testEndpointParameters**](FakeApi.md#testEndpointParameters) | **POST** fake | Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트
17+
[**testEnumParameters**](FakeApi.md#testEnumParameters) | **GET** fake | To test enum parameters
18+
[**testGroupParameters**](FakeApi.md#testGroupParameters) | **DELETE** fake | Fake endpoint to test group parameters (optional)
19+
[**testInlineAdditionalProperties**](FakeApi.md#testInlineAdditionalProperties) | **POST** fake/inline-additionalProperties | test inline additionalProperties
20+
[**testJsonFormData**](FakeApi.md#testJsonFormData) | **GET** fake/jsonFormData | test json serialization of form data
21+
[**testQueryParameterCollectionFormat**](FakeApi.md#testQueryParameterCollectionFormat) | **PUT** fake/test-query-paramters |
2222

2323

2424
<a name="fakeHealthGet"></a>
@@ -527,13 +527,13 @@ To test enum parameters
527527
//import org.openapitools.client.models.*
528528

529529
val apiInstance = FakeApi()
530-
val enumHeaderStringArray : kotlin.Array<kotlin.String> = // kotlin.Array<kotlin.String> | Header parameter enum test (string array)
530+
val enumHeaderStringArray : kotlin.collections.List<kotlin.String> = // kotlin.collections.List<kotlin.String> | Header parameter enum test (string array)
531531
val enumHeaderString : kotlin.String = enumHeaderString_example // kotlin.String | Header parameter enum test (string)
532-
val enumQueryStringArray : kotlin.Array<kotlin.String> = // kotlin.Array<kotlin.String> | Query parameter enum test (string array)
532+
val enumQueryStringArray : kotlin.collections.List<kotlin.String> = // kotlin.collections.List<kotlin.String> | Query parameter enum test (string array)
533533
val enumQueryString : kotlin.String = enumQueryString_example // kotlin.String | Query parameter enum test (string)
534534
val enumQueryInteger : kotlin.Int = 56 // kotlin.Int | Query parameter enum test (double)
535535
val enumQueryDouble : kotlin.Double = 1.2 // kotlin.Double | Query parameter enum test (double)
536-
val enumFormStringArray : kotlin.Array<kotlin.String> = enumFormStringArray_example // kotlin.Array<kotlin.String> | Form parameter enum test (string array)
536+
val enumFormStringArray : kotlin.collections.List<kotlin.String> = enumFormStringArray_example // kotlin.collections.List<kotlin.String> | Form parameter enum test (string array)
537537
val enumFormString : kotlin.String = enumFormString_example // kotlin.String | Form parameter enum test (string)
538538
try {
539539
apiInstance.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString)
@@ -550,13 +550,13 @@ try {
550550

551551
Name | Type | Description | Notes
552552
------------- | ------------- | ------------- | -------------
553-
**enumHeaderStringArray** | [**kotlin.Array&lt;kotlin.String&gt;**](kotlin.String.md)| Header parameter enum test (string array) | [optional] [enum: >, $]
553+
**enumHeaderStringArray** | [**kotlin.collections.List&lt;kotlin.String&gt;**](kotlin.String.md)| Header parameter enum test (string array) | [optional] [enum: >, $]
554554
**enumHeaderString** | **kotlin.String**| Header parameter enum test (string) | [optional] [default to &quot;-efg&quot;] [enum: _abc, -efg, (xyz)]
555-
**enumQueryStringArray** | [**kotlin.Array&lt;kotlin.String&gt;**](kotlin.String.md)| Query parameter enum test (string array) | [optional] [enum: >, $]
555+
**enumQueryStringArray** | [**kotlin.collections.List&lt;kotlin.String&gt;**](kotlin.String.md)| Query parameter enum test (string array) | [optional] [enum: >, $]
556556
**enumQueryString** | **kotlin.String**| Query parameter enum test (string) | [optional] [default to &quot;-efg&quot;] [enum: _abc, -efg, (xyz)]
557557
**enumQueryInteger** | **kotlin.Int**| Query parameter enum test (double) | [optional] [enum: 1, -2]
558558
**enumQueryDouble** | **kotlin.Double**| Query parameter enum test (double) | [optional] [enum: 1.1, -1.2]
559-
**enumFormStringArray** | [**kotlin.Array&lt;kotlin.String&gt;**](kotlin.String.md)| Form parameter enum test (string array) | [optional] [default to &quot;$&quot;] [enum: >, $]
559+
**enumFormStringArray** | [**kotlin.collections.List&lt;kotlin.String&gt;**](kotlin.String.md)| Form parameter enum test (string array) | [optional] [default to &quot;$&quot;] [enum: >, $]
560560
**enumFormString** | **kotlin.String**| Form parameter enum test (string) | [optional] [default to &quot;-efg&quot;] [enum: _abc, -efg, (xyz)]
561561

562562
### Return type
@@ -735,11 +735,11 @@ To test the collection format in query parameters
735735
//import org.openapitools.client.models.*
736736

737737
val apiInstance = FakeApi()
738-
val pipe : kotlin.Array<kotlin.String> = // kotlin.Array<kotlin.String> |
739-
val ioutil : kotlin.Array<kotlin.String> = // kotlin.Array<kotlin.String> |
740-
val http : kotlin.Array<kotlin.String> = // kotlin.Array<kotlin.String> |
741-
val url : kotlin.Array<kotlin.String> = // kotlin.Array<kotlin.String> |
742-
val context : kotlin.Array<kotlin.String> = // kotlin.Array<kotlin.String> |
738+
val pipe : kotlin.collections.List<kotlin.String> = // kotlin.collections.List<kotlin.String> |
739+
val ioutil : kotlin.collections.List<kotlin.String> = // kotlin.collections.List<kotlin.String> |
740+
val http : kotlin.collections.List<kotlin.String> = // kotlin.collections.List<kotlin.String> |
741+
val url : kotlin.collections.List<kotlin.String> = // kotlin.collections.List<kotlin.String> |
742+
val context : kotlin.collections.List<kotlin.String> = // kotlin.collections.List<kotlin.String> |
743743
try {
744744
apiInstance.testQueryParameterCollectionFormat(pipe, ioutil, http, url, context)
745745
} catch (e: ClientException) {
@@ -755,11 +755,11 @@ try {
755755

756756
Name | Type | Description | Notes
757757
------------- | ------------- | ------------- | -------------
758-
**pipe** | [**kotlin.Array&lt;kotlin.String&gt;**](kotlin.String.md)| |
759-
**ioutil** | [**kotlin.Array&lt;kotlin.String&gt;**](kotlin.String.md)| |
760-
**http** | [**kotlin.Array&lt;kotlin.String&gt;**](kotlin.String.md)| |
761-
**url** | [**kotlin.Array&lt;kotlin.String&gt;**](kotlin.String.md)| |
762-
**context** | [**kotlin.Array&lt;kotlin.String&gt;**](kotlin.String.md)| |
758+
**pipe** | [**kotlin.collections.List&lt;kotlin.String&gt;**](kotlin.String.md)| |
759+
**ioutil** | [**kotlin.collections.List&lt;kotlin.String&gt;**](kotlin.String.md)| |
760+
**http** | [**kotlin.collections.List&lt;kotlin.String&gt;**](kotlin.String.md)| |
761+
**url** | [**kotlin.collections.List&lt;kotlin.String&gt;**](kotlin.String.md)| |
762+
**context** | [**kotlin.collections.List&lt;kotlin.String&gt;**](kotlin.String.md)| |
763763

764764
### Return type
765765

‎samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/docs/FakeApi.md

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,21 @@ All URIs are relative to *http://petstore.swagger.io:80/v2*
44

55
Method | HTTP request | Description
66
------------- | ------------- | -------------
7-
[**fakeHealthGet**](FakeApi.md#fakeHealthGet) | **GET** /fake/health | Health check endpoint
8-
[**fakeHttpSignatureTest**](FakeApi.md#fakeHttpSignatureTest) | **GET** /fake/http-signature-test | test http signature authentication
9-
[**fakeOuterBooleanSerialize**](FakeApi.md#fakeOuterBooleanSerialize) | **POST** /fake/outer/boolean |
10-
[**fakeOuterCompositeSerialize**](FakeApi.md#fakeOuterCompositeSerialize) | **POST** /fake/outer/composite |
11-
[**fakeOuterNumberSerialize**](FakeApi.md#fakeOuterNumberSerialize) | **POST** /fake/outer/number |
12-
[**fakeOuterStringSerialize**](FakeApi.md#fakeOuterStringSerialize) | **POST** /fake/outer/string |
13-
[**testBodyWithFileSchema**](FakeApi.md#testBodyWithFileSchema) | **PUT** /fake/body-with-file-schema |
14-
[**testBodyWithQueryParams**](FakeApi.md#testBodyWithQueryParams) | **PUT** /fake/body-with-query-params |
15-
[**testClientModel**](FakeApi.md#testClientModel) | **PATCH** /fake | To test \&quot;client\&quot; model
16-
[**testEndpointParameters**](FakeApi.md#testEndpointParameters) | **POST** /fake | Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트
17-
[**testEnumParameters**](FakeApi.md#testEnumParameters) | **GET** /fake | To test enum parameters
18-
[**testGroupParameters**](FakeApi.md#testGroupParameters) | **DELETE** /fake | Fake endpoint to test group parameters (optional)
19-
[**testInlineAdditionalProperties**](FakeApi.md#testInlineAdditionalProperties) | **POST** /fake/inline-additionalProperties | test inline additionalProperties
20-
[**testJsonFormData**](FakeApi.md#testJsonFormData) | **GET** /fake/jsonFormData | test json serialization of form data
21-
[**testQueryParameterCollectionFormat**](FakeApi.md#testQueryParameterCollectionFormat) | **PUT** /fake/test-query-paramters |
7+
[**fakeHealthGet**](FakeApi.md#fakeHealthGet) | **GET** fake/health | Health check endpoint
8+
[**fakeHttpSignatureTest**](FakeApi.md#fakeHttpSignatureTest) | **GET** fake/http-signature-test | test http signature authentication
9+
[**fakeOuterBooleanSerialize**](FakeApi.md#fakeOuterBooleanSerialize) | **POST** fake/outer/boolean |
10+
[**fakeOuterCompositeSerialize**](FakeApi.md#fakeOuterCompositeSerialize) | **POST** fake/outer/composite |
11+
[**fakeOuterNumberSerialize**](FakeApi.md#fakeOuterNumberSerialize) | **POST** fake/outer/number |
12+
[**fakeOuterStringSerialize**](FakeApi.md#fakeOuterStringSerialize) | **POST** fake/outer/string |
13+
[**testBodyWithFileSchema**](FakeApi.md#testBodyWithFileSchema) | **PUT** fake/body-with-file-schema |
14+
[**testBodyWithQueryParams**](FakeApi.md#testBodyWithQueryParams) | **PUT** fake/body-with-query-params |
15+
[**testClientModel**](FakeApi.md#testClientModel) | **PATCH** fake | To test \&quot;client\&quot; model
16+
[**testEndpointParameters**](FakeApi.md#testEndpointParameters) | **POST** fake | Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트
17+
[**testEnumParameters**](FakeApi.md#testEnumParameters) | **GET** fake | To test enum parameters
18+
[**testGroupParameters**](FakeApi.md#testGroupParameters) | **DELETE** fake | Fake endpoint to test group parameters (optional)
19+
[**testInlineAdditionalProperties**](FakeApi.md#testInlineAdditionalProperties) | **POST** fake/inline-additionalProperties | test inline additionalProperties
20+
[**testJsonFormData**](FakeApi.md#testJsonFormData) | **GET** fake/jsonFormData | test json serialization of form data
21+
[**testQueryParameterCollectionFormat**](FakeApi.md#testQueryParameterCollectionFormat) | **PUT** fake/test-query-paramters |
2222

2323

2424
<a name="fakeHealthGet"></a>
@@ -527,13 +527,13 @@ To test enum parameters
527527
//import org.openapitools.client.models.*
528528

529529
val apiInstance = FakeApi()
530-
val enumHeaderStringArray : kotlin.Array<kotlin.String> = // kotlin.Array<kotlin.String> | Header parameter enum test (string array)
530+
val enumHeaderStringArray : kotlin.collections.List<kotlin.String> = // kotlin.collections.List<kotlin.String> | Header parameter enum test (string array)
531531
val enumHeaderString : kotlin.String = enumHeaderString_example // kotlin.String | Header parameter enum test (string)
532-
val enumQueryStringArray : kotlin.Array<kotlin.String> = // kotlin.Array<kotlin.String> | Query parameter enum test (string array)
532+
val enumQueryStringArray : kotlin.collections.List<kotlin.String> = // kotlin.collections.List<kotlin.String> | Query parameter enum test (string array)
533533
val enumQueryString : kotlin.String = enumQueryString_example // kotlin.String | Query parameter enum test (string)
534534
val enumQueryInteger : kotlin.Int = 56 // kotlin.Int | Query parameter enum test (double)
535535
val enumQueryDouble : kotlin.Double = 1.2 // kotlin.Double | Query parameter enum test (double)
536-
val enumFormStringArray : kotlin.Array<kotlin.String> = enumFormStringArray_example // kotlin.Array<kotlin.String> | Form parameter enum test (string array)
536+
val enumFormStringArray : kotlin.collections.List<kotlin.String> = enumFormStringArray_example // kotlin.collections.List<kotlin.String> | Form parameter enum test (string array)
537537
val enumFormString : kotlin.String = enumFormString_example // kotlin.String | Form parameter enum test (string)
538538
try {
539539
apiInstance.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString)
@@ -550,13 +550,13 @@ try {
550550

551551
Name | Type | Description | Notes
552552
------------- | ------------- | ------------- | -------------
553-
**enumHeaderStringArray** | [**kotlin.Array&lt;kotlin.String&gt;**](kotlin.String.md)| Header parameter enum test (string array) | [optional] [enum: >, $]
553+
**enumHeaderStringArray** | [**kotlin.collections.List&lt;kotlin.String&gt;**](kotlin.String.md)| Header parameter enum test (string array) | [optional] [enum: >, $]
554554
**enumHeaderString** | **kotlin.String**| Header parameter enum test (string) | [optional] [default to &quot;-efg&quot;] [enum: _abc, -efg, (xyz)]
555-
**enumQueryStringArray** | [**kotlin.Array&lt;kotlin.String&gt;**](kotlin.String.md)| Query parameter enum test (string array) | [optional] [enum: >, $]
555+
**enumQueryStringArray** | [**kotlin.collections.List&lt;kotlin.String&gt;**](kotlin.String.md)| Query parameter enum test (string array) | [optional] [enum: >, $]
556556
**enumQueryString** | **kotlin.String**| Query parameter enum test (string) | [optional] [default to &quot;-efg&quot;] [enum: _abc, -efg, (xyz)]
557557
**enumQueryInteger** | **kotlin.Int**| Query parameter enum test (double) | [optional] [enum: 1, -2]
558558
**enumQueryDouble** | **kotlin.Double**| Query parameter enum test (double) | [optional] [enum: 1.1, -1.2]
559-
**enumFormStringArray** | [**kotlin.Array&lt;kotlin.String&gt;**](kotlin.String.md)| Form parameter enum test (string array) | [optional] [default to &quot;$&quot;] [enum: >, $]
559+
**enumFormStringArray** | [**kotlin.collections.List&lt;kotlin.String&gt;**](kotlin.String.md)| Form parameter enum test (string array) | [optional] [default to &quot;$&quot;] [enum: >, $]
560560
**enumFormString** | **kotlin.String**| Form parameter enum test (string) | [optional] [default to &quot;-efg&quot;] [enum: _abc, -efg, (xyz)]
561561

562562
### Return type
@@ -735,11 +735,11 @@ To test the collection format in query parameters
735735
//import org.openapitools.client.models.*
736736

737737
val apiInstance = FakeApi()
738-
val pipe : kotlin.Array<kotlin.String> = // kotlin.Array<kotlin.String> |
739-
val ioutil : kotlin.Array<kotlin.String> = // kotlin.Array<kotlin.String> |
740-
val http : kotlin.Array<kotlin.String> = // kotlin.Array<kotlin.String> |
741-
val url : kotlin.Array<kotlin.String> = // kotlin.Array<kotlin.String> |
742-
val context : kotlin.Array<kotlin.String> = // kotlin.Array<kotlin.String> |
738+
val pipe : kotlin.collections.List<kotlin.String> = // kotlin.collections.List<kotlin.String> |
739+
val ioutil : kotlin.collections.List<kotlin.String> = // kotlin.collections.List<kotlin.String> |
740+
val http : kotlin.collections.List<kotlin.String> = // kotlin.collections.List<kotlin.String> |
741+
val url : kotlin.collections.List<kotlin.String> = // kotlin.collections.List<kotlin.String> |
742+
val context : kotlin.collections.List<kotlin.String> = // kotlin.collections.List<kotlin.String> |
743743
try {
744744
apiInstance.testQueryParameterCollectionFormat(pipe, ioutil, http, url, context)
745745
} catch (e: ClientException) {
@@ -755,11 +755,11 @@ try {
755755

756756
Name | Type | Description | Notes
757757
------------- | ------------- | ------------- | -------------
758-
**pipe** | [**kotlin.Array&lt;kotlin.String&gt;**](kotlin.String.md)| |
759-
**ioutil** | [**kotlin.Array&lt;kotlin.String&gt;**](kotlin.String.md)| |
760-
**http** | [**kotlin.Array&lt;kotlin.String&gt;**](kotlin.String.md)| |
761-
**url** | [**kotlin.Array&lt;kotlin.String&gt;**](kotlin.String.md)| |
762-
**context** | [**kotlin.Array&lt;kotlin.String&gt;**](kotlin.String.md)| |
758+
**pipe** | [**kotlin.collections.List&lt;kotlin.String&gt;**](kotlin.String.md)| |
759+
**ioutil** | [**kotlin.collections.List&lt;kotlin.String&gt;**](kotlin.String.md)| |
760+
**http** | [**kotlin.collections.List&lt;kotlin.String&gt;**](kotlin.String.md)| |
761+
**url** | [**kotlin.collections.List&lt;kotlin.String&gt;**](kotlin.String.md)| |
762+
**context** | [**kotlin.collections.List&lt;kotlin.String&gt;**](kotlin.String.md)| |
763763

764764
### Return type
765765

0 commit comments

Comments
 (0)