working test case

springdoc · Jan 2, 2025 · c4d2078 · c4d2078
1 parent a9148f4
commit c4d2078
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 27 deletions.
diff --git a/...penapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/app13/TestController.kt b/...penapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/app13/TestController.kt
@@ -34,8 +34,8 @@ data class KeyValue(
 
 @Schema
 data class SomeDTO(
-    @Schema(description = "Description A", allOf = [KeyValue::class]) val fieldA: KeyValue,
-    @Schema(description = "Description B", allOf = [KeyValue::class]) val fieldB: KeyValue,
+    @Schema(description = "Description A") val fieldA: KeyValue,
+    @Schema(description = "Description B") val fieldB: KeyValue,
 )
 
 

diff --git a/...openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/resources/results/app13.json b/...openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/resources/results/app13.json
@@ -1,5 +1,5 @@
 {
-  "openapi" : "3.0.1",
+  "openapi" : "3.1.0",
   "info" : {
     "title" : "OpenAPI definition",
     "version" : "v0"
@@ -37,19 +37,14 @@
         "required" : [ "key", "value" ],
         "type" : "object",
         "description" : "Generic description",
-        "allOf" : [ {
-          "$ref" : "#/components/schemas/KeyValue"
-        }, {
-          "type" : "object",
-          "properties" : {
-            "key" : {
-              "type" : "string"
-            },
-            "value" : {
-              "type" : "string"
-            }
+        "properties" : {
+          "key" : {
+            "type" : "string"
+          },
+          "value" : {
+            "type" : "string"
           }
-        } ]
+        }
       },
       "SomeDTO" : {
         "required": [
@@ -59,22 +54,12 @@
         "type": "object",
         "properties": {
           "fieldA": {
-            "type": "object",
             "description": "Description A",
-            "allOf": [
-              {
-                "$ref": "#/components/schemas/KeyValue"
-              }
-            ]
+            "$ref": "#/components/schemas/KeyValue"
           },
           "fieldB": {
-            "type": "object",
             "description": "Description B",
-            "allOf": [
-              {
-                "$ref": "#/components/schemas/KeyValue"
-              }
-            ]
+            "$ref": "#/components/schemas/KeyValue"
           }
         }
       }