feat: Add openAPI/templates/Java/typeInfoAnnotation.mustache

Author: caoccao

ext/hivemq-edge-openapi-2025.11.yaml

@@ -14,7 +14,7 @@ info:
     ## OpenAPI
     HiveMQ's REST API provides an OpenAPI 3.0 schema definition that can imported into popular API tooling (e.g. Postman) or can be used to generate client-code for multiple programming languages.
   title: HiveMQ Edge REST API
-  version: 2025.10-SNAPSHOT
+  version: 2025.11-SNAPSHOT
   x-logo:
     url: https://www.hivemq.com/img/svg/hivemq-bee.svg
 tags:
@@ -4862,6 +4862,11 @@ components:
     ApiError:
       allOf:
         - $ref: '#/components/schemas/ProblemDetails'
+        - type: object
+          required:
+            - detail
+            - status
+            - type
       discriminator:
         propertyName: type
         mapping:

ext/openAPI/components/schemas/errors/ApiError.yaml

@@ -1,5 +1,10 @@
 allOf:
   - $ref: "../ProblemDetails.yaml"
+  - type: object
+    required:
+      - detail
+      - status
+      - type
 discriminator:
   propertyName: type
   mapping:

ext/openAPI/openapi.yaml

@@ -30,7 +30,7 @@ info:
     imported into popular API tooling (e.g. Postman) or can be used to generate
     client-code for multiple programming languages.
   title: HiveMQ Edge REST API
-  version: 2025.10-SNAPSHOT
+  version: 2025.11-SNAPSHOT
   x-logo:
     url: https://www.hivemq.com/img/svg/hivemq-bee.svg
 tags:

ext/openAPI/templates/Java/README.md

@@ -0,0 +1,29 @@
+# OpenAPI Templates - Java
+
+This folder is for overwriting the default OpenAPI Java templates.
+
+## Where to Download the Templates?
+
+```bash
+git clone https://github.com/OpenAPITools/openapi-generator.git
+```
+
+## Change Logs
+
+Last updated: 2025-07-01
+
+### `typeInfoAnnotation.mustache`
+
+The discriminator name `type` conflicts with the JackSon `type`. This patch changes the JackSon `type` to `jsontype`.
+
+```diff
+@JsonIgnoreProperties(
+-   value = "{{{discriminator.propertyBaseName}}}", // ignore manually set {{{discriminator.propertyBaseName}}}, it will be automatically generated by Jackson during serialization
+-   allowSetters = true // allows the {{{discriminator.propertyBaseName}}} to be set during deserialization
+  value = "json{{{discriminator.propertyBaseName}}}", // ignore manually set json{{{discriminator.propertyBaseName}}}, it will be automatically generated by Jackson during serialization
+  allowSetters = true // allows the json{{{discriminator.propertyBaseName}}} to be set during deserialization
+)
+
+- @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "{{{discriminator.propertyBaseName}}}", visible = true)
++ @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "json{{{discriminator.propertyBaseName}}}", visible = true)
+```

ext/openAPI/templates/Java/typeInfoAnnotation.mustache

@@ -0,0 +1,24 @@
+{{#jackson}}
+
+@JsonIgnoreProperties(
+  value = "json{{{discriminator.propertyBaseName}}}", // ignore manually set json{{{discriminator.propertyBaseName}}}, it will be automatically generated by Jackson during serialization
+  allowSetters = true // allows the json{{{discriminator.propertyBaseName}}} to be set during deserialization
+)
+
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "json{{{discriminator.propertyBaseName}}}", visible = true)
+{{#discriminator.mappedModels}}
+{{#-first}}
+@JsonSubTypes({
+{{/-first}}
+  @JsonSubTypes.Type(value = {{modelName}}.class, name = "{{^vendorExtensions.x-discriminator-value}}{{mappingName}}{{/vendorExtensions.x-discriminator-value}}{{#vendorExtensions.x-discriminator-value}}{{{vendorExtensions.x-discriminator-value}}}{{/vendorExtensions.x-discriminator-value}}"),
+{{#-last}}
+})
+{{/-last}}
+{{/discriminator.mappedModels}}
+{{/jackson}}
+{{#jsonbPolymorphism}}
+@JsonbTypeInfo(key = "{{{discriminator.propertyBaseName}}}"{{#discriminator.mappedModels}}{{#-first}}, value = {
+{{/-first}}
+  @JsonbSubtype(alias = "{{^vendorExtensions.x-discriminator-value}}{{mappingName}}{{/vendorExtensions.x-discriminator-value}}{{#vendorExtensions.x-discriminator-value}}{{{vendorExtensions.x-discriminator-value}}}{{/vendorExtensions.x-discriminator-value}}", type = {{modelName}}.class),
+{{#-last}}
+}{{/-last}}{{/discriminator.mappedModels}}){{/jsonbPolymorphism}}

hivemq-edge/build.gradle.kts

@@ -274,6 +274,7 @@ val buildDirectory = layout.buildDirectory.get()
 tasks.register<GenerateTask>("genJaxRs") {
     inputSpec.set("${projectDir}/../ext/hivemq-edge-openapi-${project.version}.yaml")
     outputDir.set("${buildDirectory}/generated/openapi")
+    templateDir.set("$projectDir/../ext/openapi/templates/Java")
     generatorName.set("jaxrs-spec")
     apiPackage.set("com.hivemq.edge.api")
     modelPackage.set("com.hivemq.edge.api.model")