replace petstore with focused spec for non-discriminator oneOf/anyOf sample

Author: naokiwakata

bin/configs/kotlin-oneOf-anyOf-kotlinx-serialization.yaml

@@ -1,6 +1,6 @@
 generatorName: kotlin
 outputDir: samples/client/others/kotlin-oneOf-anyOf-kotlinx-serialization
-inputSpec: modules/openapi-generator/src/test/resources/3_0/kotlin/petstore.yaml
+inputSpec: modules/openapi-generator/src/test/resources/3_0/kotlin/oneof-anyof-non-discriminator.yaml
 templateDir: modules/openapi-generator/src/main/resources/kotlin-client
 additionalProperties:
   artifactId: kotlin-oneOf-anyOf-kotlinx-serialization

modules/openapi-generator/src/test/resources/3_0/kotlin/oneof-anyof-non-discriminator.yaml

@@ -0,0 +1,138 @@
+openapi: 3.0.1
+info:
+  title: oneOf/anyOf non-discriminator example
+  description: Test non-discriminator oneOf and anyOf with model, primitive, and array types
+  version: '0.1'
+servers:
+  - url: http://example.org
+tags:
+  - name: test
+paths:
+  '/v1/test/oneOf':
+    get:
+      tags:
+        - test
+      operationId: get-oneOf
+      responses:
+        '200':
+          description: OK
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/UserOrPet'
+  '/v1/test/oneOfArray':
+    get:
+      tags:
+        - test
+      operationId: get-oneOf-array
+      responses:
+        '200':
+          description: OK
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/UserOrPetOrArrayString'
+  '/v1/test/oneOfPrimitive':
+    get:
+      tags:
+        - test
+      operationId: get-oneOf-primitive
+      responses:
+        '200':
+          description: OK
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/StringOrLong'
+  '/v1/test/oneOfBooleanPrimitive':
+    get:
+      tags:
+        - test
+      operationId: get-oneOf-boolean-primitive
+      responses:
+        '200':
+          description: OK
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/BooleanOrLong'
+  '/v1/test/anyOf':
+    get:
+      tags:
+        - test
+      operationId: get-anyOf
+      responses:
+        '200':
+          description: OK
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/AnyOfUserOrPet'
+  '/v1/test/anyOfArray':
+    get:
+      tags:
+        - test
+      operationId: get-anyOf-array
+      responses:
+        '200':
+          description: OK
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/AnyOfUserOrPetOrArrayString'
+components:
+  schemas:
+    User:
+      type: object
+      properties:
+        id:
+          type: integer
+          format: int64
+        username:
+          type: string
+      required:
+        - id
+        - username
+    Pet:
+      type: object
+      properties:
+        id:
+          type: integer
+          format: int64
+        name:
+          type: string
+      required:
+        - id
+        - name
+    UserOrPet:
+      oneOf:
+        - $ref: '#/components/schemas/User'
+        - $ref: '#/components/schemas/Pet'
+    UserOrPetOrArrayString:
+      oneOf:
+        - $ref: '#/components/schemas/User'
+        - $ref: '#/components/schemas/Pet'
+        - type: array
+          items:
+            type: string
+    StringOrLong:
+      oneOf:
+        - type: string
+        - type: integer
+          format: int64
+    BooleanOrLong:
+      oneOf:
+        - type: boolean
+        - type: integer
+          format: int64
+    AnyOfUserOrPet:
+      anyOf:
+        - $ref: '#/components/schemas/User'
+        - $ref: '#/components/schemas/Pet'
+    AnyOfUserOrPetOrArrayString:
+      anyOf:
+        - $ref: '#/components/schemas/User'
+        - $ref: '#/components/schemas/Pet'
+        - type: array
+          items:
+            type: string

samples/client/others/kotlin-oneOf-anyOf-kotlinx-serialization/.openapi-generator/FILES

@@ -1,19 +1,13 @@
 .openapi-generator-ignore
 README.md
 build.gradle
-docs/Annotation.md
 docs/AnyOfUserOrPet.md
 docs/AnyOfUserOrPetOrArrayString.md
-docs/ApiResponse.md
-docs/Category.md
-docs/FakeApi.md
-docs/Order.md
+docs/BooleanOrLong.md
 docs/Pet.md
-docs/PetApi.md
-docs/StoreApi.md
-docs/Tag.md
+docs/StringOrLong.md
+docs/TestApi.md
 docs/User.md
-docs/UserApi.md
 docs/UserOrPet.md
 docs/UserOrPetOrArrayString.md
 gradle/wrapper/gradle-wrapper.jar
@@ -22,14 +16,7 @@ gradlew
 gradlew.bat
 proguard-rules.pro
 settings.gradle
-src/main/kotlin/org/openapitools/client/apis/FakeApi.kt
-src/main/kotlin/org/openapitools/client/apis/PetApi.kt
-src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
-src/main/kotlin/org/openapitools/client/apis/UserApi.kt
-src/main/kotlin/org/openapitools/client/auth/ApiKeyAuth.kt
-src/main/kotlin/org/openapitools/client/auth/OAuth.kt
-src/main/kotlin/org/openapitools/client/auth/OAuthFlow.kt
-src/main/kotlin/org/openapitools/client/auth/OAuthOkHttpClient.kt
+src/main/kotlin/org/openapitools/client/apis/TestApi.kt
 src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt
 src/main/kotlin/org/openapitools/client/infrastructure/AtomicBooleanAdapter.kt
 src/main/kotlin/org/openapitools/client/infrastructure/AtomicIntegerAdapter.kt
@@ -46,29 +33,20 @@ src/main/kotlin/org/openapitools/client/infrastructure/StringBuilderAdapter.kt
 src/main/kotlin/org/openapitools/client/infrastructure/URIAdapter.kt
 src/main/kotlin/org/openapitools/client/infrastructure/URLAdapter.kt
 src/main/kotlin/org/openapitools/client/infrastructure/UUIDAdapter.kt
-src/main/kotlin/org/openapitools/client/models/Annotation.kt
 src/main/kotlin/org/openapitools/client/models/AnyOfUserOrPet.kt
 src/main/kotlin/org/openapitools/client/models/AnyOfUserOrPetOrArrayString.kt
-src/main/kotlin/org/openapitools/client/models/Category.kt
-src/main/kotlin/org/openapitools/client/models/ModelApiResponse.kt
-src/main/kotlin/org/openapitools/client/models/Order.kt
+src/main/kotlin/org/openapitools/client/models/BooleanOrLong.kt
 src/main/kotlin/org/openapitools/client/models/Pet.kt
-src/main/kotlin/org/openapitools/client/models/Tag.kt
+src/main/kotlin/org/openapitools/client/models/StringOrLong.kt
 src/main/kotlin/org/openapitools/client/models/User.kt
 src/main/kotlin/org/openapitools/client/models/UserOrPet.kt
 src/main/kotlin/org/openapitools/client/models/UserOrPetOrArrayString.kt
-src/test/kotlin/org/openapitools/client/apis/FakeApiTest.kt
-src/test/kotlin/org/openapitools/client/apis/PetApiTest.kt
-src/test/kotlin/org/openapitools/client/apis/StoreApiTest.kt
-src/test/kotlin/org/openapitools/client/apis/UserApiTest.kt
-src/test/kotlin/org/openapitools/client/models/AnnotationTest.kt
+src/test/kotlin/org/openapitools/client/apis/TestApiTest.kt
 src/test/kotlin/org/openapitools/client/models/AnyOfUserOrPetOrArrayStringTest.kt
 src/test/kotlin/org/openapitools/client/models/AnyOfUserOrPetTest.kt
-src/test/kotlin/org/openapitools/client/models/ApiResponseTest.kt
-src/test/kotlin/org/openapitools/client/models/CategoryTest.kt
-src/test/kotlin/org/openapitools/client/models/OrderTest.kt
+src/test/kotlin/org/openapitools/client/models/BooleanOrLongTest.kt
 src/test/kotlin/org/openapitools/client/models/PetTest.kt
-src/test/kotlin/org/openapitools/client/models/TagTest.kt
+src/test/kotlin/org/openapitools/client/models/StringOrLongTest.kt
 src/test/kotlin/org/openapitools/client/models/UserOrPetOrArrayStringTest.kt
 src/test/kotlin/org/openapitools/client/models/UserOrPetTest.kt
 src/test/kotlin/org/openapitools/client/models/UserTest.kt

samples/client/others/kotlin-oneOf-anyOf-kotlinx-serialization/README.md

@@ -1,11 +1,11 @@
-# org.openapitools.client - Kotlin client library for OpenAPI Petstore
+# org.openapitools.client - Kotlin client library for oneOf/anyOf non-discriminator example
 
-This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+Test non-discriminator oneOf and anyOf with model, primitive, and array types
 
 ## Overview
 This API client was generated by the [OpenAPI Generator](https://openapi-generator.tech) project.  By using the [openapi-spec](https://github.com/OAI/OpenAPI-Specification) from a remote server, you can easily generate an API client.
 
-- API version: 1.0.0
+- API version: 0.1
 - Package version: 
 - Generator version: 7.21.0-SNAPSHOT
 - Build package: org.openapitools.codegen.languages.KotlinClientCodegen
@@ -41,45 +41,26 @@ This runs all tests and packages the library.
 <a id="documentation-for-api-endpoints"></a>
 ## Documentation for API Endpoints
 
-All URIs are relative to *http://petstore.swagger.io/v2*
+All URIs are relative to *http://example.org*
 
 | Class | Method | HTTP request | Description |
 | ------------ | ------------- | ------------- | ------------- |
-| *FakeApi* | [**annotations**](docs/FakeApi.md#annotations) | **POST** fake/annotations | annotate |
-| *FakeApi* | [**updatePetWithFormNumber**](docs/FakeApi.md#updatepetwithformnumber) | **PUT** fake/annotations | Updates a pet in the store with form data (number) |
-| *PetApi* | [**addPet**](docs/PetApi.md#addpet) | **POST** pet | Add a new pet to the store |
-| *PetApi* | [**deletePet**](docs/PetApi.md#deletepet) | **DELETE** pet/{petId} | Deletes a pet |
-| *PetApi* | [**findPetsByStatus**](docs/PetApi.md#findpetsbystatus) | **GET** pet/findByStatus | Finds Pets by status |
-| *PetApi* | [**findPetsByTags**](docs/PetApi.md#findpetsbytags) | **GET** pet/findByTags | Finds Pets by tags |
-| *PetApi* | [**getPetById**](docs/PetApi.md#getpetbyid) | **GET** pet/{petId} | Find pet by ID |
-| *PetApi* | [**updatePet**](docs/PetApi.md#updatepet) | **PUT** pet | Update an existing pet |
-| *PetApi* | [**updatePetWithForm**](docs/PetApi.md#updatepetwithform) | **POST** pet/{petId} | Updates a pet in the store with form data |
-| *PetApi* | [**uploadFile**](docs/PetApi.md#uploadfile) | **POST** pet/{petId}/uploadImage | uploads an image |
-| *StoreApi* | [**deleteOrder**](docs/StoreApi.md#deleteorder) | **DELETE** store/order/{orderId} | Delete purchase order by ID |
-| *StoreApi* | [**getInventory**](docs/StoreApi.md#getinventory) | **GET** store/inventory | Returns pet inventories by status |
-| *StoreApi* | [**getOrderById**](docs/StoreApi.md#getorderbyid) | **GET** store/order/{orderId} | Find purchase order by ID |
-| *StoreApi* | [**placeOrder**](docs/StoreApi.md#placeorder) | **POST** store/order | Place an order for a pet |
-| *UserApi* | [**createUser**](docs/UserApi.md#createuser) | **POST** user | Create user |
-| *UserApi* | [**createUsersWithArrayInput**](docs/UserApi.md#createuserswitharrayinput) | **POST** user/createWithArray | Creates list of users with given input array |
-| *UserApi* | [**createUsersWithListInput**](docs/UserApi.md#createuserswithlistinput) | **POST** user/createWithList | Creates list of users with given input array |
-| *UserApi* | [**deleteUser**](docs/UserApi.md#deleteuser) | **DELETE** user/{username} | Delete user |
-| *UserApi* | [**getUserByName**](docs/UserApi.md#getuserbyname) | **GET** user/{username} | Get user by user name |
-| *UserApi* | [**loginUser**](docs/UserApi.md#loginuser) | **GET** user/login | Logs user into the system |
-| *UserApi* | [**logoutUser**](docs/UserApi.md#logoutuser) | **GET** user/logout | Logs out current logged in user session |
-| *UserApi* | [**updateUser**](docs/UserApi.md#updateuser) | **PUT** user/{username} | Updated user |
+| *TestApi* | [**getAnyOf**](docs/TestApi.md#getanyof) | **GET** v1/test/anyOf |  |
+| *TestApi* | [**getAnyOfArray**](docs/TestApi.md#getanyofarray) | **GET** v1/test/anyOfArray |  |
+| *TestApi* | [**getOneOf**](docs/TestApi.md#getoneof) | **GET** v1/test/oneOf |  |
+| *TestApi* | [**getOneOfArray**](docs/TestApi.md#getoneofarray) | **GET** v1/test/oneOfArray |  |
+| *TestApi* | [**getOneOfBooleanPrimitive**](docs/TestApi.md#getoneofbooleanprimitive) | **GET** v1/test/oneOfBooleanPrimitive |  |
+| *TestApi* | [**getOneOfPrimitive**](docs/TestApi.md#getoneofprimitive) | **GET** v1/test/oneOfPrimitive |  |
 
 
 <a id="documentation-for-models"></a>
 ## Documentation for Models
 
- - [org.openapitools.client.models.Annotation](docs/Annotation.md)
  - [org.openapitools.client.models.AnyOfUserOrPet](docs/AnyOfUserOrPet.md)
  - [org.openapitools.client.models.AnyOfUserOrPetOrArrayString](docs/AnyOfUserOrPetOrArrayString.md)
- - [org.openapitools.client.models.Category](docs/Category.md)
- - [org.openapitools.client.models.ModelApiResponse](docs/ModelApiResponse.md)
- - [org.openapitools.client.models.Order](docs/Order.md)
+ - [org.openapitools.client.models.BooleanOrLong](docs/BooleanOrLong.md)
  - [org.openapitools.client.models.Pet](docs/Pet.md)
- - [org.openapitools.client.models.Tag](docs/Tag.md)
+ - [org.openapitools.client.models.StringOrLong](docs/StringOrLong.md)
  - [org.openapitools.client.models.User](docs/User.md)
  - [org.openapitools.client.models.UserOrPet](docs/UserOrPet.md)
  - [org.openapitools.client.models.UserOrPetOrArrayString](docs/UserOrPetOrArrayString.md)
@@ -88,22 +69,5 @@ All URIs are relative to *http://petstore.swagger.io/v2*
 <a id="documentation-for-authorization"></a>
 ## Documentation for Authorization
 
-
-Authentication schemes defined for the API:
-<a id="petstore_auth"></a>
-### petstore_auth
-
-- **Type**: OAuth
-- **Flow**: implicit
-- **Authorization URL**: http://petstore.swagger.io/api/oauth/dialog
-- **Scopes**: 
-  - write:pets: modify pets in your account
-  - read:pets: read your pets
-
-<a id="api_key"></a>
-### api_key
-
-- **Type**: API key
-- **API key parameter name**: api_key
-- **Location**: HTTP header
+Endpoints do not require authorization.
 

samples/client/others/kotlin-oneOf-anyOf-kotlinx-serialization/build.gradle

@@ -58,7 +58,6 @@ test {
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
     implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.9.0"
-    implementation "org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:1.0.2"
     implementation "com.squareup.okhttp3:logging-interceptor:5.1.0"
     implementation "com.squareup.retrofit2:retrofit:$retrofitVersion"
     implementation "com.squareup.retrofit2:converter-kotlinx-serialization:$retrofitVersion"

samples/client/others/kotlin-oneOf-anyOf-kotlinx-serialization/docs/AnyOfUserOrPet.md

@@ -4,26 +4,9 @@
 ## Properties
 | Name | Type | Description | Notes |
 | ------------ | ------------- | ------------- | ------------- |
+| **id** | **kotlin.Long** |  |  |
 | **username** | **kotlin.String** |  |  |
 | **name** | **kotlin.String** |  |  |
-| **photoUrls** | **kotlin.collections.List<kotlin.String>** |  |  |
-| **id** | **kotlin.Long** |  |  [optional] |
-| **firstName** | **kotlin.String** |  |  [optional] |
-| **lastName** | **kotlin.String** |  |  [optional] |
-| **email** | **kotlin.String** |  |  [optional] |
-| **password** | **kotlin.String** |  |  [optional] |
-| **phone** | **kotlin.String** |  |  [optional] |
-| **userStatus** | **kotlin.Int** | User Status |  [optional] |
-| **category** | [**Category**](Category.md) |  |  [optional] |
-| **tags** | [**kotlin.collections.List<Tag>**](Tag.md) |  |  [optional] |
-| **status** | [**inline**](#Status) | pet status in the store |  [optional] |
-
-
-<a id="Status"></a>
-## Enum: status
-| Name | Value |
-| ---- | ----- |
-| status | available, pending, sold |
 
 
 

samples/client/others/kotlin-oneOf-anyOf-kotlinx-serialization/docs/AnyOfUserOrPetOrArrayString.md

@@ -4,26 +4,9 @@
 ## Properties
 | Name | Type | Description | Notes |
 | ------------ | ------------- | ------------- | ------------- |
+| **id** | **kotlin.Long** |  |  |
 | **username** | **kotlin.String** |  |  |
 | **name** | **kotlin.String** |  |  |
-| **photoUrls** | **kotlin.collections.List<kotlin.String>** |  |  |
-| **id** | **kotlin.Long** |  |  [optional] |
-| **firstName** | **kotlin.String** |  |  [optional] |
-| **lastName** | **kotlin.String** |  |  [optional] |
-| **email** | **kotlin.String** |  |  [optional] |
-| **password** | **kotlin.String** |  |  [optional] |
-| **phone** | **kotlin.String** |  |  [optional] |
-| **userStatus** | **kotlin.Int** | User Status |  [optional] |
-| **category** | [**Category**](Category.md) |  |  [optional] |
-| **tags** | [**kotlin.collections.List<Tag>**](Tag.md) |  |  [optional] |
-| **status** | [**inline**](#Status) | pet status in the store |  [optional] |
-
-
-<a id="Status"></a>
-## Enum: status
-| Name | Value |
-| ---- | ----- |
-| status | available, pending, sold |