Merge branch 'master' into bugfix/pageable-scan-resolve-allof-constraints

# Conflicts:
#	modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/SpringCodegen.java

Author: Picazsoo

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

@@ -7,13 +7,16 @@ on:
       - 'samples/client/others/kotlin-jvm-okhttp-parameter-tests/**'
       - samples/client/others/kotlin-integer-enum/**
       - samples/client/others/kotlin-jvm-spring-3-restclient-nullable-return/**
+      - samples/client/others/kotlin-oneOf-anyOf-kotlinx-serialization*/**
+      - samples/client/others/kotlin-oneOf-discriminator-kotlinx-serialization*/**
   pull_request:
     paths:
       - 'samples/client/petstore/kotlin*/**'
       - 'samples/client/others/kotlin-jvm-okhttp-parameter-tests/**'
       - samples/client/others/kotlin-integer-enum/**
-      - samples/client/others/kotlin-oneOf-anyOf-kotlinx-serialization/**
       - samples/client/others/kotlin-jvm-spring-3-restclient-nullable-return/**
+      - samples/client/others/kotlin-oneOf-anyOf-kotlinx-serialization*/**
+      - samples/client/others/kotlin-oneOf-discriminator-kotlinx-serialization*/**
 
 jobs:
   build:
@@ -78,6 +81,8 @@ jobs:
           - samples/client/petstore/kotlin-allOf-discriminator-kotlinx-serialization
           - samples/client/others/kotlin-oneOf-discriminator-kotlinx-serialization
           - samples/client/others/kotlin-oneOf-anyOf-kotlinx-serialization
+          - samples/client/others/kotlin-oneOf-anyOf-kotlinx-serialization-nonPublicApi
+          - samples/client/others/kotlin-oneOf-anyOf-kotlinx-serialization-explicitApi
     steps:
       - uses: actions/checkout@v5
       - uses: actions/setup-java@v5

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

@@ -14,6 +14,7 @@ on:
       - 'samples/server/petstore/kotlin-spring-sealed-interfaces/**'
       - 'samples/server/petstore/kotlin-springboot-sort-validation/**'
       - 'samples/server/petstore/kotlin-springboot-paged-model/**'
+      - 'samples/server/petstore/kotlin-server/ktor-delegate-pattern/generated/**'
       # comment out due to gradle build failure
       # - samples/server/petstore/kotlin-spring-default/**
   pull_request:
@@ -29,6 +30,7 @@ on:
       - 'samples/server/petstore/kotlin-spring-sealed-interfaces/**'
       - 'samples/server/petstore/kotlin-springboot-sort-validation/**'
       - 'samples/server/petstore/kotlin-springboot-paged-model/**'
+      - 'samples/server/petstore/kotlin-server/ktor-delegate-pattern/generated/**'
       # comment out due to gradle build failure
       # - samples/server/petstore/kotlin-spring-default/**
 
@@ -63,6 +65,7 @@ jobs:
           - samples/server/petstore/kotlin-server/javalin
           - samples/server/petstore/kotlin-server/javalin-6
           - samples/server/petstore/kotlin-server/ktor
+          - samples/server/petstore/kotlin-server/ktor-delegate-pattern/generated
           - samples/server/petstore/kotlin-server/ktor2
           - samples/server/petstore/kotlin-server-modelMutable
           - samples/server/petstore/kotlin-misk

.github/workflows/samples-spring-jdk17.yaml

@@ -18,6 +18,7 @@ on:
       - samples/server/petstore/springboot-paged-model/**
       - samples/openapi3/server/petstore/spring-boot-oneof-sealed/**
       - samples/openapi3/server/petstore/spring-boot-oneof-interface/**
+      - samples/client/petstore/spring-http-interface-oauth/**
   pull_request:
     paths:
       - samples/openapi3/client/petstore/spring-cloud-3-with-optional/**
@@ -35,6 +36,7 @@ on:
       - samples/server/petstore/springboot-paged-model/**
       - samples/openapi3/server/petstore/spring-boot-oneof-sealed/**
       - samples/openapi3/server/petstore/spring-boot-oneof-interface/**
+      - samples/client/petstore/spring-http-interface-oauth/**
 jobs:
   build:
     name: Build Java Spring (JDK17)
@@ -60,6 +62,7 @@ jobs:
           - samples/server/petstore/springboot-paged-model
           - samples/openapi3/server/petstore/spring-boot-oneof-sealed
           - samples/openapi3/server/petstore/spring-boot-oneof-interface
+          - samples/client/petstore/spring-http-interface-oauth
     steps:
       - uses: actions/checkout@v5
       - uses: actions/setup-java@v5

.gitignore

@@ -312,3 +312,6 @@ samples/client/jetbrains/adyen/checkout71/http/client/Apis/http-client.private.e
 
 # Generated by the run-in-docker.sh
 \?/
+
+# AI agent caches
+.junie

CI/circle_parallel.sh

@@ -43,6 +43,5 @@ elif [ "$NODE_INDEX" = "3" ]; then
 else
   echo "Running node $NODE_INDEX ..."
   java -version
-  ./mvnw clean install
 
 fi

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

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

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

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

bin/configs/kotlin-server-ktor-delegate-pattern.yaml

@@ -0,0 +1,9 @@
+generatorName: kotlin-server
+outputDir: samples/server/petstore/kotlin-server/ktor-delegate-pattern/generated
+library: ktor
+inputSpec: modules/openapi-generator/src/test/resources/3_1/petstore.yaml
+templateDir: modules/openapi-generator/src/main/resources/kotlin-server
+additionalProperties:
+  hideGenerationTimestamp: "true"
+  serializableModel: "true"
+  delegatePattern: "true"

bin/configs/spring-http-interface-oauth.yaml

@@ -0,0 +1,15 @@
+generatorName: spring
+library: spring-http-interface
+outputDir: samples/client/petstore/spring-http-interface-oauth
+inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore-addpet-only.yaml
+templateDir: modules/openapi-generator/src/main/resources/JavaSpring
+additionalProperties:
+  artifactId: spring-http-interface-oauth-petstore
+  snapshotVersion: "true"
+  hideGenerationTimestamp: "true"
+  modelNameSuffix: 'Dto'
+  generatedConstructorWithRequiredArgs: "false"
+  clientRegistrationId: "petstore-oauth"
+  useSpringBoot4: "true"
+  useJackson3: true
+  openApiNullable: false

docs/generators/java-camel.md

@@ -43,6 +43,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |camelSecurityDefinitions|generate camel security definitions| |true|
 |camelUseDefaultValidationErrorProcessor|generate default validation error processor| |true|
 |camelValidationErrorProcessor|validation error processor bean name| |validationErrorProcessor|
+|clientRegistrationId|Client registration ID for OAuth2 in Spring HTTP Interface (@ClientRegistrationId annotation). Requires library=spring-http-interface and useSpringBoot4=true (Spring Security 7).| |null|
 |configPackage|configuration package for generated code| |org.openapitools.configuration|
 |containerDefaultToNull|Set containers (array, set, map) default to null| |false|
 |dateLibrary|Option. Date library to use|<dl><dt>**joda**</dt><dd>Joda (for legacy app only)</dd><dt>**legacy**</dt><dd>Legacy java.util.Date</dd><dt>**java8-localdatetime**</dt><dd>Java 8 using LocalDateTime (for legacy app only)</dd><dt>**java8**</dt><dd>Java 8 native JSR310 (preferred for jdk 1.8+)</dd></dl>|java8|