diff --git a/.github/workflows/samples-kotlin-client.yaml b/.github/workflows/samples-kotlin-client.yaml index 23ffc655a9e2..7a3fb62e8ddc 100644 --- a/.github/workflows/samples-kotlin-client.yaml +++ b/.github/workflows/samples-kotlin-client.yaml @@ -70,7 +70,7 @@ jobs: - samples/client/others/kotlin-jvm-okhttp-parameter-tests - samples/client/others/kotlin-jvm-okhttp-path-comments - samples/client/others/kotlin-integer-enum - - samples/client/petstore/kotlin-allOff-discriminator-kotlinx-serialization + - samples/client/petstore/kotlin-allOf-discriminator-kotlinx-serialization steps: - uses: actions/checkout@v5 - uses: actions/setup-java@v5 diff --git a/bin/configs/kotlin-allOff-discriminator-kotlinx-serialization.yaml b/bin/configs/kotlin-allOf-discriminator-kotlinx-serialization.yaml similarity index 72% rename from bin/configs/kotlin-allOff-discriminator-kotlinx-serialization.yaml rename to bin/configs/kotlin-allOf-discriminator-kotlinx-serialization.yaml index 457e08045c96..495f18b70898 100644 --- a/bin/configs/kotlin-allOff-discriminator-kotlinx-serialization.yaml +++ b/bin/configs/kotlin-allOf-discriminator-kotlinx-serialization.yaml @@ -1,9 +1,9 @@ generatorName: kotlin -outputDir: samples/client/petstore/kotlin-allOff-discriminator-kotlinx-serialization +outputDir: samples/client/petstore/kotlin-allOf-discriminator-kotlinx-serialization inputSpec: modules/openapi-generator/src/test/resources/3_0/kotlin/polymorphism.yaml templateDir: modules/openapi-generator/src/main/resources/kotlin-client additionalProperties: - artifactId: kotlin-allOff-discriminator + artifactId: kotlin-allOf-discriminator serializableModel: "false" dateLibrary: java8 enumUnknownDefaultCase: true diff --git a/bin/configs/kotlin-allOff-discriminator.yaml b/bin/configs/kotlin-allOf-discriminator.yaml similarity index 72% rename from bin/configs/kotlin-allOff-discriminator.yaml rename to bin/configs/kotlin-allOf-discriminator.yaml index 0de0dd1e429a..3358efa5d35b 100644 --- a/bin/configs/kotlin-allOff-discriminator.yaml +++ b/bin/configs/kotlin-allOf-discriminator.yaml @@ -1,9 +1,9 @@ generatorName: kotlin -outputDir: samples/client/petstore/kotlin-allOff-discriminator +outputDir: samples/client/petstore/kotlin-allOf-discriminator inputSpec: modules/openapi-generator/src/test/resources/3_0/issue_10792.yaml templateDir: modules/openapi-generator/src/main/resources/kotlin-client additionalProperties: - artifactId: kotlin-allOff-discriminator + artifactId: kotlin-allOf-discriminator serializableModel: "false" dateLibrary: java8 enumUnknownDefaultCase: true diff --git a/samples/client/petstore/kotlin-allOff-discriminator-kotlinx-serialization/.openapi-generator-ignore b/samples/client/petstore/kotlin-allOf-discriminator-kotlinx-serialization/.openapi-generator-ignore similarity index 100% rename from samples/client/petstore/kotlin-allOff-discriminator-kotlinx-serialization/.openapi-generator-ignore rename to samples/client/petstore/kotlin-allOf-discriminator-kotlinx-serialization/.openapi-generator-ignore diff --git a/samples/client/petstore/kotlin-allOff-discriminator-kotlinx-serialization/.openapi-generator/FILES b/samples/client/petstore/kotlin-allOf-discriminator-kotlinx-serialization/.openapi-generator/FILES similarity index 100% rename from samples/client/petstore/kotlin-allOff-discriminator-kotlinx-serialization/.openapi-generator/FILES rename to samples/client/petstore/kotlin-allOf-discriminator-kotlinx-serialization/.openapi-generator/FILES diff --git a/samples/client/petstore/kotlin-allOff-discriminator-kotlinx-serialization/.openapi-generator/VERSION b/samples/client/petstore/kotlin-allOf-discriminator-kotlinx-serialization/.openapi-generator/VERSION similarity index 100% rename from samples/client/petstore/kotlin-allOff-discriminator-kotlinx-serialization/.openapi-generator/VERSION rename to samples/client/petstore/kotlin-allOf-discriminator-kotlinx-serialization/.openapi-generator/VERSION diff --git a/samples/client/petstore/kotlin-allOff-discriminator-kotlinx-serialization/README.md b/samples/client/petstore/kotlin-allOf-discriminator-kotlinx-serialization/README.md similarity index 100% rename from samples/client/petstore/kotlin-allOff-discriminator-kotlinx-serialization/README.md rename to samples/client/petstore/kotlin-allOf-discriminator-kotlinx-serialization/README.md diff --git a/samples/client/petstore/kotlin-allOff-discriminator-kotlinx-serialization/build.gradle b/samples/client/petstore/kotlin-allOf-discriminator-kotlinx-serialization/build.gradle similarity index 100% rename from samples/client/petstore/kotlin-allOff-discriminator-kotlinx-serialization/build.gradle rename to samples/client/petstore/kotlin-allOf-discriminator-kotlinx-serialization/build.gradle diff --git a/samples/client/petstore/kotlin-allOff-discriminator-kotlinx-serialization/docs/Animal.md b/samples/client/petstore/kotlin-allOf-discriminator-kotlinx-serialization/docs/Animal.md similarity index 100% rename from samples/client/petstore/kotlin-allOff-discriminator-kotlinx-serialization/docs/Animal.md rename to samples/client/petstore/kotlin-allOf-discriminator-kotlinx-serialization/docs/Animal.md diff --git a/samples/client/petstore/kotlin-allOff-discriminator-kotlinx-serialization/docs/Bird.md b/samples/client/petstore/kotlin-allOf-discriminator-kotlinx-serialization/docs/Bird.md similarity index 100% rename from samples/client/petstore/kotlin-allOff-discriminator-kotlinx-serialization/docs/Bird.md rename to samples/client/petstore/kotlin-allOf-discriminator-kotlinx-serialization/docs/Bird.md diff --git a/samples/client/petstore/kotlin-allOff-discriminator-kotlinx-serialization/docs/BirdApi.md b/samples/client/petstore/kotlin-allOf-discriminator-kotlinx-serialization/docs/BirdApi.md similarity index 100% rename from samples/client/petstore/kotlin-allOff-discriminator-kotlinx-serialization/docs/BirdApi.md rename to samples/client/petstore/kotlin-allOf-discriminator-kotlinx-serialization/docs/BirdApi.md diff --git a/samples/client/petstore/kotlin-allOff-discriminator-kotlinx-serialization/gradle/wrapper/gradle-wrapper.jar b/samples/client/petstore/kotlin-allOf-discriminator-kotlinx-serialization/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from samples/client/petstore/kotlin-allOff-discriminator-kotlinx-serialization/gradle/wrapper/gradle-wrapper.jar rename to samples/client/petstore/kotlin-allOf-discriminator-kotlinx-serialization/gradle/wrapper/gradle-wrapper.jar diff --git a/samples/client/petstore/kotlin-allOff-discriminator-kotlinx-serialization/gradle/wrapper/gradle-wrapper.properties b/samples/client/petstore/kotlin-allOf-discriminator-kotlinx-serialization/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from samples/client/petstore/kotlin-allOff-discriminator-kotlinx-serialization/gradle/wrapper/gradle-wrapper.properties rename to samples/client/petstore/kotlin-allOf-discriminator-kotlinx-serialization/gradle/wrapper/gradle-wrapper.properties diff --git a/samples/client/petstore/kotlin-allOff-discriminator-kotlinx-serialization/gradlew b/samples/client/petstore/kotlin-allOf-discriminator-kotlinx-serialization/gradlew old mode 100644 new mode 100755 similarity index 100% rename from samples/client/petstore/kotlin-allOff-discriminator-kotlinx-serialization/gradlew rename to samples/client/petstore/kotlin-allOf-discriminator-kotlinx-serialization/gradlew diff --git a/samples/client/petstore/kotlin-allOff-discriminator-kotlinx-serialization/gradlew.bat b/samples/client/petstore/kotlin-allOf-discriminator-kotlinx-serialization/gradlew.bat similarity index 100% rename from samples/client/petstore/kotlin-allOff-discriminator-kotlinx-serialization/gradlew.bat rename to samples/client/petstore/kotlin-allOf-discriminator-kotlinx-serialization/gradlew.bat diff --git a/samples/client/petstore/kotlin-allOff-discriminator-kotlinx-serialization/proguard-rules.pro b/samples/client/petstore/kotlin-allOf-discriminator-kotlinx-serialization/proguard-rules.pro similarity index 100% rename from samples/client/petstore/kotlin-allOff-discriminator-kotlinx-serialization/proguard-rules.pro rename to samples/client/petstore/kotlin-allOf-discriminator-kotlinx-serialization/proguard-rules.pro diff --git a/samples/client/petstore/kotlin-allOf-discriminator-kotlinx-serialization/settings.gradle b/samples/client/petstore/kotlin-allOf-discriminator-kotlinx-serialization/settings.gradle new file mode 100644 index 000000000000..3144bd03e2eb --- /dev/null +++ b/samples/client/petstore/kotlin-allOf-discriminator-kotlinx-serialization/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'kotlin-allOf-discriminator' diff --git a/samples/client/petstore/kotlin-allOff-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/apis/BirdApi.kt b/samples/client/petstore/kotlin-allOf-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/apis/BirdApi.kt similarity index 100% rename from samples/client/petstore/kotlin-allOff-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/apis/BirdApi.kt rename to samples/client/petstore/kotlin-allOf-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/apis/BirdApi.kt diff --git a/samples/client/petstore/kotlin-allOff-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/infrastructure/ApiAbstractions.kt b/samples/client/petstore/kotlin-allOf-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/infrastructure/ApiAbstractions.kt similarity index 100% rename from samples/client/petstore/kotlin-allOff-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/infrastructure/ApiAbstractions.kt rename to samples/client/petstore/kotlin-allOf-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/infrastructure/ApiAbstractions.kt diff --git a/samples/client/petstore/kotlin-allOff-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/petstore/kotlin-allOf-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt similarity index 100% rename from samples/client/petstore/kotlin-allOff-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt rename to samples/client/petstore/kotlin-allOf-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt diff --git a/samples/client/petstore/kotlin-allOff-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/infrastructure/ApiResponse.kt b/samples/client/petstore/kotlin-allOf-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/infrastructure/ApiResponse.kt similarity index 100% rename from samples/client/petstore/kotlin-allOff-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/infrastructure/ApiResponse.kt rename to samples/client/petstore/kotlin-allOf-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/infrastructure/ApiResponse.kt diff --git a/samples/client/petstore/kotlin-allOff-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/infrastructure/AtomicBooleanAdapter.kt b/samples/client/petstore/kotlin-allOf-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/infrastructure/AtomicBooleanAdapter.kt similarity index 100% rename from samples/client/petstore/kotlin-allOff-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/infrastructure/AtomicBooleanAdapter.kt rename to samples/client/petstore/kotlin-allOf-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/infrastructure/AtomicBooleanAdapter.kt diff --git a/samples/client/petstore/kotlin-allOff-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/infrastructure/AtomicIntegerAdapter.kt b/samples/client/petstore/kotlin-allOf-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/infrastructure/AtomicIntegerAdapter.kt similarity index 100% rename from samples/client/petstore/kotlin-allOff-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/infrastructure/AtomicIntegerAdapter.kt rename to samples/client/petstore/kotlin-allOf-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/infrastructure/AtomicIntegerAdapter.kt diff --git a/samples/client/petstore/kotlin-allOff-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/infrastructure/AtomicLongAdapter.kt b/samples/client/petstore/kotlin-allOf-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/infrastructure/AtomicLongAdapter.kt similarity index 100% rename from samples/client/petstore/kotlin-allOff-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/infrastructure/AtomicLongAdapter.kt rename to samples/client/petstore/kotlin-allOf-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/infrastructure/AtomicLongAdapter.kt diff --git a/samples/client/petstore/kotlin-allOff-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/infrastructure/BigDecimalAdapter.kt b/samples/client/petstore/kotlin-allOf-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/infrastructure/BigDecimalAdapter.kt similarity index 100% rename from samples/client/petstore/kotlin-allOff-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/infrastructure/BigDecimalAdapter.kt rename to samples/client/petstore/kotlin-allOf-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/infrastructure/BigDecimalAdapter.kt diff --git a/samples/client/petstore/kotlin-allOff-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/infrastructure/BigIntegerAdapter.kt b/samples/client/petstore/kotlin-allOf-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/infrastructure/BigIntegerAdapter.kt similarity index 100% rename from samples/client/petstore/kotlin-allOff-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/infrastructure/BigIntegerAdapter.kt rename to samples/client/petstore/kotlin-allOf-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/infrastructure/BigIntegerAdapter.kt diff --git a/samples/client/petstore/kotlin-allOff-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/infrastructure/Errors.kt b/samples/client/petstore/kotlin-allOf-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/infrastructure/Errors.kt similarity index 100% rename from samples/client/petstore/kotlin-allOff-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/infrastructure/Errors.kt rename to samples/client/petstore/kotlin-allOf-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/infrastructure/Errors.kt diff --git a/samples/client/petstore/kotlin-allOff-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/infrastructure/LocalDateAdapter.kt b/samples/client/petstore/kotlin-allOf-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/infrastructure/LocalDateAdapter.kt similarity index 100% rename from samples/client/petstore/kotlin-allOff-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/infrastructure/LocalDateAdapter.kt rename to samples/client/petstore/kotlin-allOf-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/infrastructure/LocalDateAdapter.kt diff --git a/samples/client/petstore/kotlin-allOff-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/infrastructure/LocalDateTimeAdapter.kt b/samples/client/petstore/kotlin-allOf-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/infrastructure/LocalDateTimeAdapter.kt similarity index 100% rename from samples/client/petstore/kotlin-allOff-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/infrastructure/LocalDateTimeAdapter.kt rename to samples/client/petstore/kotlin-allOf-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/infrastructure/LocalDateTimeAdapter.kt diff --git a/samples/client/petstore/kotlin-allOff-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/infrastructure/OffsetDateTimeAdapter.kt b/samples/client/petstore/kotlin-allOf-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/infrastructure/OffsetDateTimeAdapter.kt similarity index 100% rename from samples/client/petstore/kotlin-allOff-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/infrastructure/OffsetDateTimeAdapter.kt rename to samples/client/petstore/kotlin-allOf-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/infrastructure/OffsetDateTimeAdapter.kt diff --git a/samples/client/petstore/kotlin-allOff-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt b/samples/client/petstore/kotlin-allOf-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt similarity index 100% rename from samples/client/petstore/kotlin-allOff-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt rename to samples/client/petstore/kotlin-allOf-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt diff --git a/samples/client/petstore/kotlin-allOff-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/infrastructure/RequestConfig.kt b/samples/client/petstore/kotlin-allOf-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/infrastructure/RequestConfig.kt similarity index 100% rename from samples/client/petstore/kotlin-allOff-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/infrastructure/RequestConfig.kt rename to samples/client/petstore/kotlin-allOf-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/infrastructure/RequestConfig.kt diff --git a/samples/client/petstore/kotlin-allOff-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/infrastructure/RequestMethod.kt b/samples/client/petstore/kotlin-allOf-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/infrastructure/RequestMethod.kt similarity index 100% rename from samples/client/petstore/kotlin-allOff-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/infrastructure/RequestMethod.kt rename to samples/client/petstore/kotlin-allOf-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/infrastructure/RequestMethod.kt diff --git a/samples/client/petstore/kotlin-allOff-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/infrastructure/ResponseExtensions.kt b/samples/client/petstore/kotlin-allOf-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/infrastructure/ResponseExtensions.kt similarity index 100% rename from samples/client/petstore/kotlin-allOff-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/infrastructure/ResponseExtensions.kt rename to samples/client/petstore/kotlin-allOf-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/infrastructure/ResponseExtensions.kt diff --git a/samples/client/petstore/kotlin-allOff-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/infrastructure/Serializer.kt b/samples/client/petstore/kotlin-allOf-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/infrastructure/Serializer.kt similarity index 100% rename from samples/client/petstore/kotlin-allOff-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/infrastructure/Serializer.kt rename to samples/client/petstore/kotlin-allOf-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/infrastructure/Serializer.kt diff --git a/samples/client/petstore/kotlin-allOff-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/infrastructure/StringBuilderAdapter.kt b/samples/client/petstore/kotlin-allOf-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/infrastructure/StringBuilderAdapter.kt similarity index 100% rename from samples/client/petstore/kotlin-allOff-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/infrastructure/StringBuilderAdapter.kt rename to samples/client/petstore/kotlin-allOf-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/infrastructure/StringBuilderAdapter.kt diff --git a/samples/client/petstore/kotlin-allOff-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/infrastructure/URIAdapter.kt b/samples/client/petstore/kotlin-allOf-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/infrastructure/URIAdapter.kt similarity index 100% rename from samples/client/petstore/kotlin-allOff-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/infrastructure/URIAdapter.kt rename to samples/client/petstore/kotlin-allOf-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/infrastructure/URIAdapter.kt diff --git a/samples/client/petstore/kotlin-allOff-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/infrastructure/URLAdapter.kt b/samples/client/petstore/kotlin-allOf-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/infrastructure/URLAdapter.kt similarity index 100% rename from samples/client/petstore/kotlin-allOff-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/infrastructure/URLAdapter.kt rename to samples/client/petstore/kotlin-allOf-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/infrastructure/URLAdapter.kt diff --git a/samples/client/petstore/kotlin-allOff-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/infrastructure/UUIDAdapter.kt b/samples/client/petstore/kotlin-allOf-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/infrastructure/UUIDAdapter.kt similarity index 100% rename from samples/client/petstore/kotlin-allOff-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/infrastructure/UUIDAdapter.kt rename to samples/client/petstore/kotlin-allOf-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/infrastructure/UUIDAdapter.kt diff --git a/samples/client/petstore/kotlin-allOff-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/models/Animal.kt b/samples/client/petstore/kotlin-allOf-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/models/Animal.kt similarity index 100% rename from samples/client/petstore/kotlin-allOff-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/models/Animal.kt rename to samples/client/petstore/kotlin-allOf-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/models/Animal.kt diff --git a/samples/client/petstore/kotlin-allOff-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/models/Bird.kt b/samples/client/petstore/kotlin-allOf-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/models/Bird.kt similarity index 100% rename from samples/client/petstore/kotlin-allOff-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/models/Bird.kt rename to samples/client/petstore/kotlin-allOf-discriminator-kotlinx-serialization/src/main/kotlin/org/openapitools/client/models/Bird.kt diff --git a/samples/client/petstore/kotlin-allOff-discriminator-kotlinx-serialization/src/test/kotlin/org/openapitools/client/apis/BirdApiTest.kt b/samples/client/petstore/kotlin-allOf-discriminator-kotlinx-serialization/src/test/kotlin/org/openapitools/client/apis/BirdApiTest.kt similarity index 100% rename from samples/client/petstore/kotlin-allOff-discriminator-kotlinx-serialization/src/test/kotlin/org/openapitools/client/apis/BirdApiTest.kt rename to samples/client/petstore/kotlin-allOf-discriminator-kotlinx-serialization/src/test/kotlin/org/openapitools/client/apis/BirdApiTest.kt diff --git a/samples/client/petstore/kotlin-allOff-discriminator/src/test/kotlin/org/openapitools/client/models/AnimalTest.kt b/samples/client/petstore/kotlin-allOf-discriminator-kotlinx-serialization/src/test/kotlin/org/openapitools/client/models/AnimalTest.kt similarity index 77% rename from samples/client/petstore/kotlin-allOff-discriminator/src/test/kotlin/org/openapitools/client/models/AnimalTest.kt rename to samples/client/petstore/kotlin-allOf-discriminator-kotlinx-serialization/src/test/kotlin/org/openapitools/client/models/AnimalTest.kt index 7ce211aedea0..cbf7ad40fc35 100644 --- a/samples/client/petstore/kotlin-allOff-discriminator/src/test/kotlin/org/openapitools/client/models/AnimalTest.kt +++ b/samples/client/petstore/kotlin-allOf-discriminator-kotlinx-serialization/src/test/kotlin/org/openapitools/client/models/AnimalTest.kt @@ -31,5 +31,11 @@ class AnimalTest : ShouldSpec() { //modelInstance.id shouldBe ("TODO") } + // to test the property `optionalProperty` + should("test optionalProperty") { + // uncomment below to test the property + //modelInstance.optionalProperty shouldBe ("TODO") + } + } } diff --git a/samples/client/petstore/kotlin-allOff-discriminator-kotlinx-serialization/src/test/kotlin/org/openapitools/client/models/BirdTest.kt b/samples/client/petstore/kotlin-allOf-discriminator-kotlinx-serialization/src/test/kotlin/org/openapitools/client/models/BirdTest.kt similarity index 100% rename from samples/client/petstore/kotlin-allOff-discriminator-kotlinx-serialization/src/test/kotlin/org/openapitools/client/models/BirdTest.kt rename to samples/client/petstore/kotlin-allOf-discriminator-kotlinx-serialization/src/test/kotlin/org/openapitools/client/models/BirdTest.kt diff --git a/samples/client/petstore/kotlin-allOff-discriminator/.openapi-generator-ignore b/samples/client/petstore/kotlin-allOf-discriminator/.openapi-generator-ignore similarity index 100% rename from samples/client/petstore/kotlin-allOff-discriminator/.openapi-generator-ignore rename to samples/client/petstore/kotlin-allOf-discriminator/.openapi-generator-ignore diff --git a/samples/client/petstore/kotlin-allOff-discriminator/.openapi-generator/FILES b/samples/client/petstore/kotlin-allOf-discriminator/.openapi-generator/FILES similarity index 100% rename from samples/client/petstore/kotlin-allOff-discriminator/.openapi-generator/FILES rename to samples/client/petstore/kotlin-allOf-discriminator/.openapi-generator/FILES diff --git a/samples/client/petstore/kotlin-allOff-discriminator/.openapi-generator/VERSION b/samples/client/petstore/kotlin-allOf-discriminator/.openapi-generator/VERSION similarity index 100% rename from samples/client/petstore/kotlin-allOff-discriminator/.openapi-generator/VERSION rename to samples/client/petstore/kotlin-allOf-discriminator/.openapi-generator/VERSION diff --git a/samples/client/petstore/kotlin-allOff-discriminator/README.md b/samples/client/petstore/kotlin-allOf-discriminator/README.md similarity index 100% rename from samples/client/petstore/kotlin-allOff-discriminator/README.md rename to samples/client/petstore/kotlin-allOf-discriminator/README.md diff --git a/samples/client/petstore/kotlin-allOff-discriminator/build.gradle b/samples/client/petstore/kotlin-allOf-discriminator/build.gradle similarity index 100% rename from samples/client/petstore/kotlin-allOff-discriminator/build.gradle rename to samples/client/petstore/kotlin-allOf-discriminator/build.gradle diff --git a/samples/client/petstore/kotlin-allOff-discriminator/docs/Animal.md b/samples/client/petstore/kotlin-allOf-discriminator/docs/Animal.md similarity index 100% rename from samples/client/petstore/kotlin-allOff-discriminator/docs/Animal.md rename to samples/client/petstore/kotlin-allOf-discriminator/docs/Animal.md diff --git a/samples/client/petstore/kotlin-allOff-discriminator/docs/Bird.md b/samples/client/petstore/kotlin-allOf-discriminator/docs/Bird.md similarity index 100% rename from samples/client/petstore/kotlin-allOff-discriminator/docs/Bird.md rename to samples/client/petstore/kotlin-allOf-discriminator/docs/Bird.md diff --git a/samples/client/petstore/kotlin-allOff-discriminator/docs/BirdApi.md b/samples/client/petstore/kotlin-allOf-discriminator/docs/BirdApi.md similarity index 100% rename from samples/client/petstore/kotlin-allOff-discriminator/docs/BirdApi.md rename to samples/client/petstore/kotlin-allOf-discriminator/docs/BirdApi.md diff --git a/samples/client/petstore/kotlin-allOff-discriminator/gradle/wrapper/gradle-wrapper.jar b/samples/client/petstore/kotlin-allOf-discriminator/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from samples/client/petstore/kotlin-allOff-discriminator/gradle/wrapper/gradle-wrapper.jar rename to samples/client/petstore/kotlin-allOf-discriminator/gradle/wrapper/gradle-wrapper.jar diff --git a/samples/client/petstore/kotlin-allOff-discriminator/gradle/wrapper/gradle-wrapper.properties b/samples/client/petstore/kotlin-allOf-discriminator/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from samples/client/petstore/kotlin-allOff-discriminator/gradle/wrapper/gradle-wrapper.properties rename to samples/client/petstore/kotlin-allOf-discriminator/gradle/wrapper/gradle-wrapper.properties diff --git a/samples/client/petstore/kotlin-allOff-discriminator/gradlew b/samples/client/petstore/kotlin-allOf-discriminator/gradlew old mode 100644 new mode 100755 similarity index 100% rename from samples/client/petstore/kotlin-allOff-discriminator/gradlew rename to samples/client/petstore/kotlin-allOf-discriminator/gradlew diff --git a/samples/client/petstore/kotlin-allOff-discriminator/gradlew.bat b/samples/client/petstore/kotlin-allOf-discriminator/gradlew.bat similarity index 100% rename from samples/client/petstore/kotlin-allOff-discriminator/gradlew.bat rename to samples/client/petstore/kotlin-allOf-discriminator/gradlew.bat diff --git a/samples/client/petstore/kotlin-allOf-discriminator/settings.gradle b/samples/client/petstore/kotlin-allOf-discriminator/settings.gradle new file mode 100644 index 000000000000..3144bd03e2eb --- /dev/null +++ b/samples/client/petstore/kotlin-allOf-discriminator/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'kotlin-allOf-discriminator' diff --git a/samples/client/petstore/kotlin-allOff-discriminator/src/main/kotlin/org/openapitools/client/apis/BirdApi.kt b/samples/client/petstore/kotlin-allOf-discriminator/src/main/kotlin/org/openapitools/client/apis/BirdApi.kt similarity index 100% rename from samples/client/petstore/kotlin-allOff-discriminator/src/main/kotlin/org/openapitools/client/apis/BirdApi.kt rename to samples/client/petstore/kotlin-allOf-discriminator/src/main/kotlin/org/openapitools/client/apis/BirdApi.kt diff --git a/samples/client/petstore/kotlin-allOff-discriminator/src/main/kotlin/org/openapitools/client/infrastructure/ApiAbstractions.kt b/samples/client/petstore/kotlin-allOf-discriminator/src/main/kotlin/org/openapitools/client/infrastructure/ApiAbstractions.kt similarity index 100% rename from samples/client/petstore/kotlin-allOff-discriminator/src/main/kotlin/org/openapitools/client/infrastructure/ApiAbstractions.kt rename to samples/client/petstore/kotlin-allOf-discriminator/src/main/kotlin/org/openapitools/client/infrastructure/ApiAbstractions.kt diff --git a/samples/client/petstore/kotlin-allOff-discriminator/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/petstore/kotlin-allOf-discriminator/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt similarity index 100% rename from samples/client/petstore/kotlin-allOff-discriminator/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt rename to samples/client/petstore/kotlin-allOf-discriminator/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt diff --git a/samples/client/petstore/kotlin-allOff-discriminator/src/main/kotlin/org/openapitools/client/infrastructure/ApiResponse.kt b/samples/client/petstore/kotlin-allOf-discriminator/src/main/kotlin/org/openapitools/client/infrastructure/ApiResponse.kt similarity index 100% rename from samples/client/petstore/kotlin-allOff-discriminator/src/main/kotlin/org/openapitools/client/infrastructure/ApiResponse.kt rename to samples/client/petstore/kotlin-allOf-discriminator/src/main/kotlin/org/openapitools/client/infrastructure/ApiResponse.kt diff --git a/samples/client/petstore/kotlin-allOff-discriminator/src/main/kotlin/org/openapitools/client/infrastructure/BigDecimalAdapter.kt b/samples/client/petstore/kotlin-allOf-discriminator/src/main/kotlin/org/openapitools/client/infrastructure/BigDecimalAdapter.kt similarity index 100% rename from samples/client/petstore/kotlin-allOff-discriminator/src/main/kotlin/org/openapitools/client/infrastructure/BigDecimalAdapter.kt rename to samples/client/petstore/kotlin-allOf-discriminator/src/main/kotlin/org/openapitools/client/infrastructure/BigDecimalAdapter.kt diff --git a/samples/client/petstore/kotlin-allOff-discriminator/src/main/kotlin/org/openapitools/client/infrastructure/BigIntegerAdapter.kt b/samples/client/petstore/kotlin-allOf-discriminator/src/main/kotlin/org/openapitools/client/infrastructure/BigIntegerAdapter.kt similarity index 100% rename from samples/client/petstore/kotlin-allOff-discriminator/src/main/kotlin/org/openapitools/client/infrastructure/BigIntegerAdapter.kt rename to samples/client/petstore/kotlin-allOf-discriminator/src/main/kotlin/org/openapitools/client/infrastructure/BigIntegerAdapter.kt diff --git a/samples/client/petstore/kotlin-allOff-discriminator/src/main/kotlin/org/openapitools/client/infrastructure/ByteArrayAdapter.kt b/samples/client/petstore/kotlin-allOf-discriminator/src/main/kotlin/org/openapitools/client/infrastructure/ByteArrayAdapter.kt similarity index 100% rename from samples/client/petstore/kotlin-allOff-discriminator/src/main/kotlin/org/openapitools/client/infrastructure/ByteArrayAdapter.kt rename to samples/client/petstore/kotlin-allOf-discriminator/src/main/kotlin/org/openapitools/client/infrastructure/ByteArrayAdapter.kt diff --git a/samples/client/petstore/kotlin-allOff-discriminator/src/main/kotlin/org/openapitools/client/infrastructure/Errors.kt b/samples/client/petstore/kotlin-allOf-discriminator/src/main/kotlin/org/openapitools/client/infrastructure/Errors.kt similarity index 100% rename from samples/client/petstore/kotlin-allOff-discriminator/src/main/kotlin/org/openapitools/client/infrastructure/Errors.kt rename to samples/client/petstore/kotlin-allOf-discriminator/src/main/kotlin/org/openapitools/client/infrastructure/Errors.kt diff --git a/samples/client/petstore/kotlin-allOff-discriminator/src/main/kotlin/org/openapitools/client/infrastructure/LocalDateAdapter.kt b/samples/client/petstore/kotlin-allOf-discriminator/src/main/kotlin/org/openapitools/client/infrastructure/LocalDateAdapter.kt similarity index 100% rename from samples/client/petstore/kotlin-allOff-discriminator/src/main/kotlin/org/openapitools/client/infrastructure/LocalDateAdapter.kt rename to samples/client/petstore/kotlin-allOf-discriminator/src/main/kotlin/org/openapitools/client/infrastructure/LocalDateAdapter.kt diff --git a/samples/client/petstore/kotlin-allOff-discriminator/src/main/kotlin/org/openapitools/client/infrastructure/LocalDateTimeAdapter.kt b/samples/client/petstore/kotlin-allOf-discriminator/src/main/kotlin/org/openapitools/client/infrastructure/LocalDateTimeAdapter.kt similarity index 100% rename from samples/client/petstore/kotlin-allOff-discriminator/src/main/kotlin/org/openapitools/client/infrastructure/LocalDateTimeAdapter.kt rename to samples/client/petstore/kotlin-allOf-discriminator/src/main/kotlin/org/openapitools/client/infrastructure/LocalDateTimeAdapter.kt diff --git a/samples/client/petstore/kotlin-allOff-discriminator/src/main/kotlin/org/openapitools/client/infrastructure/OffsetDateTimeAdapter.kt b/samples/client/petstore/kotlin-allOf-discriminator/src/main/kotlin/org/openapitools/client/infrastructure/OffsetDateTimeAdapter.kt similarity index 100% rename from samples/client/petstore/kotlin-allOff-discriminator/src/main/kotlin/org/openapitools/client/infrastructure/OffsetDateTimeAdapter.kt rename to samples/client/petstore/kotlin-allOf-discriminator/src/main/kotlin/org/openapitools/client/infrastructure/OffsetDateTimeAdapter.kt diff --git a/samples/client/petstore/kotlin-allOff-discriminator/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt b/samples/client/petstore/kotlin-allOf-discriminator/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt similarity index 100% rename from samples/client/petstore/kotlin-allOff-discriminator/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt rename to samples/client/petstore/kotlin-allOf-discriminator/src/main/kotlin/org/openapitools/client/infrastructure/PartConfig.kt diff --git a/samples/client/petstore/kotlin-allOff-discriminator/src/main/kotlin/org/openapitools/client/infrastructure/RequestConfig.kt b/samples/client/petstore/kotlin-allOf-discriminator/src/main/kotlin/org/openapitools/client/infrastructure/RequestConfig.kt similarity index 100% rename from samples/client/petstore/kotlin-allOff-discriminator/src/main/kotlin/org/openapitools/client/infrastructure/RequestConfig.kt rename to samples/client/petstore/kotlin-allOf-discriminator/src/main/kotlin/org/openapitools/client/infrastructure/RequestConfig.kt diff --git a/samples/client/petstore/kotlin-allOff-discriminator/src/main/kotlin/org/openapitools/client/infrastructure/RequestMethod.kt b/samples/client/petstore/kotlin-allOf-discriminator/src/main/kotlin/org/openapitools/client/infrastructure/RequestMethod.kt similarity index 100% rename from samples/client/petstore/kotlin-allOff-discriminator/src/main/kotlin/org/openapitools/client/infrastructure/RequestMethod.kt rename to samples/client/petstore/kotlin-allOf-discriminator/src/main/kotlin/org/openapitools/client/infrastructure/RequestMethod.kt diff --git a/samples/client/petstore/kotlin-allOff-discriminator/src/main/kotlin/org/openapitools/client/infrastructure/ResponseExtensions.kt b/samples/client/petstore/kotlin-allOf-discriminator/src/main/kotlin/org/openapitools/client/infrastructure/ResponseExtensions.kt similarity index 100% rename from samples/client/petstore/kotlin-allOff-discriminator/src/main/kotlin/org/openapitools/client/infrastructure/ResponseExtensions.kt rename to samples/client/petstore/kotlin-allOf-discriminator/src/main/kotlin/org/openapitools/client/infrastructure/ResponseExtensions.kt diff --git a/samples/client/petstore/kotlin-allOff-discriminator/src/main/kotlin/org/openapitools/client/infrastructure/Serializer.kt b/samples/client/petstore/kotlin-allOf-discriminator/src/main/kotlin/org/openapitools/client/infrastructure/Serializer.kt similarity index 100% rename from samples/client/petstore/kotlin-allOff-discriminator/src/main/kotlin/org/openapitools/client/infrastructure/Serializer.kt rename to samples/client/petstore/kotlin-allOf-discriminator/src/main/kotlin/org/openapitools/client/infrastructure/Serializer.kt diff --git a/samples/client/petstore/kotlin-allOff-discriminator/src/main/kotlin/org/openapitools/client/infrastructure/SerializerHelper.kt b/samples/client/petstore/kotlin-allOf-discriminator/src/main/kotlin/org/openapitools/client/infrastructure/SerializerHelper.kt similarity index 100% rename from samples/client/petstore/kotlin-allOff-discriminator/src/main/kotlin/org/openapitools/client/infrastructure/SerializerHelper.kt rename to samples/client/petstore/kotlin-allOf-discriminator/src/main/kotlin/org/openapitools/client/infrastructure/SerializerHelper.kt diff --git a/samples/client/petstore/kotlin-allOff-discriminator/src/main/kotlin/org/openapitools/client/infrastructure/URIAdapter.kt b/samples/client/petstore/kotlin-allOf-discriminator/src/main/kotlin/org/openapitools/client/infrastructure/URIAdapter.kt similarity index 100% rename from samples/client/petstore/kotlin-allOff-discriminator/src/main/kotlin/org/openapitools/client/infrastructure/URIAdapter.kt rename to samples/client/petstore/kotlin-allOf-discriminator/src/main/kotlin/org/openapitools/client/infrastructure/URIAdapter.kt diff --git a/samples/client/petstore/kotlin-allOff-discriminator/src/main/kotlin/org/openapitools/client/infrastructure/UUIDAdapter.kt b/samples/client/petstore/kotlin-allOf-discriminator/src/main/kotlin/org/openapitools/client/infrastructure/UUIDAdapter.kt similarity index 100% rename from samples/client/petstore/kotlin-allOff-discriminator/src/main/kotlin/org/openapitools/client/infrastructure/UUIDAdapter.kt rename to samples/client/petstore/kotlin-allOf-discriminator/src/main/kotlin/org/openapitools/client/infrastructure/UUIDAdapter.kt diff --git a/samples/client/petstore/kotlin-allOff-discriminator/src/main/kotlin/org/openapitools/client/models/Animal.kt b/samples/client/petstore/kotlin-allOf-discriminator/src/main/kotlin/org/openapitools/client/models/Animal.kt similarity index 100% rename from samples/client/petstore/kotlin-allOff-discriminator/src/main/kotlin/org/openapitools/client/models/Animal.kt rename to samples/client/petstore/kotlin-allOf-discriminator/src/main/kotlin/org/openapitools/client/models/Animal.kt diff --git a/samples/client/petstore/kotlin-allOff-discriminator/src/main/kotlin/org/openapitools/client/models/Bird.kt b/samples/client/petstore/kotlin-allOf-discriminator/src/main/kotlin/org/openapitools/client/models/Bird.kt similarity index 100% rename from samples/client/petstore/kotlin-allOff-discriminator/src/main/kotlin/org/openapitools/client/models/Bird.kt rename to samples/client/petstore/kotlin-allOf-discriminator/src/main/kotlin/org/openapitools/client/models/Bird.kt diff --git a/samples/client/petstore/kotlin-allOff-discriminator/src/test/kotlin/org/openapitools/client/apis/BirdApiTest.kt b/samples/client/petstore/kotlin-allOf-discriminator/src/test/kotlin/org/openapitools/client/apis/BirdApiTest.kt similarity index 100% rename from samples/client/petstore/kotlin-allOff-discriminator/src/test/kotlin/org/openapitools/client/apis/BirdApiTest.kt rename to samples/client/petstore/kotlin-allOf-discriminator/src/test/kotlin/org/openapitools/client/apis/BirdApiTest.kt diff --git a/samples/client/petstore/kotlin-allOff-discriminator-kotlinx-serialization/src/test/kotlin/org/openapitools/client/models/AnimalTest.kt b/samples/client/petstore/kotlin-allOf-discriminator/src/test/kotlin/org/openapitools/client/models/AnimalTest.kt similarity index 100% rename from samples/client/petstore/kotlin-allOff-discriminator-kotlinx-serialization/src/test/kotlin/org/openapitools/client/models/AnimalTest.kt rename to samples/client/petstore/kotlin-allOf-discriminator/src/test/kotlin/org/openapitools/client/models/AnimalTest.kt diff --git a/samples/client/petstore/kotlin-allOff-discriminator/src/test/kotlin/org/openapitools/client/models/BirdTest.kt b/samples/client/petstore/kotlin-allOf-discriminator/src/test/kotlin/org/openapitools/client/models/BirdTest.kt similarity index 100% rename from samples/client/petstore/kotlin-allOff-discriminator/src/test/kotlin/org/openapitools/client/models/BirdTest.kt rename to samples/client/petstore/kotlin-allOf-discriminator/src/test/kotlin/org/openapitools/client/models/BirdTest.kt diff --git a/samples/client/petstore/kotlin-allOff-discriminator-kotlinx-serialization/settings.gradle b/samples/client/petstore/kotlin-allOff-discriminator-kotlinx-serialization/settings.gradle deleted file mode 100644 index 4c574dc69245..000000000000 --- a/samples/client/petstore/kotlin-allOff-discriminator-kotlinx-serialization/settings.gradle +++ /dev/null @@ -1 +0,0 @@ -rootProject.name = 'kotlin-allOff-discriminator' diff --git a/samples/client/petstore/kotlin-allOff-discriminator/settings.gradle b/samples/client/petstore/kotlin-allOff-discriminator/settings.gradle deleted file mode 100644 index 4c574dc69245..000000000000 --- a/samples/client/petstore/kotlin-allOff-discriminator/settings.gradle +++ /dev/null @@ -1 +0,0 @@ -rootProject.name = 'kotlin-allOff-discriminator'