updates packages for #2871

bnasslahsen · bnasslahsen · commit 2cdc31f83aae · 2025-01-24T23:26:10.000+01:00
diff --git a/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v31/AbstractKotlinSpringDocMVCTest.kt b/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v31/AbstractKotlinSpringDocMVCTest.kt
@@ -44,7 +44,6 @@ import java.nio.file.Paths
 @SpringBootTest
 @AutoConfigureMockMvc
 @ActiveProfiles("test")
-@TestPropertySource(properties = ["springdoc.api-docs.version=openapi_3_0"])
 abstract class AbstractKotlinSpringDocMVCTest {
 
     @Autowired
diff --git a/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v31/app10/SpringDocApp10Test.kt b/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v31/app10/SpringDocApp10Test.kt
@@ -20,7 +20,7 @@ package test.org.springdoc.api.v31.app10
 
 import org.springframework.boot.autoconfigure.SpringBootApplication
 import org.springframework.context.annotation.ComponentScan
-import test.org.springdoc.api.v30.AbstractKotlinSpringDocMVCTest
+import test.org.springdoc.api.v31.AbstractKotlinSpringDocMVCTest
 
 class SpringDocApp10Test : AbstractKotlinSpringDocMVCTest() {
 
diff --git a/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v31/app11/SpringDocApp11Test.kt b/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v31/app11/SpringDocApp11Test.kt
@@ -21,7 +21,7 @@ package test.org.springdoc.api.v31.app11
 import org.springframework.boot.autoconfigure.SpringBootApplication
 import org.springframework.context.annotation.ComponentScan
 import org.springframework.test.context.TestPropertySource
-import test.org.springdoc.api.v30.AbstractKotlinSpringDocMVCTest
+import test.org.springdoc.api.v31.AbstractKotlinSpringDocMVCTest
 
 @TestPropertySource(properties = ["springdoc.trim-kotlin-indent=true"])
 class SpringDocApp11Test : AbstractKotlinSpringDocMVCTest() {
diff --git a/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v31/app12/SpringDocApp12Test.kt b/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v31/app12/SpringDocApp12Test.kt
@@ -20,7 +20,7 @@ package test.org.springdoc.api.v31.app12
 
 import org.springframework.boot.autoconfigure.SpringBootApplication
 import org.springframework.context.annotation.ComponentScan
-import test.org.springdoc.api.v30.AbstractKotlinSpringDocMVCTest
+import test.org.springdoc.api.v31.AbstractKotlinSpringDocMVCTest
 
 class SpringDocApp12Test : AbstractKotlinSpringDocMVCTest() {
 
diff --git a/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v31/app13/SpringDocApp13Test.kt b/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v31/app13/SpringDocApp13Test.kt
@@ -20,7 +20,7 @@ package test.org.springdoc.api.v31.app13
 
 import org.springframework.boot.autoconfigure.SpringBootApplication
 import org.springframework.test.context.TestPropertySource
-import test.org.springdoc.api.v30.AbstractKotlinSpringDocMVCTest
+import test.org.springdoc.api.v31.AbstractKotlinSpringDocMVCTest
 
 @TestPropertySource(properties = ["springdoc.api-docs.version=openapi_3_1"])
 class SpringDocApp13Test : AbstractKotlinSpringDocMVCTest() {
diff --git a/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v31/app14/SpringDocApp14Test.kt b/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v31/app14/SpringDocApp14Test.kt
@@ -19,7 +19,7 @@
 package test.org.springdoc.api.v31.app14
 
 import org.springframework.boot.autoconfigure.SpringBootApplication
-import test.org.springdoc.api.v30.AbstractKotlinSpringDocMVCTest
+import test.org.springdoc.api.v31.AbstractKotlinSpringDocMVCTest
 
 class SpringDocApp14Test : AbstractKotlinSpringDocMVCTest() {
 
diff --git a/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v31/app2/SpringDocApp2Test.kt b/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v31/app2/SpringDocApp2Test.kt
@@ -19,7 +19,7 @@
 package test.org.springdoc.api.v31.app2
 
 import org.springframework.boot.autoconfigure.SpringBootApplication
-import test.org.springdoc.api.v30.AbstractKotlinSpringDocMVCTest
+import test.org.springdoc.api.v31.AbstractKotlinSpringDocMVCTest
 
 class SpringDocApp2Test : AbstractKotlinSpringDocMVCTest() {
 
diff --git a/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v31/app3/SpringDocApp3Test.kt b/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v31/app3/SpringDocApp3Test.kt
@@ -20,7 +20,7 @@ package test.org.springdoc.api.v31.app3
 
 import org.springframework.boot.autoconfigure.SpringBootApplication
 import org.springframework.context.annotation.ComponentScan
-import test.org.springdoc.api.v30.AbstractKotlinSpringDocMVCTest
+import test.org.springdoc.api.v31.AbstractKotlinSpringDocMVCTest
 
 class SpringDocApp3Test : AbstractKotlinSpringDocMVCTest() {
 
diff --git a/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v31/app4/SpringDocApp4Test.kt b/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v31/app4/SpringDocApp4Test.kt
@@ -20,7 +20,7 @@ package test.org.springdoc.api.v31.app4
 
 import org.springframework.boot.autoconfigure.SpringBootApplication
 import org.springframework.context.annotation.ComponentScan
-import test.org.springdoc.api.v30.AbstractKotlinSpringDocMVCTest
+import test.org.springdoc.api.v31.AbstractKotlinSpringDocMVCTest
 
 class SpringDocApp4Test : AbstractKotlinSpringDocMVCTest() {
 
diff --git a/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v31/app5/SpringDocApp5Test.kt b/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v31/app5/SpringDocApp5Test.kt
@@ -20,7 +20,7 @@ package test.org.springdoc.api.v31.app5
 
 import org.springframework.boot.autoconfigure.SpringBootApplication
 import org.springframework.context.annotation.ComponentScan
-import test.org.springdoc.api.v30.AbstractKotlinSpringDocMVCTest
+import test.org.springdoc.api.v31.AbstractKotlinSpringDocMVCTest
 
 class SpringDocApp5Test : AbstractKotlinSpringDocMVCTest() {
 
diff --git a/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v31/app6/SpringDocApp6Test.kt b/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v31/app6/SpringDocApp6Test.kt
@@ -20,7 +20,7 @@ package test.org.springdoc.api.v31.app6
 
 import org.springframework.boot.autoconfigure.SpringBootApplication
 import org.springframework.context.annotation.ComponentScan
-import test.org.springdoc.api.v30.AbstractKotlinSpringDocMVCTest
+import test.org.springdoc.api.v31.AbstractKotlinSpringDocMVCTest
 
 class SpringDocApp6Test : AbstractKotlinSpringDocMVCTest() {
 
diff --git a/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v31/app7/SpringDocApp7Test.kt b/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v31/app7/SpringDocApp7Test.kt
@@ -23,7 +23,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.ComponentScan
 import org.springframework.context.support.GenericApplicationContext
-import test.org.springdoc.api.v30.AbstractKotlinSpringDocMVCTest
+import test.org.springdoc.api.v31.AbstractKotlinSpringDocMVCTest
 
 class SpringDocApp7Test : AbstractKotlinSpringDocMVCTest() {
 
diff --git a/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v31/app8/SpringDocApp8Test.kt b/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v31/app8/SpringDocApp8Test.kt
@@ -25,7 +25,7 @@ import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.ComponentScan
 import org.springframework.context.support.GenericApplicationContext
 import org.springframework.test.context.TestPropertySource
-import test.org.springdoc.api.v30.AbstractKotlinSpringDocMVCTest
+import test.org.springdoc.api.v31.AbstractKotlinSpringDocMVCTest
 
 @TestPropertySource(properties =  [Constants.SPRINGDOC_NULLABLE_REQUEST_PARAMETER_ENABLED+"=false"])
 class SpringDocApp8Test : AbstractKotlinSpringDocMVCTest() {
diff --git a/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v31/app9/SpringDocApp9Test.kt b/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/kotlin/test/org/springdoc/api/v31/app9/SpringDocApp9Test.kt
@@ -1,7 +1,7 @@
 package test.org.springdoc.api.v31.app9
 
 import org.springframework.boot.autoconfigure.SpringBootApplication
-import test.org.springdoc.api.v30.AbstractKotlinSpringDocMVCTest
+import test.org.springdoc.api.v31.AbstractKotlinSpringDocMVCTest
 
 class SpringDocApp9Test: AbstractKotlinSpringDocMVCTest() {
     @SpringBootApplication
diff --git a/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/resources/results/3.1.0/app11.json b/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/resources/results/3.1.0/app11.json
@@ -49,16 +49,16 @@
           "example-controller-2"
         ],
         "operationId": "readFoo_1",
-        "parameters": [
-          {
-            "name": "request",
-            "in": "query",
-            "required": true,
-            "schema": {
-              "$ref": "#/components/schemas/foo request"
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/foo request"
+              }
             }
-          }
-        ],
+          },
+          "required": true
+        },
         "responses": {
           "200": {
             "description": "OK",
@@ -77,36 +77,33 @@
   "components": {
     "schemas": {
       "FooResponse": {
-        "required": [
-          "name"
-        ],
         "type": "object",
         "properties": {
           "name": {
             "type": "string"
           }
-        }
+        },
+        "required": [
+          "name"
+        ]
       },
       "foo request": {
-        "required": [
-          "age"
-        ],
         "type": "object",
+        "description": "\nfoo request class description\nwith kotlin indent\n",
         "properties": {
           "age": {
             "type": "integer",
-            "description": "\nfoo request field with kotlin indent\n",
-            "format": "int32"
+            "format": "int32",
+            "description": "\nfoo request field with kotlin indent\n"
           }
         },
-        "description": "\nfoo request class description\nwith kotlin indent\n"
+        "required": [
+          "age"
+        ]
       },
       "foo response": {
-        "required": [
-          "name",
-          "subFoo"
-        ],
         "type": "object",
+        "description": "\nfoo response class description\nwith kotlin indent\n",
         "properties": {
           "name": {
             "type": "string",
@@ -116,21 +113,24 @@
             "$ref": "#/components/schemas/sub foo response"
           }
         },
-        "description": "\nfoo response class description\nwith kotlin indent\n"
+        "required": [
+          "name",
+          "subFoo"
+        ]
       },
       "sub foo response": {
-        "required": [
-          "subName"
-        ],
         "type": "object",
+        "description": "\nsub foo response class description\nwith kotlin indent\n",
         "properties": {
           "subName": {
             "type": "string",
             "description": "\nsub foo response fields with kotlin indent\n"
           }
         },
-        "description": "\nsub foo response class description\nwith kotlin indent\n"
+        "required": [
+          "subName"
+        ]
       }
     }
   }
-}
+}
diff --git a/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/resources/results/3.1.0/app14.json b/springdoc-openapi-tests/springdoc-openapi-kotlin-webmvc-tests/src/test/resources/results/3.1.0/app14.json
@@ -38,43 +38,47 @@
   "components": {
     "schemas": {
       "KeyValue": {
-        "required": [
-          "key",
-          "value"
-        ],
         "type": "object",
         "description": "Generic description",
-        "allOf": [
-          {
-            "$ref": "#/components/schemas/KeyValue"
+        "properties": {
+          "key": {
+            "type": "string"
           },
-          {
-            "type": "object",
-            "properties": {
-              "key": {
-                "type": "string"
-              },
-              "value": {
-                "type": "string"
-              }
-            }
+          "value": {
+            "type": "string"
           }
+        },
+        "required": [
+          "key",
+          "value"
         ]
       },
       "SomeDTO": {
-        "required": [
-          "field_a",
-          "field_b"
-        ],
         "type": "object",
         "properties": {
           "field_a": {
-            "$ref": "#/components/schemas/KeyValue"
+            "$ref": "#/components/schemas/KeyValue",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/KeyValue"
+              }
+            ],
+            "description": "Description A"
           },
           "field_b": {
-            "$ref": "#/components/schemas/KeyValue"
+            "$ref": "#/components/schemas/KeyValue",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/KeyValue"
+              }
+            ],
+            "description": "Description B"
           }
-        }
+        },
+        "required": [
+          "field_a",
+          "field_b"
+        ]
       }
     }
   }
