@team-supercharge/oasg 18.2.2 → 18.3.1-temp-feat-jvm-breaking.c418dc3b

package/README.md

@@ -128,42 +128,42 @@ include:
 
 The table below gives an overview of the changes (breaking, non-breaking, bug fixes) introduced in various major versions. For the resolution of breaking changes please consult the [Migration Guide](#migration-guide).
 
-| Component                        |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |
-|----------------------------------|:-:|:-:|:-:|:-:|:-:|:-:|:-:|:-:|:-:|:-:|:-:|:-:|:-:|:-:|:-:|:-:|:-:|:-:|
-| **Internal**                     | 18 | 17 | 16 | 15 | 14 | 13 | 12 | 11 | 10 | 9  | 8  | 7  | 6  | 5   | 4  | 3  | 2  | 1  |
-| _Core_                           |✨  |💥  |✨  |🐛  |💥  |✨  |🐛  |✨  |➖  |✨  |🐛  |🐛  |➖  |💥  |💥  |✨  |💥  |🆕  |
-| _Linter_                         |➖  |➖  |🐛  |➖  |➖  |➖  |➖  |💥  |➖  |➖  |➖  |➖  |🐛  |➖  |✨  |💥  |🆕  |
-| **Client Targets**               | 18 | 17 | 16 | 15 | 14 | 13 | 12 | 11 | 10 | 9  | 8  | 7  | 6  | 5   | 4  | 3  | 2  | 1  |
-| `android`                        |✨  |➖  |➖  |➖  |🐛  |💥  |➖  |➖  |💥  |➖  |➖  |➖  |➖  |➖  |➖  |➖  |🆕  |
-| `angular`                        |➖  |➖  |✨  |➖  |🐛  |💥  |➖  |➖  |➖  |🐛  |➖  |➖  |➖  |💥  |➖  |➖  |➖  |🆕  |
-| `dotnet`                         |✨  |➖  |➖  |➖  |🆕  |
-| `dotnet-system-text-json`        |🆕➖|
-| `dotnet-webapi`                  |✨  |➖  |🆕➖|
-| `dotnet-webapi-system-text-json` |🆕➖|
-| `feign`                          |🐛  |🐛  |✨  |➖  |➖  |➖  |➖  |➖  |✨  |💥  |💥  |➖  |➖  |🐛  |🐛  |🆕  |
-| `feign-kotlin`                   |🐛  |🐛  |✨  |➖  |➖  |➖  |➖  |➖  |🆕  |
-| `plain-java`                     |🐛  |🐛  |🆕  |
-| `flutter`                        |➖  |➖  |➖  |➖  |➖  |🆕  |
-| `ios`                            |➖  |➖  |➖  |➖  |➖  |💥  |🐛  |➖  |➖  |➖  |✨  |➖  |💥  |➖  |➖  |✨  |🆕  |
-| `apple-swift`                    |➖  |➖  |🆕  |
-| `kmp`                            |✨  |✨  |➖  |➖  |🆕  |
-| `python`                         |🐛  |➖  |🆕  |
-| `python-legacy`                  |🐛  |➖  |💥  |➖  |🐛  |💥  |➖  |➖  |➖  |➖  |➖  |➖  |➖  |➖  |🆕  |
-| `react`                          |💥  |➖  |🐛  |🐛  |➖  |💥  |➖  |➖  |➖  |➖  |➖  |➖  |➖  |➖  |➖  |➖  |➖  |🆕  |
-| `typescript-axios`               |✨  |➖  |🆕  |
-| `typescript-fetch`               |✨  |➖  |🆕  |
-| **Server Targets**               | 18 | 17 | 16 | 15 | 14 | 13 | 12 | 11 | 10 | 9  | 8  | 7  | 6  | 5   | 4  | 3  | 2  | 1  |
-| `nestjs`                         |✨  |🐛  |💥  |💥  |➖  |💥  |✨  |➖  |➖  |🐛  |➖  |➖  |✨  |🆕  |
-| `python-fastapi`                 |➖  |➖  |➖  |➖  |🆕  |
-| `python-fastapi-raw-request`     |➖  |➖  |➖  |➖  |🆕  |
-| `spring`                         |🐛  |🐛  |✨  |➖  |➖  |➖  |➖  |➖  |✨  |💥  |💥  |➖  |➖  |➖  |✨  |➖  |🆕  |
-| `spring-kotlin`                  |🐛  |✨  |✨  |➖  |➖  |➖  |➖  |➖  |✨  |💥  |💥  |➖  |➖  |🐛  |✨  |➖  |🆕  |
-| **Misc Targets**                 | 18 | 17 | 16 | 15 | 14 | 13 | 12 | 11 | 10 | 9  | 8  | 7  | 6  | 5   | 4  | 3  | 2  | 1  |
-| `contract-testing`               |➖  |➖  |➖  |➖  |➖  |➖  |➖  |➖  |➖  |➖  |➖  |➖  |➖  |➖  |🆕  |
-| `openapi`                        |➖  |➖  |➖  |➖  |➖  |➖  |💥  |➖  |➖  |✨  |➖  |🆕  |
-| `stubby`                         |➖  |➖  |➖  |➖  |➖  |➖  |➖  |➖  |➖  |➖  |➖  |💥  |➖  |➖  |➖  |➖  |🆕  |
-| `postman`                        |➖  |➖  |➖  |🆕  |
-| `msw`                            |🆕  |
+| Component                        |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |
+|----------------------------------|:-:|:-:|:-:|:-:|:-:|:-:|:-:|:-:|:-:|:-:|:-:|:-:|:-:|:-:|:-:|:-:|:-:|:-:|:-:|
+| **Internal**                     | 19 | 18 | 17 | 16 | 15 | 14 | 13 | 12 | 11 | 10 | 9  | 8  | 7  | 6  | 5   | 4  | 3  | 2  | 1  |
+| _Core_                           |➖  |✨  |💥  |✨  |🐛  |💥  |✨  |🐛  |✨  |➖  |✨  |🐛  |🐛  |➖  |💥  |💥  |✨  |💥  |🆕  |
+| _Linter_                         |➖  |➖  |➖  |🐛  |➖  |➖  |➖  |➖  |💥  |➖  |➖  |➖  |➖  |🐛  |➖  |✨  |💥  |🆕  |
+| **Client Targets**               | 19 | 18 | 17 | 16 | 15 | 14 | 13 | 12 | 11 | 10 | 9  | 8  | 7  | 6  | 5   | 4  | 3  | 2  | 1  |
+| `android`                        |➖  |✨  |➖  |➖  |➖  |🐛  |💥  |➖  |➖  |💥  |➖  |➖  |➖  |➖  |➖  |➖  |➖  |🆕  |
+| `angular`                        |➖  |➖  |➖  |✨  |➖  |🐛  |💥  |➖  |➖  |➖  |🐛  |➖  |➖  |➖  |💥  |➖  |➖  |➖  |🆕  |
+| `dotnet`                         |➖  |✨  |➖  |➖  |➖  |🆕  |
+| `dotnet-system-text-json`        |➖  |🆕➖|
+| `dotnet-webapi`                  |➖  |✨  |➖  |🆕➖|
+| `dotnet-webapi-system-text-json` |➖  |🆕➖|
+| `feign`                          |💥  |🐛  |🐛  |✨  |➖  |➖  |➖  |➖  |➖  |✨  |💥  |💥  |➖  |➖  |🐛  |🐛  |🆕  |
+| `feign-kotlin`                   |💥  |🐛  |🐛  |✨  |➖  |➖  |➖  |➖  |➖  |🆕  |
+| `plain-java`                     |➖  |🐛  |🐛  |🆕  |
+| `flutter`                        |➖  |➖  |➖  |➖  |➖  |➖  |🆕  |
+| `ios`                            |➖  |➖  |➖  |➖  |➖  |➖  |💥  |🐛  |➖  |➖  |➖  |✨  |➖  |💥  |➖  |➖  |✨  |🆕  |
+| `apple-swift`                    |➖  |➖  |➖  |🆕  |
+| `kmp`                            |➖  |✨  |✨  |➖  |➖  |🆕  |
+| `python`                         |➖  |🐛  |➖  |🆕  |
+| `python-legacy`                  |➖  |🐛  |➖  |💥  |➖  |🐛  |💥  |➖  |➖  |➖  |➖  |➖  |➖  |➖  |➖  |🆕  |
+| `react`                          |➖  |💥  |➖  |🐛  |🐛  |➖  |💥  |➖  |➖  |➖  |➖  |➖  |➖  |➖  |➖  |➖  |➖  |➖  |🆕  |
+| `typescript-axios`               |➖  |✨  |➖  |🆕  |
+| `typescript-fetch`               |➖  |✨  |➖  |🆕  |
+| **Server Targets**               | 19 | 18 | 17 | 16 | 15 | 14 | 13 | 12 | 11 | 10 | 9  | 8  | 7  | 6  | 5   | 4  | 3  | 2  | 1  |
+| `nestjs`                         |➖  |✨  |🐛  |💥  |💥  |➖  |💥  |✨  |➖  |➖  |🐛  |➖  |➖  |✨  |🆕  |
+| `python-fastapi`                 |➖  |➖  |➖  |➖  |➖  |🆕  |
+| `python-fastapi-raw-request`     |➖  |➖  |➖  |➖  |➖  |🆕  |
+| `spring`                         |💥  |🐛  |🐛  |✨  |➖  |➖  |➖  |➖  |➖  |✨  |💥  |💥  |➖  |➖  |➖  |✨  |➖  |🆕  |
+| `spring-kotlin`                  |💥  |🐛  |✨  |✨  |➖  |➖  |➖  |➖  |➖  |✨  |💥  |💥  |➖  |➖  |🐛  |✨  |➖  |🆕  |
+| **Misc Targets**                 | 19 | 18 | 17 | 16 | 15 | 14 | 13 | 12 | 11 | 10 | 9  | 8  | 7  | 6  | 5   | 4  | 3  | 2  | 1  |
+| `contract-testing`               |➖  |➖  |➖  |➖  |➖  |➖  |➖  |➖  |➖  |➖  |➖  |➖  |➖  |➖  |➖  |🆕  |
+| `openapi`                        |➖  |➖  |➖  |➖  |➖  |➖  |➖  |💥  |➖  |➖  |✨  |➖  |🆕  |
+| `stubby`                         |➖  |➖  |➖  |➖  |➖  |➖  |➖  |➖  |➖  |➖  |➖  |➖  |💥  |➖  |➖  |➖  |➖  |🆕  |
+| `postman`                        |➖  |➖  |➖  |➖  |🆕  |
+| `msw`                            |➖  |🆕  |
 
 **Legend:**
 
@@ -1519,6 +1519,47 @@ setupWorker(
 
 This section covers the breaking changes and their migrations across major version upgrades.
 
+## From `18.x.x` to `19.0.0`
+
+### Breaking in `spring`, `spring-kotlin`, `feign` and `feign-kotlin` targets
+
+SDK jars produced by these targets now target **Spring Boot 4** and **Jackson 3**, which moved to
+the new `tools.jackson` group. Consumers must upgrade accordingly, or pin the previous baseline via
+`generatorCustomArgs` in their _OASg_ `config.json`:
+
+```json
+"generatorCustomArgs": "-puseSpringBoot3=true -puseSpringBoot4=false -puseJackson3=false -popenApiNullable=true"
+```
+
+### Breaking in `spring` and `feign` targets
+
+`openApiNullable` is now disabled, as the `jackson-databind-nullable` library behind it is Jackson 2
+only. `nullable: true` properties are generated as plain types instead of `JsonNullable<T>`.
+
+### Breaking in `spring-kotlin` and `feign-kotlin` targets
+
+API interface methods have no default implementation anymore and fail compilation unless the consumer
+overrides them. To keep the previous behaviour, set `skipDefaultInterface=false` back via
+`generatorCustomArgs` in your _OASg_ `config.json`.
+
+## From `18.2.x` to `18.3.0`
+
+These changes shipped in `18.3.0` with the update to _OpenAPI Generator_ `7.22.0`.
+
+### Breaking in `spring-kotlin` and `feign-kotlin` targets
+
+1. `oneOf` schemas with a `discriminator` are now generated as a Kotlin `sealed interface` declaring
+   only the discriminator property, so subtype properties have to be reached by narrowing with `is`.
+2. Projects overriding `model.mustache` via `templateDir` must re-fork it — it changed significantly
+   upstream. See [Template Customization](#template-customization).
+
+### Breaking in `feign` and `feign-kotlin` targets
+
+The generated client configuration classes (`ClientConfiguration`, `ApiKeyRequestInterceptor`, and
+`ClientPropertiesConfiguration` for OAuth specs) moved from the shared
+`org.openapitools.configuration` package to `<basePackage>.config`, so clients no longer overshadow
+each other in projects consuming several of them. Update your imports accordingly.
+
 ## From `17.x.x` to `18.0.0`
 
 ### Breaking in `react` target

package/bin/oasg

@@ -38,9 +38,9 @@ const DEFAULT_GENERATOR_MAPPING = {
   // client targets
   "android":                      { version: '7.17.0',  generator: 'kotlin' },
   "angular":                      { version: '7.11.0',  generator: 'typescript-angular' },
-  "feign":                        { version: '7.12.0',  generator: 'spring' },
-  "feign-kotlin":                 { version: '7.12.0',  generator: 'kotlin-spring' },
-  "plain-java":                   { version: '7.12.0',  generator: 'java' },
+  "feign":                        { version: '7.22.0',  generator: 'spring' },
+  "feign-kotlin":                 { version: '7.22.0',  generator: 'kotlin-spring' },
+  "plain-java":                   { version: '7.22.0',  generator: 'java' },
   "flutter":                      { version: '7.0.1',   generator: 'dart-dio' },
   "ios":                          { version: '7.0.1',   generator: 'swift5' },
   "apple-swift":                  { version: undefined, generator: undefined },
@@ -52,8 +52,8 @@ const DEFAULT_GENERATOR_MAPPING = {
   "typescript-fetch":             { version: '7.11.0',  generator: 'typescript-fetch' },
   // server targets
   "nestjs":                       { version: '7.0.1',   generator: 'typescript-angular' },
-  "spring":                       { version: '7.12.0',  generator: 'spring' },
-  "spring-kotlin":                { version: '7.12.0',  generator: 'kotlin-spring' },
+  "spring":                       { version: '7.22.0',  generator: 'spring' },
+  "spring-kotlin":                { version: '7.22.0',  generator: 'kotlin-spring' },
   "python-fastapi":               { version: '7.8.0',   generator: 'python-fastapi' },
   "python-fastapi-raw-request":   { version: '7.0.1',   generator: 'python-fastapi' },
   "dotnet":                       { version: '7.11.0',  generator: 'csharp-functions' },
@@ -741,4 +741,3 @@ function determineArtifactVersion(argv) {
 function determinePreRelease(argv) {
   return argv.preRelease ? true : false;
 }
-

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@team-supercharge/oasg",
-  "version": "18.2.2",
+  "version": "18.3.1-temp-feat-jvm-breaking.c418dc3b",
   "description": "Node-based tool to lint OpenAPI documents and generate clients, servers and documentation from them",
   "author": "Supercharge",
   "license": "MIT",

package/targets/dotnet-webapi-system-text-json/README.md

@@ -125,15 +125,15 @@ public class PetHandlers
 {
     // Operation with a response body -> return the response model
     public Task<Pet> Handle(AddPetRequest request)
-        => Task.FromResult(request.pet);
+        => Task.FromResult(request.Pet);
 
     public async Task<Pet> Handle(GetPetByIdRequest request)
-        => await _repository.GetAsync(request.petId)
-           ?? throw new PetNotFoundException(request.petId);
+        => await _repository.GetAsync(request.PetId)
+           ?? throw new PetNotFoundException(request.PetId);
 
     // No-response-body operation -> return Task (the endpoint returns NoContent)
     public Task Handle(DeletePetRequest request)
-        => _repository.DeleteAsync(request.petId);
+        => _repository.DeleteAsync(request.PetId);
 }
 ```
 
@@ -164,7 +164,7 @@ public class GetPetByIdHandler(IHttpContextAccessor http)
     {
         var user = http.HttpContext!.User;            // authenticated principal
         var tenant = user.FindFirst("tenant")?.Value;
-        return await _repository.GetAsync(request.petId, tenant);
+        return await _repository.GetAsync(request.PetId, tenant);
     }
 }
 ```

package/targets/dotnet-webapi-system-text-json/templates/minimalEndpoints.mustache

@@ -41,7 +41,7 @@ namespace {{packageName}}
 {{#operations}}
 {{#operation}}
     /// <summary>Wolverine request for {{classname}}.{{operationId}}, carrying every parameter.</summary>
-    public record {{operationId}}Request({{#allParams}}{{>paramType}} {{paramName}}{{^-last}}, {{/-last}}{{/allParams}});
+    public record {{operationId}}Request({{#allParams}}{{>paramType}} {{#lambda.pascalcase}}{{paramName}}{{/lambda.pascalcase}}{{^-last}}, {{/-last}}{{/allParams}});
 {{/operation}}
 {{/operations}}
 {{/apis}}

package/targets/feign/.mvn/wrapper/maven-wrapper.properties

@@ -1,2 +1,4 @@
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip
-wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar
+wrapperVersion=3.3.4
+distributionType=bin
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.16/apache-maven-3.9.16-bin.zip
+wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.4/maven-wrapper-3.3.4.jar

package/targets/feign/generate.sh

@@ -5,13 +5,26 @@ source $(dirname "$0")/../common.sh
 rm -rf out/$targetId
 mkdir -p out/$targetId
 
+properties=(
+  "artifactId=${artifactId}"
+  "groupId=${groupId}"
+  "artifactVersion=${version}"
+  "basePackage=${basePackage}"
+  "apiPackage=${basePackage}.api"
+  "modelPackage=${basePackage}.model"
+  "configPackage=${basePackage}.config"
+)
+
+props=$(IFS=,; echo "${properties[*]}")
+
 java -jar $binary generate \
   -g $generatorId \
   -i $openApiFile \
   -t $templateDir \
   -o out/$targetId \
   -c $(dirname "$0")/generator-config.json \
-  -p "artifactId=${artifactId},groupId=${groupId},basePackage=${basePackage},apiPackage=${basePackage}.api,modelPackage=${basePackage}.model,invokerPackage=${basePackage}.client,artifactVersion=${version}" $generatorCustomArgs
+  -p "$props" \
+  $generatorCustomArgs
 
 cd out/$targetId
 cp $(dirname "$0")/mvnw .

package/targets/feign/generator-config.json

@@ -1,22 +1,20 @@
 {
   "library": "spring-cloud",
-  "dateLibrary": "java8",
-  "java8": true,
   "useTags": true,
   "hideGenerationTimestamp": true,
   "booleanGetterPrefix": "is",
-  "generateForOpenFeign": true,
-  "removeEnumValuePrefix": false,
   "documentationProvider": "none",
   "annotationLibrary": "none",
-  "useSpringBoot3": true,
+  "useFeignClientContextId": false,
+  "useSpringBoot3": false,
+  "useSpringBoot4": true,
+  "useJackson3": true,
+  "openApiNullable": false,
   "typeMappings": {
-    "OffsetDateTime": "java.time.Instant",
-    "Date": "java.time.LocalDate"
+    "OffsetDateTime": "Instant"
   },
   "importMappings": {
-    "java.time.OffsetDateTime": "java.time.Instant",
-    "java.util.Date": "java.time.LocalDate"
+    "OffsetDateTime": "java.time.Instant"
   },
   "inlineSchemaOptions": {
     "ARRAY_ITEM_SUFFIX": "",