OpenAPITools · Picazsoo · Nov 26, 2025 · Nov 27, 2025 · Nov 27, 2025 · Nov 27, 2025
diff --git a/.github/workflows/samples-kotlin-server-jdk17.yaml b/.github/workflows/samples-kotlin-server-jdk17.yaml
@@ -37,6 +37,8 @@ jobs:
           - samples/server/petstore/kotlin-server-required-and-nullable-properties
           - samples/server/petstore/kotlin-springboot-3
           - samples/server/petstore/kotlin-springboot-3-no-response-entity
+          - samples/server/petstore/kotlin-springboot-3-dollar-issue-swagger2
+          - samples/server/petstore/kotlin-springboot-3-dollar-issue-swagger2-interface-only
           - samples/server/petstore/kotlin-springboot-additionalproperties
           - samples/server/petstore/kotlin-springboot-delegate-nodefaults
           - samples/server/petstore/kotlin-springboot-request-cookie

diff --git a/.github/workflows/samples-kotlin-server.yaml b/.github/workflows/samples-kotlin-server.yaml
@@ -41,6 +41,7 @@ jobs:
           - samples/server/petstore/kotlin-springboot-source-swagger2
           - samples/server/petstore/kotlin-springboot-springfox
           - samples/server/petstore/kotlin-springboot-x-kotlin-implements
+          - samples/server/petstore/kotlin-springboot-dollar-issue-swagger1
           - samples/server/petstore/kotlin-springboot-include-http-request-context-delegate
           - samples/server/petstore/kotlin-server/ktor
           - samples/server/petstore/kotlin-server/ktor2

diff --git a/bin/configs/kotlin-explicit.yaml b/bin/configs/kotlin-explicit.yaml
@@ -1,6 +1,6 @@
 generatorName: kotlin
 outputDir: samples/client/petstore/kotlin-explicit
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
+inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-dollars.yaml
 templateDir: modules/openapi-generator/src/main/resources/kotlin-client
 additionalProperties:
   artifactId: kotlin-petstore-explicit

diff --git a/bin/configs/kotlin-gson.yaml b/bin/configs/kotlin-gson.yaml
@@ -1,6 +1,6 @@
 generatorName: kotlin
 outputDir: samples/client/petstore/kotlin-gson
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
+inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-dollars.yaml
 templateDir: modules/openapi-generator/src/main/resources/kotlin-client
 additionalProperties:
   serializationLibrary: gson

diff --git a/bin/configs/kotlin-jackson.yaml b/bin/configs/kotlin-jackson.yaml
@@ -1,6 +1,6 @@
 generatorName: kotlin
 outputDir: samples/client/petstore/kotlin-jackson
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
+inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-dollars.yaml
 templateDir: modules/openapi-generator/src/main/resources/kotlin-client
 additionalProperties:
   serializationLibrary: jackson

diff --git a/bin/configs/kotlin-jvm-ktor-jackson.yaml b/bin/configs/kotlin-jvm-ktor-jackson.yaml
@@ -1,7 +1,7 @@
 generatorName: kotlin
 outputDir: samples/client/petstore/kotlin-jvm-ktor-jackson
 library: jvm-ktor
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
+inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-dollars.yaml
 templateDir: modules/openapi-generator/src/main/resources/kotlin-client
 additionalProperties:
   artifactId: kotlin-petstore-jvm-ktor-jackson

diff --git a/bin/configs/kotlin-jvm-okhttp4-coroutines.yaml b/bin/configs/kotlin-jvm-okhttp4-coroutines.yaml
@@ -1,7 +1,7 @@
 generatorName: kotlin
 outputDir: samples/client/petstore/kotlin-jvm-okhttp4-coroutines
 library: jvm-okhttp4
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
+inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-dollars.yaml
 templateDir: modules/openapi-generator/src/main/resources/kotlin-client
 additionalProperties:
   serializationLibrary: gson

diff --git a/bin/configs/kotlin-jvm-retrofit2-kotlinx_serialization.yaml b/bin/configs/kotlin-jvm-retrofit2-kotlinx_serialization.yaml
@@ -1,7 +1,7 @@
 generatorName: kotlin
 outputDir: samples/client/petstore/kotlin-retrofit2-kotlinx_serialization
 library: jvm-retrofit2
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
+inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-dollars.yaml
 templateDir: modules/openapi-generator/src/main/resources/kotlin-client
 additionalProperties:
   serializationLibrary: kotlinx_serialization

diff --git a/bin/configs/kotlin-jvm-retrofit2-retrofit2.yaml b/bin/configs/kotlin-jvm-retrofit2-retrofit2.yaml
@@ -1,7 +1,7 @@
 generatorName: kotlin
 outputDir: samples/client/petstore/kotlin-retrofit2
 library: jvm-retrofit2
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
+inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-dollars.yaml
 templateDir: modules/openapi-generator/src/main/resources/kotlin-client
 additionalProperties:
   artifactId: kotlin-petstore-retrofit2
diff --git a/bin/configs/kotlin-jvm-retrofit2-rx3.yaml b/bin/configs/kotlin-jvm-retrofit2-rx3.yaml
@@ -1,7 +1,7 @@
 generatorName: kotlin
 outputDir: samples/client/petstore/kotlin-retrofit2-rx3
 library: jvm-retrofit2
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
+inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-dollars.yaml
 templateDir: modules/openapi-generator/src/main/resources/kotlin-client
 additionalProperties:
   artifactId: kotlin-petstore-retrofit2-rx3

diff --git a/bin/configs/kotlin-jvm-volley.yaml b/bin/configs/kotlin-jvm-volley.yaml
@@ -1,7 +1,7 @@
 generatorName: kotlin
 outputDir: samples/client/petstore/kotlin-jvm-volley
 library: jvm-volley
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
+inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-dollars.yaml
 templateDir: modules/openapi-generator/src/main/resources/kotlin-client
 additionalProperties:
   artifactId: kotlin-petstore-jvm-volley

diff --git a/bin/configs/kotlin-kotlinx-datetime.yaml b/bin/configs/kotlin-kotlinx-datetime.yaml
@@ -1,6 +1,6 @@
 generatorName: kotlin
 outputDir: samples/client/petstore/kotlin-kotlinx-datetime
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
+inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-dollars.yaml
 templateDir: modules/openapi-generator/src/main/resources/kotlin-client
 additionalProperties:
   artifactId: kotlin-petstore-threetenbp

diff --git a/bin/configs/kotlin-modelMutable.yaml b/bin/configs/kotlin-modelMutable.yaml
@@ -1,6 +1,6 @@
 generatorName: kotlin
 outputDir: samples/client/petstore/kotlin-modelMutable
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
+inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-dollars.yaml
 templateDir: modules/openapi-generator/src/main/resources/kotlin-client
 additionalProperties:
   artifactId: kotlin-modelMutable

diff --git a/bin/configs/kotlin-moshi-codegen.yaml b/bin/configs/kotlin-moshi-codegen.yaml
@@ -1,6 +1,6 @@
 generatorName: kotlin
 outputDir: samples/client/petstore/kotlin-moshi-codegen
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
+inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-dollars.yaml
 templateDir: modules/openapi-generator/src/main/resources/kotlin-client
 additionalProperties:
   serializationLibrary: moshi

diff --git a/bin/configs/kotlin-multiplatform-kotlinx-datetime.yaml b/bin/configs/kotlin-multiplatform-kotlinx-datetime.yaml
@@ -2,7 +2,7 @@ generatorName: kotlin
 outputDir: samples/client/petstore/kotlin-multiplatform-kotlinx-datetime
 library: multiplatform
 dateLibrary: kotlinx-datetime
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
+inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-dollars.yaml
 templateDir: modules/openapi-generator/src/main/resources/kotlin-client
 additionalProperties:
   artifactId: kotlin-client-petstore-multiplatform-kotlinx-datetime
diff --git a/bin/configs/kotlin-multiplatform.yaml b/bin/configs/kotlin-multiplatform.yaml
@@ -2,7 +2,7 @@ generatorName: kotlin
 outputDir: samples/client/petstore/kotlin-multiplatform
 library: multiplatform
 dateLibrary: kotlinx-datetime
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
+inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-dollars.yaml
 templateDir: modules/openapi-generator/src/main/resources/kotlin-client
 additionalProperties:
   artifactId: kotlin-client-petstore-multiplatform
diff --git a/bin/configs/kotlin-nonpublic.yaml b/bin/configs/kotlin-nonpublic.yaml
@@ -1,6 +1,6 @@
 generatorName: kotlin
 outputDir: samples/client/petstore/kotlin-nonpublic
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
+inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-dollars.yaml
 templateDir: modules/openapi-generator/src/main/resources/kotlin-client
 additionalProperties:
   nonPublicApi: "true"

diff --git a/bin/configs/kotlin-nullable.yaml b/bin/configs/kotlin-nullable.yaml
@@ -1,6 +1,6 @@
 generatorName: kotlin
 outputDir: samples/client/petstore/kotlin-nullable
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
+inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-dollars.yaml
 templateDir: modules/openapi-generator/src/main/resources/kotlin-client
 additionalProperties:
   artifactId: kotlin-petstore-nullable

diff --git a/bin/configs/kotlin-server-jaxrs-spec-mutiny.yaml b/bin/configs/kotlin-server-jaxrs-spec-mutiny.yaml
@@ -1,7 +1,7 @@
 generatorName: kotlin-server
 outputDir: samples/server/petstore/kotlin-server/jaxrs-spec-mutiny
 library: jaxrs-spec
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
+inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-dollars.yaml
 templateDir: modules/openapi-generator/src/main/resources/kotlin-server
 additionalProperties:
   returnResponse: "true"

diff --git a/bin/configs/kotlin-server-jaxrs-spec.yaml b/bin/configs/kotlin-server-jaxrs-spec.yaml
@@ -1,7 +1,7 @@
 generatorName: kotlin-server
 outputDir: samples/server/petstore/kotlin-server/jaxrs-spec
 library: jaxrs-spec
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
+inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-dollars.yaml
 templateDir: modules/openapi-generator/src/main/resources/kotlin-server
 additionalProperties:
   useCoroutines: "true"
diff --git a/bin/configs/kotlin-server-ktor.yaml b/bin/configs/kotlin-server-ktor.yaml
@@ -1,7 +1,7 @@
 generatorName: kotlin-server
 outputDir: samples/server/petstore/kotlin-server/ktor
 library: ktor
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
+inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-dollars.yaml
 templateDir: modules/openapi-generator/src/main/resources/kotlin-server
 additionalProperties:
   hideGenerationTimestamp: "true"

diff --git a/bin/configs/kotlin-server-modelMutable.yaml b/bin/configs/kotlin-server-modelMutable.yaml
@@ -1,7 +1,7 @@
 generatorName: kotlin-server
 outputDir: samples/server/petstore/kotlin-server-modelMutable
 library: ktor
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
+inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-dollars.yaml
 templateDir: modules/openapi-generator/src/main/resources/kotlin-server
 additionalProperties:
   hideGenerationTimestamp: "true"

diff --git a/bin/configs/kotlin-spring-boot-3-dollar-issue-swagger2-interface-only.yaml b/bin/configs/kotlin-spring-boot-3-dollar-issue-swagger2-interface-only.yaml
@@ -0,0 +1,14 @@
+generatorName: kotlin-spring
+outputDir: samples/server/petstore/kotlin-springboot-3-dollar-issue-swagger2-interface-only
+library: spring-boot
+inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore-with-dollars.yaml
+templateDir: modules/openapi-generator/src/main/resources/kotlin-spring
+additionalProperties:
+  documentationProvider: springDoc
+  annotationLibrary: swagger2
+  useSwaggerUI: "false"
+  interfaceOnly: "true"
+  serializableModel: "true"
+  beanValidations: "true"
+  useSpringBoot3: "true"
+  requestMappingMode: api_interface
diff --git a/bin/configs/kotlin-spring-boot-3-dollar-issue-swagger2.yaml b/bin/configs/kotlin-spring-boot-3-dollar-issue-swagger2.yaml
@@ -0,0 +1,14 @@
+generatorName: kotlin-spring
+outputDir: samples/server/petstore/kotlin-springboot-3-dollar-issue-swagger2
+library: spring-boot
+inputSpec: modules/openapi-generator/src/test/resources/3_0/kotlin/petstore-with-tags.yaml
+templateDir: modules/openapi-generator/src/main/resources/kotlin-spring
+additionalProperties:
+  documentationProvider: springDoc
+  annotationLibrary: swagger2
+  useSwaggerUI: "false"
+  serviceImplementation: "true"
+  serializableModel: "true"
+  beanValidations: "true"
+  useSpringBoot3: "true"
+  requestMappingMode: api_interface
diff --git a/bin/configs/kotlin-spring-boot-dollar-issue-swagger1.yaml b/bin/configs/kotlin-spring-boot-dollar-issue-swagger1.yaml
@@ -0,0 +1,13 @@
+generatorName: kotlin-spring
+outputDir: samples/server/petstore/kotlin-springboot-dollar-issue-swagger1
+library: spring-boot
+inputSpec: modules/openapi-generator/src/test/resources/3_0/kotlin/petstore-with-tags.yaml
+templateDir: modules/openapi-generator/src/main/resources/kotlin-spring
+additionalProperties:
+  documentationProvider: springFox
+  annotationLibrary: swagger1
+  useSwaggerUI: "false"
+  serviceImplementation: "true"
+  serializableModel: "true"
+  beanValidations: "true"
+  requestMappingMode: api_interface
diff --git a/bin/configs/kotlin-spring-boot-x-kotlin-implements.yaml b/bin/configs/kotlin-spring-boot-x-kotlin-implements.yaml
@@ -9,7 +9,7 @@ additionalProperties:
   useSwaggerUI: false
   serviceImplementation: false
   skipDefaultInterface: true
-  interfaceOnly: true
+  interfaceOnly: false
   serializableModel: true
   beanValidations: true
   includeHttpRequestContext: true
diff --git a/bin/configs/kotlin-spring-declarative-interface-reactive-coroutines.yaml b/bin/configs/kotlin-spring-declarative-interface-reactive-coroutines.yaml
@@ -1,7 +1,7 @@
 generatorName: kotlin-spring
 outputDir: samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines
 library: spring-declarative-http-interface
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
+inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore-with-dollars.yaml
 templateDir: modules/openapi-generator/src/main/resources/kotlin-spring
 additionalProperties:
   documentationProvider: springDoc

diff --git a/bin/configs/kotlin-spring-declarative-interface-reactive-reactor-wrapped.yaml b/bin/configs/kotlin-spring-declarative-interface-reactive-reactor-wrapped.yaml
@@ -1,7 +1,7 @@
 generatorName: kotlin-spring
 outputDir: samples/server/petstore/kotlin-spring-declarative-interface-reactive-reactor-wrapped
 library: spring-declarative-http-interface
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
+inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore-with-dollars.yaml
 templateDir: modules/openapi-generator/src/main/resources/kotlin-spring
 additionalProperties:
   documentationProvider: springDoc

diff --git a/bin/configs/kotlin-spring-declarative-interface-wrapped.yaml b/bin/configs/kotlin-spring-declarative-interface-wrapped.yaml
@@ -1,7 +1,7 @@
 generatorName: kotlin-spring
 outputDir: samples/server/petstore/kotlin-spring-declarative-interface-wrapped
 library: spring-declarative-http-interface
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
+inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore-with-dollars.yaml
 templateDir: modules/openapi-generator/src/main/resources/kotlin-spring
 additionalProperties:
   documentationProvider: springDoc

diff --git a/bin/configs/kotlin-spring-declarative-interface.yaml b/bin/configs/kotlin-spring-declarative-interface.yaml
@@ -1,7 +1,7 @@
 generatorName: kotlin-spring
 outputDir: samples/server/petstore/kotlin-spring-declarative-interface
 library: spring-declarative-http-interface
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
+inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore-with-dollars.yaml
 templateDir: modules/openapi-generator/src/main/resources/kotlin-spring
 additionalProperties:
   documentationProvider: springDoc

diff --git a/bin/configs/kotlin.yaml b/bin/configs/kotlin.yaml
@@ -1,6 +1,6 @@
 generatorName: kotlin
 outputDir: samples/client/petstore/kotlin
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
+inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-dollars.yaml
 templateDir: modules/openapi-generator/src/main/resources/kotlin-client
 additionalProperties:
   artifactId: kotlin-petstore-client

diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenOperation.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenOperation.java
@@ -33,7 +33,7 @@ public class CodegenOperation {
             hasErrorResponseObject; // if 4xx, 5xx responses have at least one error object defined
     public CodegenProperty returnProperty;
     public String path, operationId, returnType, returnFormat, httpMethod, returnBaseType,
-            returnContainer, summary, unescapedNotes, notes, baseName, defaultResponse;
+            returnContainer, summary, unescapedSummary, unescapedNotes, notes, baseName, defaultResponse;
     public CodegenDiscriminator discriminator;
     public List<Map<String, String>> consumes, produces, prioritizedContentTypes;
     public List<CodegenServer> servers = new ArrayList<CodegenServer>();
@@ -429,6 +429,7 @@ public String toString() {
         sb.append(", returnBaseType='").append(returnBaseType).append('\'');
         sb.append(", returnContainer='").append(returnContainer).append('\'');
         sb.append(", summary='").append(summary).append('\'');
+        sb.append(", unescapedSummary='").append(unescapedSummary).append('\'');
         sb.append(", unescapedNotes='").append(unescapedNotes).append('\'');
         sb.append(", notes='").append(notes).append('\'');
         sb.append(", baseName='").append(baseName).append('\'');
@@ -502,6 +503,7 @@ public boolean equals(Object o) {
                 Objects.equals(returnBaseType, that.returnBaseType) &&
                 Objects.equals(returnContainer, that.returnContainer) &&
                 Objects.equals(summary, that.summary) &&
+                Objects.equals(unescapedSummary, that.unescapedSummary) &&
                 Objects.equals(unescapedNotes, that.unescapedNotes) &&
                 Objects.equals(notes, that.notes) &&
                 Objects.equals(baseName, that.baseName) &&
@@ -547,7 +549,7 @@ public int hashCode() {
                 returnTypeIsPrimitive, returnSimpleType, subresourceOperation, isMap,
                 isArray, isMultipart, isVoid, isResponseBinary, isResponseFile, isResponseOptional, hasReference,
                 isDeprecated, isCallbackRequest, uniqueItems, path, operationId, returnType, httpMethod,
-                returnBaseType, returnContainer, summary, unescapedNotes, notes, baseName, defaultResponse,
+                returnBaseType, returnContainer, summary, unescapedSummary, unescapedNotes, notes, baseName, defaultResponse,
                 discriminator, consumes, produces, prioritizedContentTypes, servers, bodyParam, allParams, bodyParams,
                 pathParams, queryParams, headerParams, formParams, cookieParams, requiredParams, returnProperty, optionalParams,
                 authMethods, tags, responses, callbacks, imports, examples, requestBodyExamples, externalDocs,

diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenResponse.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenResponse.java
@@ -33,6 +33,7 @@ public class CodegenResponse implements IJsonSchemaValidationProperties {
     public boolean is4xx;
     public boolean is5xx;
     public String message;
+    public String unescapedMessage;
     public List<Map<String, Object>> examples;
     public String dataType;
     public String baseType;
@@ -109,7 +110,7 @@ public class CodegenResponse implements IJsonSchemaValidationProperties {
 
     @Override
     public int hashCode() {
-        return Objects.hash(headers, code, message, examples, dataType, baseType, containerType, containerTypeMapped, hasHeaders,
+        return Objects.hash(headers, code, message, unescapedMessage, examples, dataType, baseType, containerType, containerTypeMapped, hasHeaders,
                 isString, isNumeric, isInteger, isLong, isNumber, isFloat, isDouble, isDecimal, isByteArray, isBoolean, isDate,
                 isDateTime, isUuid, isEmail, isPassword, isModel, isFreeFormObject, isAnyType, isDefault, simpleType, primitiveType,
                 isMap, isOptional, isArray, isBinary, isFile, schema, jsonSchema, vendorExtensions, items, additionalProperties,
@@ -182,6 +183,7 @@ public boolean equals(Object o) {
                 Objects.equals(headers, that.headers) &&
                 Objects.equals(code, that.code) &&
                 Objects.equals(message, that.message) &&
+                Objects.equals(unescapedMessage, that.unescapedMessage) &&
                 Objects.equals(examples, that.examples) &&
                 Objects.equals(dataType, that.dataType) &&
                 Objects.equals(baseType, that.baseType) &&
@@ -582,6 +584,7 @@ public String toString() {
         sb.append(", is4xx='").append(is4xx).append('\'');
         sb.append(", is5xx='").append(is5xx).append('\'');
         sb.append(", message='").append(message).append('\'');
+        sb.append(", unescapedMessage='").append(unescapedMessage).append('\'');
         sb.append(", examples=").append(examples);
         sb.append(", dataType='").append(dataType).append('\'');
         sb.append(", baseType='").append(baseType).append('\'');