clean up

code clean up/refacotring
2024-04-03 14:11:38 +08:00 · 2024-04-03 13:50:16 +08:00
1639 changed files with 11083 additions and 45696 deletions
--- a/.github/workflows/openapi-generator.yaml
+++ b/.github/workflows/openapi-generator.yaml
@@ -140,23 +140,8 @@ jobs:
        with:
          name: openapi-generator-cli.jar
          path: modules/openapi-generator-cli/target
-      - name: Delete samples that are entirely generated
-        run: |
-          rm -rf samples/client/petstore/csharp/generichost/net8/AllOf
-          rm -rf samples/client/petstore/csharp/generichost/net8/AnyOf
-          rm -rf samples/client/petstore/csharp/generichost/net8/AnyOfNoCompare
-          rm -rf samples/client/petstore/csharp/generichost/net8/FormModels
-          rm -rf samples/client/petstore/csharp/generichost/net8/NullReferenceTypes
-          rm -rf samples/client/petstore/csharp/generichost/net8/OneOf
-          rm -rf samples/client/petstore/csharp/generichost/net8/Petstore
-          rm -rf samples/client/petstore/csharp/generichost/net8/SourceGeneration
-          rm -rf samples/client/petstore/csharp/generichost/net8/UseDateTimeForDate
-          rm -rf samples/client/petstore/csharp/generichost/standard2.0/Petstore
      - name: Generate samples
-        run: |
-          bash bin/generate-samples.sh
-          # when a sample is deleted, you have to generate it twice for all files to get created
-          bash bin/generate-samples.sh
+        run: bash bin/generate-samples.sh
      - name: Verify git status
        run: |
          if [[ "$(git status --porcelain)" != "" ]]; then
--- a/.github/workflows/samples-dotnet.yaml
+++ b/.github/workflows/samples-dotnet.yaml
@@ -23,7 +23,6 @@ jobs:
        sample:
          - samples/client/petstore/csharp/generichost/net8/AllOf
          - samples/client/petstore/csharp/generichost/net8/AnyOf
-          - samples/client/petstore/csharp/generichost/net8/AnyOfNoCompare
          - samples/client/petstore/csharp/generichost/net8/FormModels
          - samples/client/petstore/csharp/generichost/net8/ManualPetstoreTests
          - samples/client/petstore/csharp/generichost/net8/ManualSourceGenerationTests
--- a/.github/workflows/samples-scala.yaml
+++ b/.github/workflows/samples-scala.yaml
@@ -32,7 +32,6 @@ jobs:
          - samples/server/petstore/scalatra
          - samples/server/petstore/scala-finch # cannot be tested with jdk11
          - samples/server/petstore/scala-http4s-server
-          - samples/server/petstore/scala-cask
    steps:
      - uses: actions/checkout@v4
      - uses: actions/setup-java@v4
--- a/README.md
+++ b/README.md
@@ -61,7 +61,7 @@ If you find OpenAPI Generator useful for work, please consider asking your compa
 [<img src="https://openapi-generator.tech/img/companies/bumpsh.png" width="128" height="128">](https://bump.sh/?utm_source=openapi_generator&utm_medium=github_webpage&utm_campaign=sponsor)
 [<img src="https://openapi-generator.tech/img/companies/bileto.png" width="128" height="128">](https://www.bileto.com/?utm_source=openapi_generator&utm_medium=github_webpage&utm_campaign=sponsor)
 [<img src="https://openapi-generator.tech/img/companies/bairesdev.png" width="128" height="128">](https://www.bairesdev.com/sponsoring-open-source-projects/?utm_source=openapi_generator&utm_medium=github_webpage&utm_campaign=sponsor)
-[<img src="https://openapi-generator.tech/img/companies/dmtech.jpeg" width="128" height="128">](https://www.dmtech.de/?utm_source=openapi_generator&utm_medium=github_webpage&utm_campaign=sponsor)
+[<img src="https://openapi-generator.tech/img/companies/dmtech.jpeg" width="128" height="128">](https://www.dm-jobs.com/?utm_source=openapi_generator&utm_medium=github_webpage&utm_campaign=sponsor)
 [<img src="https://openapi-generator.tech/img/companies/adyen.png" width="128" height="128">](https://adyen.com/?utm_source=openapi_generator&utm_medium=github_webpage&utm_campaign=sponsor)
 [<img src="https://openapi-generator.tech/img/companies/fornex.png" width="128" height="128">](https://fornex.com/?utm_source=openapi_generator&utm_medium=github_webpage&utm_campaign=sponsor)
 [<img src="https://openapi-generator.tech/img/companies/alloyautomation.png" width="128" height="128">](https://runalloy.com/signup?utm_source=github&utm_medium=referral&utm_campaign=1524_openapigenerator)
@@ -85,7 +85,7 @@ OpenAPI Generator allows generation of API client libraries (SDK generation), se
 |                                  | Languages/Frameworks                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                |
 | -------------------------------- |-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
 | **API clients**                  | **ActionScript**, **Ada**, **Apex**, **Bash**, **C**, **C#** (.net 2.0, 3.5 or later, .NET Standard 1.3 - 2.1, .NET Core 3.1, .NET 5.0. Libraries: RestSharp, GenericHost, HttpClient), **C++** (Arduino, cpp-restsdk, Qt5, Tizen, Unreal Engine 4), **Clojure**, **Crystal**, **Dart**, **Elixir**, **Elm**, **Eiffel**, **Erlang**, **Go**, **Groovy**, **Haskell** (http-client, Servant), **Java** (Apache HttpClient 4.x, Apache HttpClient 5.x, Jersey2.x, OkHttp, Retrofit1.x, Retrofit2.x, Feign, RestTemplate, RESTEasy, Vertx, Google API Client Library for Java, Rest-assured, Spring 5 Web Client, MicroProfile Rest Client, Helidon), **Jetbrains HTTP Client**, **Julia**, **k6**, **Kotlin**, **Lua**, **N4JS**, **Nim**, **Node.js/JavaScript** (ES5, ES6, AngularJS with Google Closure Compiler annotations, Flow types, Apollo GraphQL DataStore), **Objective-C**, **OCaml**, **Perl**, **PHP**, **PowerShell**, **Python**, **R**, **Ruby**, **Rust** (hyper, reqwest, rust-server), **Scala** (akka, http4s, scalaz, sttp, swagger-async-httpclient, pekko), **Swift** (2.x, 3.x, 4.x, 5.x), **Typescript** (AngularJS, Angular (9.x - 17.x), Aurelia, Axios, Fetch, Inversify, jQuery, Nestjs, Node, redux-query, Rxjs), **XoJo**, **Zapier** |
-| **Server stubs**                 | **Ada**, **C#** (ASP.NET Core, Azure Functions), **C++** (Pistache, Restbed, Qt5 QHTTPEngine), **Erlang**, **F#** (Giraffe), **Go** (net/http, Gin, Echo), **Haskell** (Servant, Yesod), **Java** (MSF4J, Spring, Undertow, JAX-RS: CDI, CXF, Inflector, Jersey, RestEasy, Play Framework, [PKMST](https://github.com/ProKarma-Inc/pkmst-getting-started-examples), [Vert.x](https://vertx.io/), [Apache Camel](https://camel.apache.org/), [Helidon](https://helidon.io/)), **Julia**, **Kotlin** (Spring Boot, [Ktor](https://github.com/ktorio/ktor), [Vert.x](https://vertx.io/)), **PHP** (Laravel, Lumen, [Mezzio (fka Zend Expressive)](https://github.com/mezzio/mezzio), Slim, Silex, [Symfony](https://symfony.com/)), **Python** (FastAPI, Flask), **NodeJS**, **Ruby** (Sinatra, Rails5), **Rust** ([rust-server](https://openapi-generator.tech/docs/generators/rust-server/)), **Scala** (Akka, [Finch](https://github.com/finagle/finch), [Lagom](https://github.com/lagom/lagom), [Play](https://www.playframework.com/), [Cask](https://github.com/com-lihaoyi/cask), Scalatra)                                                                                                                                                                                                                                               |
+| **Server stubs**                 | **Ada**, **C#** (ASP.NET Core, Azure Functions), **C++** (Pistache, Restbed, Qt5 QHTTPEngine), **Erlang**, **F#** (Giraffe), **Go** (net/http, Gin, Echo), **Haskell** (Servant, Yesod), **Java** (MSF4J, Spring, Undertow, JAX-RS: CDI, CXF, Inflector, Jersey, RestEasy, Play Framework, [PKMST](https://github.com/ProKarma-Inc/pkmst-getting-started-examples), [Vert.x](https://vertx.io/), [Apache Camel](https://camel.apache.org/), [Helidon](https://helidon.io/)), **Julia**, **Kotlin** (Spring Boot, [Ktor](https://github.com/ktorio/ktor), [Vert.x](https://vertx.io/)), **PHP** (Laravel, Lumen, [Mezzio (fka Zend Expressive)](https://github.com/mezzio/mezzio), Slim, Silex, [Symfony](https://symfony.com/)), **Python** (FastAPI, Flask), **NodeJS**, **Ruby** (Sinatra, Rails5), **Rust** ([rust-server](https://openapi-generator.tech/docs/generators/rust-server/)), **Scala** (Akka, [Finch](https://github.com/finagle/finch), [Lagom](https://github.com/lagom/lagom), [Play](https://www.playframework.com/), Scalatra)                                                                                                                                                                                                                                               |
 | **API documentation generators** | **HTML**, **Confluence Wiki**, **Asciidoc**, **Markdown**, **PlantUML**                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             |
 | **Configuration files**          | [**Apache2**](https://httpd.apache.org/)                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            |
 | **Others**                       | **GraphQL**, **JMeter**, **Ktorm**, **MySQL Schema**, **Postman Collection**, **Protocol Buffer**, **WSDL**                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 |
@@ -1102,7 +1102,6 @@ Here is a list of template creators:
   * Ruby on Rails 5: @zlx
   * Rust (rust-server): @metaswitch
   * Scala Akka: @Bouillie
-   * Scala Cask: @aaronp
   * Scala Finch: @jimschubert [:heart:](https://www.patreon.com/jimschubert)
   * Scala Lagom: @gmkumar2005
   * Scala Play: @adigerber
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -45,7 +45,6 @@ build_script:
 test_script:
  - dotnet test samples\client\petstore\csharp\generichost\net8\AllOf\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
  - dotnet test samples\client\petstore\csharp\generichost\net8\AnyOf\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
-  - dotnet test samples\client\petstore\csharp\generichost\net8\AnyOfNoCompare\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
  - dotnet test samples\client\petstore\csharp\generichost\net8\FormModels\src\Org.OpenAPITools.Test\Org.OpenAPITools.Test.csproj
  - dotnet test samples\client\petstore\csharp\generichost\net8\ManualSourceGenerationTests\ManualTests.Latest.UseSourceGeneration\ManualTests.Latest.UseSourceGeneration.csproj
  - dotnet test samples\client\petstore\csharp\generichost\net8\ManualPetstoreTests\OpenAPIClient-generichost-manual-tests\OpenAPIClient-generichost-manual-tests.csproj
--- a/bin/configs/csharp-generichost-net8-anyOfNoCompare.yaml
+++ b/bin/configs/csharp-generichost-net8-anyOfNoCompare.yaml
@@ -1,13 +0,0 @@
-# for csharp generichost
-generatorName: csharp
-outputDir: samples/client/petstore/csharp/generichost/net8/AnyOfNoCompare
-inputSpec: modules/openapi-generator/src/test/resources/3_0/anyOf.yaml
-library: generichost
-templateDir: modules/openapi-generator/src/main/resources/csharp
-additionalProperties:
-  packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}'
-  useCompareNetObjects: false
-  disallowAdditionalPropertiesIfNotPresent: false
-  nullableReferenceTypes: true
-  equatable: true
-  targetFramework: net8.0
--- a/bin/configs/java-microprofile-rest-client-3.0-jackson-with-xml.yaml
+++ b/bin/configs/java-microprofile-rest-client-3.0-jackson-with-xml.yaml
@@ -8,5 +8,4 @@ additionalProperties:
  serializationLibrary: jackson
  artifactId: microprofile-rest-client-3-jackson-with-xml
  configKey: petstore
-  microprofileRestClientVersion: "3.0"
-  hideGenerationTimestamp: true
+  microprofileRestClientVersion: "3.0"
--- a/bin/configs/java-microprofile-rest-client-3.0-jackson.yaml
+++ b/bin/configs/java-microprofile-rest-client-3.0-jackson.yaml
@@ -7,5 +7,4 @@ additionalProperties:
  serializationLibrary: jackson
  artifactId: microprofile-rest-client-3-jackson
  configKey: petstore
-  microprofileRestClientVersion: "3.0"
-  hideGenerationTimestamp: true
+  microprofileRestClientVersion: "3.0"
--- a/bin/configs/java-okhttp-gson-swagger1.yaml
+++ b/bin/configs/java-okhttp-gson-swagger1.yaml
@@ -9,5 +9,4 @@ additionalProperties:
  useOneOfDiscriminatorLookup: "true"
  disallowAdditionalPropertiesIfNotPresent: false
  annotationLibrary: "swagger1"
-openapiNormalizer:
-  SET_TAGS_FOR_ALL_OPERATIONS: common
+
--- a/bin/configs/jaxrs-spec-quarkus-mutiny.yaml
+++ b/bin/configs/jaxrs-spec-quarkus-mutiny.yaml
@@ -1,15 +0,0 @@
-generatorName: jaxrs-spec
-outputDir: samples/server/petstore/jaxrs-spec-quarkus-mutiny
-inputSpec: modules/openapi-generator/src/test/resources/3_0/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"
-  useMicroProfileOpenAPIAnnotations: "true"
-  useAsync: "true"
-  useMutiny: "true"
-  library: "quarkus"
-  dateLibrary: "java8-localdatetime"
--- a/bin/configs/kotlin-model-prefix-type-mapping-echo-api.yaml
+++ b/bin/configs/kotlin-model-prefix-type-mapping-echo-api.yaml
@@ -12,4 +12,4 @@ additionalProperties:
  enumPropertyNaming: UPPERCASE
  serializationLibrary: gson
 openapiNormalizer:
-  SIMPLIFY_ONEOF_ANYOF: false
+  SIMPLIFY_ONEOF_ANYOF=false
--- a/bin/configs/kotlin-model-prefix-type-mapping.yaml
+++ b/bin/configs/kotlin-model-prefix-type-mapping.yaml
@@ -12,4 +12,4 @@ additionalProperties:
  enumPropertyNaming: UPPERCASE
  serializationLibrary: gson
 openapiNormalizer:
-  SIMPLIFY_ONEOF_ANYOF: false
+  SIMPLIFY_ONEOF_ANYOF=false
--- a/bin/configs/scala-cask-petstore-new.yaml
+++ b/bin/configs/scala-cask-petstore-new.yaml
@@ -1,13 +0,0 @@
-generatorName: scala-cask
-outputDir: samples/server/petstore/scala-cask
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/scala-cask
-additionalProperties:
-  hideGenerationTimestamp: "true"
-  artifactId: scala-cask-petstore
-  groupId: "cask.groupId"
-  package: "sample.cask"
-  modelPackage: "sample.cask.model"
-  apiPackage: "sample.cask.api"
-  gitRepoId: "sample-cask-repo"
-  gitUserId: "sample-cask-user"
--- a/bin/configs/unmaintained/html2.yaml
+++ b/bin/configs/unmaintained/html2.yaml
--- a/bin/utils/test_file_list.yaml
+++ b/bin/utils/test_file_list.yaml
@@ -10,7 +10,7 @@
 - filename: "samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/ClientTest.java"
  sha256: db505f7801fef62c13a08a8e9ca1fc4c5c947ab46b46f12943139d353feacf17
 - filename: "samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/JSONTest.java"
-  sha256: 8210bdaf06aae8dc46521515a8a0ef10e48c980fadd3efd95313e6c806f409c2
+  sha256: c479b587cf0d51fa550eb81d33b277081807b87dc28649027d1164224c25ad0a
 - filename: "samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/api/PetApiTest.java"
  sha256: 0d64cdc11809a7b5b952ccdad2bd91bd0045b3894d6fabf3e368fa0be12b8217
 - filename: "samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/PetTest.java"
--- a/docs/customization.md
+++ b/docs/customization.md
@@ -304,8 +304,6 @@ You can use also `config.yml` with following equivalent example:
 apiPackage: "petstore"
 ```

-Another example of config file can be found in [modules/openapi-generator/src/test/resources/sampleConfig.json](https://github.com/OpenAPITools/openapi-generator/blob/master/modules/openapi-generator/src/test/resources/sampleConfig.json)
-
 Supported config options can be different per language. Running `config-help -g {lang}` will show available options.
 **These options are applied via configuration file (e.g. config.json or config.yml) or by passing them with `-p {optionName}={optionValue}`**. (If `-p {optionName}` does not work, please open a [ticket](https://github.com/openapitools/openapi-generator/issues/new) and we'll look into it)

--- a/docs/generators.md
+++ b/docs/generators.md
@@ -134,7 +134,6 @@ The following generators are available:
 * [rust-axum (beta)](generators/rust-axum.md)  
 * [rust-server](generators/rust-server.md)  
 * [scala-akka-http-server (beta)](generators/scala-akka-http-server.md)  
-* [scala-cask](generators/scala-cask.md)  
 * [scala-finch](generators/scala-finch.md)  
 * [scala-http4s-server](generators/scala-http4s-server.md)  
 * [scala-lagom-server](generators/scala-lagom-server.md)  
--- a/docs/generators/groovy.md
+++ b/docs/generators/groovy.md
@@ -135,7 +135,6 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 ## RESERVED WORDS

 <ul class="column-ul">
-<li>_</li>
 <li>abstract</li>
 <li>apiclient</li>
 <li>apiexception</li>
--- a/docs/generators/java-camel.md
+++ b/docs/generators/java-camel.md
@@ -174,7 +174,6 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 ## RESERVED WORDS

 <ul class="column-ul">
-<li>_</li>
 <li>abstract</li>
 <li>apiclient</li>
 <li>apiexception</li>
--- a/docs/generators/java-helidon-client.md
+++ b/docs/generators/java-helidon-client.md
@@ -128,7 +128,6 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 ## RESERVED WORDS

 <ul class="column-ul">
-<li>_</li>
 <li>abstract</li>
 <li>apiclient</li>
 <li>apiexception</li>
--- a/docs/generators/java-helidon-server.md
+++ b/docs/generators/java-helidon-server.md
@@ -130,7 +130,6 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 ## RESERVED WORDS

 <ul class="column-ul">
-<li>_</li>
 <li>abstract</li>
 <li>apiclient</li>
 <li>apiexception</li>
--- a/docs/generators/java-inflector.md
+++ b/docs/generators/java-inflector.md
@@ -132,7 +132,6 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 ## RESERVED WORDS

 <ul class="column-ul">
-<li>_</li>
 <li>abstract</li>
 <li>apiclient</li>
 <li>apiexception</li>
--- a/docs/generators/java-micronaut-client.md
+++ b/docs/generators/java-micronaut-client.md
@@ -153,7 +153,6 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 ## RESERVED WORDS

 <ul class="column-ul">
-<li>_</li>
 <li>abstract</li>
 <li>apiclient</li>
 <li>apiexception</li>
--- a/docs/generators/java-micronaut-server.md
+++ b/docs/generators/java-micronaut-server.md
@@ -153,7 +153,6 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 ## RESERVED WORDS

 <ul class="column-ul">
-<li>_</li>
 <li>abstract</li>
 <li>apiclient</li>
 <li>apiexception</li>
--- a/docs/generators/java-msf4j.md
+++ b/docs/generators/java-msf4j.md
@@ -138,7 +138,6 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 ## RESERVED WORDS

 <ul class="column-ul">
-<li>_</li>
 <li>abstract</li>
 <li>apiclient</li>
 <li>apiexception</li>
--- a/docs/generators/java-pkmst.md
+++ b/docs/generators/java-pkmst.md
@@ -139,7 +139,6 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 ## RESERVED WORDS

 <ul class="column-ul">
-<li>_</li>
 <li>abstract</li>
 <li>apiclient</li>
 <li>apiexception</li>
--- a/docs/generators/java-play-framework.md
+++ b/docs/generators/java-play-framework.md
@@ -142,7 +142,6 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 ## RESERVED WORDS

 <ul class="column-ul">
-<li>_</li>
 <li>abstract</li>
 <li>apiclient</li>
 <li>apiexception</li>
--- a/docs/generators/java-undertow-server.md
+++ b/docs/generators/java-undertow-server.md
@@ -132,7 +132,6 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 ## RESERVED WORDS

 <ul class="column-ul">
-<li>_</li>
 <li>abstract</li>
 <li>apiclient</li>
 <li>apiexception</li>
--- a/docs/generators/java-vertx-web.md
+++ b/docs/generators/java-vertx-web.md
@@ -132,7 +132,6 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 ## RESERVED WORDS

 <ul class="column-ul">
-<li>_</li>
 <li>abstract</li>
 <li>apiclient</li>
 <li>apiexception</li>
--- a/docs/generators/java-vertx.md
+++ b/docs/generators/java-vertx.md
@@ -135,7 +135,6 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 ## RESERVED WORDS

 <ul class="column-ul">
-<li>_</li>
 <li>abstract</li>
 <li>apiclient</li>
 <li>apiexception</li>
--- a/docs/generators/java-wiremock.md
+++ b/docs/generators/java-wiremock.md
@@ -132,7 +132,6 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 ## RESERVED WORDS

 <ul class="column-ul">
-<li>_</li>
 <li>abstract</li>
 <li>apiclient</li>
 <li>apiexception</li>
--- a/docs/generators/java.md
+++ b/docs/generators/java.md
@@ -164,7 +164,6 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 ## RESERVED WORDS

 <ul class="column-ul">
-<li>_</li>
 <li>abstract</li>
 <li>apiclient</li>
 <li>apiexception</li>
--- a/docs/generators/jaxrs-cxf-cdi.md
+++ b/docs/generators/jaxrs-cxf-cdi.md
@@ -78,7 +78,6 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |useBeanValidation|Use BeanValidation API annotations| |true|
 |useJakartaEe|whether to use Jakarta EE namespace instead of javax| |false|
 |useMicroProfileOpenAPIAnnotations|Whether to generate Microprofile OpenAPI annotations. Only valid when library is set to quarkus.| |false|
-|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|
 |useTags|use tags for creating interface and controller classnames| |false|
@@ -147,7 +146,6 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 ## RESERVED WORDS

 <ul class="column-ul">
-<li>_</li>
 <li>abstract</li>
 <li>apiclient</li>
 <li>apiexception</li>
--- a/docs/generators/jaxrs-cxf-client.md
+++ b/docs/generators/jaxrs-cxf-client.md
@@ -137,7 +137,6 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 ## RESERVED WORDS

 <ul class="column-ul">
-<li>_</li>
 <li>abstract</li>
 <li>apiclient</li>
 <li>apiexception</li>
--- a/docs/generators/jaxrs-cxf-extended.md
+++ b/docs/generators/jaxrs-cxf-extended.md
@@ -160,7 +160,6 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 ## RESERVED WORDS

 <ul class="column-ul">
-<li>_</li>
 <li>abstract</li>
 <li>apiclient</li>
 <li>apiexception</li>
--- a/docs/generators/jaxrs-cxf.md
+++ b/docs/generators/jaxrs-cxf.md
@@ -155,7 +155,6 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 ## RESERVED WORDS

 <ul class="column-ul">
-<li>_</li>
 <li>abstract</li>
 <li>apiclient</li>
 <li>apiexception</li>
--- a/docs/generators/jaxrs-jersey.md
+++ b/docs/generators/jaxrs-jersey.md
@@ -138,7 +138,6 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 ## RESERVED WORDS

 <ul class="column-ul">
-<li>_</li>
 <li>abstract</li>
 <li>apiclient</li>
 <li>apiexception</li>
--- a/docs/generators/jaxrs-resteasy-eap.md
+++ b/docs/generators/jaxrs-resteasy-eap.md
@@ -139,7 +139,6 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 ## RESERVED WORDS

 <ul class="column-ul">
-<li>_</li>
 <li>abstract</li>
 <li>apiclient</li>
 <li>apiexception</li>
--- a/docs/generators/jaxrs-resteasy.md
+++ b/docs/generators/jaxrs-resteasy.md
@@ -138,7 +138,6 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 ## RESERVED WORDS

 <ul class="column-ul">
-<li>_</li>
 <li>abstract</li>
 <li>apiclient</li>
 <li>apiexception</li>
--- a/docs/generators/jaxrs-spec.md
+++ b/docs/generators/jaxrs-spec.md
@@ -78,7 +78,6 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |useBeanValidation|Use BeanValidation API annotations| |true|
 |useJakartaEe|whether to use Jakarta EE namespace instead of javax| |false|
 |useMicroProfileOpenAPIAnnotations|Whether to generate Microprofile OpenAPI annotations. Only valid when library is set to quarkus.| |false|
-|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|
 |useTags|use tags for creating interface and controller classnames| |false|
@@ -147,7 +146,6 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 ## RESERVED WORDS

 <ul class="column-ul">
-<li>_</li>
 <li>abstract</li>
 <li>apiclient</li>
 <li>apiexception</li>
--- a/docs/generators/python-aiohttp.md
+++ b/docs/generators/python-aiohttp.md
@@ -91,7 +91,6 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>except</li>
 <li>exec</li>
 <li>false</li>
-<li>field</li>
 <li>finally</li>
 <li>float</li>
 <li>for</li>
--- a/docs/generators/python-blueplanet.md
+++ b/docs/generators/python-blueplanet.md
@@ -91,7 +91,6 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>except</li>
 <li>exec</li>
 <li>false</li>
-<li>field</li>
 <li>finally</li>
 <li>float</li>
 <li>for</li>
--- a/docs/generators/python-flask.md
+++ b/docs/generators/python-flask.md
@@ -91,7 +91,6 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>except</li>
 <li>exec</li>
 <li>false</li>
-<li>field</li>
 <li>finally</li>
 <li>float</li>
 <li>for</li>
--- a/docs/generators/python.md
+++ b/docs/generators/python.md
@@ -88,7 +88,6 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>except</li>
 <li>exec</li>
 <li>false</li>
-<li>field</li>
 <li>finally</li>
 <li>float</li>
 <li>for</li>
--- a/docs/generators/scala-cask.md
+++ b/docs/generators/scala-cask.md
@@ -1,261 +0,0 @@
---
-title: Documentation for the scala-cask Generator
---
-
-## METADATA
-
-| Property | Value | Notes |
-| -------- | ----- | ----- |
-| generator name | scala-cask | pass this to the generate command after -g |
-| generator stability | STABLE | |
-| generator type | SERVER | |
-| generator language | Scala | |
-| generator default templating engine | mustache | |
-| helpTxt | Generates a scala-cask server. | |
-
-## CONFIG OPTIONS
-These options may be applied as additional-properties (cli) or configOptions (plugins). Refer to [configuration docs](https://openapi-generator.tech/docs/configuration) for more details.
-
-| Option | Description | Values | Default |
-| ------ | ----------- | ------ | ------- |
-|allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
-|apiPackage|package for generated api classes| |null|
-|artifactId|artifactId in generated pom.xml. This also becomes part of the generated library's filename| |null|
-|dateLibrary|Option. Date library to use|<dl><dt>**joda**</dt><dd>Joda (for legacy app)</dd><dt>**java8**</dt><dd>Java 8 native JSR310 (preferred for JDK 1.8+)</dd></dl>|java8|
-|disallowAdditionalPropertiesIfNotPresent|If false, the 'additionalProperties' implementation (set to true by default) is compliant with the OAS and JSON schema specifications. If true (default), keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>Keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.</dd></dl>|true|
-|ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
-|enumUnknownDefaultCase|If the server adds new enum cases, that are unknown by an old spec/client, the client will fail to parse the network response.With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the server sends an enum case that is not known by the client/spec, they can safely fallback to this case.|<dl><dt>**false**</dt><dd>No changes to the enum's are made, this is the default option.</dd><dt>**true**</dt><dd>With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the enum case sent by the server is not known by the client/spec, can safely be decoded to this case.</dd></dl>|false|
-|gitRepoId|Git repo ID, e.g. openapi-generator.| |null|
-|gitUserId|Git user ID, e.g. openapitools.| |null|
-|groupId|groupId in generated pom.xml| |null|
-|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C# have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
-|modelPackage|package for generated models| |null|
-|modelPropertyNaming|Naming convention for the property: 'camelCase', 'PascalCase', 'snake_case' and 'original', which keeps the original name| |camelCase|
-|packageName|packageDescription| |null|
-|prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
-|sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
-|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
-|sourceFolder|source folder for generated code| |null|
-
-## IMPORT MAPPING
-
-| Type/Alias | Imports |
-| ---------- | ------- |
-|Array|java.util.List|
-|ArrayList|java.util.ArrayList|
-|Date|java.util.Date|
-|DateTime|org.joda.time.*|
-|File|java.io.File|
-|HashMap|java.util.HashMap|
-|ListBuffer|scala.collection.mutable.ListBuffer|
-|ListSet|scala.collection.immutable.ListSet|
-|LocalDate|org.joda.time.*|
-|LocalDateTime|org.joda.time.*|
-|LocalTime|org.joda.time.*|
-|Seq|scala.collection.immutable.Seq|
-|Set|scala.collection.immutable.Set|
-|Timestamp|java.sql.Timestamp|
-|URI|java.net.URI|
-|UUID|java.util.UUID|
-
-
-## INSTANTIATION TYPES
-
-| Type/Alias | Instantiated By |
-| ---------- | --------------- |
-|set|Set|
-
-
-## LANGUAGE PRIMITIVES
-
-<ul class="column-ul">
-<li>Any</li>
-<li>Array</li>
-<li>Boolean</li>
-<li>Byte</li>
-<li>Double</li>
-<li>Float</li>
-<li>Int</li>
-<li>List</li>
-<li>Long</li>
-<li>Map</li>
-<li>Object</li>
-<li>Seq</li>
-<li>String</li>
-<li>boolean</li>
-</ul>
-
-## RESERVED WORDS
-
-<ul class="column-ul">
-<li>abstract</li>
-<li>assert</li>
-<li>boolean</li>
-<li>break</li>
-<li>byte</li>
-<li>case</li>
-<li>catch</li>
-<li>char</li>
-<li>class</li>
-<li>const</li>
-<li>continue</li>
-<li>default</li>
-<li>do</li>
-<li>double</li>
-<li>else</li>
-<li>enum</li>
-<li>extends</li>
-<li>final</li>
-<li>finally</li>
-<li>float</li>
-<li>for</li>
-<li>goto</li>
-<li>if</li>
-<li>implements</li>
-<li>import</li>
-<li>instanceof</li>
-<li>int</li>
-<li>interface</li>
-<li>long</li>
-<li>native</li>
-<li>new</li>
-<li>package</li>
-<li>private</li>
-<li>protected</li>
-<li>public</li>
-<li>return</li>
-<li>short</li>
-<li>static</li>
-<li>strictfp</li>
-<li>super</li>
-<li>switch</li>
-<li>synchronized</li>
-<li>this</li>
-<li>throw</li>
-<li>throws</li>
-<li>transient</li>
-<li>try</li>
-<li>type</li>
-<li>void</li>
-<li>volatile</li>
-<li>while</li>
-</ul>
-
-## FEATURE SET
-
-
-### Client Modification Feature
-| Name | Supported | Defined By |
-| ---- | --------- | ---------- |
-|BasePath|✗|ToolingExtension
-|Authorizations|✗|ToolingExtension
-|UserAgent|✗|ToolingExtension
-|MockServer|✗|ToolingExtension
-
-### Data Type Feature
-| Name | Supported | Defined By |
-| ---- | --------- | ---------- |
-|Custom|✗|OAS2,OAS3
-|Int32|✓|OAS2,OAS3
-|Int64|✓|OAS2,OAS3
-|Float|✓|OAS2,OAS3
-|Double|✓|OAS2,OAS3
-|Decimal|✓|ToolingExtension
-|String|✓|OAS2,OAS3
-|Byte|✓|OAS2,OAS3
-|Binary|✓|OAS2,OAS3
-|Boolean|✓|OAS2,OAS3
-|Date|✓|OAS2,OAS3
-|DateTime|✓|OAS2,OAS3
-|Password|✓|OAS2,OAS3
-|File|✓|OAS2
-|Uuid|✗|
-|Array|✓|OAS2,OAS3
-|Null|✗|OAS3
-|AnyType|✗|OAS2,OAS3
-|Object|✓|OAS2,OAS3
-|Maps|✓|ToolingExtension
-|CollectionFormat|✓|OAS2
-|CollectionFormatMulti|✓|OAS2
-|Enum|✓|OAS2,OAS3
-|ArrayOfEnum|✓|ToolingExtension
-|ArrayOfModel|✓|ToolingExtension
-|ArrayOfCollectionOfPrimitives|✓|ToolingExtension
-|ArrayOfCollectionOfModel|✓|ToolingExtension
-|ArrayOfCollectionOfEnum|✓|ToolingExtension
-|MapOfEnum|✓|ToolingExtension
-|MapOfModel|✓|ToolingExtension
-|MapOfCollectionOfPrimitives|✓|ToolingExtension
-|MapOfCollectionOfModel|✓|ToolingExtension
-|MapOfCollectionOfEnum|✓|ToolingExtension
-
-### Documentation Feature
-| Name | Supported | Defined By |
-| ---- | --------- | ---------- |
-|Readme|✗|ToolingExtension
-|Model|✓|ToolingExtension
-|Api|✓|ToolingExtension
-
-### Global Feature
-| Name | Supported | Defined By |
-| ---- | --------- | ---------- |
-|Host|✓|OAS2,OAS3
-|BasePath|✓|OAS2,OAS3
-|Info|✓|OAS2,OAS3
-|Schemes|✗|OAS2,OAS3
-|PartialSchemes|✓|OAS2,OAS3
-|Consumes|✓|OAS2
-|Produces|✓|OAS2
-|ExternalDocumentation|✓|OAS2,OAS3
-|Examples|✓|OAS2,OAS3
-|XMLStructureDefinitions|✗|OAS2,OAS3
-|MultiServer|✗|OAS3
-|ParameterizedServer|✗|OAS3
-|ParameterStyling|✗|OAS3
-|Callbacks|✓|OAS3
-|LinkObjects|✗|OAS3
-
-### Parameter Feature
-| Name | Supported | Defined By |
-| ---- | --------- | ---------- |
-|Path|✓|OAS2,OAS3
-|Query|✓|OAS2,OAS3
-|Header|✓|OAS2,OAS3
-|Body|✓|OAS2
-|FormUnencoded|✓|OAS2
-|FormMultipart|✓|OAS2
-|Cookie|✓|OAS3
-
-### Schema Support Feature
-| Name | Supported | Defined By |
-| ---- | --------- | ---------- |
-|Simple|✓|OAS2,OAS3
-|Composite|✓|OAS2,OAS3
-|Polymorphism|✓|OAS2,OAS3
-|Union|✗|OAS3
-|allOf|✗|OAS2,OAS3
-|anyOf|✗|OAS3
-|oneOf|✗|OAS3
-|not|✗|OAS3
-
-### Security Feature
-| Name | Supported | Defined By |
-| ---- | --------- | ---------- |
-|BasicAuth|✓|OAS2,OAS3
-|ApiKey|✓|OAS2,OAS3
-|OpenIDConnect|✗|OAS3
-|BearerToken|✓|OAS3
-|OAuth2_Implicit|✓|OAS2,OAS3
-|OAuth2_Password|✓|OAS2,OAS3
-|OAuth2_ClientCredentials|✓|OAS2,OAS3
-|OAuth2_AuthorizationCode|✓|OAS2,OAS3
-|SignatureAuth|✗|OAS3
-|AWSV4Signature|✗|ToolingExtension
-
-### Wire Format Feature
-| Name | Supported | Defined By |
-| ---- | --------- | ---------- |
-|JSON|✓|OAS2,OAS3
-|XML|✓|OAS2,OAS3
-|PROTOBUF|✗|ToolingExtension
-|Custom|✗|OAS2,OAS3
--- a/docs/generators/spring.md
+++ b/docs/generators/spring.md
@@ -167,7 +167,6 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 ## RESERVED WORDS

 <ul class="column-ul">
-<li>_</li>
 <li>abstract</li>
 <li>apiclient</li>
 <li>apiexception</li>
--- a/modules/openapi-generator-cli/pom.xml
+++ b/modules/openapi-generator-cli/pom.xml
@@ -4,7 +4,7 @@
        <groupId>org.openapitools</groupId>
        <artifactId>openapi-generator-project</artifactId>
        <!-- RELEASE_VERSION -->
-        <version>7.5.0</version>
+        <version>7.5.0-SNAPSHOT</version>
        <!-- /RELEASE_VERSION -->
        <relativePath>../..</relativePath>
    </parent>
--- a/modules/openapi-generator-cli/src/main/java/org/openapitools/codegen/cmd/Generate.java
+++ b/modules/openapi-generator-cli/src/main/java/org/openapitools/codegen/cmd/Generate.java
@@ -515,11 +515,11 @@ public class Generate extends OpenApiGeneratorCommand {
        applyModelNameMappingsKvpList(modelNameMappings, configurator);
        applyEnumNameMappingsKvpList(enumNameMappings, configurator);
        applyOperationIdNameMappingsKvpList(operationIdNameMappings, configurator);
-        applyOpenapiNormalizerKvpList(openapiNormalizer, configurator);
+        applyOpenAPINormalizerKvpList(openapiNormalizer, configurator);
        applyTypeMappingsKvpList(typeMappings, configurator);
        applyAdditionalPropertiesKvpList(additionalProperties, configurator);
        applyLanguageSpecificPrimitivesCsvList(languageSpecificPrimitives, configurator);
-        applyOpenapiGeneratorIgnoreListCsvList(openapiGeneratorIgnoreList, configurator);
+        applyOpenAPIGeneratorIgnoreListCsvList(openapiGeneratorIgnoreList, configurator);
        applyReservedWordsMappingsKvpList(reservedWordsMappings, configurator);
        applyServerVariablesKvpList(serverVariableOverrides, configurator);

--- a/modules/openapi-generator-core/pom.xml
+++ b/modules/openapi-generator-core/pom.xml
@@ -6,7 +6,7 @@
    <artifactId>openapi-generator-project</artifactId>
    <groupId>org.openapitools</groupId>
    <!-- RELEASE_VERSION -->
-    <version>7.5.0</version>
+    <version>7.5.0-SNAPSHOT</version>
    <!-- /RELEASE_VERSION -->
    <relativePath>../..</relativePath>
  </parent>
--- a/modules/openapi-generator-core/src/main/java/org/openapitools/codegen/config/GeneratorSettings.java
+++ b/modules/openapi-generator-core/src/main/java/org/openapitools/codegen/config/GeneratorSettings.java
@@ -321,7 +321,7 @@ public final class GeneratorSettings implements Serializable {
     *
     * @return a map of rules
     */
-    public Map<String, String> getOpenapiNormalizer() {
+    public Map<String, String> getOpenAPINormalizer() {
        return openapiNormalizer;
    }

@@ -346,7 +346,7 @@ public final class GeneratorSettings implements Serializable {
     *
     * @return the openapi generator ignore list
     */
-    public Set<String> getOpenapiGeneratorIgnoreList() {
+    public Set<String> getOpenAPIGeneratorIgnoreList() {
        return openapiGeneratorIgnoreList;
    }

@@ -614,14 +614,14 @@ public final class GeneratorSettings implements Serializable {
        if (copy.getOperationIdNameMappings() != null) {
            builder.operationIdNameMappings.putAll(copy.getOperationIdNameMappings());
        }
-        if (copy.getOpenapiNormalizer() != null) {
-            builder.openapiNormalizer.putAll(copy.getOpenapiNormalizer());
+        if (copy.getOpenAPINormalizer() != null) {
+            builder.openapiNormalizer.putAll(copy.getOpenAPINormalizer());
        }
        if (copy.getLanguageSpecificPrimitives() != null) {
            builder.languageSpecificPrimitives.addAll(copy.getLanguageSpecificPrimitives());
        }
-        if (copy.getOpenapiGeneratorIgnoreList() != null) {
-            builder.openapiGeneratorIgnoreList.addAll(copy.getOpenapiGeneratorIgnoreList());
+        if (copy.getOpenAPIGeneratorIgnoreList() != null) {
+            builder.openapiGeneratorIgnoreList.addAll(copy.getOpenAPIGeneratorIgnoreList());
        }
        if (copy.getReservedWordsMappings() != null) {
            builder.reservedWordsMappings.putAll(copy.getReservedWordsMappings());
@@ -1152,7 +1152,7 @@ public final class GeneratorSettings implements Serializable {
         * @param openapiNormalizer the {@code openapiNormalizer} to set
         * @return a reference to this Builder
         */
-        public Builder withOpenapiNormalizer(Map<String, String> openapiNormalizer) {
+        public Builder withOpenAPINormalizer(Map<String, String> openapiNormalizer) {
            this.openapiNormalizer = openapiNormalizer;
            return this;
        }
@@ -1164,7 +1164,7 @@ public final class GeneratorSettings implements Serializable {
         * @param value The value of the OpenAPI normalizer rule
         * @return a reference to this Builder
         */
-        public Builder withOpenapiNormalizer(String key, String value) {
+        public Builder withOpenAPINormalizer(String key, String value) {
            if (this.openapiNormalizer == null) {
                this.openapiNormalizer = new HashMap<>();
            }
@@ -1203,7 +1203,7 @@ public final class GeneratorSettings implements Serializable {
         * @param openapiGeneratorIgnoreList the {@code openapiGeneratorIgnoreList} to set
         * @return a reference to this Builder
         */
-        public Builder withOpenapiGeneratorIgnoreList(Set<String> openapiGeneratorIgnoreList) {
+        public Builder withOpenAPIGeneratorIgnoreList(Set<String> openapiGeneratorIgnoreList) {
            this.openapiGeneratorIgnoreList = openapiGeneratorIgnoreList;
            return this;
        }
@@ -1214,7 +1214,7 @@ public final class GeneratorSettings implements Serializable {
         * @param value The value of entry to set
         * @return a reference to this Builder
         */
-        public Builder withOpenapiGeneratorIgnoreList(String value) {
+        public Builder withOpenAPIGeneratorIgnoreList(String value) {
            if (this.openapiGeneratorIgnoreList == null) {
                this.openapiGeneratorIgnoreList = new HashSet<>();
            }
@@ -1390,9 +1390,9 @@ public final class GeneratorSettings implements Serializable {
                Objects.equals(getModelNameMappings(), that.getModelNameMappings()) &&
                Objects.equals(getEnumNameMappings(), that.getEnumNameMappings()) &&
                Objects.equals(getOperationIdNameMappings(), that.getOperationIdNameMappings()) &&
-                Objects.equals(getOpenapiNormalizer(), that.getOpenapiNormalizer()) &&
+                Objects.equals(getOpenAPINormalizer(), that.getOpenAPINormalizer()) &&
                Objects.equals(getLanguageSpecificPrimitives(), that.getLanguageSpecificPrimitives()) &&
-                Objects.equals(getOpenapiGeneratorIgnoreList(), that.getOpenapiGeneratorIgnoreList()) &&
+                Objects.equals(getOpenAPIGeneratorIgnoreList(), that.getOpenAPIGeneratorIgnoreList()) &&
                Objects.equals(getReservedWordsMappings(), that.getReservedWordsMappings()) &&
                Objects.equals(getGitHost(), that.getGitHost()) &&
                Objects.equals(getGitUserId(), that.getGitUserId()) &&
@@ -1428,9 +1428,9 @@ public final class GeneratorSettings implements Serializable {
                getModelNameMappings(),
                getEnumNameMappings(),
                getOperationIdNameMappings(),
-                getOpenapiNormalizer(),
+                getOpenAPINormalizer(),
                getLanguageSpecificPrimitives(),
-                getOpenapiGeneratorIgnoreList(),
+                getOpenAPIGeneratorIgnoreList(),
                getReservedWordsMappings(),
                getGitHost(),
                getGitUserId(),
--- a/modules/openapi-generator-gradle-plugin/gradle.properties
+++ b/modules/openapi-generator-gradle-plugin/gradle.properties
@@ -1,5 +1,5 @@
 # RELEASE_VERSION
-openApiGeneratorVersion=7.5.0
+openApiGeneratorVersion=7.5.0-SNAPSHOT
 # /RELEASE_VERSION

 # BEGIN placeholders
--- a/modules/openapi-generator-gradle-plugin/pom.xml
+++ b/modules/openapi-generator-gradle-plugin/pom.xml
@@ -4,7 +4,7 @@
        <groupId>org.openapitools</groupId>
        <artifactId>openapi-generator-project</artifactId>
        <!-- RELEASE_VERSION -->
-        <version>7.5.0</version>
+        <version>7.5.0-SNAPSHOT</version>
        <!-- /RELEASE_VERSION -->
        <relativePath>../..</relativePath>
    </parent>
--- a/modules/openapi-generator-gradle-plugin/samples/local-spec/gradle.properties
+++ b/modules/openapi-generator-gradle-plugin/samples/local-spec/gradle.properties
@@ -1,3 +1,3 @@
 # RELEASE_VERSION
-openApiGeneratorVersion=7.5.0
+openApiGeneratorVersion=7.5.0-SNAPSHOT
 # /RELEASE_VERSION
--- a/modules/openapi-generator-gradle-plugin/src/main/kotlin/org/openapitools/generator/gradle/plugin/tasks/GenerateTask.kt
+++ b/modules/openapi-generator-gradle-plugin/src/main/kotlin/org/openapitools/generator/gradle/plugin/tasks/GenerateTask.kt
@@ -887,7 +887,7 @@ open class GenerateTask @Inject constructor(private val objectFactory: ObjectFac

            if (openapiNormalizer.isPresent) {
                openapiNormalizer.get().forEach { entry ->
-                    configurator.addOpenapiNormalizer(entry.key, entry.value)
+                    configurator.addOpenAPINormalizer(entry.key, entry.value)
                }
            }

@@ -917,7 +917,7 @@ open class GenerateTask @Inject constructor(private val objectFactory: ObjectFac

            if (openapiGeneratorIgnoreList.isPresent) {
                openapiGeneratorIgnoreList.get().forEach {
-                    configurator.addOpenapiGeneratorIgnoreList(it)
+                    configurator.addOpenAPIGeneratorIgnoreList(it)
                }
            }

--- a/modules/openapi-generator-gradle-plugin/src/test/kotlin/GenerateTaskDslTest.kt
+++ b/modules/openapi-generator-gradle-plugin/src/test/kotlin/GenerateTaskDslTest.kt
@@ -401,7 +401,7 @@ class GenerateTaskDslTest : TestBase() {
    fun `openApiValidate should fail on invalid spec`() {
        // Arrange
        val projectFiles = mapOf(
-                "spec.yaml" to javaClass.classLoader.getResourceAsStream("specs/petstore-v3.0-invalid-due-to-missing-info-attribute.yaml")
+                "spec.yaml" to javaClass.classLoader.getResourceAsStream("specs/petstore-v3.0-invalid.yaml")
        )

        withProject(defaultBuildGradle, projectFiles)
@@ -423,7 +423,7 @@ class GenerateTaskDslTest : TestBase() {
    fun `openApiValidate should ok skip spec validation`() {
        // Arrange
        val projectFiles = mapOf(
-                "spec.yaml" to javaClass.classLoader.getResourceAsStream("specs/petstore-v3.0-invalid-due-to-missing-info-attribute.yaml")
+                "spec.yaml" to javaClass.classLoader.getResourceAsStream("specs/petstore-v3.0-invalid.yaml")
        )

        withProject("""
--- a/modules/openapi-generator-gradle-plugin/src/test/kotlin/ValidateTaskDslTest.kt
+++ b/modules/openapi-generator-gradle-plugin/src/test/kotlin/ValidateTaskDslTest.kt
@@ -113,7 +113,7 @@ class ValidateTaskDslTest : TestBase() {
    fun `openApiValidate should fail on invalid spec`(gradleVersion: String?) {
        // Arrange
        val projectFiles = mapOf(
-            "spec.yaml" to javaClass.classLoader.getResourceAsStream("specs/petstore-v3.0-invalid-due-to-missing-info-attribute.yaml")
+            "spec.yaml" to javaClass.classLoader.getResourceAsStream("specs/petstore-v3.0-invalid.yaml")
        )
        withProject(
            """
@@ -139,50 +139,6 @@ class ValidateTaskDslTest : TestBase() {
            result.output.contains("Spec is invalid."),
            "Unexpected/no message presented to the user for an invalid spec."
        )
-        assertTrue(
-            result.output.contains("attribute info is missing"),
-            "Spec validation detail"
-        )
-        assertEquals(
-            FAILED, result.task(":openApiValidate")?.outcome,
-            "Expected a failed run, but found ${result.task(":openApiValidate")?.outcome}"
-        )
-    }
-
-    @Test(dataProvider = "gradle_version_provider")
-    fun `openApiValidate should fail on invalid spec with duplicate 200 status code`(gradleVersion: String?) {
-        // Arrange
-        val projectFiles = mapOf(
-            "spec.yaml" to javaClass.classLoader.getResourceAsStream("specs/petstore-v3.0-invalid-due-to-duplicate-200-status-code.yaml")
-        )
-        withProject(
-            """
-            | plugins {
-            |   id 'org.openapi.generator'
-            | }
-            |
-            | openApiValidate {
-            |   inputSpec = file('spec.yaml').absolutePath
-            | }
-        """.trimMargin(), projectFiles
-        )
-
-        // Act
-        val result = getGradleRunner(gradleVersion)
-            .withProjectDir(temp)
-            .withArguments("openApiValidate")
-            .withPluginClasspath()
-            .buildAndFail()
-
-        // Assert
-        assertTrue(
-            result.output.contains("Spec is invalid."),
-            "Unexpected/no message presented to the user for an invalid spec."
-        )
-        assertTrue(
-            result.output.contains("Duplicate field 200"),
-            "Spec validation detail"
-        )
        assertEquals(
            FAILED, result.task(":openApiValidate")?.outcome,
            "Expected a failed run, but found ${result.task(":openApiValidate")?.outcome}"
@@ -230,7 +186,7 @@ class ValidateTaskDslTest : TestBase() {
    fun `validateBadSpec as defined task should fail on invalid spec`(gradleVersion: String?) {
        // Arrange
        val projectFiles = mapOf(
-            "spec.yaml" to javaClass.classLoader.getResourceAsStream("specs/petstore-v3.0-invalid-due-to-missing-info-attribute.yaml")
+            "spec.yaml" to javaClass.classLoader.getResourceAsStream("specs/petstore-v3.0-invalid.yaml")
        )
        withProject(
            """
@@ -256,10 +212,6 @@ class ValidateTaskDslTest : TestBase() {
            result.output.contains("Spec is invalid."),
            "Unexpected/no message presented to the user for an invalid spec."
        )
-        assertTrue(
-            result.output.contains("attribute info is missing"),
-            "Unexpected/no message presented to the user for an invalid spec."
-        )
        assertEquals(
            FAILED, result.task(":validateBadSpec")?.outcome,
            "Expected a failed run, but found ${result.task(":validateBadSpec")?.outcome}"
--- a/modules/openapi-generator-gradle-plugin/src/test/resources/specs/petstore-v3.0-invalid-due-to-duplicate-200-status-code.yaml
+++ b/modules/openapi-generator-gradle-plugin/src/test/resources/specs/petstore-v3.0-invalid-due-to-duplicate-200-status-code.yaml
@@ -1,111 +0,0 @@
-openapi: "3.0.0"
-info:
-  version: 1.0.0
-  title: Swagger Petstore
-  license:
-    name: MIT
-servers:
-  - url: http://petstore.swagger.io/v1
-paths:
-  /pets:
-    get:
-      summary: List all pets
-      operationId: listPets
-      tags:
-        - pets
-      parameters:
-        - name: limit
-          in: query
-          description: How many items to return at one time (max 100)
-          required: false
-          schema:
-            type: integer
-            format: int32
-      responses:
-        '200':
-          description: A paged array of pets
-          headers:
-            x-next:
-              description: A link to the next page of responses
-              schema:
-                type: string
-          content:
-            application/json:
-              schema:
-                $ref: "#/components/schemas/Pets"
-        '200':
-          description: duplicate 200
-        default:
-          description: unexpected error
-          content:
-            application/json:
-              schema:
-                $ref: "#/components/schemas/Error"
-    post:
-      summary: Create a pet
-      operationId: createPets
-      tags:
-        - pets
-      responses:
-        '201':
-          description: Null response
-        default:
-          description: unexpected error
-          content:
-            application/json:
-              schema:
-                $ref: "#/components/schemas/Error"
-  /pets/{petId}:
-    get:
-      summary: Info for a specific pet
-      operationId: showPetById
-      tags:
-        - pets
-      parameters:
-        - name: petId
-          in: path
-          required: true
-          description: The id of the pet to retrieve
-          schema:
-            type: string
-      responses:
-        '200':
-          description: Expected response to a valid request
-          content:
-            application/json:
-              schema:
-                $ref: "#/components/schemas/Pets"
-        default:
-          description: unexpected error
-          content:
-            application/json:
-              schema:
-                $ref: "#/components/schemas/Error"
-components:
-  schemas:
-    Pet:
-      required:
-        - id
-        - name
-      properties:
-        id:
-          type: integer
-          format: int64
-        name:
-          type: string
-        tag:
-          type: string
-    Pets:
-      type: array
-      items:
-        $ref: "#/components/schemas/Pet"
-    Error:
-      required:
-        - code
-        - message
-      properties:
-        code:
-          type: integer
-          format: int32
-        message:
-          type: string
--- a/modules/openapi-generator-gradle-plugin/src/test/resources/specs/petstore-v3.0-invalid-due-to-missing-info-attribute.yaml
+++ b/modules/openapi-generator-gradle-plugin/src/test/resources/specs/petstore-v3.0-invalid-due-to-missing-info-attribute.yaml
--- a/modules/openapi-generator-maven-plugin/examples/java-client.xml
+++ b/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.5.0</version>
+                <version>7.5.0-SNAPSHOT</version>
                <!-- /RELEASE_VERSION -->
                <executions>
                    <execution>
--- a/modules/openapi-generator-maven-plugin/examples/kotlin.xml
+++ b/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.5.0</version>
+				<version>7.5.0-SNAPSHOT</version>
 				<!-- /RELEASE_VERSION -->
 				<executions>
 					<execution>
--- a/modules/openapi-generator-maven-plugin/examples/multi-module/java-client/pom.xml
+++ b/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.5.0</version>
+                <version>7.5.0-SNAPSHOT</version>
                <!-- /RELEASE_VERSION -->
                <dependencies>
                    <dependency>
--- a/modules/openapi-generator-maven-plugin/examples/non-java-invalid-spec.xml
+++ b/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.5.0</version>
+                <version>7.5.0-SNAPSHOT</version>
                <!-- /RELEASE_VERSION -->
                <executions>
                    <execution>
--- a/modules/openapi-generator-maven-plugin/examples/non-java.xml
+++ b/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.5.0</version>
+                <version>7.5.0-SNAPSHOT</version>
                <!-- /RELEASE_VERSION -->
                <executions>
                    <execution>
--- a/modules/openapi-generator-maven-plugin/examples/spring.xml
+++ b/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.5.0</version>
+                <version>7.5.0-SNAPSHOT</version>
                <!-- /RELEASE_VERSION -->
                <executions>
                    <execution>
--- a/modules/openapi-generator-maven-plugin/pom.xml
+++ b/modules/openapi-generator-maven-plugin/pom.xml
@@ -5,7 +5,7 @@
        <groupId>org.openapitools</groupId>
        <artifactId>openapi-generator-project</artifactId>
        <!-- RELEASE_VERSION -->
-        <version>7.5.0</version>
+        <version>7.5.0-SNAPSHOT</version>
        <!-- /RELEASE_VERSION -->
        <relativePath>../..</relativePath>
    </parent>
--- a/modules/openapi-generator-maven-plugin/src/main/java/org/openapitools/codegen/plugin/CodeGenMojo.java
+++ b/modules/openapi-generator-maven-plugin/src/main/java/org/openapitools/codegen/plugin/CodeGenMojo.java
@@ -829,7 +829,7 @@ public class CodeGenMojo extends AbstractMojo {

                // Retained for backwards-compatibility with configOptions -> openapi-normalizer
                if (openapiNormalizer == null && configOptions.containsKey("openapi-normalizer")) {
-                    applyOpenapiNormalizerKvp(configOptions.get("openapi-normalizer").toString(),
+                    applyOpenAPINormalizerKvp(configOptions.get("openapi-normalizer").toString(),
                            configurator);
                }

@@ -846,7 +846,7 @@ public class CodeGenMojo extends AbstractMojo {

                // Retained for backwards-compatibility with configOptions -> openapi-generator-ignore-list
                if (openapiGeneratorIgnoreList == null && configOptions.containsKey("openapi-generator-ignore-list")) {
-                    applyOpenapiGeneratorIgnoreListCsv(configOptions
+                    applyOpenAPIGeneratorIgnoreListCsv(configOptions
                            .get("openapi-generator-ignore-list").toString(), configurator);
                }

@@ -919,7 +919,7 @@ public class CodeGenMojo extends AbstractMojo {

            // Apply OpenAPI normalizer rules
            if (openapiNormalizer != null && (configOptions == null || !configOptions.containsKey("openapi-normalizer"))) {
-                applyOpenapiNormalizerKvpList(openapiNormalizer, configurator);
+                applyOpenAPINormalizerKvpList(openapiNormalizer, configurator);
            }

            // Apply Type Mappings
@@ -936,7 +936,7 @@ public class CodeGenMojo extends AbstractMojo {
            // Apply Language Specific Primitives
            if (openapiGeneratorIgnoreList != null
                    && (configOptions == null || !configOptions.containsKey("openapi-generator-ignore-list"))) {
-                applyOpenapiGeneratorIgnoreListCsvList(openapiGeneratorIgnoreList, configurator);
+                applyOpenAPIGeneratorIgnoreListCsvList(openapiGeneratorIgnoreList, configurator);
            }

            // Apply Additional Properties
--- a/modules/openapi-generator-online/pom.xml
+++ b/modules/openapi-generator-online/pom.xml
@@ -4,7 +4,7 @@
        <groupId>org.openapitools</groupId>
        <artifactId>openapi-generator-project</artifactId>
        <!-- RELEASE_VERSION -->
-        <version>7.5.0</version>
+        <version>7.5.0-SNAPSHOT</version>
        <!-- /RELEASE_VERSION -->
        <relativePath>../..</relativePath>
    </parent>
--- a/modules/openapi-generator/pom.xml
+++ b/modules/openapi-generator/pom.xml
@@ -4,7 +4,7 @@
        <groupId>org.openapitools</groupId>
        <artifactId>openapi-generator-project</artifactId>
        <!-- RELEASE_VERSION -->
-        <version>7.5.0</version>
+        <version>7.5.0-SNAPSHOT</version>
        <!-- /RELEASE_VERSION -->
        <relativePath>../..</relativePath>
    </parent>
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenConfig.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenConfig.java
@@ -358,8 +358,8 @@ public interface CodegenConfig {

    boolean getAddSuffixToDuplicateOperationNicknames();

-    boolean getUseOpenapiNormalizer();
+    boolean getUseOpenAPINormalizer();

-    Set<String> getOpenapiGeneratorIgnoreList();
+    Set<String> getOpenAPIGeneratorIgnoreList();

 }
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java
@@ -52,6 +52,7 @@ import org.openapitools.codegen.api.TemplatingEngineAdapter;
 import org.openapitools.codegen.config.GlobalSettings;
 import org.openapitools.codegen.examples.ExampleGenerator;
 import org.openapitools.codegen.languages.PhpNextgenClientCodegen;
+import org.openapitools.codegen.languages.RustAxumServerCodegen;
 import org.openapitools.codegen.languages.RustServerCodegen;
 import org.openapitools.codegen.meta.FeatureSet;
 import org.openapitools.codegen.meta.GeneratorMetadata;
@@ -96,8 +97,6 @@ public class DefaultCodegen implements CodegenConfig {
    private static final Cache<SanitizeNameOptions, String> sanitizedNameCache;
    private static final String xSchemaTestExamplesKey = "x-schema-test-examples";
    private static final String xSchemaTestExamplesRefPrefix = "#/components/x-schema-test-examples/";
-    protected static Schema falseSchema;
-    protected static Schema trueSchema = new Schema();

    static {
        DefaultFeatureSet = FeatureSet.newBuilder()
@@ -150,8 +149,6 @@ public class DefaultCodegen implements CodegenConfig {
                .expireAfterAccess(cacheExpiry, TimeUnit.SECONDS)
                .ticker(Ticker.systemTicker())
                .build();
-        falseSchema = new Schema();
-        falseSchema.setNot(new Schema());
    }

    protected GeneratorMetadata generatorMetadata;
@@ -303,8 +300,6 @@ public class DefaultCodegen implements CodegenConfig {
    // A cache to efficiently lookup schema `toModelName()` based on the schema Key
    private final Map<String, String> schemaKeyToModelNameCache = new HashMap<>();

-    protected boolean loadDeepObjectIntoItems = true;
-
    // if true then baseTypes will be imported
    protected boolean importBaseType = true;

@@ -706,7 +701,7 @@ public class DefaultCodegen implements CodegenConfig {
     * Removes importToRemove from the imports of objs, if present.
     * This is useful to remove imports that are already present in operations-related template files, to avoid importing the same thing twice.
     *
-     * @param objs           imports will be removed from this objs' imports collection
+     * @param objs imports will be removed from this objs' imports collection
     * @param importToRemove the import statement to be removed
     */
    protected void removeImport(OperationsMap objs, String importToRemove) {
@@ -1091,7 +1086,7 @@ public class DefaultCodegen implements CodegenConfig {
                        addOneOfNameExtension(s, n);
                    }
                } else if (ModelUtils.isArraySchema(s)) {
-                    Schema items = ModelUtils.getSchemaItems(s);
+                    Schema items = ((ArraySchema) s).getItems();
                    if (ModelUtils.isComposedSchema(items)) {
                        addOneOfNameExtension(items, nOneOf);
                        addOneOfInterfaceModel(items, nOneOf);
@@ -2064,7 +2059,8 @@ public class DefaultCodegen implements CodegenConfig {
            }
            return inner;
        } else if (ModelUtils.isArraySchema(schema)) {
-            String inner = getSchemaType(ModelUtils.getSchemaItems(schema));
+            ArraySchema arraySchema = (ArraySchema) schema;
+            String inner = getSchemaType(getSchemaItems(arraySchema));
            String parentType;
            if (ModelUtils.isSet(schema)) {
                parentType = "set";
@@ -2301,7 +2297,7 @@ public class DefaultCodegen implements CodegenConfig {
     * Any non-null value will cause {{#defaultValue} check to pass.
     *
     * @param codegenProperty Codegen Property
-     * @param schema          Parameter schema
+     * @param schema Parameter schema
     * @return string presentation of the default value of the parameter
     */
    public String toDefaultParameterValue(CodegenProperty codegenProperty, Schema<?> schema) {
@@ -2328,7 +2324,7 @@ public class DefaultCodegen implements CodegenConfig {
     * Return null if you do NOT want a default value.
     * Any non-null value will cause {{#defaultValue} check to pass.
     *
-     * @param schema          Property schema
+     * @param schema Property schema
     * @param codegenProperty Codegen property
     * @return string presentation of the default value of the property
     */
@@ -2370,6 +2366,15 @@ public class DefaultCodegen implements CodegenConfig {

    }

+    protected Schema<?> getSchemaItems(ArraySchema schema) {
+        Schema<?> items = schema.getItems();
+        if (items == null) {
+            LOGGER.error("Undefined array inner type for `{}`. Default to String.", schema.getName());
+            items = new StringSchema().description("TODO default missing array inner type to string");
+            schema.setItems(items);
+        }
+        return items;
+    }

    protected Schema<?> getSchemaAdditionalProperties(Schema schema) {
        Schema<?> inner = ModelUtils.getAdditionalProperties(schema);
@@ -3007,7 +3012,6 @@ public class DefaultCodegen implements CodegenConfig {
    /**
     * A method that allows generators to pre-process test example payloads
     * This can be useful if one needs to change how values like null in string are represented
-     *
     * @param data the test data payload
     * @return the updated test data payload
     */
@@ -3018,7 +3022,6 @@ public class DefaultCodegen implements CodegenConfig {
    /**
     * Processes any test cases if they exist in the components.x-test-examples vendor extensions
     * If they exist then cast them to java class instances and return them back in a map
-     *
     * @param refToTestCases the component schema name that the test cases are for
     */
    private HashMap<String, SchemaTestCase> extractSchemaTestCases(String refToTestCases) {
@@ -3055,7 +3058,7 @@ public class DefaultCodegen implements CodegenConfig {
    /**
     * Sets the booleans that define the model's type
     *
-     * @param model  the model to update
+     * @param model the model to update
     * @param schema the model's schema
     */
    protected void updateModelForString(CodegenModel model, Schema schema) {
@@ -3113,11 +3116,6 @@ public class DefaultCodegen implements CodegenConfig {
        Map<String, Schema> allDefinitions = ModelUtils.getSchemas(this.openAPI);

        CodegenModel m = CodegenModelFactory.newInstance(CodegenModelType.MODEL);
-        if (schema.equals(trueSchema)) {
-            m.setIsBooleanSchemaTrue(true);
-        } else if (schema.equals(falseSchema)) {
-            m.setIsBooleanSchemaFalse(true);
-        }
        // unalias schema
        schema = unaliasSchema(schema);
        if (schema == null) {
@@ -3313,6 +3311,7 @@ public class DefaultCodegen implements CodegenConfig {
     * @param sc                 The Schema that may contain the discriminator
     * @param discPropName       The String that is the discriminator propertyName in the schema
     * @param visitedSchemas     A set of visited schema names
+     *
     */
    private CodegenProperty discriminatorFound(String composedSchemaName, Schema sc, String discPropName, Set<String> visitedSchemas) {
        if (visitedSchemas.contains(composedSchemaName)) { // recursive schema definition found
@@ -3399,7 +3398,7 @@ public class DefaultCodegen implements CodegenConfig {
    /**
     * Recursively look in Schema sc for the discriminator and return it
     *
-     * @param sc             The Schema that may contain the discriminator
+     * @param sc The Schema that may contain the discriminator
     * @param visitedSchemas An array list of visited schemas
     */
    private Discriminator recursiveGetDiscriminator(Schema sc, ArrayList<Schema> visitedSchemas) {
@@ -3619,9 +3618,9 @@ public class DefaultCodegen implements CodegenConfig {
            Map<String, Object> vendorExtensions = cs.getExtensions();
            String mappingName =
                    Optional.ofNullable(vendorExtensions)
-                            .map(ve -> ve.get("x-discriminator-value"))
-                            .map(discriminatorValue -> (String) discriminatorValue)
-                            .orElse(currentSchemaName);
+                        .map(ve -> ve.get("x-discriminator-value"))
+                        .map(discriminatorValue -> (String) discriminatorValue)
+                        .orElse(currentSchemaName);
            MappedModel mm = new MappedModel(mappingName, toModelName(currentSchemaName), !mappingName.equals(currentSchemaName));
            descendentSchemas.add(mm);
        }
@@ -3648,11 +3647,11 @@ public class DefaultCodegen implements CodegenConfig {
        //  the future..
        String propertyType =
                Optional.ofNullable(schema.getProperties())
-                        .map(p -> (Schema<?>) p.get(discriminatorPropertyName))
-                        .map(Schema::get$ref)
-                        .map(ModelUtils::getSimpleRef)
-                        .map(this::toModelName)
-                        .orElseGet(() -> typeMapping.get("string"));
+                    .map(p -> (Schema<?>) p.get(discriminatorPropertyName))
+                    .map(Schema::get$ref)
+                    .map(ModelUtils::getSimpleRef)
+                    .map(this::toModelName)
+                    .orElseGet(() -> typeMapping.get("string"));
        discriminator.setPropertyType(propertyType);

        // check to see if the discriminator property is an enum string
@@ -3943,8 +3942,8 @@ public class DefaultCodegen implements CodegenConfig {
     * This method was kept when required was added to the fromProperty signature
     * to ensure that the change was non-breaking
     *
-     * @param name name of the property
-     * @param p    OAS property schema
+     * @param name     name of the property
+     * @param p        OAS property schema
     * @return Codegen Property object
     */
    public CodegenProperty fromProperty(String name, Schema p) {
@@ -3960,9 +3959,9 @@ public class DefaultCodegen implements CodegenConfig {
     * Any subsequent processing of the CodegenModel return value must be idempotent
     * for a given (String name, Schema schema).
     *
-     * @param name                             name of the property
-     * @param p                                OAS property schema
-     * @param required                         true if the property is required in the next higher object schema, false otherwise
+     * @param name     name of the property
+     * @param p        OAS property schema
+     * @param required true if the property is required in the next higher object schema, false otherwise
     * @param schemaIsFromAdditionalProperties true if the property is a required property defined by additional properties schema
     *                                         If this is the actual additionalProperties schema not defining a required property, then
     *                                         the value should be false
@@ -3973,7 +3972,7 @@ public class DefaultCodegen implements CodegenConfig {
            LOGGER.error("Undefined property/schema for `{}`. Default to type:string.", name);
            return null;
        }
-        LOGGER.debug("debugging fromProperty for {}: {}", name, p);
+        LOGGER.debug("debugging fromProperty for {} : {}", name, p);
        NamedSchema ns = new NamedSchema(name, p, required, schemaIsFromAdditionalProperties);
        CodegenProperty cpc = schemaCodegenPropertyCache.get(ns);
        if (cpc != null) {
@@ -4002,11 +4001,6 @@ public class DefaultCodegen implements CodegenConfig {
        }

        CodegenProperty property = CodegenModelFactory.newInstance(CodegenModelType.PROPERTY);
-        if (p.equals(trueSchema)) {
-            property.setIsBooleanSchemaTrue(true);
-        } else if (p.equals(falseSchema)) {
-            property.setIsBooleanSchemaFalse(true);
-        }

        // unalias schema
        p = unaliasSchema(p);
@@ -4180,7 +4174,8 @@ public class DefaultCodegen implements CodegenConfig {

            // handle inner property
            String itemName = getItemsName(p, name);
-            Schema innerSchema = unaliasSchema(ModelUtils.getSchemaItems(p));
+            ArraySchema arraySchema = (ArraySchema) p;
+            Schema innerSchema = unaliasSchema(getSchemaItems(arraySchema));
            CodegenProperty cp = fromProperty(itemName, innerSchema, false);
            updatePropertyForArray(property, cp);
        } else if (ModelUtils.isTypeObjectSchema(p)) {
@@ -4490,7 +4485,8 @@ public class DefaultCodegen implements CodegenConfig {
            CodegenProperty cm = fromProperty("response", responseSchema, false);

            if (ModelUtils.isArraySchema(responseSchema)) {
-                CodegenProperty innerProperty = fromProperty("response", ModelUtils.getSchemaItems(responseSchema), false);
+                ArraySchema as = (ArraySchema) responseSchema;
+                CodegenProperty innerProperty = fromProperty("response", getSchemaItems(as), false);
                op.returnBaseType = innerProperty.baseType;
            } else if (ModelUtils.isMapSchema(responseSchema)) {
                CodegenProperty innerProperty = fromProperty("response", ModelUtils.getAdditionalProperties(responseSchema), false);
@@ -4741,7 +4737,7 @@ public class DefaultCodegen implements CodegenConfig {
            if (contentType != null) {
                contentType = contentType.toLowerCase(Locale.ROOT);
            }
-            if (contentType != null &&
+            if (!(this instanceof RustAxumServerCodegen) && contentType != null &&
                    (contentType.startsWith("application/x-www-form-urlencoded") ||
                            contentType.startsWith("multipart"))) {
                // process form parameters
@@ -5015,7 +5011,8 @@ public class DefaultCodegen implements CodegenConfig {
            r.isArray = true;
            r.containerType = cp.containerType;
            r.containerTypeMapped = typeMapping.get(cp.containerType);
-            CodegenProperty items = fromProperty("response", ModelUtils.getSchemaItems(responseSchema), false);
+            ArraySchema as = (ArraySchema) responseSchema;
+            CodegenProperty items = fromProperty("response", getSchemaItems(as), false);
            r.setItems(items);
            CodegenProperty innerCp = items;

@@ -5391,7 +5388,8 @@ public class DefaultCodegen implements CodegenConfig {
            }
            addVarsRequiredVarsAdditionalProps(parameterSchema, codegenParameter);
        } else if (ModelUtils.isArraySchema(parameterSchema)) {
-            Schema inner = ModelUtils.getSchemaItems(parameterSchema);
+            final ArraySchema arraySchema = (ArraySchema) parameterSchema;
+            Schema inner = getSchemaItems(arraySchema);

            collectionFormat = getCollectionFormat(parameter);
            // default to csv:
@@ -5476,7 +5474,7 @@ public class DefaultCodegen implements CodegenConfig {

        codegenParameter.pattern = toRegularExpression(parameterSchema.getPattern());

-        if (codegenParameter.isQueryParam && codegenParameter.isDeepObject && loadDeepObjectIntoItems) {
+        if (codegenParameter.isQueryParam && codegenParameter.isDeepObject) {
            Schema schema = parameterSchema;
            if (schema.get$ref() != null) {
                schema = ModelUtils.getReferencedSchema(openAPI, schema);
@@ -5908,10 +5906,10 @@ public class DefaultCodegen implements CodegenConfig {
    /**
     * Add the model name of the child schema in a composed schema to the set of imports
     *
-     * @param composed    composed schema
+     * @param composed composed schema
     * @param childSchema composed schema
-     * @param model       codegen model
-     * @param modelName   model name
+     * @param model codegen model
+     * @param modelName model name
     */
    protected void addImport(Schema composed, Schema childSchema, CodegenModel model, String modelName) {
        if (composed == null || childSchema == null) {
@@ -6794,12 +6792,12 @@ public class DefaultCodegen implements CodegenConfig {
            String enumValue = isDataTypeString(dataType)
                    ? enumUnknownDefaultCaseName
                    : // This is a dummy value that attempts to avoid collisions with previously specified cases.
-                    // Int.max / 192
-                    // The number 192 that is used to calculate this random value, is the Swift Evolution proposal for frozen/non-frozen enums.
-                    // [SE-0192](https://github.com/apple/swift-evolution/blob/master/proposals/0192-non-exhaustive-enums.md)
-                    // Since this functionality was born in the Swift 5 generator and latter on broth to all generators
-                    // https://github.com/OpenAPITools/openapi-generator/pull/11013
-                    String.valueOf(11184809);
+                      // Int.max / 192
+                      // The number 192 that is used to calculate this random value, is the Swift Evolution proposal for frozen/non-frozen enums.
+                      // [SE-0192](https://github.com/apple/swift-evolution/blob/master/proposals/0192-non-exhaustive-enums.md)
+                      // Since this functionality was born in the Swift 5 generator and latter on broth to all generators
+                      // https://github.com/OpenAPITools/openapi-generator/pull/11013
+                      String.valueOf(11184809);

            enumVar.put("name", toEnumVarName(enumName, dataType));
            enumVar.put("value", toEnumValue(enumValue, dataType));
@@ -7203,9 +7201,7 @@ public class DefaultCodegen implements CodegenConfig {
        codegenParameter.nameInPascalCase = camelize(codegenParameter.paramName);
        codegenParameter.nameInSnakeCase = CaseFormat.UPPER_CAMEL.to(CaseFormat.UPPER_UNDERSCORE, codegenParameter.nameInPascalCase);
        codegenParameter.nameInLowerCase = codegenParameter.paramName.toLowerCase(Locale.ROOT);
-        codegenParameter.isContainer = codegenProperty.isContainer;
-        codegenParameter.containerType = codegenProperty.containerType;
-        codegenParameter.containerTypeMapped = codegenProperty.containerTypeMapped;
+
        codegenParameter.dataFormat = codegenProperty.dataFormat;
        // non-array/map
        updateCodegenPropertyEnum(codegenProperty);
@@ -7272,27 +7268,19 @@ public class DefaultCodegen implements CodegenConfig {
                }
            }
        } else if (ModelUtils.isTypeObjectSchema(ps)) {
-            if (ModelUtils.isMapSchema(ps)) {
-                codegenParameter.isMap = true;
-                codegenParameter.additionalProperties = codegenProperty.additionalProperties;
-                codegenParameter.setAdditionalPropertiesIsAnyType(codegenProperty.getAdditionalPropertiesIsAnyType());
-                codegenParameter.items = codegenProperty.items;
-                codegenParameter.isPrimitiveType = false;
-                codegenParameter.items = codegenProperty.items;
-                codegenParameter.mostInnerItems = codegenProperty.mostInnerItems;
-            } else if (ModelUtils.isFreeFormObject(ps)) {
+            if (ModelUtils.isFreeFormObject(ps)) {
                codegenParameter.isFreeFormObject = true;
            }
        } else if (ModelUtils.isNullType(ps)) {
        } else if (ModelUtils.isAnyType(ps)) {
            // any schema with no type set, composed schemas often do this
        } else if (ModelUtils.isArraySchema(ps)) {
-            Schema inner = ModelUtils.getSchemaItems(ps);
+            Schema inner = getSchemaItems((ArraySchema) ps);
            CodegenProperty arrayInnerProperty = fromProperty("inner", inner, false);
-            codegenParameter.isArray = true;
            codegenParameter.items = arrayInnerProperty;
            codegenParameter.mostInnerItems = arrayInnerProperty.mostInnerItems;
            codegenParameter.isPrimitiveType = false;
+            codegenParameter.isContainer = true;
            // hoist items data into the array property
            // TODO this hoisting code is generator specific and should be isolated into updateFormPropertyForArray
            codegenParameter.baseType = arrayInnerProperty.dataType;
@@ -7568,10 +7556,11 @@ public class DefaultCodegen implements CodegenConfig {
        if (ModelUtils.isGenerateAliasAsModel(schema) && StringUtils.isNotBlank(name)) {
            this.addBodyModelSchema(codegenParameter, name, schema, imports, bodyParameterName, true);
        } else {
-            Schema inner = ModelUtils.getSchemaItems(schema);
-            CodegenProperty codegenProperty = fromProperty("property", schema, false);
+            final ArraySchema arraySchema = (ArraySchema) schema;
+            Schema inner = getSchemaItems(arraySchema);
+            CodegenProperty codegenProperty = fromProperty("property", arraySchema, false);
            if (codegenProperty == null) {
-                throw new RuntimeException("CodegenProperty cannot be null. arraySchema for debugging: " + schema);
+                throw new RuntimeException("CodegenProperty cannot be null. arraySchema for debugging: " + arraySchema);
            }

            imports.add(codegenProperty.baseType);
@@ -7604,7 +7593,7 @@ public class DefaultCodegen implements CodegenConfig {

            codegenParameter.items = codegenProperty.items;
            codegenParameter.mostInnerItems = codegenProperty.mostInnerItems;
-            codegenParameter.dataType = getTypeDeclaration(schema);
+            codegenParameter.dataType = getTypeDeclaration(arraySchema);
            codegenParameter.baseType = getSchemaType(inner);
            codegenParameter.isContainer = Boolean.TRUE;
            codegenParameter.isNullable = codegenProperty.isNullable;
@@ -7983,7 +7972,6 @@ public class DefaultCodegen implements CodegenConfig {
    protected String getAdditionalPropertiesName() {
        return "additional_properties";
    }
-
    private void addJsonSchemaForBodyRequestInCaseItsNotPresent(CodegenParameter codegenParameter, RequestBody body) {
        if (codegenParameter.jsonSchema == null)
            codegenParameter.jsonSchema = Json.pretty(body);
@@ -8250,8 +8238,8 @@ public class DefaultCodegen implements CodegenConfig {
    /**
     * Add a given ComposedSchema as an interface model to be generated, assuming it has `oneOf` defined
     *
-     * @param cs   ComposedSchema object to create as interface model
-     * @param type name to use for the generated interface model
+     * @param cs      ComposedSchema object to create as interface model
+     * @param type    name to use for the generated interface model
     */
    public void addOneOfInterfaceModel(Schema cs, String type) {
        if (cs.getOneOf() == null) {
@@ -8441,7 +8429,7 @@ public class DefaultCodegen implements CodegenConfig {
                // in other sub-schemas of allOf/anyOf/oneOf
                cp.vendorExtensions.putIfAbsent("x-duplicated-data-type", true);
            } else {
-                if (isTypeErasedGenerics()) {
+                if(isTypeErasedGenerics()) {
                    dataTypeSet.add(cp.baseType);
                } else {
                    dataTypeSet.add(cp.dataType);
@@ -8472,17 +8460,13 @@ public class DefaultCodegen implements CodegenConfig {
    }

    @Override
-    public boolean getUseInlineModelResolver() {
-        return true;
-    }
+    public boolean getUseInlineModelResolver() { return true; }

    @Override
-    public boolean getUseOpenapiNormalizer() {
-        return true;
-    }
+    public boolean getUseOpenAPINormalizer() { return true; }

    @Override
-    public Set<String> getOpenapiGeneratorIgnoreList() {
+    public Set<String> getOpenAPIGeneratorIgnoreList() {
        return openapiGeneratorIgnoreList;
    }

@@ -8496,37 +8480,7 @@ public class DefaultCodegen implements CodegenConfig {
        And convert special characters like newline, tab, carriage return
        Into strings that can be rendered in the language that the generator will output to
        */
-    protected String handleSpecialCharacters(String name) {
-        return name;
-    }
-
-    /**
-     * Used to ensure that null or Schema is returned given an input Boolean/Schema/null
-     * This will be used in openapi 3.1.0 spec processing to ensure that Booleans become Schemas
-     * Because our generators only understand Schemas
-     * Note: use getIsBooleanSchemaTrue or getIsBooleanSchemaFalse on the IJsonSchemaValidationProperties
-     * if you need to be able to detect if the original schema's value was true or false
-     *
-     * @param schema the input Boolean or Schema data to convert to a Schema
-     * @return Schema the input data converted to a Schema if possible
-     */
-    protected Schema getSchemaFromBooleanOrSchema(Object schema) {
-        if (schema == null) {
-            return null;
-        } else if (schema instanceof Boolean) {
-            if (Boolean.TRUE.equals(schema)) {
-                return trueSchema;
-            } else if (Boolean.FALSE.equals(schema)) {
-                return falseSchema;
-            }
-            // null case
-            return null;
-        } else if (schema instanceof Schema) {
-            return (Schema) schema;
-        } else {
-            throw new IllegalArgumentException("Invalid schema type; type must be Boolean or Schema");
-        }
-    }
+    protected String handleSpecialCharacters(String name) { return name; }

    public void setAutosetConstants(boolean autosetConstants) {
        this.autosetConstants = autosetConstants;
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java
@@ -265,7 +265,7 @@ public class DefaultGenerator implements Generator {

        // normalize the spec
        try {
-            if (config.getUseOpenapiNormalizer()) {
+            if (config.getUseOpenAPINormalizer()) {
                SemVer version = new SemVer(openAPI.getOpenapi());
                if (version.atLeast("3.1.0")) {
                    config.openapiNormalizer().put("NORMALIZE_31SPEC", "true");
@@ -929,8 +929,8 @@ public class DefaultGenerator implements Generator {
    /*
     * Generate .openapi-generator-ignore if the option openapiGeneratorIgnoreFile is enabled.
     */
-    private void generateOpenapiGeneratorIgnoreFile() {
-        if (config.getOpenapiGeneratorIgnoreList() == null || config.getOpenapiGeneratorIgnoreList().isEmpty()) {
+    private void generateOpenAPIGeneratorIgnoreFile() {
+        if (config.getOpenAPIGeneratorIgnoreList() == null || config.getOpenAPIGeneratorIgnoreList().isEmpty()) {
            return;
        }

@@ -982,7 +982,7 @@ public class DefaultGenerator implements Generator {
            Writer fileWriter = Files.newBufferedWriter(ignoreFile.toPath(), StandardCharsets.UTF_8);
            fileWriter.write(header);
            // add entries provided by the users
-            for (String entry : config.getOpenapiGeneratorIgnoreList()) {
+            for (String entry : config.getOpenAPIGeneratorIgnoreList()) {
                fileWriter.write(entry);
                fileWriter.write("\n");
            }
@@ -1219,7 +1219,7 @@ public class DefaultGenerator implements Generator {
        processUserDefinedTemplates();

        // generate .openapi-generator-ignore if the option openapiGeneratorIgnoreFile is enabled
-        generateOpenapiGeneratorIgnoreFile();
+        generateOpenAPIGeneratorIgnoreFile();

        List<File> files = new ArrayList<>();
        // models
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/InlineModelResolver.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/InlineModelResolver.java
@@ -338,9 +338,10 @@ public class InlineModelResolver {
            return;
        }
        // Check array items
-        if (ModelUtils.isArraySchema(schema)) {
-            Schema items = ModelUtils.getSchemaItems(schema);
-            if (items == null && schema.getPrefixItems() == null) {
+        if (schema instanceof ArraySchema) {
+            ArraySchema array = (ArraySchema) schema;
+            Schema items = array.getItems();
+            if (items == null && array.getPrefixItems() == null) {
                LOGGER.debug("Incorrect array schema with no items, prefixItems: {}", schema.toString());
                return;
            }
@@ -356,7 +357,7 @@ public class InlineModelResolver {

            if (isModelNeeded(items)) {
                // If this schema should be split into its own model, do so
-                schema.setItems(this.makeSchemaInComponents(schemaName, items));
+                array.setItems(this.makeSchemaInComponents(schemaName, items));
            }
        }
        // Check allOf, anyOf, oneOf for inline models
@@ -770,8 +771,9 @@ public class InlineModelResolver {
        for (Map.Entry<String, Schema> propertiesEntry : properties.entrySet()) {
            String key = propertiesEntry.getKey();
            Schema property = propertiesEntry.getValue();
-            if (ModelUtils.isObjectSchema(property)) {
-                Schema op = property;
+            if (property instanceof ObjectSchema && ((ObjectSchema) property).getProperties() != null
+                    && ((ObjectSchema) property).getProperties().size() > 0) {
+                ObjectSchema op = (ObjectSchema) property;
                String modelName = resolveModelName(op.getTitle(), path + "_" + key);
                Schema model = modelFromProperty(openAPI, op, modelName);
                String existing = matchGenerated(model);
@@ -786,10 +788,11 @@ public class InlineModelResolver {
                    propsToUpdate.put(key, schema);
                    modelsToAdd.put(modelName, model);
                }
-            } else if (ModelUtils.isArraySchema(property)) {
-                Schema inner = ModelUtils.getSchemaItems(property);
-                if (ModelUtils.isObjectSchema(inner)) {
-                    Schema op = inner;
+            } else if (property instanceof ArraySchema) {
+                ArraySchema ap = (ArraySchema) property;
+                Schema inner = ap.getItems();
+                if (inner instanceof ObjectSchema) {
+                    ObjectSchema op = (ObjectSchema) inner;
                    if (op.getProperties() != null && op.getProperties().size() > 0) {
                        flattenProperties(openAPI, op.getProperties(), path);
                        String modelName = resolveModelName(op.getTitle(), path + "_" + key);
@@ -798,12 +801,12 @@ public class InlineModelResolver {
                        if (existing != null) {
                            Schema schema = new Schema().$ref(existing);
                            schema.setRequired(op.getRequired());
-                            property.setItems(schema);
+                            ap.setItems(schema);
                        } else {
                            modelName = addSchemas(modelName, innerModel);
                            Schema schema = new Schema().$ref(modelName);
                            schema.setRequired(op.getRequired());
-                            property.setItems(schema);
+                            ap.setItems(schema);
                        }
                    }
                } else if (ModelUtils.isComposedSchema(inner)) {
@@ -812,14 +815,14 @@ public class InlineModelResolver {
                    innerModelName = addSchemas(innerModelName, inner);
                    Schema schema = new Schema().$ref(innerModelName);
                    schema.setRequired(inner.getRequired());
-                    property.setItems(schema);
+                    ap.setItems(schema);
                } else {
                    LOGGER.debug("Schema not yet handled in model resolver: {}", inner);
                }
            } else if (ModelUtils.isMapSchema(property)) {
                Schema inner = ModelUtils.getAdditionalProperties(property);
-                if (ModelUtils.isObjectSchema(inner)) {
-                    Schema op = inner;
+                if (inner instanceof ObjectSchema) {
+                    ObjectSchema op = (ObjectSchema) inner;
                    if (op.getProperties() != null && op.getProperties().size() > 0) {
                        flattenProperties(openAPI, op.getProperties(), path);
                        String modelName = resolveModelName(op.getTitle(), path + "_" + key);
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/OpenAPINormalizer.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/OpenAPINormalizer.java
@@ -499,7 +499,7 @@ public class OpenAPINormalizer {
        }

        if (StringUtils.isNotEmpty(schema.get$ref())) {
-            // no need to process $ref
+            // not need to process $ref
            return schema;
        }

@@ -509,10 +509,9 @@ public class OpenAPINormalizer {
            visitedSchemas.add(schema);
        }

-        if (ModelUtils.isArraySchema(schema)) { // array
-            Schema result = normalizeArraySchema(schema);
-            normalizeSchema(result.getItems(), visitedSchemas);
-            return result;
+        if (schema instanceof ArraySchema) { // array
+            normalizeArraySchema(schema);
+            normalizeSchema(schema.getItems(), visitedSchemas);
        } else if (schema.getAdditionalProperties() instanceof Schema) { // map
            normalizeMapSchema(schema);
            normalizeSchema((Schema) schema.getAdditionalProperties(), visitedSchemas);
@@ -567,8 +566,7 @@ public class OpenAPINormalizer {
    }

    private Schema normalizeArraySchema(Schema schema) {
-        Schema result = processNormalize31Spec(schema, new HashSet<>());
-        return processSetArraytoNullable(result);
+        return processSetArraytoNullable(schema);
    }

    private Schema normalizeMapSchema(Schema schema) {
@@ -596,7 +594,7 @@ public class OpenAPINormalizer {
        }
        for (Map.Entry<String, Schema> propertiesEntry : properties.entrySet()) {
            Schema property = propertiesEntry.getValue();
-            Schema newProperty = normalizeSchema(property, new HashSet<>());
+            Schema newProperty = normalizeSchema(property, visitedSchemas);
            propertiesEntry.setValue(newProperty);
        }
    }
@@ -890,7 +888,7 @@ public class OpenAPINormalizer {

        if (schema.getTypes() != null && !schema.getTypes().isEmpty()) {
            // 3.1 spec
-            if (schema.getTypes().size() == 1) { // 1 type only
+            if (schema.getTypes().size() ==1) { // 1 type only
                String type = (String) schema.getTypes().iterator().next();
                return type == null || "null".equals(type);
            } else { // more than 1 type so must not be just null
@@ -902,11 +900,6 @@ public class OpenAPINormalizer {
            if (Boolean.TRUE.equals(schema.getNullable())) {
                return true;
            }
-
-            // for `type: null`
-            if (schema.getTypes() == null && schema.get$ref() == null) {
-                return true;
-            }
        } else { // 3.0.x or 2.x spec
            if ((schema.getType() == null || schema.getType().equals("null")) && schema.get$ref() == null) {
                return true;
@@ -943,7 +936,7 @@ public class OpenAPINormalizer {
            if (oneOfSchemas.size() == 6) {
                TreeSet<String> ts = new TreeSet<>();
                for (Schema s: oneOfSchemas) {
-                    ts.add(ModelUtils.getType(s));
+                    ts.add(s.getType());
                }

                if (ts.equals(anyTypeTreeSet)) {
@@ -1068,7 +1061,7 @@ public class OpenAPINormalizer {
            if (anyOfSchemas.size() == 6) {
                TreeSet<String> ts = new TreeSet<>();
                for (Schema s: anyOfSchemas) {
-                    ts.add(ModelUtils.getType(s));
+                    ts.add(s.getType());
                }

                if (ts.equals(anyTypeTreeSet)) {
@@ -1229,7 +1222,7 @@ public class OpenAPINormalizer {
        // only one item (type) left
        if (schema.getTypes().size() == 1) {
            String type = String.valueOf(schema.getTypes().iterator().next());
-            if (ModelUtils.isArraySchema(schema)) {
+            if ("array".equals(type)) {
                ArraySchema as = new ArraySchema();
                as.setDescription(schema.getDescription());
                as.setDefault(schema.getDefault());
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/config/CodegenConfigurator.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/config/CodegenConfigurator.java
@@ -145,14 +145,14 @@ public class CodegenConfigurator {
            if(generatorSettings.getOperationIdNameMappings() != null) {
                configurator.operationIdNameMappings.putAll(generatorSettings.getOperationIdNameMappings());
            }
-            if(generatorSettings.getOpenapiNormalizer() != null) {
-                configurator.openapiNormalizer.putAll(generatorSettings.getOpenapiNormalizer());
+            if(generatorSettings.getOpenAPINormalizer() != null) {
+                configurator.openapiNormalizer.putAll(generatorSettings.getOpenAPINormalizer());
            }
            if(generatorSettings.getLanguageSpecificPrimitives() != null) {
                configurator.languageSpecificPrimitives.addAll(generatorSettings.getLanguageSpecificPrimitives());
            }
-            if(generatorSettings.getOpenapiGeneratorIgnoreList() != null) {
-                configurator.openapiGeneratorIgnoreList.addAll(generatorSettings.getOpenapiGeneratorIgnoreList());
+            if(generatorSettings.getOpenAPIGeneratorIgnoreList() != null) {
+                configurator.openapiGeneratorIgnoreList.addAll(generatorSettings.getOpenAPIGeneratorIgnoreList());
            }
            if(generatorSettings.getReservedWordsMappings() != null) {
                configurator.reservedWordsMappings.putAll(generatorSettings.getReservedWordsMappings());
@@ -268,9 +268,9 @@ public class CodegenConfigurator {
        return this;
    }

-    public CodegenConfigurator addOpenapiNormalizer(String key, String value) {
+    public CodegenConfigurator addOpenAPINormalizer(String key, String value) {
        this.openapiNormalizer.put(key, value);
-        generatorSettingsBuilder.withOpenapiNormalizer(key, value);
+        generatorSettingsBuilder.withOpenAPINormalizer(key, value);
        return this;
    }

@@ -286,9 +286,9 @@ public class CodegenConfigurator {
        return this;
    }

-    public CodegenConfigurator addOpenapiGeneratorIgnoreList(String value) {
+    public CodegenConfigurator addOpenAPIGeneratorIgnoreList(String value) {
        this.openapiGeneratorIgnoreList.add(value);
-        generatorSettingsBuilder.withOpenapiGeneratorIgnoreList(value);
+        generatorSettingsBuilder.withOpenAPIGeneratorIgnoreList(value);
        return this;
    }

@@ -482,9 +482,9 @@ public class CodegenConfigurator {
        return this;
    }

-    public CodegenConfigurator setOpenapiNormalizer(Map<String, String> openapiNormalizer) {
+    public CodegenConfigurator setOpenAPINormalizer(Map<String, String> openapiNormalizer) {
        this.openapiNormalizer = openapiNormalizer;
-        generatorSettingsBuilder.withOpenapiNormalizer(openapiNormalizer);
+        generatorSettingsBuilder.withOpenAPINormalizer(openapiNormalizer);
        return this;
    }

@@ -515,10 +515,10 @@ public class CodegenConfigurator {
        return this;
    }

-    public CodegenConfigurator setOpenapiGeneratorIgnoreList(
+    public CodegenConfigurator setOpenAPIGeneratorIgnoreList(
            Set<String> openapiGeneratorIgnoreList) {
        this.openapiGeneratorIgnoreList = openapiGeneratorIgnoreList;
-        generatorSettingsBuilder.withOpenapiGeneratorIgnoreList(openapiGeneratorIgnoreList);
+        generatorSettingsBuilder.withOpenAPIGeneratorIgnoreList(openapiGeneratorIgnoreList);
        return this;
    }

@@ -779,9 +779,9 @@ public class CodegenConfigurator {
        config.modelNameMapping().putAll(generatorSettings.getModelNameMappings());
        config.enumNameMapping().putAll(generatorSettings.getEnumNameMappings());
        config.operationIdNameMapping().putAll(generatorSettings.getOperationIdNameMappings());
-        config.openapiNormalizer().putAll(generatorSettings.getOpenapiNormalizer());
+        config.openapiNormalizer().putAll(generatorSettings.getOpenAPINormalizer());
        config.languageSpecificPrimitives().addAll(generatorSettings.getLanguageSpecificPrimitives());
-        config.openapiGeneratorIgnoreList().addAll(generatorSettings.getOpenapiGeneratorIgnoreList());
+        config.openapiGeneratorIgnoreList().addAll(generatorSettings.getOpenAPIGeneratorIgnoreList());
        config.reservedWordsMappings().putAll(generatorSettings.getReservedWordsMappings());
        config.additionalProperties().putAll(generatorSettings.getAdditionalProperties());

--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/config/CodegenConfiguratorUtils.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/config/CodegenConfiguratorUtils.java
@@ -185,16 +185,16 @@ public final class CodegenConfiguratorUtils {
        }
    }

-    public static void applyOpenapiNormalizerKvpList(List<String> openapiNormalizer, CodegenConfigurator configurator) {
+    public static void applyOpenAPINormalizerKvpList(List<String> openapiNormalizer, CodegenConfigurator configurator) {
        for (String propString : openapiNormalizer) {
-            applyOpenapiNormalizerKvp(propString, configurator);
+            applyOpenAPINormalizerKvp(propString, configurator);
        }
    }

-    public static void applyOpenapiNormalizerKvp(String openapiNormalizer, CodegenConfigurator configurator) {
+    public static void applyOpenAPINormalizerKvp(String openapiNormalizer, CodegenConfigurator configurator) {
        final Map<String, String> map = createMapFromKeyValuePairs(openapiNormalizer);
        for (Map.Entry<String, String> entry : map.entrySet()) {
-            configurator.addOpenapiNormalizer(entry.getKey().trim(), entry.getValue().trim());
+            configurator.addOpenAPINormalizer(entry.getKey().trim(), entry.getValue().trim());
        }
    }

@@ -250,16 +250,16 @@ public final class CodegenConfiguratorUtils {
        }
    }

-    public static void applyOpenapiGeneratorIgnoreListCsvList(List<String> openapiGeneratorIgnoreList, CodegenConfigurator configurator) {
+    public static void applyOpenAPIGeneratorIgnoreListCsvList(List<String> openapiGeneratorIgnoreList, CodegenConfigurator configurator) {
        for (String propString : openapiGeneratorIgnoreList) {
-            applyOpenapiGeneratorIgnoreListCsv(propString, configurator);
+            applyOpenAPIGeneratorIgnoreListCsv(propString, configurator);
        }
    }

-    public static void applyOpenapiGeneratorIgnoreListCsv(String openapiGeneratorIgnoreList, CodegenConfigurator configurator) {
+    public static void applyOpenAPIGeneratorIgnoreListCsv(String openapiGeneratorIgnoreList, CodegenConfigurator configurator) {
        final Set<String> set = createSetFromCsvList(openapiGeneratorIgnoreList);
        for (String item : set) {
-            configurator.addOpenapiGeneratorIgnoreList(item);
+            configurator.addOpenAPIGeneratorIgnoreList(item);
        }
    }

--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/examples/ExampleGenerator.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/examples/ExampleGenerator.java
@@ -84,9 +84,10 @@ public class ExampleGenerator {
        }

        if (ModelUtils.isArraySchema(responseSchema)) { // array of schema
-            if (ModelUtils.getSchemaItems(responseSchema) != null) { // array of primitive types
+            ArraySchema as = (ArraySchema) responseSchema;
+            if (as.getItems() != null) { // array of primitive types
                return generate((Map<String, Object>) responseSchema.getExample(),
-                        new ArrayList<>(producesInfo), responseSchema);
+                        new ArrayList<>(producesInfo), as);
            } else {
                // TODO log warning message as such case is not handled at the moment
                return null;
@@ -247,9 +248,9 @@ public class ExampleGenerator {
            }
            return Boolean.TRUE;
        } else if (ModelUtils.isArraySchema(property)) {
-            Schema innerType = ModelUtils.getSchemaItems(property);
+            Schema innerType = ((ArraySchema) property).getItems();
            if (innerType != null) {
-                int arrayLength = null == property.getMaxItems() ? 2 :  property.getMaxItems();
+                int arrayLength = null == ((ArraySchema) property).getMaxItems() ? 2 : ((ArraySchema) property).getMaxItems();
                // avoid memory issues by limiting to max. 5 items
                arrayLength = Math.min(arrayLength, 5);
                Object[] objectProperties = new Object[arrayLength];
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/examples/XmlExampleGenerator.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/examples/XmlExampleGenerator.java
@@ -128,7 +128,8 @@ public class XmlExampleGenerator {
        StringBuilder sb = new StringBuilder();

        if (ModelUtils.isArraySchema(schema)) {
-            Schema inner = ModelUtils.getSchemaItems(schema);
+            ArraySchema as = (ArraySchema) schema;
+            Schema inner = as.getItems();
            boolean wrapped = false;
            if (schema.getXml() != null && schema.getXml().getWrapped() != null && schema.getXml().getWrapped()) {
                wrapped = true;
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractAdaCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractAdaCodegen.java
@@ -532,7 +532,8 @@ abstract public class AbstractAdaCodegen extends DefaultCodegen implements Codeg
        }

        if (ModelUtils.isArraySchema(p)) {
-            Schema inner = ModelUtils.getSchemaItems(p);
+            ArraySchema ap = (ArraySchema) p;
+            Schema inner = ap.getItems();
            String itemType = getTypeDeclaration(inner);
            if (itemType.startsWith("OpenAPI.")) {
                return itemType + "_Vector";
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractApexCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractApexCodegen.java
@@ -188,9 +188,10 @@ public abstract class AbstractApexCodegen extends DefaultCodegen implements Code
    @Override
    public String getTypeDeclaration(Schema p) {
        if (ModelUtils.isArraySchema(p)) {
-            Schema inner = ModelUtils.getSchemaItems(p);
+            ArraySchema ap = (ArraySchema) p;
+            Schema inner = ap.getItems();
            if (inner == null) {
-                LOGGER.warn("{}(array property) does not have a proper inner type defined", p.getName());
+                LOGGER.warn("{}(array property) does not have a proper inner type defined", ap.getName());
                // TODO maybe better defaulting to StringProperty than returning null
                return null;
            }
@@ -219,12 +220,13 @@ public abstract class AbstractApexCodegen extends DefaultCodegen implements Code
    @Override
    public String toDefaultValue(Schema p) {
        if (ModelUtils.isArraySchema(p)) {
+            final ArraySchema ap = (ArraySchema) p;
            final String pattern = "new ArrayList<%s>()";
-            if (ModelUtils.getSchemaItems(p) == null) {
+            if (ap.getItems() == null) {
                return null;
            }

-            return String.format(Locale.ROOT, pattern, getTypeDeclaration(ModelUtils.getSchemaItems(p)));
+            return String.format(Locale.ROOT, pattern, getTypeDeclaration(ap.getItems()));
        } else if (ModelUtils.isMapSchema(p)) {
            final MapSchema ap = (MapSchema) p;
            final String pattern = "new HashMap<%s>()";
@@ -316,7 +318,7 @@ public abstract class AbstractApexCodegen extends DefaultCodegen implements Code

        if (ModelUtils.isArraySchema(p)) {
            example = "new " + getTypeDeclaration(p) + "{" + toExampleValue(
-                    ModelUtils.getSchemaItems(p)) + "}";
+                    ((ArraySchema) p).getItems()) + "}";
        } else if (ModelUtils.isBooleanSchema(p)) {
            example = String.valueOf(!"false".equals(example));
        } else if (ModelUtils.isByteArraySchema(p)) {
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCSharpCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCSharpCodegen.java
@@ -585,7 +585,7 @@ public abstract class AbstractCSharpCodegen extends DefaultCodegen implements Co
                List<CodegenProperty> allOf = composedSchemas.getAllOf();
                if (allOf != null) {
                    for (CodegenProperty property : allOf) {
-                        property.name = patchPropertyName(model, camelize(property.baseType));
+                        property.name = patchPropertyName(model, property.baseType);
                        patchPropertyVendorExtensions(property);
                    }
                }
@@ -594,7 +594,7 @@ public abstract class AbstractCSharpCodegen extends DefaultCodegen implements Co
                if (anyOf != null) {
                    removePropertiesDeclaredInComposedTypes(objs, model, anyOf);
                    for (CodegenProperty property : anyOf) {
-                        property.name = patchPropertyName(model, camelize(property.baseType));
+                        property.name = patchPropertyName(model, property.baseType);
                        property.isNullable = true;
                        patchPropertyVendorExtensions(property);
                    }
@@ -604,7 +604,7 @@ public abstract class AbstractCSharpCodegen extends DefaultCodegen implements Co
                if (oneOf != null) {
                    removePropertiesDeclaredInComposedTypes(objs, model, oneOf);
                    for (CodegenProperty property : oneOf) {
-                        property.name = patchPropertyName(model, camelize(property.baseType));
+                        property.name = patchPropertyName(model, property.baseType);
                        property.isNullable = true;
                        patchPropertyVendorExtensions(property);
                    }
@@ -1433,12 +1433,12 @@ public abstract class AbstractCSharpCodegen extends DefaultCodegen implements Co
     * @param arr The input array property
     * @return The type declaration when the type is an array of arrays.
     */
-    private String getArrayTypeDeclaration(Schema arr) {
+    private String getArrayTypeDeclaration(ArraySchema arr) {
        // TODO: collection type here should be fully qualified namespace to avoid model conflicts
        // This supports arrays of arrays.
        String arrayType = typeMapping.get("array");
        StringBuilder instantiationType = new StringBuilder(arrayType);
-        Schema items = ModelUtils.getSchemaItems(arr);
+        Schema items = arr.getItems();
        String nestedType = getTypeDeclaration(items);
        // TODO: We may want to differentiate here between generics and primitive arrays.
        instantiationType.append("<").append(nestedType).append(">");
@@ -1448,7 +1448,7 @@ public abstract class AbstractCSharpCodegen extends DefaultCodegen implements Co
    @Override
    public String toInstantiationType(Schema p) {
        if (ModelUtils.isArraySchema(p)) {
-            return getArrayTypeDeclaration(p);
+            return getArrayTypeDeclaration((ArraySchema) p);
        }
        return super.toInstantiationType(p);
    }
@@ -1456,7 +1456,7 @@ public abstract class AbstractCSharpCodegen extends DefaultCodegen implements Co
    @Override
    public String getTypeDeclaration(Schema p) {
        if (ModelUtils.isArraySchema(p)) {
-            return getArrayTypeDeclaration(p);
+            return getArrayTypeDeclaration((ArraySchema) p);
        } else if (ModelUtils.isMapSchema(p)) {
            // Should we also support maps of maps?
            Schema inner = ModelUtils.getAdditionalProperties(p);
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractDartCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractDartCodegen.java
@@ -512,7 +512,7 @@ public abstract class AbstractDartCodegen extends DefaultCodegen {
        Schema<?> schema = unaliasSchema(p);
        Schema<?> target = ModelUtils.isGenerateAliasAsModel() ? p : schema;
        if (ModelUtils.isArraySchema(target)) {
-            Schema<?> items = ModelUtils.getSchemaItems(schema);
+            Schema<?> items = getSchemaItems((ArraySchema) schema);
            return getSchemaType(target) + "<" + getTypeDeclaration(items) + ">";
        }
        if (ModelUtils.isMapSchema(target)) {
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractEiffelCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractEiffelCodegen.java
@@ -293,7 +293,8 @@ public abstract class AbstractEiffelCodegen extends DefaultCodegen implements Co
    @Override
    public String getTypeDeclaration(Schema p) {
        if (ModelUtils.isArraySchema(p)) {
-            Schema inner = ModelUtils.getSchemaItems(p);
+            ArraySchema ap = (ArraySchema) p;
+            Schema inner = ap.getItems();
            return "LIST [" + getTypeDeclaration(inner) + "]";
        } else if (ModelUtils.isMapSchema(p)) {
            Schema inner = ModelUtils.getAdditionalProperties(p);
@@ -577,7 +578,8 @@ public abstract class AbstractEiffelCodegen extends DefaultCodegen implements Co
 //            String inner = toModelName(getSchemaType(additionalProperties2));
 //            return instantiationTypes.get("map") + " [" + inner + "]";
 //        } else if (ModelUtils.isArraySchema(p)) {
-//            String inner = toModelName(getSchemaType(ModelUtils.getSchemaItems(p)));
+//            ArraySchema ap = (ArraySchema) p;
+//            String inner = toModelName(getSchemaType(ap.getItems()));
 //            return instantiationTypes.get("array") + " [" + inner + "]";
 //        } else {
 //            return null;
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractFSharpCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractFSharpCodegen.java
@@ -855,12 +855,12 @@ public abstract class AbstractFSharpCodegen extends DefaultCodegen implements Co
     * @param arr The input array property
     * @return The type declaration when the type is an array of arrays.
     */
-    private String getArrayTypeDeclaration(Schema arr) {
+    private String getArrayTypeDeclaration(ArraySchema arr) {
        // TODO: collection type here should be fully qualified namespace to avoid model conflicts
        // This supports arrays of arrays.
        String arrayType = typeMapping.get("array");
        StringBuilder instantiationType = new StringBuilder(arrayType);
-        Schema items = ModelUtils.getSchemaItems(arr);
+        Schema items = arr.getItems();
        String nestedType = getTypeDeclaration(items);
        // TODO: We may want to differentiate here between generics and primitive arrays.
        return nestedType + "[]";
@@ -869,7 +869,7 @@ public abstract class AbstractFSharpCodegen extends DefaultCodegen implements Co
    @Override
    public String toInstantiationType(Schema p) {
        if (ModelUtils.isArraySchema(p)) {
-            return getArrayTypeDeclaration(p);
+            return getArrayTypeDeclaration((ArraySchema) p);
        }
        return super.toInstantiationType(p);
    }
@@ -877,7 +877,7 @@ public abstract class AbstractFSharpCodegen extends DefaultCodegen implements Co
    @Override
    public String getTypeDeclaration(Schema p) {
        if (ModelUtils.isArraySchema(p)) {
-            return getArrayTypeDeclaration(p);
+            return getArrayTypeDeclaration((ArraySchema) p);
        } else if (ModelUtils.isMapSchema(p)) {
            // Should we also support maps of maps?
            Schema inner = ModelUtils.getAdditionalProperties(p);
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractGoCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractGoCodegen.java
@@ -360,7 +360,8 @@ public abstract class AbstractGoCodegen extends DefaultCodegen implements Codege
    @Override
    public String getTypeDeclaration(Schema p) {
        if (ModelUtils.isArraySchema(p)) {
-            Schema inner = ModelUtils.getSchemaItems(p);
+            ArraySchema ap = (ArraySchema) p;
+            Schema inner = ap.getItems();
            // In OAS 3.0.x, the array "items" attribute is required.
            // In OAS >= 3.1, the array "items" attribute is optional such that the OAS
            // specification is aligned with the JSON schema specification.
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractGraphQLCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractGraphQLCodegen.java
@@ -273,7 +273,8 @@ public abstract class AbstractGraphQLCodegen extends DefaultCodegen implements C
    @Override
    public String getTypeDeclaration(Schema p) {
        if (ModelUtils.isArraySchema(p)) {
-            Schema inner = ModelUtils.getSchemaItems(p);
+            ArraySchema ap = (ArraySchema) p;
+            Schema inner = ap.getItems();
            return "[" + getTypeDeclaration(inner) + "]";
        } else if (ModelUtils.isMapSchema(p)) {
            Object ap = p.getAdditionalProperties();
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java
@@ -192,7 +192,7 @@ public abstract class AbstractJavaCodegen extends DefaultCodegen implements Code
                        "ApiClient", "ApiException", "ApiResponse", "Configuration", "StringUtil",

                        // language reserved words
-                        "_", "abstract", "continue", "for", "new", "switch", "assert",
+                        "abstract", "continue", "for", "new", "switch", "assert",
                        "default", "if", "package", "synchronized", "boolean", "do", "goto", "private",
                        "this", "break", "double", "implements", "protected", "throw", "byte", "else",
                        "import", "public", "throws", "case", "enum", "instanceof", "return", "transient",
@@ -946,7 +946,7 @@ public abstract class AbstractJavaCodegen extends DefaultCodegen implements Code
        Schema<?> schema = unaliasSchema(p);
        Schema<?> target = ModelUtils.isGenerateAliasAsModel() ? p : schema;
        if (ModelUtils.isArraySchema(target)) {
-            Schema<?> items = ModelUtils.getSchemaItems(schema);
+            Schema<?> items = getSchemaItems((ArraySchema) schema);
            return getSchemaType(target) + "<" + getBeanValidation(items) + getTypeDeclaration(items) + ">";
        } else if (ModelUtils.isMapSchema(target)) {
            // Note: ModelUtils.isMapSchema(p) returns true when p is a composed schema that also defines
@@ -999,10 +999,6 @@ public abstract class AbstractJavaCodegen extends DefaultCodegen implements Code
            return getNumberBeanValidation(items);
        }

-        if (ModelUtils.isLongSchema(items)) {
-            return getLongBeanValidation(items);
-        }
-
        if (ModelUtils.isIntegerSchema(items)) {
            return getIntegerBeanValidation(items);
        }
@@ -1025,21 +1021,6 @@ public abstract class AbstractJavaCodegen extends DefaultCodegen implements Code
        return "";
    }

-    private String getLongBeanValidation(Schema<?> items) {
-        if (items.getMinimum() != null && items.getMaximum() != null) {
-            return String.format(Locale.ROOT, "@Min(%sL) @Max(%sL)", items.getMinimum(), items.getMaximum());
-        }
-
-        if (items.getMinimum() != null) {
-            return String.format(Locale.ROOT, "@Min(%sL)", items.getMinimum());
-        }
-
-        if (items.getMaximum() != null) {
-            return String.format(Locale.ROOT, "@Max(%sL)", items.getMaximum());
-        }
-        return "";
-    }
-
    private String getNumberBeanValidation(Schema<?> items) {
        if (items.getMinimum() != null && items.getMaximum() != null) {
            return String.format(Locale.ROOT, "@DecimalMin(value = \"%s\", inclusive = %s) @DecimalMax(value = \"%s\", inclusive = %s)",
@@ -1927,9 +1908,10 @@ public abstract class AbstractJavaCodegen extends DefaultCodegen implements Code
        // string
        String var = value.replaceAll("\\W+", "_").toUpperCase(Locale.ROOT);
        if (var.matches("\\d.*")) {
-            var = "_" + var;
+            return "_" + var;
+        } else {
+            return var;
        }
-        return this.toVarName(var);
    }

    @Override
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJuliaCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJuliaCodegen.java
@@ -346,7 +346,8 @@ public abstract class AbstractJuliaCodegen extends DefaultCodegen {
    @Override
    public String getTypeDeclaration(Schema schema) {
        if (ModelUtils.isArraySchema(schema)) {
-            Schema inner = ModelUtils.getSchemaItems(schema);
+            ArraySchema ap = (ArraySchema) schema;
+            Schema inner = ap.getItems();
            return getSchemaType(schema) + "{" + getTypeDeclaration(inner) + "}";
        } else if (ModelUtils.isSet(schema)) {
            Schema inner = ModelUtils.getAdditionalProperties(schema);
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractKotlinCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractKotlinCodegen.java
@@ -359,7 +359,7 @@ public abstract class AbstractKotlinCodegen extends DefaultCodegen implements Co
        Schema<?> schema = unaliasSchema(p);
        Schema<?> target = ModelUtils.isGenerateAliasAsModel() ? p : schema;
        if (ModelUtils.isArraySchema(target)) {
-            Schema<?> items = ModelUtils.getSchemaItems( schema);
+            Schema<?> items = getSchemaItems((ArraySchema) schema);
            return getSchemaType(target) + "<" + getTypeDeclaration(items) + ">";
        } else if (ModelUtils.isMapSchema(target)) {
            // Note: ModelUtils.isMapSchema(p) returns true when p is a composed schema that also defines
@@ -683,11 +683,6 @@ public abstract class AbstractKotlinCodegen extends DefaultCodegen implements Co
     */
    @Override
    public String toModelName(final String name) {
-        // obtain the name from modelNameMapping directly if provided
-        if (modelNameMapping.containsKey(name)) {
-            return modelNameMapping.get(name);
-        }
-
        // memoization
        if (schemaKeyToModelNameCache.containsKey(name)) {
            return schemaKeyToModelNameCache.get(name);
@@ -906,7 +901,7 @@ public abstract class AbstractKotlinCodegen extends DefaultCodegen implements Co
        } else if ("kotlin.Float".equals(datatype)) {
            return value + "f";
        } else {
-            return "\"" + value + "\"";
+            return "\"" + escapeText(value) + "\"";
        }
    }

@@ -1109,7 +1104,7 @@ public abstract class AbstractKotlinCodegen extends DefaultCodegen implements Co
            }

            StringBuilder defaultContent = new StringBuilder();
-            Schema<?> itemsSchema = ModelUtils.getSchemaItems(schema);
+            Schema<?> itemsSchema = getSchemaItems((ArraySchema) schema);
            _default.elements().forEachRemaining((element) -> {
                String defaultValue = element.asText();
                if (defaultValue != null) {
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPhpCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPhpCodegen.java
@@ -355,10 +355,11 @@ public abstract class AbstractPhpCodegen extends DefaultCodegen implements Codeg
    @Override
    public String getTypeDeclaration(Schema p) {
        if (ModelUtils.isArraySchema(p)) {
-            Schema inner = ModelUtils.getSchemaItems(p);
+            ArraySchema ap = (ArraySchema) p;
+            Schema inner = ap.getItems();
            if (inner == null) {
                LOGGER.warn("{}(array property) does not have a proper inner type defined.Default to string",
-                        p.getName());
+                        ap.getName());
                inner = new StringSchema().description("TODO default missing array inner type to string");
            }
            return getTypeDeclaration(inner) + "[]";
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPythonCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPythonCodegen.java
@@ -105,8 +105,6 @@ public abstract class AbstractPythonCodegen extends DefaultCodegen implements Co
        // from https://docs.python.org/3/reference/lexical_analysis.html#keywords
        setReservedWordsLowerCase(
                Arrays.asList(
-                        // pydantic
-                        "field",
                        // local variable name used in API methods (endpoints)
                        "all_params", "resource_path", "path_params", "query_params",
                        "header_params", "form_params", "local_var_files", "body_params", "auth_settings",
@@ -491,7 +489,8 @@ public abstract class AbstractPythonCodegen extends DefaultCodegen implements Co
            if (StringUtils.isNotBlank(schema.getTitle()) && !"null".equals(schema.getTitle())) {
                includedSchemas.add(schema);
            }
-            example = "[\n" + indentationString + toExampleValueRecursive(ModelUtils.getSchemaItems(schema), includedSchemas, indentation + 1) + "\n" + indentationString + "]";
+            ArraySchema arrayschema = (ArraySchema) schema;
+            example = "[\n" + indentationString + toExampleValueRecursive(arrayschema.getItems(), includedSchemas, indentation + 1) + "\n" + indentationString + "]";
        } else if (ModelUtils.isMapSchema(schema)) {
            if (StringUtils.isNotBlank(schema.getTitle()) && !"null".equals(schema.getTitle())) {
                includedSchemas.add(schema);
@@ -692,7 +691,8 @@ public abstract class AbstractPythonCodegen extends DefaultCodegen implements Co
        p = ModelUtils.unaliasSchema(openAPI, p);

        if (ModelUtils.isArraySchema(p)) {
-            Schema inner = ModelUtils.getSchemaItems(p);
+            ArraySchema ap = (ArraySchema) p;
+            Schema inner = ap.getItems();
            return getSchemaType(p) + "[" + getCollectionItemTypeDeclaration(inner) + "]";
        } else if (ModelUtils.isMapSchema(p)) {
            Schema inner = ModelUtils.getAdditionalProperties(p);
@@ -1000,11 +1000,6 @@ public abstract class AbstractPythonCodegen extends DefaultCodegen implements Co
            // set the extensions if the key is absent
            model.getVendorExtensions().putIfAbsent("x-py-readonly", readOnlyFields);

-            // remove the items of postponedModelImports in modelImports to avoid circular imports error
-            if (!modelImports.isEmpty() && !postponedModelImports.isEmpty()){
-                modelImports.removeAll(postponedModelImports);
-            }
-
            // import models one by one
            if (!modelImports.isEmpty()) {
                Set<String> modelsToImport = new TreeSet<>();
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPythonConnexionServerCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPythonConnexionServerCodegen.java
@@ -351,7 +351,8 @@ public abstract class AbstractPythonConnexionServerCodegen extends AbstractPytho
    @Override
    public String getTypeDeclaration(Schema p) {
        if (ModelUtils.isArraySchema(p)) {
-            Schema inner = ModelUtils.getSchemaItems(p);
+            ArraySchema ap = (ArraySchema) p;
+            Schema inner = ap.getItems();
            return getSchemaType(p) + "[" + getTypeDeclaration(inner) + "]";
        } else if (ModelUtils.isMapSchema(p)) {
            Schema inner = ModelUtils.getAdditionalProperties(p);
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPythonPydanticV1Codegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPythonPydanticV1Codegen.java
@@ -454,7 +454,8 @@ public abstract class AbstractPythonPydanticV1Codegen extends DefaultCodegen imp
            if (StringUtils.isNotBlank(schema.getTitle()) && !"null".equals(schema.getTitle())) {
                includedSchemas.add(schema);
            }
-            example = "[\n" + indentationString + toExampleValueRecursive(ModelUtils.getSchemaItems(schema), includedSchemas, indentation + 1) + "\n" + indentationString + "]";
+            ArraySchema arrayschema = (ArraySchema) schema;
+            example = "[\n" + indentationString + toExampleValueRecursive(arrayschema.getItems(), includedSchemas, indentation + 1) + "\n" + indentationString + "]";
        } else if (ModelUtils.isMapSchema(schema)) {
            if (StringUtils.isNotBlank(schema.getTitle()) && !"null".equals(schema.getTitle())) {
                includedSchemas.add(schema);
@@ -655,7 +656,8 @@ public abstract class AbstractPythonPydanticV1Codegen extends DefaultCodegen imp
        p = ModelUtils.unaliasSchema(openAPI, p);

        if (ModelUtils.isArraySchema(p)) {
-            Schema inner = ModelUtils.getSchemaItems(p);
+            ArraySchema ap = (ArraySchema) p;
+            Schema inner = ap.getItems();
            return getSchemaType(p) + "[" + getTypeDeclaration(inner) + "]";
        } else if (ModelUtils.isMapSchema(p)) {
            Schema inner = ModelUtils.getAdditionalProperties(p);
@@ -1002,11 +1004,6 @@ public abstract class AbstractPythonPydanticV1Codegen extends DefaultCodegen imp
            model.getVendorExtensions().putIfAbsent("x-py-datetime-imports", datetimeImports);
            model.getVendorExtensions().putIfAbsent("x-py-readonly", readOnlyFields);

-            // remove the items of postponedModelImports in modelImports to avoid circular imports error
-            if (!modelImports.isEmpty() && !postponedModelImports.isEmpty()){
-                modelImports.removeAll(postponedModelImports);
-            }
-
            // import models one by one
            if (!modelImports.isEmpty()) {
                Set<String> modelsToImport = new TreeSet<>();
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractRubyCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractRubyCodegen.java
@@ -119,7 +119,7 @@ abstract public class AbstractRubyCodegen extends DefaultCodegen implements Code
    @Override
    public String getTypeDeclaration(Schema schema) {
        if (ModelUtils.isArraySchema(schema)) {
-            Schema inner = ModelUtils.getSchemaItems(schema);
+            Schema inner = ((ArraySchema) schema).getItems();
            return getSchemaType(schema) + "<" + getTypeDeclaration(inner) + ">";
        } else if (ModelUtils.isMapSchema(schema)) {
            Schema inner = ModelUtils.getAdditionalProperties(schema);
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractRustCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractRustCodegen.java
@@ -236,7 +236,8 @@ public abstract class AbstractRustCodegen extends DefaultCodegen implements Code
    @Override
    public String getTypeDeclaration(Schema p) {
        if (ModelUtils.isArraySchema(p)) {
-            Schema inner = ModelUtils.getSchemaItems(p);
+            ArraySchema ap = (ArraySchema) p;
+            Schema inner = ap.getItems();
            String innerType = getTypeDeclaration(inner);
            return typeMapping.get("array") + "<" + innerType + ">";
        } else if (ModelUtils.isMapSchema(p)) {
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractScalaCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractScalaCodegen.java
@@ -371,7 +371,7 @@ public abstract class AbstractScalaCodegen extends DefaultCodegen {
        Schema<?> schema = unaliasSchema(p);
        Schema<?> target = ModelUtils.isGenerateAliasAsModel() ? p : schema;
        if (ModelUtils.isArraySchema(target)) {
-            Schema<?> items = ModelUtils.getSchemaItems(schema);
+            Schema<?> items = getSchemaItems((ArraySchema) schema);
            return getSchemaType(target) + "[" + getTypeDeclaration(items) + "]";
        } else if (ModelUtils.isMapSchema(target)) {
            Schema<?> inner = ModelUtils.getAdditionalProperties(target);
@@ -404,8 +404,9 @@ public abstract class AbstractScalaCodegen extends DefaultCodegen {
            String inner = getSchemaType(ModelUtils.getAdditionalProperties(p));
            return instantiationTypes.get("map") + "[String, " + inner + "]";
        } else if (ModelUtils.isArraySchema(p)) {
-            String inner = getSchemaType(ModelUtils.getSchemaItems(p));
-            return (ModelUtils.isSet(p) ? instantiationTypes.get("set") : instantiationTypes.get("array")) + "[" + inner + "]";
+            ArraySchema ap = (ArraySchema) p;
+            String inner = getSchemaType(ap.getItems());
+            return (ModelUtils.isSet(ap) ? instantiationTypes.get("set") : instantiationTypes.get("array")) + "[" + inner + "]";
        } else {
            return null;
        }
@@ -432,9 +433,10 @@ public abstract class AbstractScalaCodegen extends DefaultCodegen {
            String inner = getSchemaType(ModelUtils.getAdditionalProperties(p));
            return "new HashMap[String, " + inner + "]() ";
        } else if (ModelUtils.isArraySchema(p)) {
-            String inner = getSchemaType(ModelUtils.getSchemaItems(p));
+            ArraySchema ap = (ArraySchema) p;
+            String inner = getSchemaType(ap.getItems());
            String genericType;
-            if (ModelUtils.isSet(p)) {
+            if (ModelUtils.isSet(ap)) {
                genericType = instantiationTypes.get("set");
            } else {
                genericType = instantiationTypes.get("array");
@@ -473,7 +475,8 @@ public abstract class AbstractScalaCodegen extends DefaultCodegen {
    public CodegenProperty fromProperty(String name, Schema p, boolean required) {
        CodegenProperty prop = super.fromProperty(name, p, required);
        if (ModelUtils.isArraySchema(p)) {
-            if (ModelUtils.isSet(p)) {
+            ArraySchema as = (ArraySchema) p;
+            if (ModelUtils.isSet(as)) {
                prop.containerType = "set";
            }
        }
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractTypeScriptClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractTypeScriptClientCodegen.java
@@ -624,7 +624,7 @@ public abstract class AbstractTypeScriptClientCodegen extends DefaultCodegen imp
    @Override
    public String getTypeDeclaration(Schema p) {
        if (ModelUtils.isArraySchema(p)) {
-            Schema<?> items = ModelUtils.getSchemaItems(p);
+            Schema<?> items = getSchemaItems((ArraySchema) p);
            return getSchemaType(p) + "<" + getTypeDeclaration(unaliasSchema(items)) + ">";
        } else if (ModelUtils.isMapSchema(p)) {
            Schema<?> inner = getSchemaAdditionalProperties(p);
@@ -647,7 +647,8 @@ public abstract class AbstractTypeScriptClientCodegen extends DefaultCodegen imp
        // handle enums of various data types
        Schema inner;
        if (ModelUtils.isArraySchema(p)) {
-            inner = ModelUtils.getSchemaItems(p);
+            ArraySchema mp1 = (ArraySchema) p;
+            inner = mp1.getItems();
            return this.getSchemaType(p) + "<" + this.getParameterDataType(parameter, inner) + ">";
        } else if (ModelUtils.isMapSchema(p)) {
            inner = ModelUtils.getAdditionalProperties(p);
@@ -1176,7 +1177,8 @@ public abstract class AbstractTypeScriptClientCodegen extends DefaultCodegen imp
        return filteredSchemas.stream().map(schema -> {
            String schemaType = getSchemaType(schema);
            if (ModelUtils.isArraySchema(schema)) {
-                Schema inner = ModelUtils.getSchemaItems(schema);
+                ArraySchema ap = (ArraySchema) schema;
+                Schema inner = ap.getItems();
                schemaType = schemaType + "<" + getSchemaType(inner) + ">";
            }
            return schemaType;
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AndroidClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AndroidClientCodegen.java
@@ -221,7 +221,8 @@ public class AndroidClientCodegen extends DefaultCodegen implements CodegenConfi
    @Override
    public String getTypeDeclaration(Schema p) {
        if (ModelUtils.isArraySchema(p)) {
-            Schema inner = ModelUtils.getSchemaItems(p);
+            ArraySchema ap = (ArraySchema) p;
+            Schema inner = ap.getItems();
            return getSchemaType(p) + "<" + getTypeDeclaration(inner) + ">";
        } else if (ModelUtils.isMapSchema(p)) {
            Schema inner = ModelUtils.getAdditionalProperties(p);
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ApexClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ApexClientCodegen.java
@@ -223,7 +223,7 @@ public class ApexClientCodegen extends AbstractApexCodegen {
    public String toDefaultValue(Schema p) {
        String out = null;
        if (ModelUtils.isArraySchema(p)) {
-            Schema inner = ModelUtils.getSchemaItems(p);
+            Schema inner = ((ArraySchema) p).getItems();
            out = String.format(
                    Locale.ROOT,
                    "new List<%s>()",
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/BashClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/BashClientCodegen.java
@@ -429,7 +429,8 @@ public class BashClientCodegen extends DefaultCodegen implements CodegenConfig {
    @Override
    public String getTypeDeclaration(Schema p) {
        if (ModelUtils.isArraySchema(p)) {
-            Schema inner = ModelUtils.getSchemaItems(p);
+            ArraySchema ap = (ArraySchema) p;
+            Schema inner = ap.getItems();
            return getSchemaType(p) + "[" + getTypeDeclaration(inner) + "]";
        } else if (ModelUtils.isMapSchema(p)) {
            Schema inner = ModelUtils.getAdditionalProperties(p);
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpClientCodegen.java
@@ -1515,7 +1515,8 @@ public class CSharpClientCodegen extends AbstractCSharpCodegen {
            }
            return instantiationTypes.get("map") + "<String, " + inner + ">";
        } else if (ModelUtils.isArraySchema(schema)) {
-            String inner = getSchemaType(ModelUtils.getSchemaItems(schema));
+            ArraySchema arraySchema = (ArraySchema) schema;
+            String inner = getSchemaType(arraySchema.getItems());
            return instantiationTypes.get("array") + "<" + inner + ">";
        } else {
            return null;
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
William Cheng	d4cccf386d	clean up	2024-04-03 14:11:38 +08:00
William Cheng	326f46baa3	code clean up/refacotring	2024-04-03 13:50:16 +08:00