test with JDK21 in github workflow

.github/workflows/gradle-plugin-tests.yaml

@@ -19,7 +19,6 @@ jobs:
         with:
           java-version: 11
           distribution: 'temurin'
-          cache: gradle
       - name: Cache maven dependencies
         uses: actions/cache@v4
         env:

.github/workflows/gradle-test.yaml

@@ -37,7 +37,6 @@ jobs:
         with:
           distribution: 'temurin'
           java-version: 11
-          cache: gradle
       # Cache Gradle Dependencies
       - name: Setup Gradle Dependencies Cache
         uses: actions/cache@v4

.github/workflows/linux.yaml

@@ -16,7 +16,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        java: [11, 17]
+        java: [11, 17, 21]
         os: [ubuntu-latest]
     steps:
       - name: Check out code
@@ -27,7 +27,6 @@ jobs:
         with:
           distribution: 'temurin'
           java-version: ${{ matrix.java }}
-          cache: gradle
 
       - uses: actions/cache@v4
         with:
@@ -62,7 +61,7 @@ jobs:
           GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
 
       - name: Upload Maven build artifact
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v4
         if: matrix.java == '11' && matrix.os == 'ubuntu-latest'
         with:
           name: artifact
@@ -96,9 +95,8 @@ jobs:
         with:
           java-version: 11
           maven-version: 3.8.8
-          cache: gradle
       - name: Download build artifact
-        uses: actions/download-artifact@v6
+        uses: actions/download-artifact@v5
         with:
           name: artifact
       - name: Run Ensures Script

.github/workflows/openapi-generator.yaml

@@ -21,7 +21,6 @@ jobs:
         with:
           java-version: 11
           distribution: 'temurin'
-          cache: gradle
       - name: Cache maven dependencies
         uses: actions/cache@v4
         env:
@@ -42,7 +41,7 @@ jobs:
           GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
       - run: ls -la  modules/openapi-generator-cli/target
       - name: Upload openapi-generator-cli.jar artifact
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v4
         with:
           name: openapi-generator-cli.jar
           path: modules/openapi-generator-cli/target/openapi-generator-cli.jar
@@ -60,7 +59,6 @@ jobs:
         with:
           java-version: 11
           distribution: 'temurin'
-          cache: gradle
       - name: Cache maven dependencies
         uses: actions/cache@v4
         env:
@@ -81,7 +79,7 @@ jobs:
           GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
       - name: Publish unit test reports
         if: ${{ always() }}
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v4
         with:
           name: surefire-test-results
           path: '**/surefire-reports/TEST-*.xml'
@@ -99,7 +97,7 @@ jobs:
           java-version: 11
           distribution: 'temurin'
       - name: Download openapi-generator-cli.jar artifact
-        uses: actions/download-artifact@v6
+        uses: actions/download-artifact@v5
         with:
           name: openapi-generator-cli.jar
           path: modules/openapi-generator-cli/target
@@ -138,7 +136,7 @@ jobs:
           java-version: 11
           distribution: 'temurin'
       - name: Download openapi-generator-cli.jar artifact
-        uses: actions/download-artifact@v6
+        uses: actions/download-artifact@v5
         with:
           name: openapi-generator-cli.jar
           path: modules/openapi-generator-cli/target

.github/workflows/samples-aspnet-fastenpoints-server.yaml

@@ -26,7 +26,7 @@ jobs:
           - samples/server/petstore/aspnet/fastendpoints-useValidators
     steps:
       - uses: actions/checkout@v5
-      - uses: actions/setup-dotnet@v5.0.1
+      - uses: actions/setup-dotnet@v5.0.0
         with:
           dotnet-version: '8.0.x'
       - name: Build

.github/workflows/samples-dotnet-petstore.yml

@@ -26,7 +26,7 @@ jobs:
           - samples/client/petstore/csharp/restsharp/standard2.0/Petstore/
     steps:
       - uses: actions/checkout@v5
-      - uses: actions/setup-dotnet@v5.0.1
+      - uses: actions/setup-dotnet@v5.0.0
         with:
           dotnet-version: '7.0.x'
       - name: Build

.github/workflows/samples-dotnet-standard.yaml

@@ -28,7 +28,7 @@ jobs:
           # - samples/client/petstore/csharp/unityWebRequest/standard2.0/Petstore/
     steps:
       - uses: actions/checkout@v5
-      - uses: actions/setup-dotnet@v5.0.1
+      - uses: actions/setup-dotnet@v5.0.0
         with:
           dotnet-version: 3.1.*
       - name: Build

.github/workflows/samples-dotnet6-server.yaml

@@ -25,7 +25,7 @@ jobs:
           - samples/server/petstore/aspnetcore-6.0-useSwashBuckle
     steps:
       - uses: actions/checkout@v5
-      - uses: actions/setup-dotnet@v5.0.1
+      - uses: actions/setup-dotnet@v5.0.0
         with:
           dotnet-version: '6.0.x'
       - name: Build

.github/workflows/samples-dotnet7-client.yml

@@ -43,7 +43,7 @@ jobs:
           - samples/client/petstore/csharp/restsharp/standard2.0/ConditionalSerialization/
     steps:
       - uses: actions/checkout@v5
-      - uses: actions/setup-dotnet@v5.0.1
+      - uses: actions/setup-dotnet@v5.0.0
         with:
           dotnet-version: '7.0.x'
       - name: Build

.github/workflows/samples-dotnet8-client-echo-api.yaml

@@ -19,7 +19,7 @@ jobs:
           - samples/client/echo_api/csharp/restsharp/net8/EchoApi
     steps:
       - uses: actions/checkout@v5
-      - uses: actions/setup-dotnet@v5.0.1
+      - uses: actions/setup-dotnet@v5.0.0
         with:
           dotnet-version: '8.0.x'
       - name: Run echo server

.github/workflows/samples-dotnet8-client.yaml

@@ -19,7 +19,7 @@ jobs:
           - samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/
     steps:
       - uses: actions/checkout@v5
-      - uses: actions/setup-dotnet@v5.0.1
+      - uses: actions/setup-dotnet@v5.0.0
         with:
           dotnet-version: '8.0.x'
       - name: Build

.github/workflows/samples-dotnet8-server.yaml

@@ -26,7 +26,7 @@ jobs:
           - samples/server/petstore/aspnetcore-8.0-use-centralized-package-version-management
     steps:
       - uses: actions/checkout@v5
-      - uses: actions/setup-dotnet@v5.0.1
+      - uses: actions/setup-dotnet@v5.0.0
         with:
           dotnet-version: '8.0.x'
       - name: Build

.github/workflows/samples-dotnet8.yaml

@@ -34,7 +34,7 @@ jobs:
           - samples/client/petstore/csharp/generichost/net8/UseDateTimeForDate
     steps:
       - uses: actions/checkout@v5
-      - uses: actions/setup-dotnet@v5.0.1
+      - uses: actions/setup-dotnet@v5.0.0
         with:
           dotnet-version: '8.0.x'
       - name: Build

.github/workflows/samples-dotnet9.yaml

@@ -48,7 +48,7 @@ jobs:
           #- samples/client/petstore/csharp/unityWebRequest/net9/Petstore
     steps:
       - uses: actions/checkout@v5
-      - uses: actions/setup-dotnet@v5.0.1
+      - uses: actions/setup-dotnet@v5.0.0
         with:
           dotnet-version: '9.0.101'
       - name: Build

.github/workflows/samples-groovy.yaml

@@ -26,7 +26,6 @@ jobs:
         with:
           distribution: 'temurin'
           java-version: 8
-          cache: gradle
       - name: Cache maven dependencies
         uses: actions/cache@v4
         env:

.github/workflows/samples-java-client-jdk11.yaml

@@ -61,7 +61,6 @@ jobs:
           - samples/client/petstore/java/native
           - samples/client/petstore/java/native-async
           - samples/client/petstore/java/native-jakarta
-          - samples/client/petstore/java/native-useGzipFeature
           - samples/client/petstore/java/retrofit2
           - samples/client/petstore/java/retrofit2rx2
           - samples/client/petstore/java/retrofit2rx3
@@ -119,7 +118,6 @@ jobs:
         with:
           distribution: 'temurin'
           java-version: 11
-          cache: gradle
       - name: Cache maven dependencies
         uses: actions/cache@v4
         env:

.github/workflows/samples-java-client-jdk17.yaml

@@ -42,7 +42,6 @@ jobs:
         with:
           distribution: 'temurin'
           java-version: 17
-          cache: gradle
       - name: Cache maven dependencies
         uses: actions/cache@v4
         env:

.github/workflows/samples-jaxrs.yaml

@@ -34,9 +34,6 @@ jobs:
           - samples/server/petstore/jaxrs-cxf-cdi
           - samples/server/petstore/jaxrs-cxf-non-spring-app
           - samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations
-          - samples/server/petstore/jaxrs-spec-swagger-annotations
-          - samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta
-          - samples/server/petstore/jaxrs-spec-swagger-v3-annotations
     steps:
       - uses: actions/checkout@v5
       - uses: actions/setup-java@v5

.github/workflows/samples-kotlin-client.yaml

@@ -44,7 +44,6 @@ jobs:
           - samples/client/petstore/kotlin-threetenbp
           - samples/client/petstore/kotlin-kotlinx-datetime
           - samples/client/petstore/kotlin-uppercase-enum
-          - samples/client/petstore/kotlin-array-integer-enum
           - samples/client/petstore/kotlin-default-values-jvm-okhttp4
           - samples/client/petstore/kotlin-default-values-jvm-retrofit2
           - samples/client/petstore/kotlin-default-values-jvm-volley
@@ -72,14 +71,12 @@ jobs:
           - samples/client/others/kotlin-jvm-okhttp-path-comments
           - samples/client/others/kotlin-integer-enum
           - samples/client/petstore/kotlin-allOf-discriminator-kotlinx-serialization
-          - samples/client/others/kotlin-oneOf-discriminator-kotlinx-serialization
     steps:
       - uses: actions/checkout@v5
       - uses: actions/setup-java@v5
         with:
           distribution: 'temurin'
           java-version: 11
-          cache: gradle
       - name: Cache maven dependencies
         uses: actions/cache@v4
         env:

.github/workflows/samples-kotlin-echo-api.yaml

@@ -26,7 +26,6 @@ jobs:
         with:
           distribution: 'temurin'
           java-version: 17
-          cache: gradle
       - name: Cache maven dependencies
         uses: actions/cache@v4
         env:

.github/workflows/samples-kotlin-server-jdk17.yaml

@@ -8,7 +8,6 @@ on:
       - 'samples/server/petstore/kotlin-server-modelMutable/**'
       - 'samples/server/petstore/kotlin-springboot-*/**'
       - 'samples/server/petstore/kotlin-server-required-and-nullable-properties/**'
-      - 'samples/server/petstore/kotlin-spring-declarative*/**'
       # comment out due to gradle build failure
       # - samples/server/petstore/kotlin-spring-default/**
   pull_request:
@@ -18,7 +17,6 @@ on:
       - 'samples/server/petstore/kotlin-server-modelMutable/**'
       - 'samples/server/petstore/kotlin-springboot-*/**'
       - 'samples/server/petstore/kotlin-server-required-and-nullable-properties/**'
-      - 'samples/server/petstore/kotlin-spring-declarative*/**'
       # comment out due to gradle build failure
       # - samples/server/petstore/kotlin-spring-default/**
 
@@ -46,10 +44,6 @@ jobs:
           - samples/server/petstore/kotlin-server/ktor
           - samples/server/petstore/kotlin-server/ktor2
           - samples/server/petstore/kotlin-misk
-          - samples/server/petstore/kotlin-spring-declarative-interface
-          - samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines
-          - samples/server/petstore/kotlin-spring-declarative-interface-reactive-reactor-wrapped
-          - samples/server/petstore/kotlin-spring-declarative-interface-wrapped
           # comment out due to gradle build failure
           # - samples/server/petstore/kotlin-spring-default/
     steps:
@@ -58,7 +52,6 @@ jobs:
         with:
           distribution: 'temurin'
           java-version: 17
-          cache: gradle
       - name: Cache maven dependencies
         uses: actions/cache@v4
         env:

.github/workflows/samples-kotlin-server-jdk21.yaml

@@ -32,7 +32,6 @@ jobs:
         with:
           distribution: 'temurin'
           java-version: 21
-          cache: gradle
       - name: Cache maven dependencies
         uses: actions/cache@v4
         env:

.github/workflows/samples-kotlin-server.yaml

@@ -39,7 +39,6 @@ jobs:
           - samples/server/petstore/kotlin-springboot-source-swagger2
           - samples/server/petstore/kotlin-springboot-springfox
           - samples/server/petstore/kotlin-springboot-x-kotlin-implements
-          - samples/server/petstore/kotlin-springboot-include-http-request-context-delegate
           - samples/server/petstore/kotlin-server/ktor
           - samples/server/petstore/kotlin-server/ktor2
           - samples/server/petstore/kotlin-server/jaxrs-spec
@@ -60,8 +59,7 @@ jobs:
       - uses: actions/setup-java@v5
         with:
           distribution: 'temurin'
-          java-version: 11
-          cache: gradle
+          java-version: 8
       - name: Cache maven dependencies
         uses: actions/cache@v4
         env:

.github/workflows/windows.yaml

@@ -16,7 +16,7 @@ jobs:
     runs-on: windows-latest
     strategy:
       matrix:
-        java: [11, 17]
+        java: [11, 17, 21]
     steps:
       - uses: actions/checkout@v5
       - name: Set up JDK ${{ matrix.java }}
@@ -24,7 +24,6 @@ jobs:
         with:
           java-version: ${{ matrix.java }}
           distribution: 'temurin'
-          cache: gradle
       - name: Cache maven dependencies
         uses: actions/cache@v4
         env:

README.md

@@ -15,7 +15,7 @@
 
 <div align="center">
 
-[Master](https://github.com/OpenAPITools/openapi-generator/tree/master) (`7.18.0`):
+[Master](https://github.com/OpenAPITools/openapi-generator/tree/master) (`7.17.0`):
 [![Integration Test2](https://circleci.com/gh/OpenAPITools/openapi-generator.svg?style=shield)](https://circleci.com/gh/OpenAPITools/openapi-generator)
 [![Bitrise](https://img.shields.io/bitrise/4a2b10a819d12b67/master?label=bitrise%3A%20Swift+4,5&token=859FMDR8QHwabCzwvZK6vQ)](https://app.bitrise.io/app/4a2b10a819d12b67)
 
@@ -148,8 +148,8 @@ The OpenAPI Specification has undergone 3 revisions since initial creation in 20
 
 | OpenAPI Generator Version                                                                                                                                 | Release Date | Notes                                             |
 | --------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------ | ------------------------------------------------- |
-| 7.18.0 (upcoming minor release) [SNAPSHOT](https://github.com/OpenAPITools/openapi-generator/wiki/FAQ#how-to-test-with-the-latest-master-of-openapi-generator) | 10.12.2025   | Minor release with breaking changes (with fallback) |
-| [7.17.0](https://github.com/OpenAPITools/openapi-generator/releases/tag/v7.17.0) (latest stable release)                                                    | 29.10.2025   | Minor release with breaking changes (with fallback) |
+| 7.17.0 (upcoming minor release) [SNAPSHOT](https://github.com/OpenAPITools/openapi-generator/wiki/FAQ#how-to-test-with-the-latest-master-of-openapi-generator) | 24.10.2025   | Minor release with breaking changes (with fallback) |
+| [7.16.0](https://github.com/OpenAPITools/openapi-generator/releases/tag/v7.16.0) (latest stable release)                                                    | 28.09.2025   | Minor release with breaking changes (with fallback) |
 | [6.6.0](https://github.com/OpenAPITools/openapi-generator/releases/tag/v6.6.0)                                                    | 11.05.2023   | Minor release with breaking changes (with fallback) |
 | [5.4.0](https://github.com/OpenAPITools/openapi-generator/releases/tag/v5.4.0)                                                    | 31.01.2022   | Minor release with breaking changes (with fallback) |
 | [4.3.1](https://github.com/OpenAPITools/openapi-generator/releases/tag/v4.3.1)                                                    | 06.05.2020   | Patch release (enhancements, bug fixes, etc)                       |
@@ -212,16 +212,16 @@ See the different versions of the [openapi-generator-cli](https://search.maven.o
 <!-- RELEASE_VERSION -->
 If you're looking for the latest stable version, you can grab it directly from Maven.org (Java 11 runtime at a minimum):
 
-JAR location: `https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/7.17.0/openapi-generator-cli-7.17.0.jar`
+JAR location: `https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/7.16.0/openapi-generator-cli-7.16.0.jar`
 
 For **Mac/Linux** users:
 ```sh
-wget https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/7.17.0/openapi-generator-cli-7.17.0.jar -O openapi-generator-cli.jar
+wget https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/7.16.0/openapi-generator-cli-7.16.0.jar -O openapi-generator-cli.jar
 ```
 
 For **Windows** users, you will need to install [wget](http://gnuwin32.sourceforge.net/packages/wget.htm) or you can use Invoke-WebRequest in PowerShell (3.0+), e.g.
 ```
-Invoke-WebRequest -OutFile openapi-generator-cli.jar https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/7.17.0/openapi-generator-cli-7.17.0.jar
+Invoke-WebRequest -OutFile openapi-generator-cli.jar https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/7.16.0/openapi-generator-cli-7.16.0.jar
 ```
 
 After downloading the JAR, run `java -jar openapi-generator-cli.jar help` to show the usage.
@@ -456,7 +456,7 @@ openapi-generator-cli version
 To use a specific version of "openapi-generator-cli"
 
 ```sh
-openapi-generator-cli version-manager set 7.17.0
+openapi-generator-cli version-manager set 7.16.0
 ```
 
 Or install it as dev-dependency:
@@ -480,7 +480,7 @@ pip install openapi-generator-cli
 
 To install a specific version
 ```
-pip install openapi-generator-cli==7.17.0
+pip install openapi-generator-cli==7.16.0
 ```
 
 You can also install with [jdk4py](https://github.com/activeviam/jdk4py) instead of java binary. (python>=3.10 is required)
@@ -506,7 +506,7 @@ java -jar modules/openapi-generator-cli/target/openapi-generator-cli.jar generat
 (if you're on Windows, replace the last command with `java -jar modules\openapi-generator-cli\target\openapi-generator-cli.jar generate -i https://raw.githubusercontent.com/openapitools/openapi-generator/master/modules/openapi-generator/src/test/resources/3_0/petstore.yaml -g php -o c:\temp\php_api_client`)
 
 <!-- RELEASE_VERSION -->
-You can also download the JAR (latest release) directly from [maven.org](https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/7.17.0/openapi-generator-cli-7.17.0.jar)
+You can also download the JAR (latest release) directly from [maven.org](https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/7.16.0/openapi-generator-cli-7.16.0.jar)
 <!-- /RELEASE_VERSION -->
 
 To get a list of **general** options available, please run `java -jar modules/openapi-generator-cli/target/openapi-generator-cli.jar help generate`
@@ -1182,7 +1182,6 @@ Here is a list of template creators:
    * Scala Finch: @jimschubert [:heart:](https://www.patreon.com/jimschubert)
    * Scala Lagom: @gmkumar2005
    * Scala Play: @adigerber
-   * TypeScript NestJS: @aryobenholzner
  * Documentation
    * AsciiDoc: @man-at-home
    * HTML Doc 2: @jhitchcock

bin/configs/java-native-useGzipFeature.yaml

@@ -1,9 +0,0 @@
-generatorName: java
-outputDir: samples/client/petstore/java/native-useGzipFeature
-library: native
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore-addpet-only.yaml
-templateDir: modules/openapi-generator/src/main/resources/Java
-additionalProperties:
-  artifactId: petstore-native-useGzipFeature
-  hideGenerationTimestamp: "true"
-  useJakartaEe: "true"

bin/configs/jaxrs-spec-swagger-annotations.yaml

@@ -1,11 +0,0 @@
-generatorName: jaxrs-spec
-outputDir: samples/server/petstore/jaxrs-spec-swagger-annotations
-inputSpec: modules/openapi-generator/src/test/resources/3_0/jaxrs-spec/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/JavaJaxRS/spec
-additionalProperties:
-  artifactId: jaxrs-spec-petstore-server
-  serializableModel: "true"
-  hideGenerationTimestamp: "true"
-  implicitHeadersRegex: (api_key|enum_header_string)
-  generateBuilders: "true"
-  useSwaggerAnnotations: "true"

bin/configs/jaxrs-spec-swagger-v3-annotations-jakarta.yaml

@@ -1,12 +0,0 @@
-generatorName: jaxrs-spec
-outputDir: samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta
-inputSpec: modules/openapi-generator/src/test/resources/3_0/jaxrs-spec/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/JavaJaxRS/spec
-additionalProperties:
-  artifactId: jaxrs-spec-petstore-server-jakarta-swagger-v3
-  serializableModel: "true"
-  hideGenerationTimestamp: "true"
-  implicitHeadersRegex: (api_key|enum_header_string)
-  generateBuilders: "true"
-  useSwaggerV3Annotations: "true"
-  useJakartaEe: "true"

bin/configs/jaxrs-spec-swagger-v3-annotations.yaml

@@ -1,11 +0,0 @@
-generatorName: jaxrs-spec
-outputDir: samples/server/petstore/jaxrs-spec-swagger-v3-annotations
-inputSpec: modules/openapi-generator/src/test/resources/3_0/jaxrs-spec/petstore-with-fake-endpoints-models-for-testing.yaml
-templateDir: modules/openapi-generator/src/main/resources/JavaJaxRS/spec
-additionalProperties:
-  artifactId: jaxrs-spec-petstore-server
-  serializableModel: "true"
-  hideGenerationTimestamp: "true"
-  implicitHeadersRegex: (api_key|enum_header_string)
-  generateBuilders: "true"
-  useSwaggerV3Annotations: "true"

bin/configs/kotlin-array-integer-enum.yaml

@@ -1,8 +0,0 @@
-generatorName: kotlin
-outputDir: samples/client/petstore/kotlin-array-integer-enum
-inputSpec: modules/openapi-generator/src/test/resources/3_0/kotlin/issue15204-int-array-enum.yaml
-templateDir: modules/openapi-generator/src/main/resources/kotlin-client
-additionalProperties:
-  artifactId: kotlin-array-integer-enum
-  serializableModel: "true"
-  dateLibrary: java8

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

@@ -1,12 +0,0 @@
-generatorName: kotlin
-outputDir: samples/client/others/kotlin-oneOf-discriminator-kotlinx-serialization
-inputSpec: modules/openapi-generator/src/test/resources/3_0/kotlin/polymorphism-oneof-discriminator.yaml
-templateDir: modules/openapi-generator/src/main/resources/kotlin-client
-additionalProperties:
-  artifactId: kotlin-oneOf-discriminator
-  serializableModel: "false"
-  dateLibrary: java8
-  library: jvm-retrofit2
-  enumUnknownDefaultCase: true
-  serializationLibrary: kotlinx_serialization
-  generateOneOfAnyOfWrappers: true

bin/configs/kotlin-spring-boot-include-http-request-context-delegate.yaml

@@ -1,17 +0,0 @@
-generatorName: kotlin-spring
-outputDir: samples/server/petstore/kotlin-springboot-include-http-request-context-delegate
-library: spring-boot
-inputSpec: modules/openapi-generator/src/test/resources/3_0/kotlin/petstore-with-x-kotlin-implements.yaml
-templateDir: modules/openapi-generator/src/main/resources/kotlin-spring
-additionalProperties:
-  documentationProvider: none
-  annotationLibrary: swagger1
-  useSwaggerUI: false
-  serviceImplementation: false
-  skipDefaultInterface: true
-  interfaceOnly: false
-  serializableModel: true
-  beanValidations: true
-  includeHttpRequestContext: true
-  reactive: true
-  delegatePattern: true

bin/configs/kotlin-spring-boot-x-kotlin-implements.yaml

@@ -5,11 +5,10 @@ inputSpec: modules/openapi-generator/src/test/resources/3_0/kotlin/petstore-with
 templateDir: modules/openapi-generator/src/main/resources/kotlin-spring
 additionalProperties:
   documentationProvider: none
-  annotationLibrary: swagger1
-  useSwaggerUI: false
-  serviceImplementation: false
-  skipDefaultInterface: true
-  interfaceOnly: true
-  serializableModel: true
-  beanValidations: true
-  includeHttpRequestContext: true
+  annotationLibrary: none
+  useSwaggerUI: "false"
+  serviceImplementation: "false"
+  skipDefaultInterface: "true"
+  interfaceOnly: "true"
+  serializableModel: "true"
+  beanValidations: "true"

bin/configs/kotlin-spring-declarative-interface-reactive-coroutines.yaml

@@ -1,16 +0,0 @@
-generatorName: kotlin-spring
-outputDir: samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines
-library: spring-declarative-http-interface
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/kotlin-spring
-additionalProperties:
-  documentationProvider: springDoc
-  annotationLibrary: swagger2
-  useSwaggerUI: "false"
-  serializableModel: "true"
-  beanValidations: "true"
-  interfaceOnly: true
-  reactive: true
-  declarativeInterfaceWrapResponses: false
-  useFlowForArrayReturnType: false
-  declarativeInterfaceReactiveMode: "coroutines"

bin/configs/kotlin-spring-declarative-interface-reactive-reactor-wrapped.yaml

@@ -1,16 +0,0 @@
-generatorName: kotlin-spring
-outputDir: samples/server/petstore/kotlin-spring-declarative-interface-reactive-reactor-wrapped
-library: spring-declarative-http-interface
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/kotlin-spring
-additionalProperties:
-  documentationProvider: springDoc
-  annotationLibrary: swagger2
-  useSwaggerUI: "false"
-  serializableModel: "true"
-  beanValidations: "true"
-  interfaceOnly: true
-  reactive: true
-  declarativeInterfaceWrapResponses: true
-  useFlowForArrayReturnType: false
-  declarativeInterfaceReactiveMode: "reactor"

bin/configs/kotlin-spring-declarative-interface-wrapped.yaml

@@ -1,15 +0,0 @@
-generatorName: kotlin-spring
-outputDir: samples/server/petstore/kotlin-spring-declarative-interface-wrapped
-library: spring-declarative-http-interface
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/kotlin-spring
-additionalProperties:
-  documentationProvider: springDoc
-  annotationLibrary: swagger2
-  useSwaggerUI: "false"
-  serializableModel: "true"
-  beanValidations: "true"
-  interfaceOnly: true
-  reactive: false
-  declarativeInterfaceWrapResponses: true
-  useFlowForArrayReturnType: false

bin/configs/kotlin-spring-declarative-interface.yaml

@@ -1,15 +0,0 @@
-generatorName: kotlin-spring
-outputDir: samples/server/petstore/kotlin-spring-declarative-interface
-library: spring-declarative-http-interface
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/kotlin-spring
-additionalProperties:
-  documentationProvider: springDoc
-  annotationLibrary: swagger2
-  useSwaggerUI: "false"
-  serializableModel: "true"
-  beanValidations: "true"
-  interfaceOnly: true
-  reactive: false
-  declarativeInterfaceWrapResponses: true
-  useFlowForArrayReturnType: false

bin/configs/python-httpx.yaml

@@ -6,7 +6,7 @@ library: httpx
 additionalProperties:
   packageName: petstore_api
   mapNumberTo: float
-  poetry1: false
+  poetry1: true
 nameMappings:
   _type: underscore_type
   type_: type_with_underscore

bin/configs/rust-reqwest-enum-query-params.yaml

@@ -1,8 +0,0 @@
-generatorName: rust
-outputDir: samples/client/others/rust/reqwest/enum-query-params
-library: reqwest
-inputSpec: modules/openapi-generator/src/test/resources/3_0/rust/enum-query-params.yaml
-templateDir: modules/openapi-generator/src/main/resources/rust
-additionalProperties:
-  supportAsync: true
-  packageName: enum-query-params-reqwest

bin/configs/rust-reqwest-petstore-serde-path-to-error.yaml

@@ -1,10 +0,0 @@
-generatorName: rust
-outputDir: samples/client/petstore/rust/reqwest/petstore-serde-path-to-error
-library: reqwest
-inputSpec: modules/openapi-generator/src/test/resources/3_0/rust/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/rust
-additionalProperties:
-  packageName: petstore-reqwest-serde-path-to-error
-  useSerdePathToError: true
-enumNameMappings:
-  delivered: shipped

bin/utils/test_file_list.yaml

@@ -31,10 +31,10 @@
   sha256: 24c6a39a9d7327d397dc038c368a19c84f14ed96a69fe28d53719b3eaf0a725c
 - filename: "samples/client/petstore/java/jersey3/src/test/java/org/openapitools/client/api/PetApiTest.java"
   sha256: 5e9f471d34310f94895751bb96cc79583376f043593c3a387c82077c70f8102f
-- filename: "samples/client/petstore/java/jersey3/src/test/java/org/openapitools/client/MammalTest.java"
-  sha256: a09c120b694788b12f8d73cc0dd307e509ee1744b2ff45c5711b1186c419f915
-- filename: "samples/client/petstore/java/jersey3/src/test/java/org/openapitools/client/ZebraTest.java"
-  sha256: 15e509d8cb8e9b050c6418cfbf8a5dced9acc97cf29e5727da9f907c52d11f1e
+- filename: "samples/client/petstore/java/jersey3/src/test/java/org/openapitools/client/model/MammalTest.java"
+  sha256: 67a9e63e13ebddac21cb236aa015edce30f5d3bd8d6adcf50044cad00d48c45e
+- filename: "samples/client/petstore/java/jersey3/src/test/java/org/openapitools/client/model/ZebraTest.java"
+  sha256: 15eeb6d8a9a79d0f1930b861540d9c5780d6c49ea4fdb68269ac3e7ec481e142
 - filename: "samples/client/petstore/java/okhttp-gson-3.1/src/test/java/org/openapitools/client/api/PetApiTest.java"
   sha256: d8f7fff724f81e666daf115cc25f8347e1fda4e861aa30df0dae3fa50c91404c
 - filename: "samples/client/petstore/java/okhttp-gson-dynamicOperations/src/test/java/org/openapitools/client/api/PetApiTest.java"
@@ -59,6 +59,6 @@
   sha256: 45cdaba3d2adc212cd4f0184ad475419a95e2326254c2ef84175e210c922b2f3
 # rust axum test files
 - filename: "samples/server/petstore/rust-axum/output/rust-axum-oneof/tests/oneof_with_discriminator.rs"
-  sha256: b2093528aac971193f2863a70f46eea45cf8bda79120b133a614599e80d8b46d
+  sha256: 2d4f5a069fdcb3057bb078d5e75b3de63cd477b97725e457079df24bd2c30600
 - filename: "samples/server/petstore/rust-axum/output/openapi-v3/tests/oneof_untagged.rs"
   sha256: 1d3fb01f65e98290b1d3eece28014c7d3e3f2fdf18e7110249d3c591cc4642ab

docs/customization.md

@@ -538,7 +538,6 @@ OpenAPI Normalizer transforms the input OpenAPI doc/spec (which may not perfectl
 
 - SIMPLIFY_ONEOF_ANYOF 
 - SIMPLIFY_BOOLEAN_ENUM
-- REFACTOR_ALLOF_WITH_PROPERTIES_ONLY
 
 (One can use `DISABLE_ALL=true` to disable all the rules)
 
@@ -644,16 +643,9 @@ Example:
 java -jar modules/openapi-generator-cli/target/openapi-generator-cli.jar generate -g java -i modules/openapi-generator/src/test/resources/3_0/required-properties.yaml -o /tmp/java-okhttp/ --openapi-normalizer NORMALIZER_CLASS=org.openapitools.codegen.OpenAPINormalizerTest$RemoveRequiredNormalizer
 ```
 
-- `REMOVE_PROPERTIES_FROM_TYPE_OTHER_THAN_OBJECT`: When set to true, remove the "properties" of a schema with type other than "object".
-
-Example:
-```
-java -jar modules/openapi-generator-cli/target/openapi-generator-cli.jar generate -g java -i modules/openapi-generator/src/test/resources/3_0/required-properties.yaml -o /tmp/java-okhttp/ --openapi-normalizer REMOVE_PROPERTIES_FROM_TYPE_OTHER_THAN_OBJECT=true
-```
-
 - `FILTER`
 
-The `FILTER` parameter allows selective inclusion of API operations based on specific criteria. It applies the `x-internal: true` property to operations that do **not** match the specified values, preventing them from being generated. Multiple filters can be separated by a semicolon.
+The `FILTER` parameter allows selective inclusion of API operations based on specific criteria. It applies the `x-internal: true` property to operations that do **not** match the specified values, preventing them from being generated.
 
 ### Available Filters
 
@@ -666,9 +658,6 @@ The `FILTER` parameter allows selective inclusion of API operations based on spe
 - **`tag`**  
   When set to `tag:person|basic`, operations **not** tagged with `person` or `basic` will be marked as internal (`x-internal: true`), and will not be generated.
 
-- **`path`**  
-  When set to `path:/v1|/v2`, operations on paths **not** starting with `/v1` or with `/v2` will be marked as internal (`x-internal: true`), and will not be generated.
-
 ### Example Usage
 
 ```sh
@@ -676,7 +665,7 @@ java -jar modules/openapi-generator-cli/target/openapi-generator-cli.jar generat
   -g java \
   -i modules/openapi-generator/src/test/resources/3_0/petstore.yaml \
   -o /tmp/java-okhttp/ \
-  --openapi-normalizer FILTER="operationId:addPet|getPetById ; tag:store"
+  --openapi-normalizer FILTER="operationId:addPet|getPetById"
 ```
 
 - `SET_CONTAINER_TO_NULLABLE`: When set to `array|set|map` (or just `array`) for example, it will set `nullable` in array, set and map to true.

docs/generators.md

@@ -3,7 +3,6 @@ id: generators
 title: Generators List
 ---
 
-[main] INFO  o.o.c.l.PythonFastAPIServerCodegen - Skipping sorting of path operations, order matters, let the developer decide via their specification file.
 The following generators are available:
 
 ## CLIENT generators

docs/generators/java-camel.md

@@ -133,9 +133,6 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |x-spring-paginated|Add `org.springframework.data.domain.Pageable` to controller method. Can be used to handle `page`, `size` and `sort` query parameters. If these query parameters are also specified in the operation spec, they will be removed from the controller method as their values can be obtained from the `Pageable` object.|OPERATION|false
 |x-version-param|Marker property that tells that this parameter would be used for endpoint versioning. Applicable for headers & query params. true/false|OPERATION_PARAMETER|null
 |x-pattern-message|Add this property whenever you need to customize the invalidation error message for the regex pattern of a variable|FIELD, OPERATION_PARAMETER|null
-|x-size-message|Add this property whenever you need to customize the invalidation error message for the size or length of a variable|FIELD, OPERATION_PARAMETER|null
-|x-minimum-message|Add this property whenever you need to customize the invalidation error message for the minimum value of a variable|FIELD, OPERATION_PARAMETER|null
-|x-maximum-message|Add this property whenever you need to customize the invalidation error message for the maximum value of a variable|FIELD, OPERATION_PARAMETER|null
 |x-spring-api-version|Value for 'version' attribute in @RequestMapping (for Spring 7 and above).|OPERATION|null
 
 

docs/generators/java-microprofile.md

@@ -105,7 +105,6 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |useRxJava3|Whether to use the RxJava3 adapter with the retrofit2 library. IMPORTANT: This option has been deprecated.| |false|
 |useSealedOneOfInterfaces|Generate the oneOf interfaces as sealed interfaces. Only supported for WebClient and RestClient.| |false|
 |useSingleRequestParameter|Setting this property to "true" will generate functions with a single argument containing all API endpoint parameters instead of one argument per parameter. ONLY native, jersey2, jersey3, okhttp-gson, microprofile, Spring RestClient, Spring WebClient support this option. Setting this property to "static" does the same as "true", but also makes the generated arguments class static with single parameter instantiation.| |false|
-|useUnaryInterceptor|If true it will generate ResponseInterceptors using a UnaryOperator. This can be usefull for manipulating the request before it gets passed, for example doing your own decryption| |false|
 |webclientBlockingOperations|Making all WebClient operations blocking(sync). Note that if on operation 'x-webclient-blocking: false' then such operation won't be sync| |false|
 |withAWSV4Signature|whether to include AWS v4 signature support (only available for okhttp-gson library)| |false|
 |withXml|whether to include support for application/xml content type and include XML annotations in the model (works with libraries that provide support for JSON and XML)| |false|

docs/generators/java.md

@@ -105,7 +105,6 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |useRxJava3|Whether to use the RxJava3 adapter with the retrofit2 library. IMPORTANT: This option has been deprecated.| |false|
 |useSealedOneOfInterfaces|Generate the oneOf interfaces as sealed interfaces. Only supported for WebClient and RestClient.| |false|
 |useSingleRequestParameter|Setting this property to "true" will generate functions with a single argument containing all API endpoint parameters instead of one argument per parameter. ONLY native, jersey2, jersey3, okhttp-gson, microprofile, Spring RestClient, Spring WebClient support this option. Setting this property to "static" does the same as "true", but also makes the generated arguments class static with single parameter instantiation.| |false|
-|useUnaryInterceptor|If true it will generate ResponseInterceptors using a UnaryOperator. This can be usefull for manipulating the request before it gets passed, for example doing your own decryption| |false|
 |webclientBlockingOperations|Making all WebClient operations blocking(sync). Note that if on operation 'x-webclient-blocking: false' then such operation won't be sync| |false|
 |withAWSV4Signature|whether to include AWS v4 signature support (only available for okhttp-gson library)| |false|
 |withXml|whether to include support for application/xml content type and include XML annotations in the model (works with libraries that provide support for JSON and XML)| |false|

docs/generators/jaxrs-cxf-cdi.md

@@ -84,7 +84,6 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |useMutiny|Whether to use Smallrye Mutiny instead of CompletionStage for asynchronous computation. Only valid when library is set to quarkus.| |false|
 |useOneOfInterfaces|whether to use a java interface to describe a set of oneOf options, where each option is a class that implements the interface| |false|
 |useSwaggerAnnotations|Whether to generate Swagger annotations.| |true|
-|useSwaggerV3Annotations|Whether to generate Swagger v3 (OpenAPI v3) annotations.| |false|
 |useTags|use tags for creating interface and controller classnames| |false|
 |withXml|whether to include support for application/xml content type and include XML annotations in the model (works with libraries that provide support for JSON and XML)| |false|
 

docs/generators/jaxrs-spec.md

@@ -85,7 +85,6 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |useMutiny|Whether to use Smallrye Mutiny instead of CompletionStage for asynchronous computation. Only valid when library is set to quarkus.| |false|
 |useOneOfInterfaces|whether to use a java interface to describe a set of oneOf options, where each option is a class that implements the interface| |false|
 |useSwaggerAnnotations|Whether to generate Swagger annotations.| |true|
-|useSwaggerV3Annotations|Whether to generate Swagger v3 (OpenAPI v3) annotations.| |false|
 |useTags|use tags for creating interface and controller classnames| |false|
 |withXml|whether to include support for application/xml content type and include XML annotations in the model (works with libraries that provide support for JSON and XML)| |false|
 

docs/generators/kotlin-spring.md

@@ -27,17 +27,14 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |basePackage|base package (invokerPackage) for generated code| |org.openapitools|
 |beanQualifiers|Whether to add fully-qualifier class names as bean qualifiers in @Component and @RestController annotations. May be used to prevent bean names clash if multiple generated libraries (contexts) added to single project.| |false|
 |configPackage|configuration package for generated code| |org.openapitools.configuration|
-|declarativeInterfaceReactiveMode|What type of reactive style to use in Spring Http declarative interface|<dl><dt>**coroutines**</dt><dd>Use kotlin-idiomatic 'suspend' functions</dd><dt>**reactor**</dt><dd>Use reactor return wrappers 'Mono' and 'Flux'</dd></dl>|coroutines|
-|declarativeInterfaceWrapResponses|Whether (when false) to return actual type (e.g. List&lt;Fruit&gt;) and handle non 2xx responses via exceptions or (when true) return entire ResponseEntity (e.g. ResponseEntity&lt;List&lt;Fruit&gt;&gt;)| |false|
 |delegatePattern|Whether to generate the server files using the delegate pattern| |false|
 |documentationProvider|Select the OpenAPI documentation provider.|<dl><dt>**none**</dt><dd>Do not publish an OpenAPI specification.</dd><dt>**source**</dt><dd>Publish the original input OpenAPI specification.</dd><dt>**springfox**</dt><dd>Generate an OpenAPI 2 (fka Swagger RESTful API Documentation Specification) specification using SpringFox 2.x. Deprecated (for removal); use springdoc instead.</dd><dt>**springdoc**</dt><dd>Generate an OpenAPI 3 specification using SpringDoc.</dd></dl>|springdoc|
 |enumPropertyNaming|Naming convention for enum properties: 'camelCase', 'PascalCase', 'snake_case', 'UPPERCASE', and 'original'| |original|
 |exceptionHandler|generate default global exception handlers (not compatible with reactive. enabling reactive will disable exceptionHandler )| |true|
 |gradleBuildFile|generate a gradle build file using the Kotlin DSL| |true|
 |groupId|Generated artifact package's organization (i.e. maven groupId).| |org.openapitools|
-|includeHttpRequestContext|Whether to include HttpServletRequest (blocking) or ServerWebExchange (reactive) as additional parameter in generated methods.| |false|
 |interfaceOnly|Whether to generate only API interface stubs without the server files.| |false|
-|library|library template (sub-template)|<dl><dt>**spring-boot**</dt><dd>Spring-boot Server application.</dd><dt>**spring-cloud**</dt><dd>Spring-Cloud-Feign client with Spring-Boot auto-configured settings.</dd><dt>**spring-declarative-http-interface**</dt><dd>Spring Declarative Interface client</dd></dl>|spring-boot|
+|library|library template (sub-template)|<dl><dt>**spring-boot**</dt><dd>Spring-boot Server application.</dd><dt>**spring-cloud**</dt><dd>Spring-Cloud-Feign client with Spring-Boot auto-configured settings.</dd></dl>|spring-boot|
 |modelMutable|Create mutable models| |false|
 |modelPackage|model package for generated code| |org.openapitools.model|
 |packageName|Generated artifact package name.| |org.openapitools|
@@ -70,9 +67,6 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |x-discriminator-value|Used with model inheritance to specify value for discriminator that identifies current model|MODEL|
 |x-field-extra-annotation|List of custom annotations to be added to property|FIELD, OPERATION_PARAMETER|null
 |x-pattern-message|Add this property whenever you need to customize the invalidation error message for the regex pattern of a variable|FIELD, OPERATION_PARAMETER|null
-|x-size-message|Add this property whenever you need to customize the invalidation error message for the size or length of a variable|FIELD, OPERATION_PARAMETER|null
-|x-minimum-message|Add this property whenever you need to customize the invalidation error message for the minimum value of a variable|FIELD, OPERATION_PARAMETER|null
-|x-maximum-message|Add this property whenever you need to customize the invalidation error message for the maximum value of a variable|FIELD, OPERATION_PARAMETER|null
 |x-kotlin-implements|Ability to specify interfaces that model must implement|MODEL|empty array
 |x-kotlin-implements-fields|Specify attributes that are implemented by the interface(s) added via `x-kotlin-implements`|MODEL|empty array
 

docs/generators/nim.md

@@ -226,8 +226,8 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |Polymorphism|✗|OAS2,OAS3
 |Union|✗|OAS3
 |allOf|✗|OAS2,OAS3
-|anyOf|✓|OAS3
-|oneOf|✓|OAS3
+|anyOf|✗|OAS3
+|oneOf|✗|OAS3
 |not|✗|OAS3
 
 ### Security Feature

docs/generators/python-aiohttp.md

@@ -55,7 +55,6 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <ul class="column-ul">
 <li>Dict</li>
 <li>List</li>
-<li>UUID</li>
 <li>bool</li>
 <li>bytes</li>
 <li>date</li>
@@ -156,7 +155,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |DateTime|✓|OAS2,OAS3
 |Password|✓|OAS2,OAS3
 |File|✓|OAS2
-|Uuid|✓|
+|Uuid|✗|
 |Array|✓|OAS2,OAS3
 |Null|✗|OAS3
 |AnyType|✗|OAS2,OAS3

docs/generators/python-blueplanet.md

@@ -55,7 +55,6 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <ul class="column-ul">
 <li>Dict</li>
 <li>List</li>
-<li>UUID</li>
 <li>bool</li>
 <li>bytes</li>
 <li>date</li>
@@ -156,7 +155,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |DateTime|✓|OAS2,OAS3
 |Password|✓|OAS2,OAS3
 |File|✓|OAS2
-|Uuid|✓|
+|Uuid|✗|
 |Array|✓|OAS2,OAS3
 |Null|✗|OAS3
 |AnyType|✗|OAS2,OAS3

docs/generators/python-fastapi.md

@@ -50,7 +50,6 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <ul class="column-ul">
 <li>Dict</li>
 <li>List</li>
-<li>UUID</li>
 <li>bool</li>
 <li>bytes</li>
 <li>date</li>
@@ -151,7 +150,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |DateTime|✓|OAS2,OAS3
 |Password|✓|OAS2,OAS3
 |File|✓|OAS2
-|Uuid|✓|
+|Uuid|✗|
 |Array|✓|OAS2,OAS3
 |Null|✗|OAS3
 |AnyType|✗|OAS2,OAS3

docs/generators/python-flask.md

@@ -55,7 +55,6 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <ul class="column-ul">
 <li>Dict</li>
 <li>List</li>
-<li>UUID</li>
 <li>bool</li>
 <li>bytes</li>
 <li>date</li>
@@ -156,7 +155,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |DateTime|✓|OAS2,OAS3
 |Password|✓|OAS2,OAS3
 |File|✓|OAS2
-|Uuid|✓|
+|Uuid|✗|
 |Array|✓|OAS2,OAS3
 |Null|✗|OAS3
 |AnyType|✗|OAS2,OAS3

docs/generators/python.md

@@ -53,7 +53,6 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <ul class="column-ul">
 <li>Dict</li>
 <li>List</li>
-<li>UUID</li>
 <li>bool</li>
 <li>bytearray</li>
 <li>bytes</li>
@@ -156,7 +155,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |DateTime|✓|OAS2,OAS3
 |Password|✓|OAS2,OAS3
 |File|✓|OAS2
-|Uuid|✓|
+|Uuid|✗|
 |Array|✓|OAS2,OAS3
 |Null|✗|OAS3
 |AnyType|✗|OAS2,OAS3

docs/generators/rust.md

@@ -34,7 +34,6 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |supportTokenSource|If set, add support for google-cloud-token. This option is for 'reqwest' and 'reqwest-trait' library only and requires the 'supportAsync' option| |false|
 |topLevelApiClient|Creates a top level `Api` trait and `ApiClient` struct that contain all Apis. This option is for 'reqwest-trait' library only| |false|
 |useBonBuilder|Use the bon crate for building parameter types. This option is for the 'reqwest-trait' library only| |false|
-|useSerdePathToError|If set, use the serde_path_to_error library to enhance serde error messages. This option is for 'reqwest' and 'reqwest-trait' library only| |false|
 |useSingleRequestParameter|Setting this property to true will generate functions with a single argument containing all API endpoint parameters instead of one argument per parameter.| |false|
 |withAWSV4Signature|whether to include AWS v4 signature support| |false|
 

docs/generators/spring.md

@@ -126,9 +126,6 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |x-spring-paginated|Add `org.springframework.data.domain.Pageable` to controller method. Can be used to handle `page`, `size` and `sort` query parameters. If these query parameters are also specified in the operation spec, they will be removed from the controller method as their values can be obtained from the `Pageable` object.|OPERATION|false
 |x-version-param|Marker property that tells that this parameter would be used for endpoint versioning. Applicable for headers & query params. true/false|OPERATION_PARAMETER|null
 |x-pattern-message|Add this property whenever you need to customize the invalidation error message for the regex pattern of a variable|FIELD, OPERATION_PARAMETER|null
-|x-size-message|Add this property whenever you need to customize the invalidation error message for the size or length of a variable|FIELD, OPERATION_PARAMETER|null
-|x-minimum-message|Add this property whenever you need to customize the invalidation error message for the minimum value of a variable|FIELD, OPERATION_PARAMETER|null
-|x-maximum-message|Add this property whenever you need to customize the invalidation error message for the maximum value of a variable|FIELD, OPERATION_PARAMETER|null
 |x-spring-api-version|Value for 'version' attribute in @RequestMapping (for Spring 7 and above).|OPERATION|null
 
 

docs/generators/typescript-axios.md

@@ -44,7 +44,6 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |supportsES6|Generate code that conforms to ES6.| |false|
 |useSingleRequestParameter|Setting this property to true will generate functions with a single argument containing all API endpoint parameters instead of one argument per parameter.| |false|
 |useSquareBracketsInArrayNames|Setting this property to true will add brackets to array attribute names, e.g. my_values[].| |false|
-|withAWSV4Signature|whether to include AWS v4 signature support| |false|
 |withInterfaces|Setting this property to true will generate interfaces next to the default class implementations.| |false|
 |withNodeImports|Setting this property to true adds imports for NodeJS| |false|
 |withSeparateModelsAndApi|Put the model and api in separate folders and in separate classes. This requires in addition a value for 'apiPackage' and 'modelPackage'| |false|
@@ -292,7 +291,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |OAuth2_ClientCredentials|✗|OAS2,OAS3
 |OAuth2_AuthorizationCode|✗|OAS2,OAS3
 |SignatureAuth|✗|OAS3
-|AWSV4Signature|✓|ToolingExtension
+|AWSV4Signature|✗|ToolingExtension
 
 ### Wire Format Feature
 | Name | Supported | Defined By |

docs/installation.md

@@ -22,7 +22,7 @@ npm install @openapitools/openapi-generator-cli -g
 To install a specific version of the tool, pass the version during installation:
 <!-- RELEASE_VERSION -->
 ```bash
-openapi-generator-cli version-manager set 7.17.0
+openapi-generator-cli version-manager set 7.16.0
 ```
 <!-- /RELEASE_VERSION -->
 To install the tool as a dev dependency in your current project:
@@ -119,18 +119,18 @@ docker run --rm \
 <!-- RELEASE_VERSION -->
 If you're looking for the latest stable version, you can grab it directly from Maven.org (Java 11 runtime at a minimum):
 
-JAR location: `https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/7.17.0/openapi-generator-cli-7.17.0.jar`
+JAR location: `https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/7.16.0/openapi-generator-cli-7.16.0.jar`
 
 For **Mac/Linux** users:
 
 ```bash
-wget https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/7.17.0/openapi-generator-cli-7.17.0.jar -O openapi-generator-cli.jar
+wget https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/7.16.0/openapi-generator-cli-7.16.0.jar -O openapi-generator-cli.jar
 ```
 
 For **Windows** users, you will need to install [wget](http://gnuwin32.sourceforge.net/packages/wget.htm) or you can use Invoke-WebRequest in PowerShell (3.0+), e.g.
 
 ```powershell
-Invoke-WebRequest -OutFile openapi-generator-cli.jar https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/7.17.0/openapi-generator-cli-7.17.0.jar
+Invoke-WebRequest -OutFile openapi-generator-cli.jar https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/7.16.0/openapi-generator-cli-7.16.0.jar
 ```
 <!-- /RELEASE_VERSION -->
 

docs/plugins.md

@@ -16,7 +16,7 @@ Add to your `build->plugins` section (default phase is `generate-sources` phase)
 <plugin>
     <groupId>org.openapitools</groupId>
     <artifactId>openapi-generator-maven-plugin</artifactId>
-    <version>7.17.0</version>
+    <version>7.16.0</version>
     <executions>
         <execution>
             <goals>

modules/openapi-generator-cli/pom.xml

@@ -4,7 +4,7 @@
         <groupId>org.openapitools</groupId>
         <artifactId>openapi-generator-project</artifactId>
         <!-- RELEASE_VERSION -->
-        <version>7.18.0-SNAPSHOT</version>
+        <version>7.17.0-SNAPSHOT</version>
         <!-- /RELEASE_VERSION -->
         <relativePath>../../pom.xml</relativePath>
     </parent>

modules/openapi-generator-cli/src/main/java/org/openapitools/codegen/cmd/GenerateBatch.java

@@ -29,7 +29,6 @@ import io.airlift.airline.Arguments;
 import io.airlift.airline.Command;
 import io.airlift.airline.Option;
 import org.apache.commons.io.FileUtils;
-import org.apache.commons.lang3.Strings;
 import org.apache.commons.lang3.StringUtils;
 import org.openapitools.codegen.ClientOptInput;
 import org.openapitools.codegen.CodegenConfig;
@@ -249,7 +248,7 @@ public class GenerateBatch extends OpenApiGeneratorCommand {
             Path filesMeta = Paths.get(outDir.toAbsolutePath().toString(), ".openapi-generator", "FILES");
             if (filesMeta.toFile().exists()) {
                 FileUtils.readLines(filesMeta.toFile(), StandardCharsets.UTF_8).forEach(relativePath -> {
-                    if (!Strings.CS.startsWith(relativePath, ".")) {
+                    if (!StringUtils.startsWith(relativePath, ".")) {
                         Path file = outDir.resolve(relativePath).toAbsolutePath();
                         // hack: disallow directory traversal outside of output directory. we don't want to delete wrong files.
                         if (file.toString().startsWith(outDir.toAbsolutePath().toString())) {

modules/openapi-generator-core/pom.xml

@@ -6,7 +6,7 @@
     <artifactId>openapi-generator-project</artifactId>
     <groupId>org.openapitools</groupId>
     <!-- RELEASE_VERSION -->
-    <version>7.18.0-SNAPSHOT</version>
+    <version>7.17.0-SNAPSHOT</version>
     <!-- /RELEASE_VERSION -->
     <relativePath>../../pom.xml</relativePath>
   </parent>

modules/openapi-generator-gradle-plugin/README.adoc

@@ -97,7 +97,7 @@ task validateGoodSpec(type: org.openapitools.generator.gradle.plugin.tasks.Valid
 [source,group]
 ----
 plugins {
-  id "org.openapi.generator" version "7.17.0"
+  id "org.openapi.generator" version "7.16.0"
 }
 ----
 
@@ -113,7 +113,7 @@ buildscript {
     // url "https://plugins.gradle.org/m2/"
   }
   dependencies {
-    classpath "org.openapitools:openapi-generator-gradle-plugin:7.17.0"
+    classpath "org.openapitools:openapi-generator-gradle-plugin:7.16.0"
   }
 }
 
@@ -759,7 +759,7 @@ buildscript {
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:3.2.1'
-        classpath('org.openapitools:openapi-generator-gradle-plugin:7.17.0') {
+        classpath('org.openapitools:openapi-generator-gradle-plugin:7.16.0') {
             exclude group: 'com.google.guava'
         }
     }

modules/openapi-generator-gradle-plugin/gradle.properties

@@ -1,5 +1,5 @@
 # RELEASE_VERSION
-openApiGeneratorVersion=7.18.0-SNAPSHOT
+openApiGeneratorVersion=7.17.0-SNAPSHOT
 # /RELEASE_VERSION
 
 # BEGIN placeholders

modules/openapi-generator-gradle-plugin/pom.xml

@@ -4,7 +4,7 @@
         <groupId>org.openapitools</groupId>
         <artifactId>openapi-generator-project</artifactId>
         <!-- RELEASE_VERSION -->
-        <version>7.18.0-SNAPSHOT</version>
+        <version>7.17.0-SNAPSHOT</version>
         <!-- /RELEASE_VERSION -->
         <relativePath>../../pom.xml</relativePath>
     </parent>

modules/openapi-generator-gradle-plugin/samples/local-spec/README.md

@@ -19,5 +19,5 @@ gradle generateGoWithInvalidSpec    # expected outcome: BUILD FAILED
 The samples can be tested against other versions of the plugin using the `openApiGeneratorVersion` property. For example:
 
 ```bash
-gradle -PopenApiGeneratorVersion=7.17.0 openApiValidate
+gradle -PopenApiGeneratorVersion=7.16.0 openApiValidate
 ```

modules/openapi-generator-gradle-plugin/samples/local-spec/gradle.properties

@@ -1,3 +1,3 @@
 # RELEASE_VERSION
-openApiGeneratorVersion=7.18.0-SNAPSHOT
+openApiGeneratorVersion=7.17.0-SNAPSHOT
 # /RELEASE_VERSION

modules/openapi-generator-gradle-plugin/src/main/kotlin/org/openapitools/generator/gradle/plugin/extensions/OpenApiGeneratorGenerateExtension.kt

@@ -81,12 +81,12 @@ open class OpenApiGeneratorGenerateExtension(project: Project) {
     /**
      * The template directory holding a custom template.
      */
-    val templateDir = project.objects.property<String>()
+    val templateDir = project.objects.property<String?>()
 
     /**
      * The template location (which may be a directory or a classpath location) holding custom templates.
      */
-    val templateResourcePath = project.objects.property<String>()
+    val templateResourcePath = project.objects.property<String?>()
 
     /**
      * Adds authorization headers when fetching the OpenAPI definitions remotely.
@@ -109,7 +109,7 @@ open class OpenApiGeneratorGenerateExtension(project: Project) {
     /**
      * Specifies if the existing files should be overwritten during the generation.
      */
-    val skipOverwrite = project.objects.property<Boolean>()
+    val skipOverwrite = project.objects.property<Boolean?>()
 
     /**
      * Package for generated classes (where supported)
@@ -244,32 +244,32 @@ open class OpenApiGeneratorGenerateExtension(project: Project) {
     /**
      * Reference the library template (sub-template) of a generator.
      */
-    val library = project.objects.property<String>()
+    val library = project.objects.property<String?>()
 
     /**
      * Git host, e.g. gitlab.com.
      */
-    val gitHost = project.objects.property<String>()
+    val gitHost = project.objects.property<String?>()
 
     /**
      * Git user ID, e.g. openapitools.
      */
-    val gitUserId = project.objects.property<String>()
+    val gitUserId = project.objects.property<String?>()
 
     /**
      * Git repo ID, e.g. openapi-generator.
      */
-    val gitRepoId = project.objects.property<String>()
+    val gitRepoId = project.objects.property<String?>()
 
     /**
      * Release note, default to 'Minor update'.
      */
-    val releaseNote = project.objects.property<String>()
+    val releaseNote = project.objects.property<String?>()
 
     /**
      * HTTP user agent, e.g. codegen_csharp_api_client, default to 'OpenAPI-Generator/{packageVersion}/{language}'
      */
-    val httpUserAgent = project.objects.property<String>()
+    val httpUserAgent = project.objects.property<String?>()
 
     /**
      * Specifies how a reserved name should be escaped to. Otherwise, the default _<name> is used.
@@ -279,17 +279,17 @@ open class OpenApiGeneratorGenerateExtension(project: Project) {
     /**
      * Specifies an override location for the .openapi-generator-ignore file. Most useful on initial generation.
      */
-    val ignoreFileOverride = project.objects.property<String>()
+    val ignoreFileOverride = project.objects.property<String?>()
 
     /**
      * Remove prefix of operationId, e.g. config_getId => getId
      */
-    val removeOperationIdPrefix = project.objects.property<Boolean>()
+    val removeOperationIdPrefix = project.objects.property<Boolean?>()
 
     /**
      * Skip examples defined in the operation
      */
-    val skipOperationExample = project.objects.property<Boolean>()
+    val skipOperationExample = project.objects.property<Boolean?>()
 
     /**
      * Defines which API-related files should be generated. This allows you to create a subset of generated files (or none at all).
@@ -394,7 +394,7 @@ open class OpenApiGeneratorGenerateExtension(project: Project) {
     /**
      * Templating engine: "mustache" (default) or "handlebars" (beta)
      */
-    val engine = project.objects.property<String>()
+    val engine = project.objects.property<String?>()
 
     /**
      * Defines whether the output dir should be cleaned up before generating the output.

modules/openapi-generator-gradle-plugin/src/main/kotlin/org/openapitools/generator/gradle/plugin/tasks/GenerateTask.kt

@@ -55,6 +55,7 @@ import org.openapitools.codegen.config.MergedSpecBuilder
  *
  * @author Jim Schubert
  */
+@Suppress("UnstableApiUsage")
 @CacheableTask
 open class GenerateTask @Inject constructor(private val objectFactory: ObjectFactory) : DefaultTask() {
 
@@ -153,14 +154,14 @@ open class GenerateTask @Inject constructor(private val objectFactory: ObjectFac
     @get:Optional
     @get:InputDirectory
     @get:PathSensitive(PathSensitivity.RELATIVE)
-    val templateDir = project.objects.property<String>()
+    val templateDir = project.objects.property<String?>()
 
     /**
      * Resource path containing template files.
      */
     @get:Optional
     @get:Input
-    val templateResourcePath = project.objects.property<String>()
+    val templateResourcePath = project.objects.property<String?>()
 
     /**
      * Adds authorization headers when fetching the OpenAPI definitions remotely.
@@ -192,7 +193,7 @@ open class GenerateTask @Inject constructor(private val objectFactory: ObjectFac
      */
     @get:Optional
     @get:Input
-    val skipOverwrite = project.objects.property<Boolean>()
+    val skipOverwrite = project.objects.property<Boolean?>()
 
     /**
      * Package for generated classes (where supported)
@@ -383,42 +384,42 @@ open class GenerateTask @Inject constructor(private val objectFactory: ObjectFac
      */
     @get:Optional
     @get:Input
-    val library = project.objects.property<String>()
+    val library = project.objects.property<String?>()
 
     /**
      * Git host, e.g. gitlab.com.
      */
     @get:Optional
     @get:Input
-    val gitHost = project.objects.property<String>()
+    val gitHost = project.objects.property<String?>()
 
     /**
      * Git user ID, e.g. openapitools.
      */
     @get:Optional
     @get:Input
-    val gitUserId = project.objects.property<String>()
+    val gitUserId = project.objects.property<String?>()
 
     /**
      * Git repo ID, e.g. openapi-generator.
      */
     @get:Optional
     @get:Input
-    val gitRepoId = project.objects.property<String>()
+    val gitRepoId = project.objects.property<String?>()
 
     /**
      * Release note, default to 'Minor update'.
      */
     @get:Optional
     @get:Input
-    val releaseNote = project.objects.property<String>()
+    val releaseNote = project.objects.property<String?>()
 
     /**
      * HTTP user agent, e.g. codegen_csharp_api_client, default to 'OpenAPI-Generator/{packageVersion}/{language}'
      */
     @get:Optional
     @get:Input
-    val httpUserAgent = project.objects.property<String>()
+    val httpUserAgent = project.objects.property<String?>()
 
     /**
      * Specifies how a reserved name should be escaped to.
@@ -433,21 +434,21 @@ open class GenerateTask @Inject constructor(private val objectFactory: ObjectFac
     @get:Optional
     @get:InputFile
     @get:PathSensitive(PathSensitivity.RELATIVE)
-    val ignoreFileOverride = project.objects.property<String>()
+    val ignoreFileOverride = project.objects.property<String?>()
 
     /**
      * Remove prefix of operationId, e.g. config_getId => getId
      */
     @get:Optional
     @get:Input
-    val removeOperationIdPrefix = project.objects.property<Boolean>()
+    val removeOperationIdPrefix = project.objects.property<Boolean?>()
 
     /**
      * Remove examples defined in the operation
      */
     @get:Optional
     @get:Input
-    val skipOperationExample = project.objects.property<Boolean>()
+    val skipOperationExample = project.objects.property<Boolean?>()
 
     /**
      * Defines which API-related files should be generated. This allows you to create a subset of generated files (or none at all).
@@ -580,7 +581,7 @@ open class GenerateTask @Inject constructor(private val objectFactory: ObjectFac
      */
     @get:Optional
     @get:Input
-    val engine = project.objects.property<String>()
+    val engine = project.objects.property<String?>()
 
     /**
      * Defines whether the output dir should be cleaned up before generating the output.
@@ -597,11 +598,19 @@ open class GenerateTask @Inject constructor(private val objectFactory: ObjectFac
     @get:Input
     val dryRun = project.objects.property<Boolean>()
 
-    private fun <T> Property<T>.ifNotEmpty(block: Property<T>.(T) -> Unit) {
+    private fun <T : Any?> Property<T>.ifNotEmpty(block: Property<T>.(T) -> Unit) {
         if (isPresent) {
-            when (val value = get()) {
-                is String -> if (value.isNotEmpty()) block(value)
-                else -> block(value)
+            val item: T? = get()
+            if (item != null) {
+                when (get()) {
+                    is String -> if ((get() as String).isNotEmpty()) {
+                        block(get())
+                    }
+                    is String? -> if (true == (get() as String?)?.isNotEmpty()) {
+                        block(get())
+                    }
+                    else -> block(get())
+                }
             }
         }
     }
@@ -716,7 +725,7 @@ open class GenerateTask @Inject constructor(private val objectFactory: ObjectFac
             }
 
             skipOverwrite.ifNotEmpty { value ->
-                configurator.setSkipOverwrite(value)
+                configurator.setSkipOverwrite(value ?: false)
             }
 
             generatorName.ifNotEmpty { value ->
@@ -811,11 +820,11 @@ open class GenerateTask @Inject constructor(private val objectFactory: ObjectFac
             }
 
             removeOperationIdPrefix.ifNotEmpty { value ->
-                configurator.setRemoveOperationIdPrefix(value)
+                configurator.setRemoveOperationIdPrefix(value!!)
             }
 
             skipOperationExample.ifNotEmpty { value ->
-                configurator.setSkipOperationExample(value)
+                configurator.setSkipOperationExample(value!!)
             }
 
             logToStderr.ifNotEmpty { value ->

modules/openapi-generator-maven-plugin/README.md

@@ -12,7 +12,7 @@ Add to your `build->plugins` section (default phase is `generate-sources` phase)
     <groupId>org.openapitools</groupId>
     <artifactId>openapi-generator-maven-plugin</artifactId>
     <!-- RELEASE_VERSION -->
-    <version>7.17.0</version>
+    <version>7.16.0</version>
     <!-- /RELEASE_VERSION -->
     <executions>
         <execution>

modules/openapi-generator-maven-plugin/examples/java-client.xml

@@ -13,7 +13,7 @@
                 <groupId>org.openapitools</groupId>
                 <artifactId>openapi-generator-maven-plugin</artifactId>
                 <!-- RELEASE_VERSION -->
-                <version>7.18.0-SNAPSHOT</version>
+                <version>7.17.0-SNAPSHOT</version>
                 <!-- /RELEASE_VERSION -->
                 <executions>
                     <execution>

modules/openapi-generator-maven-plugin/examples/kotlin.xml

@@ -15,7 +15,7 @@
 				<groupId>org.openapitools</groupId>
 				<artifactId>openapi-generator-maven-plugin</artifactId>
 				<!-- RELEASE_VERSION -->
-				<version>7.18.0-SNAPSHOT</version>
+				<version>7.17.0-SNAPSHOT</version>
 				<!-- /RELEASE_VERSION -->
 				<executions>
 					<execution>

modules/openapi-generator-maven-plugin/examples/multi-module/java-client/pom.xml

@@ -19,7 +19,7 @@
                 <groupId>org.openapitools</groupId>
                 <artifactId>openapi-generator-maven-plugin</artifactId>
                 <!-- RELEASE_VERSION -->
-                <version>7.18.0-SNAPSHOT</version>
+                <version>7.17.0-SNAPSHOT</version>
                 <!-- /RELEASE_VERSION -->
                 <dependencies>
                     <dependency>

modules/openapi-generator-maven-plugin/examples/non-java-invalid-spec.xml

@@ -13,7 +13,7 @@
                 <groupId>org.openapitools</groupId>
                 <artifactId>openapi-generator-maven-plugin</artifactId>
                 <!-- RELEASE_VERSION -->
-                <version>7.18.0-SNAPSHOT</version>
+                <version>7.17.0-SNAPSHOT</version>
                 <!-- /RELEASE_VERSION -->
                 <executions>
                     <execution>

modules/openapi-generator-maven-plugin/examples/non-java.xml

@@ -13,7 +13,7 @@
                 <groupId>org.openapitools</groupId>
                 <artifactId>openapi-generator-maven-plugin</artifactId>
                 <!-- RELEASE_VERSION -->
-                <version>7.18.0-SNAPSHOT</version>
+                <version>7.17.0-SNAPSHOT</version>
                 <!-- /RELEASE_VERSION -->
                 <executions>
                     <execution>

modules/openapi-generator-maven-plugin/examples/spring.xml

@@ -20,7 +20,7 @@
                 <groupId>org.openapitools</groupId>
                 <artifactId>openapi-generator-maven-plugin</artifactId>
                 <!-- RELEASE_VERSION -->
-                <version>7.18.0-SNAPSHOT</version>
+                <version>7.17.0-SNAPSHOT</version>
                 <!-- /RELEASE_VERSION -->
                 <executions>
                     <execution>

modules/openapi-generator-maven-plugin/pom.xml

@@ -5,7 +5,7 @@
         <groupId>org.openapitools</groupId>
         <artifactId>openapi-generator-project</artifactId>
         <!-- RELEASE_VERSION -->
-        <version>7.18.0-SNAPSHOT</version>
+        <version>7.17.0-SNAPSHOT</version>
         <!-- /RELEASE_VERSION -->
         <relativePath>../../pom.xml</relativePath>
     </parent>

modules/openapi-generator-online/pom.xml

@@ -4,7 +4,7 @@
         <groupId>org.openapitools</groupId>
         <artifactId>openapi-generator-project</artifactId>
         <!-- RELEASE_VERSION -->
-        <version>7.18.0-SNAPSHOT</version>
+        <version>7.17.0-SNAPSHOT</version>
         <!-- /RELEASE_VERSION -->
         <relativePath>../../pom.xml</relativePath>
     </parent>

modules/openapi-generator/pom.xml

@@ -4,7 +4,7 @@
         <groupId>org.openapitools</groupId>
         <artifactId>openapi-generator-project</artifactId>
         <!-- RELEASE_VERSION -->
-        <version>7.18.0-SNAPSHOT</version>
+        <version>7.17.0-SNAPSHOT</version>
         <!-- /RELEASE_VERSION -->
         <relativePath>../../pom.xml</relativePath>
     </parent>

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

@@ -265,15 +265,6 @@ public class CodegenModel implements IJsonSchemaValidationProperties {
     private Map<String, CodegenProperty> requiredVarsMap;
     private String ref;
 
-    /**
-     * An alias for vendor extensions, e.g. one can use {{exts.x-something}} for cleaner template
-     *
-     * @return vendor extensions
-     */
-    public Map<String, Object> getExts() {
-        return vendorExtensions;
-    }
-
     @Override
     public CodegenProperty getContains() {
         return contains;
@@ -374,6 +365,7 @@ public class CodegenModel implements IJsonSchemaValidationProperties {
         return discriminator == null ? null : discriminator.getPropertyName();
     }
 
+
     @Override
     public String getPattern() {
         return pattern;

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

@@ -79,15 +79,6 @@ public class CodegenOperation {
         return params != null && !params.isEmpty();
     }
 
-    /**
-     * An alias for vendor extensions, e.g. one can use {{exts.x-something}} for cleaner template
-     *
-     * @return vendor extensions
-     */
-    public Map<String, Object> getExts() {
-        return vendorExtensions;
-    }
-
     /**
      * Check if there's at least one parameter
      *

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

@@ -534,15 +534,6 @@ public class CodegenParameter implements IJsonSchemaValidationProperties {
         return sb.toString();
     }
 
-    /**
-     * An alias for vendor extensions, e.g. one can use {{exts.x-something}} for cleaner template
-     *
-     * @return vendor extensions
-     */
-    public Map<String, Object> getExts() {
-        return vendorExtensions;
-    }
-
     // use schema.getContains or content.mediaType.schema.getContains instead of this
     @Override
     public CodegenProperty getContains() {

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

@@ -436,15 +436,6 @@ public class CodegenProperty implements Cloneable, IJsonSchemaValidationProperti
         return !getRequired() || isNullable;
     }
 
-    /**
-     * An alias for vendor extensions, e.g. one can use {{exts.x-something}} for cleaner template
-     *
-     * @return vendor extensions
-     */
-    public Map<String, Object> getExts() {
-        return vendorExtensions;
-    }
-
     @Override
     public CodegenProperty getItems() {
         return items;

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

@@ -206,15 +206,6 @@ public class CodegenResponse implements IJsonSchemaValidationProperties {
 
     }
 
-    /**
-     * An alias for vendor extensions, e.g. one can use {{exts.x-something}} for cleaner template
-     *
-     * @return vendor extensions
-     */
-    public Map<String, Object> getExts() {
-        return vendorExtensions;
-    }
-
     // use content.mediaType.schema.getContains instead of this
     @Override
     public CodegenProperty getContains() {

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

@@ -38,13 +38,4 @@ public class CodegenServer {
         sb.append('}');
         return sb.toString();
     }
-
-    /**
-     * An alias for vendor extensions, e.g. one can use {{exts.x-something}} for cleaner template
-     *
-     * @return vendor extensions
-     */
-    public Map<String, Object> getExts() {
-        return vendorExtensions;
-    }
 }

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

@@ -1843,7 +1843,6 @@ public class DefaultCodegen implements CodegenConfig {
     protected void initializeSpecialCharacterMapping() {
         // Initialize special characters
         specialCharReplacements.put("$", "Dollar");
-        specialCharReplacements.put("€", "Euro");
         specialCharReplacements.put("^", "Caret");
         specialCharReplacements.put("|", "Pipe");
         specialCharReplacements.put("=", "Equal");
@@ -5735,7 +5734,7 @@ public class DefaultCodegen implements CodegenConfig {
         cs.name = key;
         cs.description = securityScheme.getDescription();
         cs.type = securityScheme.getType().toString();
-        cs.isCode = cs.isPassword = cs.isApplication = cs.isImplicit = cs.isOpenId = cs.isOAuth = false;
+        cs.isCode = cs.isPassword = cs.isApplication = cs.isImplicit = cs.isOpenId = false;
         cs.isHttpSignature = false;
         cs.isBasicBasic = cs.isBasicBearer = false;
         cs.scheme = securityScheme.getScheme();

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

@@ -356,9 +356,7 @@ public class InlineModelResolver {
         } else if (schema.getProperties() != null) {
             // If non-object type is specified but also properties
             LOGGER.error("Illegal schema found with non-object type combined with properties," +
-                    " no properties should be defined:" +
-                    " consider using --openapi-normalizer REMOVE_PROPERTIES_FROM_TYPE_OTHER_THAN_OBJECT=true\n " +
-                    schema.toString());
+                    " no properties should be defined:\n " + schema.toString());
             return;
         } else if (schema.getAdditionalProperties() != null) {
             // If non-object type is specified but also additionalProperties

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

@@ -49,7 +49,7 @@ public class OpenAPINormalizer {
 
     private TreeSet<String> anyTypeTreeSet = new TreeSet<>();
 
-    protected static final Logger LOGGER = LoggerFactory.getLogger(OpenAPINormalizer.class);
+    protected final Logger LOGGER = LoggerFactory.getLogger(OpenAPINormalizer.class);
 
     Set<String> ruleNames = new TreeSet<>();
     Set<String> rulesDefaultToTrue = new TreeSet<>();
@@ -124,9 +124,6 @@ public class OpenAPINormalizer {
     // the allOf contains a new schema containing the properties in the top level
     final String REFACTOR_ALLOF_WITH_PROPERTIES_ONLY = "REFACTOR_ALLOF_WITH_PROPERTIES_ONLY";
 
-    // when set to true, remove the "properties" of a schema with type other than "object"
-    final String REMOVE_PROPERTIES_FROM_TYPE_OTHER_THAN_OBJECT = "REMOVE_PROPERTIES_FROM_TYPE_OTHER_THAN_OBJECT";
-
     // when set to true, normalize OpenAPI 3.1 spec to make it work with the generator
     final String NORMALIZE_31SPEC = "NORMALIZE_31SPEC";
 
@@ -136,6 +133,10 @@ public class OpenAPINormalizer {
 
     // when set (e.g. operationId:getPetById|addPet), filter out (or remove) everything else
     final String FILTER = "FILTER";
+    HashSet<String> operationIdFilters = new HashSet<>();
+    HashSet<String> methodFilters = new HashSet<>();
+
+    HashSet<String> tagFilters = new HashSet<>();
 
     // when set (e.g. operationId:getPetById|addPet), filter out (or remove) everything else
     final String SET_CONTAINER_TO_NULLABLE = "SET_CONTAINER_TO_NULLABLE";
@@ -209,13 +210,11 @@ public class OpenAPINormalizer {
         ruleNames.add(SET_CONTAINER_TO_NULLABLE);
         ruleNames.add(SET_PRIMITIVE_TYPES_TO_NULLABLE);
         ruleNames.add(SIMPLIFY_ONEOF_ANYOF_ENUM);
-        ruleNames.add(REMOVE_PROPERTIES_FROM_TYPE_OTHER_THAN_OBJECT);
 
         // rules that are default to true
         rules.put(SIMPLIFY_ONEOF_ANYOF, true);
         rules.put(SIMPLIFY_BOOLEAN_ENUM, true);
         rules.put(SIMPLIFY_ONEOF_ANYOF_ENUM, true);
-        rules.put(REFACTOR_ALLOF_WITH_PROPERTIES_ONLY, true);
 
         processRules(inputRules);
 
@@ -276,7 +275,30 @@ public class OpenAPINormalizer {
 
         if (inputRules.get(FILTER) != null) {
             rules.put(FILTER, true);
-            // actual parsing is delayed to allow customization of the Filter processing
+
+            String[] filterStrs = inputRules.get(FILTER).split(":");
+            if (filterStrs.length != 2) { // only support operationId with : at the moment
+                LOGGER.error("FILTER rule must be in the form of `operationId:name1|name2|name3` or `method:get|post|put` or `tag:tag1|tag2|tag3`: {}", inputRules.get(FILTER));
+            } else {
+                if ("operationId".equals(filterStrs[0])) {
+                    operationIdFilters = Arrays.stream(filterStrs[1].split("[|]"))
+                            .filter(Objects::nonNull)
+                            .map(String::trim)
+                            .collect(Collectors.toCollection(HashSet::new));
+                } else if ("method".equals(filterStrs[0])) {
+                    methodFilters = Arrays.stream(filterStrs[1].split("[|]"))
+                            .filter(Objects::nonNull)
+                            .map(String::trim)
+                            .collect(Collectors.toCollection(HashSet::new));
+                } else if ("tag".equals(filterStrs[0])) {
+                    tagFilters = Arrays.stream(filterStrs[1].split("[|]"))
+                            .filter(Objects::nonNull)
+                            .map(String::trim)
+                            .collect(Collectors.toCollection(HashSet::new));
+                } else {
+                    LOGGER.error("FILTER rule must be in the form of `operationId:name1|name2|name3` or `method:get|post|put` or `tag:tag1|tag2|tag3`: {}", inputRules.get(FILTER));
+                }
+            }
         }
 
         if (inputRules.get(SET_CONTAINER_TO_NULLABLE) != null) {
@@ -322,19 +344,6 @@ public class OpenAPINormalizer {
         }
     }
 
-    /**
-     * Create the filter to process the FILTER normalizer.
-     * Override this to create a custom filter normalizer.
-     *
-     * @param openApi Contract used in the filtering (could be used for customization).
-     * @param filters full FILTER value
-     *
-     * @return a Filter containing the parsed filters.
-     */
-    protected Filter createFilter(OpenAPI openApi, String filters) {
-        return new Filter(filters);
-    }
-
     /**
      * Normalizes the OpenAPI input, which may not perfectly conform to
      * the specification.
@@ -396,15 +405,15 @@ public class OpenAPINormalizer {
                     "trace", PathItem::getTrace
             );
 
-            if (Boolean.TRUE.equals(getRule(FILTER))) {
-                String filters = inputRules.get(FILTER);
-                Filter filter = createFilter(this.openAPI, filters);
-                if (filter.parse()) {
-                    // Iterates over each HTTP method in methodMap, retrieves the corresponding Operations from the PathItem,
-                    // and marks it as internal (`x-internal=true`) if the method/operationId/tag/path is not in the filters.
-                    filter.apply(pathsEntry.getKey(), path, methodMap);
+            // Iterates over each HTTP method in methodMap, retrieves the corresponding Operation from the PathItem,
+            // and marks it as internal (`x-internal`) if the method is not in methodFilters.
+            methodMap.forEach((method, getter) -> {
+                Operation operation = getter.apply(path);
+                if (operation != null && !methodFilters.isEmpty()) {
+                    LOGGER.info("operation `{}` marked internal only (x-internal: `{}`) by the method FILTER", operation.getOperationId(), !methodFilters.contains(method));
+                    operation.addExtension("x-internal", !methodFilters.contains(method));
                 }
-            }
+            });
 
             // Include callback operation as well
             for (Operation operation : path.readOperations()) {
@@ -421,6 +430,22 @@ public class OpenAPINormalizer {
             normalizeParameters(path.getParameters());
 
             for (Operation operation : operations) {
+                if (operationIdFilters.size() > 0) {
+                    if (operationIdFilters.contains(operation.getOperationId())) {
+                        operation.addExtension(X_INTERNAL, false);
+                    } else {
+                        LOGGER.info("operation `{}` marked as internal only (x-internal: true) by the operationId FILTER", operation.getOperationId());
+                        operation.addExtension(X_INTERNAL, true);
+                    }
+                } else if (!tagFilters.isEmpty()) {
+                    if (operation.getTags().stream().anyMatch(tagFilters::contains)) {
+                        operation.addExtension(X_INTERNAL, false);
+                    } else {
+                        LOGGER.info("operation `{}` marked as internal only (x-internal: true) by the tag FILTER", operation.getOperationId());
+                        operation.addExtension(X_INTERNAL, true);
+                    }
+                }
+
                 normalizeOperation(operation);
                 normalizeRequestBody(operation);
                 normalizeParameters(operation.getParameters());
@@ -696,11 +721,6 @@ public class OpenAPINormalizer {
      * @return Schema
      */
     public Schema normalizeSchema(Schema schema, Set<Schema> visitedSchemas) {
-        // normalize reference schema
-        if (StringUtils.isNotEmpty(schema.get$ref())) {
-            normalizeReferenceSchema(schema);
-        }
-
         if (skipNormalization(schema, visitedSchemas)) {
             return schema;
         }
@@ -711,8 +731,6 @@ public class OpenAPINormalizer {
 
         markSchemaAsVisited(schema, visitedSchemas);
 
-        processNormalizeOtherThanObjectWithProperties(schema);
-
         if (ModelUtils.isArraySchema(schema)) { // array
             Schema result = normalizeArraySchema(schema);
             normalizeSchema(result.getItems(), visitedSchemas);
@@ -768,30 +786,6 @@ public class OpenAPINormalizer {
         return schema;
     }
 
-    /**
-     * Normalize reference schema with allOf to support sibling properties
-     *
-     * @param schema         Schema
-     */
-    protected void normalizeReferenceSchema(Schema schema) {
-        if (schema.getTitle() != null || schema.getDescription() != null
-                || schema.getNullable() != null || schema.getDefault() != null || schema.getDeprecated() != null
-                || schema.getMaximum() != null || schema.getMinimum() != null
-                || schema.getExclusiveMaximum() != null || schema.getExclusiveMinimum() != null
-                || schema.getMaxItems() != null || schema.getMinItems() != null
-                || schema.getMaxProperties() != null || schema.getMinProperties() != null
-                || schema.getMaxLength() != null || schema.getMinLength() != null
-                || schema.getWriteOnly() != null || schema.getReadOnly() != null
-                || schema.getExample() != null || (schema.getExamples() != null && !schema.getExamples().isEmpty())
-                || schema.getMultipleOf() != null || schema.getPattern() != null
-                || (schema.getExtensions() != null && !schema.getExtensions().isEmpty())
-        ) {
-            // create allOf with a $ref schema
-            schema.addAllOfItem(new Schema<>().$ref(schema.get$ref()));
-            // clear $ref in original schema
-            schema.set$ref(null);
-        }
-    }
 
     /**
      * Check if normalization is needed.
@@ -1369,7 +1363,7 @@ public class OpenAPINormalizer {
      *
      * @param schema Schema to modify
      * @param subSchemas List of sub-schemas to check
-     * @param composedType Type of composed schema ("oneOf" or "anyOf")
+     * @param schemaType Type of composed schema ("oneOf" or "anyOf")
      * @return Simplified schema
      */
     protected Schema simplifyComposedSchemaWithEnums(Schema schema, List<Object> subSchemas, String composedType) {
@@ -1838,181 +1832,4 @@ public class OpenAPINormalizer {
     }
 
     // ===================== end of rules =====================
-
-    protected static class Filter {
-        public static final String OPERATION_ID = "operationId";
-        public static final String METHOD = "method";
-        public static final String TAG = "tag";
-        public static final String PATH = "path";
-        private final String filters;
-        protected Set<String> operationIdFilters = Collections.emptySet();
-        protected Set<String> methodFilters = Collections.emptySet();
-        protected Set<String> tagFilters = Collections.emptySet();
-        protected Set<String> pathStartingWithFilters = Collections.emptySet();
-        private boolean hasFilter;
-
-        protected Filter(String filters) {
-            this.filters = filters.trim();
-        }
-
-        /**
-         * Perform the parsing of the filter string.
-         *
-         * @return true if filters need to be processed
-         */
-        public boolean parse() {
-            if (StringUtils.isEmpty(filters)) {
-                return false;
-            }
-            try {
-                doParse();
-                return hasFilter();
-            } catch (RuntimeException e) {
-                String message = String.format(Locale.ROOT, "FILTER rule [%s] must be in the form of `%s:name1|name2|name3` or `%s:get|post|put` or `%s:tag1|tag2|tag3` or `%s:/v1|/v2`. Error: %s",
-                        filters, Filter.OPERATION_ID, Filter.METHOD, Filter.TAG, Filter.PATH, e.getMessage());
-                // throw an exception. This is a breaking change compared to pre 7.16.0
-                // Workaround: fix the syntax!
-                throw new IllegalArgumentException(message);
-            }
-        }
-
-        private void doParse() {
-            for (String filter : filters.split(";")) {
-                filter = filter.trim();
-                String[] filterStrs = filter.split(":");
-                if (filterStrs.length != 2) { // only support filter with : at the moment
-                    throw new IllegalArgumentException("filter with no value not supported :[" + filter + "]");
-                } else {
-                    String filterKey = filterStrs[0].trim();
-                    String filterValue = filterStrs[1];
-                    Set<String> parsedFilters = splitByPipe(filterValue);
-                    hasFilter = true;
-                    if (OPERATION_ID.equals(filterKey)) {
-                        operationIdFilters = parsedFilters;
-                    } else if (METHOD.equals(filterKey)) {
-                        methodFilters = parsedFilters;
-                    } else if (TAG.equals(filterKey)) {
-                        tagFilters = parsedFilters;
-                    } else if (PATH.equals(filterKey)) {
-                        pathStartingWithFilters = parsedFilters;
-                    } else {
-                        parse(filterKey, filterValue);
-                    }
-                }
-            }
-        }
-
-        /**
-         * Split the filterValue by pipe.
-         *
-         * @return the split values.
-         */
-        protected Set<String> splitByPipe(String filterValue) {
-            return Arrays.stream(filterValue.split("[|]"))
-                    .filter(Objects::nonNull)
-                    .map(String::trim)
-                    .collect(Collectors.toCollection(HashSet::new));
-        }
-
-        /**
-         * Parse non default filters.
-         *
-         * Override this method to add custom parsing logic.
-         *
-         * By default throws IllegalArgumentException.
-         *
-         * @param filterName name of the filter
-         * @param filterValue value of the filter
-         */
-        protected void parse(String filterName, String filterValue) {
-            parseFails(filterName, filterValue);
-        }
-
-        protected void parseFails(String filterName, String filterValue) {
-            throw new IllegalArgumentException("filter not supported :[" + filterName + ":" + filterValue + "]");
-        }
-
-        /**
-         * Test if the OpenAPI contract match an extra filter.
-         *
-         * Override this method to add custom logic.
-         *
-         * @param operation  Openapi Operation
-         * @param path  Path of the operation
-         *
-         * @return true if the operation of path match the filter
-         */
-        protected boolean hasCustomFilterMatch(String path, Operation operation) {
-            return false;
-        }
-
-        public boolean hasFilter() {
-            return hasFilter;
-        }
-
-        public void apply(String path, PathItem pathItem, Map<String, Function<PathItem, Operation>> methodMap) {
-            methodMap.forEach((method, getter) -> {
-                Operation operation = getter.apply(pathItem);
-                if (operation != null) {
-                    boolean found = false;
-                    found |= logIfMatch(PATH, operation, hasPathStarting(path));
-                    found |= logIfMatch(TAG, operation, hasTag(operation));
-                    found |= logIfMatch(OPERATION_ID, operation, hasOperationId(operation));
-                    found |= logIfMatch(METHOD, operation, hasMethod(method));
-                    found |= hasCustomFilterMatch(path, operation);
-
-                    operation.addExtension(X_INTERNAL, !found);
-                }
-            });
-        }
-
-        protected boolean logIfMatch(String filterName, Operation operation, boolean filterMatched) {
-            if (filterMatched) {
-                logMatch(filterName, operation);
-            }
-            return filterMatched;
-        }
-
-        protected void logMatch(String filterName, Operation operation) {
-            getLogger().info("operation `{}` marked as internal only (x-internal: true) by the {} FILTER", operation.getOperationId(), filterName);
-        }
-
-        protected Logger getLogger() {
-            return OpenAPINormalizer.LOGGER;
-        }
-
-        private boolean hasPathStarting(String path) {
-            return pathStartingWithFilters.stream().anyMatch(filter -> path.startsWith(filter));
-        }
-
-        private boolean hasTag( Operation operation) {
-            return operation.getTags() != null && operation.getTags().stream().anyMatch(tagFilters::contains);
-        }
-
-        private boolean hasOperationId(Operation operation) {
-            return operationIdFilters.contains(operation.getOperationId());
-        }
-
-        private boolean hasMethod(String method) {
-            return methodFilters.contains(method);
-        }
-    }
-
-    /**
-     * When set to true, remove "properties" attribute on schema other than "object"
-     * since it should be ignored and may result in odd generated code
-     *
-     * @param schema         Schema
-     * @return Schema
-     */
-    protected void processNormalizeOtherThanObjectWithProperties(Schema schema) {
-        if (getRule(REMOVE_PROPERTIES_FROM_TYPE_OTHER_THAN_OBJECT)) {
-            // Check object models / any type models / composed models for properties,
-            // if the schema has a type defined that is not "object" it should not define
-            // any properties
-            if (schema.getType() != null && !"object".equals(schema.getType())) {
-                schema.setProperties(null);
-            }
-        }
-    }
 }

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

@@ -27,9 +27,6 @@ public enum VendorExtension {
     X_OPERATION_EXTRA_ANNOTATION("x-operation-extra-annotation", ExtensionLevel.OPERATION, "List of custom annotations to be added to operation", null),
     X_VERSION_PARAM("x-version-param", ExtensionLevel.OPERATION_PARAMETER, "Marker property that tells that this parameter would be used for endpoint versioning. Applicable for headers & query params. true/false", null),
     X_PATTERN_MESSAGE("x-pattern-message", Arrays.asList(ExtensionLevel.FIELD, ExtensionLevel.OPERATION_PARAMETER), "Add this property whenever you need to customize the invalidation error message for the regex pattern of a variable", null),
-    X_SIZE_MESSAGE("x-size-message", Arrays.asList(ExtensionLevel.FIELD, ExtensionLevel.OPERATION_PARAMETER), "Add this property whenever you need to customize the invalidation error message for the size or length of a variable", null),
-    X_MINIMUM_MESSAGE("x-minimum-message", Arrays.asList(ExtensionLevel.FIELD, ExtensionLevel.OPERATION_PARAMETER), "Add this property whenever you need to customize the invalidation error message for the minimum value of a variable", null),
-    X_MAXIMUM_MESSAGE("x-maximum-message", Arrays.asList(ExtensionLevel.FIELD, ExtensionLevel.OPERATION_PARAMETER), "Add this property whenever you need to customize the invalidation error message for the maximum value of a variable", null),
     X_ZERO_BASED_ENUM("x-zero-based-enum", ExtensionLevel.MODEL, "When used on an enum, the index will not be generated and the default numbering will be used, zero-based", "false");
 
     private final String name;

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

@@ -1628,7 +1628,7 @@ public abstract class AbstractCSharpCodegen extends DefaultCodegen {
         Schema<?> target = ModelUtils.isGenerateAliasAsModel() ? p : schema;
         if (ModelUtils.isArraySchema(target)) {
             Schema<?> items = getSchemaItems(schema);
-            return typeMapping.get("array") + "<" + getTypeDeclarationForArray(items) + ">";
+            return getSchemaType(target) + "<" + getTypeDeclarationForArray(items) + ">";
         } else if (ModelUtils.isMapSchema(p)) {
             // Should we also support maps of maps?
             Schema<?> inner = ModelUtils.getAdditionalProperties(p);

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

@@ -1359,20 +1359,20 @@ public abstract class AbstractJavaCodegen extends DefaultCodegen implements Code
 
             return String.format(Locale.ROOT, "new %s<>()",
                     instantiationTypes().getOrDefault("map", "HashMap"));
-        } else if (ModelUtils.isIntegerSchema(schema) || cp.isInteger || cp.isLong) {
+        } else if (ModelUtils.isIntegerSchema(schema)) {
             if (schema.getDefault() != null) {
-                if (SchemaTypeUtil.INTEGER64_FORMAT.equals(schema.getFormat()) || cp.isLong) {
+                if (SchemaTypeUtil.INTEGER64_FORMAT.equals(schema.getFormat())) {
                     return schema.getDefault().toString() + "l";
                 } else {
                     return schema.getDefault().toString();
                 }
             }
             return null;
-        } else if (ModelUtils.isNumberSchema(schema) || cp.isFloat || cp.isDouble) {
+        } else if (ModelUtils.isNumberSchema(schema)) {
             if (schema.getDefault() != null) {
-                if (SchemaTypeUtil.FLOAT_FORMAT.equals(schema.getFormat()) || cp.isFloat) {
+                if (SchemaTypeUtil.FLOAT_FORMAT.equals(schema.getFormat())) {
                     return schema.getDefault().toString() + "f";
-                } else if (SchemaTypeUtil.DOUBLE_FORMAT.equals(schema.getFormat()) || cp.isDouble) {
+                } else if (SchemaTypeUtil.DOUBLE_FORMAT.equals(schema.getFormat())) {
                     return schema.getDefault().toString() + "d";
                 } else {
                     return "new BigDecimal(\"" + schema.getDefault().toString() + "\")";
@@ -1891,7 +1891,6 @@ public abstract class AbstractJavaCodegen extends DefaultCodegen implements Code
             model.imports.add("Arrays");
         } else if ("set".equals(property.containerType)) {
             model.imports.add("LinkedHashSet");
-            model.imports.add("Arrays");
             if ((!openApiNullable || !property.isNullable) && jackson) { // cannot be wrapped to nullable
                 model.imports.add("JsonDeserialize");
                 property.vendorExtensions.put("x-setter-extra-annotation", "@JsonDeserialize(as = LinkedHashSet.class)");

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

@@ -119,7 +119,6 @@ public abstract class AbstractJavaJAXRSServerCodegen extends AbstractJavaCodegen
         convertPropertyToStringAndWriteBack(CodegenConstants.IMPL_FOLDER, this::setImplFolder);
         convertPropertyToBooleanAndWriteBack(USE_BEANVALIDATION, this::setUseBeanValidation);
         convertPropertyToBooleanAndWriteBack(USE_TAGS, this::setUseTags);
-        convertPropertyToBooleanAndWriteBack(JACKSON, this::setJackson);
     }
 
     @Override

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

@@ -20,7 +20,6 @@ package org.openapitools.codegen.languages;
 import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.google.common.collect.ImmutableMap;
 import com.samskivert.mustache.Mustache;
-import com.samskivert.mustache.Template;
 import io.swagger.v3.oas.models.media.Schema;
 import io.swagger.v3.oas.models.media.StringSchema;
 import lombok.Getter;
@@ -36,9 +35,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.File;
-import java.io.IOException;
-import java.io.StringWriter;
-import java.io.Writer;
 import java.util.*;
 import java.util.function.Function;
 import java.util.regex.Pattern;
@@ -1176,15 +1172,4 @@ public abstract class AbstractKotlinCodegen extends DefaultCodegen implements Co
             }
         }
     }
-
-    protected static abstract class CustomLambda implements Mustache.Lambda {
-        @Override
-        public void execute(Template.Fragment frag, Writer out) throws IOException {
-            final StringWriter tempWriter = new StringWriter();
-            frag.execute(tempWriter);
-            out.write(formatFragment(tempWriter.toString()));
-        }
-
-        public abstract String formatFragment(String fragment);
-    }
 }

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

@@ -25,7 +25,6 @@ import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.openapitools.codegen.*;
 import org.openapitools.codegen.meta.features.SecurityFeature;
-import org.openapitools.codegen.meta.features.DataTypeFeature;
 import org.openapitools.codegen.model.ModelMap;
 import org.openapitools.codegen.model.ModelsMap;
 import org.openapitools.codegen.model.OperationMap;
@@ -72,9 +71,7 @@ public abstract class AbstractPythonCodegen extends DefaultCodegen implements Co
                 SecurityFeature.BearerToken,
                 SecurityFeature.ApiKey,
                 SecurityFeature.OAuth2_Implicit
-        )).includeDataTypeFeatures(
-                DataTypeFeature.Uuid
-        ));
+        )));
 
         // from https://docs.python.org/3/reference/lexical_analysis.html#keywords
         setReservedWordsLowerCase(
@@ -111,7 +108,6 @@ public abstract class AbstractPythonCodegen extends DefaultCodegen implements Co
         // TODO file and binary is mapped as `file`
         languageSpecificPrimitives.add("file");
         languageSpecificPrimitives.add("bytes");
-        languageSpecificPrimitives.add("UUID");
 
         typeMapping.clear();
         typeMapping.put("integer", "int");
@@ -133,7 +129,8 @@ public abstract class AbstractPythonCodegen extends DefaultCodegen implements Co
         // mapped to String as a workaround
         typeMapping.put("binary", "str");
         typeMapping.put("ByteArray", "str");
-        typeMapping.put("UUID", "UUID");
+        // map uuid to string for the time being
+        typeMapping.put("UUID", "str");
         typeMapping.put("URI", "str");
         typeMapping.put("null", "none_type");
 
@@ -574,12 +571,7 @@ public abstract class AbstractPythonCodegen extends DefaultCodegen implements Co
             type = p.dataType;
         }
 
-        if (Boolean.TRUE.equals(p.isUuid)) {
-            if (example == null) {
-                example = "38400000-8cf0-11bd-b23e-10b96e4ef00d";
-            }
-            example = "UUID('" + escapeTextInSingleQuotes(example) + "')";
-        } else if ("String".equalsIgnoreCase(type) || "str".equalsIgnoreCase(type)) {
+        if ("String".equalsIgnoreCase(type) || "str".equalsIgnoreCase(type)) {
             if (example == null) {
                 example = p.paramName + "_example";
             }
@@ -679,13 +671,7 @@ public abstract class AbstractPythonCodegen extends DefaultCodegen implements Co
             return getSchemaType(p) + "[str, " + getCollectionItemTypeDeclaration(inner) + "]";
         }
 
-        String openAPIType = super.getSchemaType(p);
-        
-        if (openAPIType == null) {
-            LOGGER.error("OpenAPI Type for {} is null. Default to UNKNOWN_OPENAPI_TYPE instead.", p.getName());
-            openAPIType = "UNKNOWN_OPENAPI_TYPE";
-        }
-
+        String openAPIType = getSchemaType(p);
         if (typeMapping.containsKey(openAPIType)) {
             return typeMapping.get(openAPIType);
         }

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

@@ -34,7 +34,6 @@ import io.swagger.v3.oas.models.media.Schema;
 import io.swagger.v3.oas.models.parameters.Parameter;
 import io.swagger.v3.oas.models.parameters.RequestBody;
 import io.swagger.v3.oas.models.security.SecurityScheme;
-import org.apache.commons.lang3.Strings;
 import org.apache.commons.lang3.StringUtils;
 import org.openapitools.codegen.*;
 import org.openapitools.codegen.meta.features.DocumentationFeature;
@@ -602,7 +601,7 @@ public abstract class AbstractPythonConnexionServerCodegen extends AbstractPytho
     @Override
     public String toModelImport(String name) {
         String modelImport;
-        if (Strings.CS.startsWithAny(name, "import", "from")) {
+        if (StringUtils.startsWithAny(name, "import", "from")) {
             modelImport = name;
         } else {
             modelImport = "from ";

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

@@ -17,7 +17,6 @@
 
 package org.openapitools.codegen.languages;
 
-import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.google.common.collect.Iterables;
 import com.samskivert.mustache.Mustache;
 import io.swagger.v3.oas.models.media.Schema;
@@ -441,17 +440,6 @@ public class GoClientCodegen extends AbstractGoCodegen {
             return null;
         }
 
-        if (ModelUtils.isArraySchema(p)) {
-            StringJoiner joinedDefaultValues = new StringJoiner(", ");
-            Object defaultValues = p.getDefault();
-            if (defaultValues instanceof ArrayNode) {
-                for (var value : (ArrayNode) defaultValues) {
-                    joinedDefaultValues.add(value.toString());
-                }
-                return "{" + joinedDefaultValues + "}";
-            }
-        }
-
         return super.toDefaultValue(p);
     }
 

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

@@ -105,7 +105,6 @@ public class JavaClientCodegen extends AbstractJavaCodegen
     public static final String FAIL_ON_UNKNOWN_PROPERTIES = "failOnUnknownProperties";
     public static final String SUPPORT_VERTX_FUTURE = "supportVertxFuture";
     public static final String USE_SEALED_ONE_OF_INTERFACES = "useSealedOneOfInterfaces";
-    public static final String USE_UNARY_INTERCEPTOR = "useUnaryInterceptor";
 
     // Internal configurations
     public static final String SINGLE_REQUEST_PARAMETER = "singleRequestParameter";
@@ -150,7 +149,6 @@ public class JavaClientCodegen extends AbstractJavaCodegen
     @Getter @Setter protected boolean failOnUnknownProperties = false;
     @Setter protected boolean supportVertxFuture = false;
     @Setter protected boolean useSealedOneOfInterfaces = false;
-    @Setter protected boolean useUnaryInterceptor = false;
     protected String authFolder;
     /**
      * Serialization library.
@@ -262,7 +260,6 @@ public class JavaClientCodegen extends AbstractJavaCodegen
         cliOptions.add(CliOption.newBoolean(FAIL_ON_UNKNOWN_PROPERTIES, "Fail Jackson de-serialization on unknown properties", this.failOnUnknownProperties));
         cliOptions.add(CliOption.newBoolean(SUPPORT_VERTX_FUTURE, "Also generate api methods that return a vertx Future instead of taking a callback. Only `vertx` supports this option. Requires vertx 4 or greater.", this.supportVertxFuture));
         cliOptions.add(CliOption.newBoolean(USE_SEALED_ONE_OF_INTERFACES, "Generate the oneOf interfaces as sealed interfaces. Only supported for WebClient and RestClient.", this.useSealedOneOfInterfaces));
-        cliOptions.add(CliOption.newBoolean(USE_UNARY_INTERCEPTOR, "If true it will generate ResponseInterceptors using a UnaryOperator. This can be usefull for manipulating the request before it gets passed, for example doing your own decryption", this.useUnaryInterceptor));
 
         supportedLibraries.put(JERSEY2, "HTTP client: Jersey client 2.25.1. JSON processing: Jackson 2.17.1");
         supportedLibraries.put(JERSEY3, "HTTP client: Jersey client 3.1.1. JSON processing: Jackson 2.17.1");
@@ -379,7 +376,6 @@ public class JavaClientCodegen extends AbstractJavaCodegen
         }
         convertPropertyToStringAndWriteBack(CodegenConstants.USE_SINGLE_REQUEST_PARAMETER, this::setUseSingleRequestParameter);
         convertPropertyToBooleanAndWriteBack(USE_SEALED_ONE_OF_INTERFACES, this::setUseSealedOneOfInterfaces);
-        convertPropertyToBooleanAndWriteBack(USE_UNARY_INTERCEPTOR, this::setUseUnaryInterceptor);
         writePropertyBack(SINGLE_REQUEST_PARAMETER, getSingleRequestParameter());
         writePropertyBack(STATIC_REQUEST, getStaticRequest());
 

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

@@ -42,7 +42,6 @@ public class JavaJAXRSSpecServerCodegen extends AbstractJavaJAXRSServerCodegen {
     public static final String GENERATE_POM = "generatePom";
     public static final String USE_SWAGGER_ANNOTATIONS = "useSwaggerAnnotations";
     public static final String USE_MICROPROFILE_OPENAPI_ANNOTATIONS = "useMicroProfileOpenAPIAnnotations";
-    public static final String USE_SWAGGER_V3_ANNOTATIONS = "useSwaggerV3Annotations";
     public static final String USE_MUTINY = "useMutiny";
     public static final String OPEN_API_SPEC_FILE_LOCATION = "openApiSpecFileLocation";
     public static final String GENERATE_JSON_CREATOR = "generateJsonCreator";
@@ -58,7 +57,6 @@ public class JavaJAXRSSpecServerCodegen extends AbstractJavaJAXRSServerCodegen {
     private boolean returnJbossResponse = false;
     private boolean generatePom = true;
     private boolean useSwaggerAnnotations = true;
-    private boolean useSwaggerV3Annotations = false;
     private boolean useMicroProfileOpenAPIAnnotations = false;
     private boolean useMutiny = false;
 
@@ -135,7 +133,6 @@ public class JavaJAXRSSpecServerCodegen extends AbstractJavaJAXRSServerCodegen {
         cliOptions.add(CliOption.newBoolean(RETURN_RESPONSE, "Whether generate API interface should return javax.ws.rs.core.Response instead of a deserialized entity. Only useful if interfaceOnly is true.").defaultValue(String.valueOf(returnResponse)));
         cliOptions.add(CliOption.newBoolean(RETURN_JBOSS_RESPONSE, "Whether generate API interface should return `org.jboss.resteasy.reactive.RestResponse` instead of a deserialized entity. This flag cannot be combined with `returnResponse` flag. It requires the flag `interfaceOnly` and `useJakartaEE` set to true, because `org.jboss.resteasy.reactive.RestResponse` was introduced in Quarkus 2.x").defaultValue(String.valueOf(returnJbossResponse)));
         cliOptions.add(CliOption.newBoolean(USE_SWAGGER_ANNOTATIONS, "Whether to generate Swagger annotations.", useSwaggerAnnotations));
-        cliOptions.add(CliOption.newBoolean(USE_SWAGGER_V3_ANNOTATIONS, "Whether to generate Swagger v3 (OpenAPI v3) annotations.", useSwaggerV3Annotations));
         cliOptions.add(CliOption.newBoolean(USE_MICROPROFILE_OPENAPI_ANNOTATIONS, "Whether to generate Microprofile OpenAPI annotations. Only valid when library is set to quarkus.", useMicroProfileOpenAPIAnnotations));
         cliOptions.add(CliOption.newString(OPEN_API_SPEC_FILE_LOCATION, "Location where the file containing the spec will be generated in the output folder. No file generated when set to null or empty string."));
         cliOptions.add(CliOption.newBoolean(SUPPORT_ASYNC, "Wrap responses in CompletionStage type, allowing asynchronous computation (requires JAX-RS 2.1).", supportAsync));
@@ -152,28 +149,14 @@ public class JavaJAXRSSpecServerCodegen extends AbstractJavaJAXRSServerCodegen {
         convertPropertyToBooleanAndWriteBack(RETURN_JBOSS_RESPONSE, value -> returnJbossResponse = value);
         convertPropertyToBooleanAndWriteBack(SUPPORT_ASYNC, this::setSupportAsync);
         if (QUARKUS_LIBRARY.equals(library) || THORNTAIL_LIBRARY.equals(library) || HELIDON_LIBRARY.equals(library) || OPEN_LIBERTY_LIBRARY.equals(library) || KUMULUZEE_LIBRARY.equals(library)) {
-            // disable Swagger v2 annotations in library modes; MicroProfile or Swagger v3 may be used instead
             useSwaggerAnnotations = false;
         } else {
             convertPropertyToBooleanAndWriteBack(USE_SWAGGER_ANNOTATIONS, value -> useSwaggerAnnotations = value);
         }
-        // Swagger v3 can be used regardless of library
-        convertPropertyToBooleanAndWriteBack(USE_SWAGGER_V3_ANNOTATIONS, value -> useSwaggerV3Annotations = value);
-        // prefer v3 when requested
-        if (useSwaggerV3Annotations) {
-            useSwaggerAnnotations = false;
-        }
         if (KUMULUZEE_LIBRARY.equals(library)) {
             super.setSourceFolder("src/main/java");
         }
 
-        if (useSwaggerAnnotations && useSwaggerV3Annotations) {
-            throw new IllegalArgumentException("Flags 'useSwaggerAnnotations' (v2) and 'useSwaggerV3Annotations' (v3) are mutually exclusive. Please enable only one.");
-        }
-        if (useSwaggerV3Annotations && useMicroProfileOpenAPIAnnotations) {
-            throw new IllegalArgumentException("Flags 'useSwaggerV3Annotations' and 'useMicroProfileOpenAPIAnnotations' are mutually exclusive. Please enable only one.");
-        }
-
         if (QUARKUS_LIBRARY.equals(library)) {
             convertPropertyToBooleanAndWriteBack(USE_MICROPROFILE_OPENAPI_ANNOTATIONS, value -> useMicroProfileOpenAPIAnnotations = value);
         }
@@ -201,30 +184,22 @@ public class JavaJAXRSSpecServerCodegen extends AbstractJavaJAXRSServerCodegen {
 
         super.processOpts();
 
-        // expose flags to templates
-        additionalProperties.put(USE_SWAGGER_ANNOTATIONS, useSwaggerAnnotations);
-        additionalProperties.put(USE_SWAGGER_V3_ANNOTATIONS, useSwaggerV3Annotations);
-        additionalProperties.put(USE_MICROPROFILE_OPENAPI_ANNOTATIONS, useMicroProfileOpenAPIAnnotations);
-
         supportingFiles.clear(); // Don't need extra files provided by AbstractJAX-RS & Java Codegen
         supportingFiles.add(new SupportingFile("README.mustache", "", "README.md")
                 .doNotOverwrite());
-
-        if (!interfaceOnly) {
-            supportingFiles.add(new SupportingFile("RestResourceRoot.mustache",
-                    (sourceFolder + '/' + invokerPackage).replace(".", "/"), "RestResourceRoot.java")
-                    .doNotOverwrite());
-
-            supportingFiles.add(new SupportingFile("RestApplication.mustache",
-                    (sourceFolder + '/' + invokerPackage).replace(".", "/"), "RestApplication.java")
-                    .doNotOverwrite());
-        }
+        supportingFiles.add(new SupportingFile("RestResourceRoot.mustache",
+                (sourceFolder + '/' + invokerPackage).replace(".", "/"), "RestResourceRoot.java")
+                .doNotOverwrite());
 
         if (generatePom) {
             supportingFiles.add(new SupportingFile("pom.mustache", "", "pom.xml")
                     .doNotOverwrite());
         }
 
+        supportingFiles.add(new SupportingFile("RestApplication.mustache",
+                (sourceFolder + '/' + invokerPackage).replace(".", "/"), "RestApplication.java")
+                .doNotOverwrite());
+
         if (StringUtils.isNotEmpty(openApiSpecFileLocation)) {
             int index = openApiSpecFileLocation.lastIndexOf('/');
             String fileFolder;
@@ -301,7 +276,6 @@ public class JavaJAXRSSpecServerCodegen extends AbstractJavaJAXRSServerCodegen {
         if (!jackson) {
             codegenModel.imports.remove("JsonValue");
             codegenModel.imports.remove("JsonProperty");
-            codegenModel.imports.remove("JsonTypeName");
         }
         return codegenModel;
     }

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

@@ -22,6 +22,7 @@ import lombok.Getter;
 import lombok.Setter;
 import org.apache.commons.lang3.StringUtils;
 import org.openapitools.codegen.*;
+import org.openapitools.codegen.meta.features.*;
 import org.openapitools.codegen.model.ModelMap;
 import org.openapitools.codegen.model.ModelsMap;
 import org.openapitools.codegen.model.OperationMap;
@@ -39,8 +40,10 @@ import java.util.function.Predicate;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import com.samskivert.mustache.Mustache;
 import lombok.Getter;
 import lombok.Setter;
+import org.apache.commons.lang3.StringUtils;
 import org.openapitools.codegen.CliOption;
 import org.openapitools.codegen.CodegenConstants;
 import org.openapitools.codegen.CodegenModel;
@@ -57,7 +60,14 @@ import org.openapitools.codegen.meta.features.ParameterFeature;
 import org.openapitools.codegen.meta.features.SchemaSupportFeature;
 import org.openapitools.codegen.meta.features.SecurityFeature;
 import org.openapitools.codegen.meta.features.WireFormatFeature;
+import org.openapitools.codegen.model.ModelMap;
+import org.openapitools.codegen.model.ModelsMap;
+import org.openapitools.codegen.model.OperationMap;
+import org.openapitools.codegen.model.OperationsMap;
 import org.openapitools.codegen.templating.mustache.ReplaceAllLambda;
+import org.openapitools.codegen.utils.ProcessUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import static java.util.Collections.sort;
 
@@ -559,7 +569,6 @@ public class KotlinClientCodegen extends AbstractKotlinCodegen {
         // as the parser interrupts that as a start of a multiline comment.
         // We replace paths like `/v1/foo/*` with `/v1/foo/<*>` to avoid this
         additionalProperties.put("sanitizePathComment", new ReplaceAllLambda("\\/\\*", "/<*>"));
-        additionalProperties.put("fnToOneOfWrapperName", new ToOneOfWrapperName());
     }
 
     private void processDateLibrary() {
@@ -965,21 +974,11 @@ public class KotlinClientCodegen extends AbstractKotlinCodegen {
                     if (discriminator == null) {
                         continue;
                     }
-
-                    // When using generateOneOfAnyOfWrappers and encountering oneOf, we keep discriminator properties,
-                    // because single entity can be referenced in multiple "parent" entities,
-                    // so discriminator for one might not be discriminator for another.
-                    boolean shouldKeepDiscriminatorField = generateOneOfAnyOfWrappers && cm.oneOf != null && !cm.oneOf.isEmpty();
-
-                    if (shouldKeepDiscriminatorField) {
-                        continue;
-                    }
-
                     // Remove discriminator property from the base class, it is not needed in the generated code
                     getAllVarProperties(cm).forEach(list -> list.removeIf(var -> var.name.equals(discriminator.getPropertyName())));
 
                     for (CodegenDiscriminator.MappedModel mappedModel : discriminator.getMappedModels()) {
-                        // Add the mapping name to additionalProperties.discriminatorValue
+                        // Add the mapping name to additionalProperties.disciminatorValue
                         // The mapping name is used to define SerializedName, which in result makes derived classes
                         // found by kotlinx-serialization during deserialization
                         CodegenProperty additionalProperties = mappedModel.getModel().getAdditionalProperties();
@@ -990,13 +989,8 @@ public class KotlinClientCodegen extends AbstractKotlinCodegen {
                         additionalProperties.discriminatorValue = mappedModel.getMappingName();
                         // Remove the discriminator property from the derived class, it is not needed in the generated code
                         getAllVarProperties(mappedModel.getModel()).forEach(list -> list.removeIf(prop -> prop.name.equals(discriminator.getPropertyName())));
-
-                        // If model has no properties after removing discriminator, mark it as empty
-                        // so it generates as a class instead of an empty data class
-                        if (mappedModel.getModel().vars.isEmpty() && !mappedModel.getModel().isEnum && !mappedModel.getModel().isAlias) {
-                            mappedModel.getModel().setHasVars(false);
-                        }
                     }
+
                 }
             }
         }
@@ -1141,13 +1135,6 @@ public class KotlinClientCodegen extends AbstractKotlinCodegen {
         param.defaultValue = type + "." + param.enumDefaultValue;
     }
 
-    private class ToOneOfWrapperName extends CustomLambda {
-        @Override
-        public String formatFragment(String fragment) {
-            return toModelName(StringUtils.lowerCase(fragment)) + "Wrapper";
-        }
-    }
-
     @Override
     public void postProcess() {
         System.out.println("################################################################################");