From 33cce11a1d78d2ee93da48831ca5b3791ab47119 Mon Sep 17 00:00:00 2001
From: dschodits-secunet <daymon.schodits@secunet.com>
Date: Wed, 11 Feb 2026 09:41:21 +0100
Subject: [PATCH] fix double serialization (#22924)

---
 .../src/main/resources/Java/typeInfoAnnotation.mustache     | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/modules/openapi-generator/src/main/resources/Java/typeInfoAnnotation.mustache b/modules/openapi-generator/src/main/resources/Java/typeInfoAnnotation.mustache
index 13e0218e4aa4..23c0dbee7d35 100644
--- a/modules/openapi-generator/src/main/resources/Java/typeInfoAnnotation.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/typeInfoAnnotation.mustache
@@ -4,8 +4,12 @@
 @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
-){{/disableDiscriminatorJsonIgnoreProperties}}
+)
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "{{{discriminator.propertyBaseName}}}", visible = true)
+{{/disableDiscriminatorJsonIgnoreProperties}}
+{{#disableDiscriminatorJsonIgnoreProperties}}
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "{{{discriminator.propertyBaseName}}}", visible = true)
+{{/disableDiscriminatorJsonIgnoreProperties}}
 {{#discriminator.mappedModels}}
 {{#-first}}
 @JsonSubTypes({