chore(deps): bump OpenAPI Generator to 7.16.0 and harden templates

- Upgrade openapi-generator-maven-plugin from 7.15.0 → 7.16.0
- api_wrapper.mustache: enforce {{commonPackage}} usage, remove fallback path
- model.mustache: clean conditional flow, preserve wrapper vs enum/pojo/oneOf
- pom.xml: added <commonPackage> to <additionalProperties> for deterministic packages
- README updated to reflect new version and usage

Author: barissayli

README.md

@@ -5,7 +5,7 @@
 [![codecov](https://codecov.io/gh/bsayli/spring-boot-openapi-generics-clients/branch/main/graph/badge.svg)](https://codecov.io/gh/bsayli/spring-boot-openapi-generics-clients)
 [![Java](https://img.shields.io/badge/Java-21-red?logo=openjdk)](https://openjdk.org/projects/jdk/21/)
 [![Spring Boot](https://img.shields.io/badge/Spring%20Boot-3.4.10-green?logo=springboot)](https://spring.io/projects/spring-boot)
-[![OpenAPI Generator](https://img.shields.io/badge/OpenAPI%20Generator-7.x-blue?logo=openapiinitiative)](https://openapi-generator.tech/)
+[![OpenAPI Generator](https://img.shields.io/badge/OpenAPI%20Generator-7.16.0-blue?logo=openapiinitiative)](https://openapi-generator.tech/)
 [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](LICENSE)
 
 ---
@@ -51,7 +51,7 @@ This repository consists of two main modules:
 | **Java**                | 21      |
 | **Spring Boot**         | 3.4.10  |
 | **Springdoc OpenAPI**   | 2.8.13  |
-| **OpenAPI Generator**   | 7.15.0  |
+| **OpenAPI Generator**   | 7.16.0  |
 | **Apache HttpClient 5** | 5.5     |
 
 ---

customer-service-client/README.md

@@ -2,7 +2,7 @@
 
 [![Java 21](https://img.shields.io/badge/Java-21-red?logo=openjdk)](https://openjdk.org/projects/jdk/21/)
 [![Spring Boot](https://img.shields.io/badge/Spring%20Boot-3.4.10-green?logo=springboot)](https://spring.io/projects/spring-boot)
-[![OpenAPI Generator](https://img.shields.io/badge/OpenAPI%20Generator-7.15.0-blue?logo=openapiinitiative)](https://openapi-generator.tech/)
+[![OpenAPI Generator](https://img.shields.io/badge/OpenAPI%20Generator-7.16.0-blue?logo=openapiinitiative)](https://openapi-generator.tech/)
 [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](../LICENSE)
 
 Generated Java client for the **customer-service**, showcasing **type-safe generic responses** with OpenAPI + a

customer-service-client/pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>io.github.bsayli</groupId>
     <artifactId>customer-service-client</artifactId>
-    <version>0.6.4</version>
+    <version>0.6.5</version>
     <name>customer-service-client</name>
     <description>Generated client (RestClient) using generics-aware OpenAPI templates</description>
     <packaging>jar</packaging>
@@ -17,7 +17,7 @@
         <java.version>21</java.version>
 
         <spring-boot.version>3.4.10</spring-boot.version>
-        <openapi.generator.version>7.15.0</openapi.generator.version>
+        <openapi.generator.version>7.16.0</openapi.generator.version>
 
         <jakarta.validation.version>3.1.1</jakarta.validation.version>
         <jakarta.annotation-api.version>3.0.0</jakarta.annotation-api.version>
@@ -213,6 +213,10 @@
                                 <openApiNullable>false</openApiNullable>
                                 <sourceFolder>src/gen/java</sourceFolder>
                             </configOptions>
+                            <additionalProperties>
+                                <additionalProperty>commonPackage=io.github.bsayli.openapi.client.common
+                                </additionalProperty>
+                            </additionalProperties>
                         </configuration>
                     </execution>
                 </executions>

customer-service-client/src/main/resources/customer-api-docs.yaml

@@ -2,7 +2,7 @@ openapi: 3.1.0
 info:
   title: Customer Service API
   description: Customer Service API with type-safe generic responses using OpenAPI
-  version: 0.6.4
+  version: 0.6.5
 servers:
   - url: http://localhost:8084/customer-service
     description: Local service URL

customer-service-client/src/main/resources/openapi-templates/api_wrapper.mustache

@@ -1,3 +1,6 @@
+{{#vendorExtensions.x-class-extra-annotation}}
+{{{vendorExtensions.x-class-extra-annotation}}}
+{{/vendorExtensions.x-class-extra-annotation}}
 public class {{classname}}
-    extends io.github.bsayli.openapi.client.common.ServiceClientResponse<{{vendorExtensions.x-api-wrapper-datatype}}> {
+    extends {{commonPackage}}.ServiceClientResponse<{{vendorExtensions.x-api-wrapper-datatype}}> {
 }

customer-service-client/src/main/resources/openapi-templates/model.mustache

@@ -8,6 +8,7 @@ import org.apache.commons.lang3.builder.HashCodeBuilder;
 {{/useReflectionEqualsHashCode}}
 import java.util.Objects;
 import java.util.Arrays;
+import java.util.Locale;
 {{#imports}}
 import {{import}};
 {{/imports}}
@@ -64,10 +65,12 @@ import java.util.StringJoiner;
 {{#models}}
 {{#model}}
 
+{{! ---- Generics-aware thin wrappers when x-api-wrapper is present ---- }}
 {{#vendorExtensions.x-api-wrapper}}
   {{>api_wrapper}}
 {{/vendorExtensions.x-api-wrapper}}
 
+{{! ---- Fallback to stock generation when not a wrapper ---- }}
 {{^vendorExtensions.x-api-wrapper}}
   {{#isEnum}}
     {{>modelEnum}}

customer-service/pom.xml

@@ -13,7 +13,7 @@
 
     <groupId>io.github.bsayli</groupId>
     <artifactId>customer-service</artifactId>
-    <version>0.6.4</version>
+    <version>0.6.5</version>
     <name>customer-service</name>
     <description>Spring Boot 3.4 + Springdoc (OpenAPI) for generics-aware client generation</description>