@team-supercharge/oasg 18.3.4 → 19.0.1

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:**
 
@@ -1195,6 +1195,26 @@ Validations from OpenAPI spec:
 | apiKey              | Api key of nuget source (If not specified, provide the CI_JOB_TOKEN)           | N        | -       |
 | generatorCustomArgs | Custom arguments of the generator (--global-property, --additional-properties) | N        | -       |
 
+> **Nullable object/enum references.** A property spec'd nullable as a
+> reference to a named schema — `nullable: true` alongside a `$ref` (OpenAPI
+> 3.0, typically via an `allOf` wrapper) or `oneOf: [$ref, {type: 'null'}]`
+> (OpenAPI 3.1) — now generates a nullable C# type (`Category?`), matching the
+> TypeScript targets' `Category | null`, regardless of whether the property is
+> `required`: `required` only governs presence of the key, never nullness of
+> the value. Previously only *optional, non-nullable* references got a `?`;
+> nullable references (required or not) silently generated a non-nullable
+> type, forcing consumers to suppress with `null!` and losing the compiler's
+> null-reference warnings at the point of use.
+>
+> Nullable **containers** (arrays, maps) are unaffected by this change and
+> still generate a non-nullable collection type.
+>
+> This applies to the `dotnet`, `dotnet-webapi` and
+> `dotnet-webapi-system-text-json` targets. `dotnet-system-text-json`
+> (`generichost`) already handled this correctly. To opt out entirely, disable
+> nullable reference types via `generatorCustomArgs`:
+> `--additional-properties=nullableReferenceTypes=false`.
+
 #### `dotnet-system-text-json`
 
 An AOT-oriented C# **client library**. Unlike `dotnet` (which uses the
@@ -1519,6 +1539,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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@team-supercharge/oasg",
-  "version": "18.3.4",
+  "version": "19.0.1",
   "description": "Node-based tool to lint OpenAPI documents and generate clients, servers and documentation from them",
   "author": "Supercharge",
   "license": "MIT",

package/targets/dotnet/templates/model.mustache

@@ -0,0 +1,165 @@
+{{>partial_header}}
+using System;
+using System.Linq;
+using System.Text;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.ComponentModel.DataAnnotations;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using {{packageName}}.Converters;
+{{#models}}
+{{#model}}
+{{/model}}
+{{/models}}
+
+{{#models}}
+{{#model}}
+namespace {{modelPackage}}
+{ {{#isEnum}}{{>enumClass}}{{/isEnum}}{{^isEnum}}
+    /// <summary>
+    /// {{description}}
+    /// </summary>
+    [DataContract]
+    public {{#modelClassModifier}}{{.}} {{/modelClassModifier}}class {{classname}} : {{#parent}}{{{.}}}, {{/parent}}IEquatable<{{classname}}>
+    {
+        {{#vars}}
+        {{#items.isEnum}}
+        {{#items}}
+        {{^complexType}}
+{{>enumClass}}
+        {{/complexType}}
+        {{/items}}
+        {{/items.isEnum}}
+        {{^items.isEnum}}
+        {{#isEnum}}
+        {{^complexType}}
+{{>enumClass}}
+        {{/complexType}}
+        {{/isEnum}}
+        {{/items.isEnum}}
+        /// <summary>
+        /// {{description}}{{^description}}Gets or Sets {{{name}}}{{/description}}
+        /// </summary>{{#description}}
+        /// <value>{{.}}</value>{{/description}}{{#required}}
+        [Required]{{/required}}{{#pattern}}
+        [RegularExpression("{{{.}}}")]{{/pattern}}{{#minLength}}{{#maxLength}}
+        [StringLength({{maxLength}}, MinimumLength={{minLength}})]{{/maxLength}}{{/minLength}}{{#minLength}}{{^maxLength}}
+        [MinLength({{minLength}})]{{/maxLength}}{{/minLength}}{{^minLength}}{{#maxLength}}
+        [MaxLength({{.}})]{{/maxLength}}{{/minLength}}{{#minimum}}{{#maximum}}
+        [Range({{minimum}}, {{maximum}})]{{/maximum}}{{/minimum}}
+        [DataMember(Name="{{baseName}}", EmitDefaultValue={{#isNullable}}true{{/isNullable}}{{^isNullable}}false{{/isNullable}})]
+        {{#isEnum}}
+        public {{{datatypeWithEnum}}}{{#isNullable}}?{{/isNullable}} {{name}} { get; set; }{{#defaultValue}} = {{{.}}};{{/defaultValue}}
+        {{/isEnum}}
+        {{^isEnum}}
+        {{! this generator never appends a question mark to dataType for a nullable object/model
+            ref (only for primitives in its hardcoded nullable-type list), so the isModel-guarded
+            branch below adds it back. isModel is never set for a primitive, so this cannot
+            produce a double question mark. Nullable containers are intentionally left non-null
+            (out of scope), matching the other .NET targets in this repo. }}
+        public {{{dataType}}}{{#nullableReferenceTypes}}{{#isNullable}}{{#isModel}}?{{/isModel}}{{/isNullable}}{{/nullableReferenceTypes}} {{name}} { get; {{#isReadOnly}}private {{/isReadOnly}}set; }{{#defaultValue}} = {{{.}}};{{/defaultValue}}
+        {{/isEnum}}
+        {{^-last}}
+
+        {{/-last}}
+        {{/vars}}
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class {{classname}} {\n");
+            {{#vars}}
+            sb.Append("  {{name}}: ").Append({{name}}).Append("\n");
+            {{/vars}}
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public {{#parent}}{{^isMap}}{{^isArray}}new {{/isArray}}{{/isMap}}{{/parent}}string ToJson()
+        {
+            return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="obj">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object obj)
+        {
+            if (obj is null) return false;
+            if (ReferenceEquals(this, obj)) return true;
+            return obj.GetType() == GetType() && Equals(({{classname}})obj);
+        }
+
+        /// <summary>
+        /// Returns true if {{classname}} instances are equal
+        /// </summary>
+        /// <param name="other">Instance of {{classname}} to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals({{classname}} other)
+        {
+            if (other is null) return false;
+            if (ReferenceEquals(this, other)) return true;
+
+            return {{#vars}}{{^isContainer}}
+                (
+                    {{name}} == other.{{name}} ||
+                    {{^vendorExtensions.x-is-value-type}}{{name}} != null &&{{/vendorExtensions.x-is-value-type}}
+                    {{name}}.Equals(other.{{name}})
+                ){{^-last}} && {{/-last}}{{/isContainer}}{{#isContainer}}
+                (
+                    {{name}} == other.{{name}} ||
+                    {{^vendorExtensions.x-is-value-type}}{{name}} != null &&
+                    other.{{name}} != null &&
+                    {{/vendorExtensions.x-is-value-type}}{{name}}.SequenceEqual(other.{{name}})
+                ){{^-last}} && {{/-last}}{{/isContainer}}{{/vars}}{{^vars}}false{{/vars}};
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                var hashCode = 41;
+                // Suitable nullity checks etc, of course :)
+                {{#vars}}
+                    {{^vendorExtensions.x-is-value-type}}if ({{name}} != null){{/vendorExtensions.x-is-value-type}}
+                    hashCode = hashCode * 59 + {{name}}.GetHashCode();
+                {{/vars}}
+                return hashCode;
+            }
+        }
+
+        #region Operators
+        #pragma warning disable 1591
+
+        public static bool operator ==({{classname}} left, {{classname}} right)
+        {
+            return Equals(left, right);
+        }
+
+        public static bool operator !=({{classname}} left, {{classname}} right)
+        {
+            return !Equals(left, right);
+        }
+
+        #pragma warning restore 1591
+        #endregion Operators
+    }
+{{/isEnum}}
+{{/model}}
+{{/models}}
+}

package/targets/dotnet-webapi/templates/model.mustache

@@ -79,7 +79,12 @@ namespace {{modelPackage}}
         public {{{datatypeWithEnum}}}{{#isNullable}}{{^required}}?{{/required}}{{/isNullable}} {{name}} { get; set; }{{#defaultValue}} = {{{.}}};{{/defaultValue}}
         {{/isEnum}}
         {{^isEnum}}
-        public {{{dataType}}}{{#nullableReferenceTypes}}{{^isContainer}}{{^required}}{{^isNullable}}?{{/isNullable}}{{/required}}{{/isContainer}}{{/nullableReferenceTypes}} {{name}} { get; set; }{{#defaultValue}} = {{{.}}};{{/defaultValue}}
+        {{! nullable object/model refs get no question mark from the generator's dataType, unlike
+            primitives whose dataType already carries one -- so the isModel-guarded branch below
+            adds it back for those. isModel is only set for refs to named schemas, never for a
+            primitive whose dataType is already nullable, so this cannot produce a double question
+            mark. Nullable containers are intentionally left non-nullable (out of scope). }}
+        public {{{dataType}}}{{#nullableReferenceTypes}}{{^isContainer}}{{^required}}{{^isNullable}}?{{/isNullable}}{{/required}}{{#isNullable}}{{#isModel}}?{{/isModel}}{{/isNullable}}{{/isContainer}}{{/nullableReferenceTypes}} {{name}} { get; set; }{{#defaultValue}} = {{{.}}};{{/defaultValue}}
         {{/isEnum}}
         {{^-last}}
 

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

@@ -79,7 +79,12 @@ namespace {{modelPackage}}
         public {{{datatypeWithEnum}}}{{#isNullable}}{{^required}}?{{/required}}{{/isNullable}} {{name}} { get; set; }{{#defaultValue}} = {{{.}}};{{/defaultValue}}
         {{/isEnum}}
         {{^isEnum}}
-        public {{{dataType}}}{{#nullableReferenceTypes}}{{^isContainer}}{{^required}}{{^isNullable}}?{{/isNullable}}{{/required}}{{/isContainer}}{{/nullableReferenceTypes}} {{name}} { get; set; }{{#defaultValue}} = {{{.}}};{{/defaultValue}}
+        {{! nullable object/model refs get no question mark from the generator's dataType, unlike
+            primitives whose dataType already carries one -- so the isModel-guarded branch below
+            adds it back for those. isModel is only set for refs to named schemas, never for a
+            primitive whose dataType is already nullable, so this cannot produce a double question
+            mark. Nullable containers are intentionally left non-nullable (out of scope). }}
+        public {{{dataType}}}{{#nullableReferenceTypes}}{{^isContainer}}{{^required}}{{^isNullable}}?{{/isNullable}}{{/required}}{{#isNullable}}{{#isModel}}?{{/isModel}}{{/isNullable}}{{/isContainer}}{{/nullableReferenceTypes}} {{name}} { get; set; }{{#defaultValue}} = {{{.}}};{{/defaultValue}}
         {{/isEnum}}
         {{^-last}}
 

package/targets/feign/generator-config.json

@@ -6,6 +6,10 @@
   "documentationProvider": "none",
   "annotationLibrary": "none",
   "useFeignClientContextId": false,
+  "useSpringBoot3": false,
+  "useSpringBoot4": true,
+  "useJackson3": true,
+  "openApiNullable": false,
   "typeMappings": {
     "OffsetDateTime": "Instant"
   },

package/targets/feign/templates/libraries/spring-cloud/pom-sb4.mustache

@@ -0,0 +1,168 @@
+{{! forked from the stock JavaSpring spring-cloud pom-sb4 to drop the hardcoded spring-security-oauth2-client version, see the FIX comment below }}
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>{{groupId}}</groupId>
+    <artifactId>{{artifactId}}</artifactId>
+    <packaging>jar</packaging>
+    <name>{{artifactId}}</name>
+    <version>{{artifactVersion}}</version>
+    <properties>
+        <java.version>17</java.version>
+        <maven.compiler.release>${java.version}</maven.compiler.release>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        {{#springDocDocumentationProvider}}
+        <springdoc.version>2.2.0</springdoc.version>
+        {{/springDocDocumentationProvider}}
+        {{^springDocDocumentationProvider}}
+        {{#swagger2AnnotationLibrary}}
+        <swagger-annotations.version>2.2.15</swagger-annotations.version>
+        {{/swagger2AnnotationLibrary}}
+        {{/springDocDocumentationProvider}}
+    </properties>
+{{#parentOverridden}}
+    <parent>
+        <groupId>{{{parentGroupId}}}</groupId>
+        <artifactId>{{{parentArtifactId}}}</artifactId>
+        <version>{{{parentVersion}}}</version>
+    </parent>
+{{/parentOverridden}}
+{{^parentOverridden}}
+    <parent>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-parent</artifactId>
+        <version>4.0.1</version>
+        <relativePath/> <!-- lookup parent from repository -->
+    </parent>
+{{/parentOverridden}}
+
+    <build>
+        <sourceDirectory>src/main/java</sourceDirectory>
+        {{#interfaceOnly}}<plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>attach-sources</id>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>{{/interfaceOnly}}
+    </build>
+
+{{^parentOverridden}}
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.springframework.cloud</groupId>
+                <artifactId>spring-cloud-dependencies</artifactId>
+                <version>2025.1.0</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+{{/parentOverridden}}
+    <dependencies>
+        {{#springDocDocumentationProvider}}
+        <!--SpringDoc dependencies -->
+          <dependency>
+            <groupId>org.springdoc</groupId>
+            <artifactId>springdoc-openapi-starter-{{#reactive}}webflux{{/reactive}}{{^reactive}}webmvc{{/reactive}}-ui</artifactId>
+            <version>${springdoc.version}</version>
+          </dependency>
+        {{/springDocDocumentationProvider}}
+        {{^springDocDocumentationProvider}}
+        {{#swagger2AnnotationLibrary}}
+        <dependency>
+            <groupId>io.swagger.core.v3</groupId>
+            <artifactId>swagger-annotations</artifactId>
+            <version>${swagger-annotations.version}</version>
+        </dependency>
+        {{/swagger2AnnotationLibrary}}
+        {{/springDocDocumentationProvider}}
+        {{^useJspecify}}
+        <!-- @Nullable annotation -->
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+            {{^parentOverridden}}
+            <version>3.0.2</version>
+            {{/parentOverridden}}
+        </dependency>
+        {{/useJspecify}}
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-openfeign</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.security</groupId>
+            {{! FIX: the generator's built-in pom-sb4 pins 6.1.1 here, which contradicts the Spring Security version managed by the Spring Boot 4 parent. Let it resolve from the BOM. }}
+            <artifactId>spring-security-oauth2-client</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>{{jacksonPackage}}.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+        </dependency>
+        {{#withXml}}
+        <!-- XML processing: Jackson -->
+        <dependency>
+            <groupId>{{jacksonPackage}}.dataformat</groupId>
+          <artifactId>jackson-dataformat-xml</artifactId>
+        </dependency>
+        {{/withXml}}
+        {{^useJackson3}}
+        <dependency>
+            <groupId>com.fasterxml.jackson.datatype</groupId>
+            <artifactId>jackson-datatype-jsr310</artifactId>
+        </dependency>
+        {{/useJackson3}}
+        {{#joda}}
+        <dependency>
+            <groupId>{{jacksonPackage}}.datatype</groupId>
+            <artifactId>jackson-datatype-joda</artifactId>
+        </dependency>
+        {{/joda}}
+        {{#openApiNullable}}
+        <dependency>
+            <groupId>org.openapitools</groupId>
+            <artifactId>jackson-databind-nullable</artifactId>
+        {{^parentOverridden}}
+            <version>0.2.8</version>
+        {{/parentOverridden}}
+        </dependency>
+        {{/openApiNullable}}
+        {{#hateoas}}
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-hateoas</artifactId>
+        </dependency>
+        {{/hateoas}}
+        {{#lombok}}
+            <dependency>
+                <groupId>org.projectlombok</groupId>
+                <artifactId>lombok</artifactId>
+                <optional>true</optional>
+            </dependency>
+        {{/lombok}}
+        {{#useBeanValidation}}
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-validation</artifactId>
+        </dependency>
+        {{/useBeanValidation}}
+        <dependency>
+            <groupId>org.springframework.data</groupId>
+            <artifactId>spring-data-commons</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+</project>

package/targets/feign-kotlin/generator-config.json

@@ -2,11 +2,14 @@
   "library": "spring-cloud",
   "gradleBuildFile": false,
   "interfaceOnly": true,
+  "skipDefaultInterface": true,
   "useTags": true,
   "enumPropertyNaming": "UPPERCASE",
   "documentationProvider": "none",
   "annotationLibrary": "none",
-  "useSpringBoot3": true,
+  "useSpringBoot3": false,
+  "useSpringBoot4": true,
+  "useJackson3": true,
   "typeMappings": {
     "DateTime": "Instant"
   },

package/targets/feign-kotlin/templates/libraries/spring-cloud/{pom-sb3.mustache → pom-sb4.mustache}

@@ -1,4 +1,3 @@
-{{! ! FIX: incompatible kotlin version - compilation fails with "The binary version of its metadata is 1.9.0, expected version is 1.7.1." - 1.7 from this POM is overriden by spring-boot-parent, and 1.8 had breaking changes }}
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
@@ -8,53 +7,41 @@
     <name>{{artifactId}}</name>
     <version>{{artifactVersion}}</version>
     <properties>{{#reactive}}
-        <kotlinx-coroutines.version>1.6.1
-        </kotlinx-coroutines.version>{{/reactive}}{{#springDocDocumentationProvider}}{{#useSwaggerUI}}
-        <springdoc-openapi.version>2.2.0
-        </springdoc-openapi.version>{{/useSwaggerUI}}{{/springDocDocumentationProvider}}{{#useSwaggerUI}}{{^springDocDocumentationProvider}}
-        <swagger-ui.version>5.3.1
+        <kotlinx-coroutines.version>1.10.1
+        </kotlinx-coroutines.version>{{/reactive}}{{#springDocDocumentationProvider}}
+        <springdoc-openapi.version>2.8.6
+        </springdoc-openapi.version>{{/springDocDocumentationProvider}}{{#useSwaggerUI}}{{^springDocDocumentationProvider}}
+        <swagger-ui.version>5.17.14
         </swagger-ui.version>{{/springDocDocumentationProvider}}{{/useSwaggerUI}}{{^springDocDocumentationProvider}}{{#swagger1AnnotationLibrary}}
         <swagger-annotations.version>1.6.6
         </swagger-annotations.version>{{/swagger1AnnotationLibrary}}{{#swagger2AnnotationLibrary}}
-        <swagger-annotations.version>2.2.15
+        <swagger-annotations.version>2.2.28
         </swagger-annotations.version>{{/swagger2AnnotationLibrary}}{{/springDocDocumentationProvider}}
-        <findbugs-jsr305.version>3.0.2</findbugs-jsr305.version>
-        <jakarta-annotation.version>2.1.0</jakarta-annotation.version>
-        <kotlin-test-junit5.version>1.7.10</kotlin-test-junit5.version>
+        <findbugs-jsr305.version>3.0.2</findbugs-jsr305.version>{{#useJackson3}}
+        <jackson3.version>3.1.0</jackson3.version>{{/useJackson3}}
+        <jakarta-annotation.version>3.0.0</jakarta-annotation.version>
+        <kotlin-test-junit5.version>2.2.0</kotlin-test-junit5.version>
 
-        {{! FIX: incompatible kotlin version }}
-        <kotlin.version>1.9.25</kotlin.version>
+        <kotlin.version>2.2.0</kotlin.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.3.13</version>
+        <version>4.0.1</version>
     </parent>
     <dependencyManagement>
         <dependencies>
             <dependency>
                 <groupId>org.springframework.cloud</groupId>
-                <artifactId>spring-cloud-starter-parent</artifactId>
-                <version>2023.0.6</version>
+                {{! FIX: the generator's built-in pom-sb4 imports spring-cloud-starter-parent, which is NOT published as a GA artifact for the 2025.1.x train (only spring-cloud-dependencies is). Use the proper importable BOM. }}
+                <artifactId>spring-cloud-dependencies</artifactId>
+                <version>2025.1.0</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
         </dependencies>
     </dependencyManagement>
-    <repositories>
-        <repository>
-            <id>repository.spring.milestone</id>
-            <name>Spring Milestone Repository</name>
-            <url>https://repo.spring.io/milestone</url>
-        </repository>
-    </repositories>
-    <pluginRepositories>
-        <pluginRepository>
-            <id>spring-milestones</id>
-            <url>https://repo.spring.io/milestone</url>
-        </pluginRepository>
-    </pluginRepositories>
     <build>
         <sourceDirectory>${project.basedir}/src/main/kotlin</sourceDirectory>
         <plugins>{{^interfaceOnly}}
@@ -120,7 +107,6 @@
     <dependencies>
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
-            {{! FIX: incompatible kotlin version }}
             <artifactId>kotlin-stdlib</artifactId>
             <version>${kotlin.version}</version>
         </dependency>
@@ -131,7 +117,7 @@
         </dependency>{{^reactive}}
         <dependency>
             <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
+            <artifactId>spring-boot-starter-webmvc</artifactId>
         </dependency>{{/reactive}}{{#reactive}}
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -199,12 +185,29 @@
             <artifactId>spring-boot-starter-oauth2-client</artifactId>
         </dependency>
         {{/hasAuthMethods}}
+{{#useJackson3}}
         <dependency>
-            <groupId>com.fasterxml.jackson.dataformat</groupId>
+            <groupId>{{jacksonPackage}}.dataformat</groupId>
             <artifactId>jackson-dataformat-yaml</artifactId>
+            <version>${jackson3.version}</version>
         </dependency>
         <dependency>
-            <groupId>com.fasterxml.jackson.dataformat</groupId>
+            <groupId>{{jacksonPackage}}.dataformat</groupId>
+            <artifactId>jackson-dataformat-xml</artifactId>
+            <version>${jackson3.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>{{jacksonPackage}}.module</groupId>
+            <artifactId>jackson-module-kotlin</artifactId>
+            <version>${jackson3.version}</version>
+        </dependency>
+{{/useJackson3}}{{^useJackson3}}
+        <dependency>
+            <groupId>{{jacksonPackage}}.dataformat</groupId>
+            <artifactId>jackson-dataformat-yaml</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>{{jacksonPackage}}.dataformat</groupId>
             <artifactId>jackson-dataformat-xml</artifactId>
         </dependency>
         <dependency>
@@ -212,21 +215,16 @@
             <artifactId>jackson-datatype-jsr310</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.fasterxml.jackson.module</groupId>
+            <groupId>{{jacksonPackage}}.module</groupId>
             <artifactId>jackson-module-kotlin</artifactId>
         </dependency>
+{{/useJackson3}}
 {{#useBeanValidation}}
         <!-- Bean Validation API support -->
         <dependency>
             <groupId>jakarta.validation</groupId>
             <artifactId>jakarta.validation-api</artifactId>
         </dependency>{{/useBeanValidation}}
-{{#openApiNullable}}
-        <dependency>
-            <groupId>org.openapitools</groupId>
-            <artifactId>jackson-databind-nullable</artifactId>
-            <version>0.2.10</version>
-        </dependency>{{/openApiNullable}}
         <dependency>
             <groupId>jakarta.annotation</groupId>
             <artifactId>jakarta.annotation-api</artifactId>
@@ -239,10 +237,5 @@
             <version>${kotlin-test-junit5.version}</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 </project>

package/targets/spring/generator-config.json

@@ -7,6 +7,10 @@
   "enumPropertyNaming": "MACRO_CASE",
   "documentationProvider": "none",
   "annotationLibrary": "none",
+  "useSpringBoot3": false,
+  "useSpringBoot4": true,
+  "useJackson3": true,
+  "openApiNullable": false,
   "typeMappings": {
     "OffsetDateTime": "Instant"
   },

package/targets/spring-kotlin/generator-config.json

@@ -2,11 +2,14 @@
   "library": "spring-boot",
   "gradleBuildFile": false,
   "interfaceOnly": true,
+  "skipDefaultInterface": true,
   "useTags": true,
   "enumPropertyNaming": "UPPERCASE",
   "annotationLibrary": "none",
   "documentationProvider": "none",
-  "useSpringBoot3": true,
+  "useSpringBoot3": false,
+  "useSpringBoot4": true,
+  "useJackson3": true,
   "requestMappingMode": "api_interface",
   "typeMappings": {
     "DateTime": "Instant"