project review

bnasslahsen · bnasslahsen · commit 091a5c92aafe · 2022-04-20T18:20:19.000+02:00
diff --git a/springdoc-openapi-common/src/main/java/org/springdoc/core/SpringDocAnnotationsUtils.java b/springdoc-openapi-common/src/main/java/org/springdoc/core/SpringDocAnnotationsUtils.java
@@ -130,12 +130,9 @@ public static Schema extractSchema(Components components, Type returnType, JsonV
 				}
 				else
 					for (Map.Entry<String, Schema> entry : schemaMap.entrySet()) {
-						if (!componentSchemas.containsKey(entry.getKey())) {
-							componentSchemas.put(entry.getKey(), entry.getValue());
-							// If we've seen this schema before but find later it should be polymorphic,
-							// replace the existing schema with this richer version.
-						} else if (entry.getValue() instanceof ComposedSchema &&
-							!(componentSchemas.get(entry.getKey()) instanceof ComposedSchema)) {
+						// If we've seen this schema before but find later it should be polymorphic,
+						// replace the existing schema with this richer version.
+						if (!componentSchemas.containsKey(entry.getKey()) || !entry.getValue().getClass().equals(componentSchemas.get(entry.getKey()).getClass())) {
 							componentSchemas.put(entry.getKey(), entry.getValue());
 						}
 					}
diff --git a/springdoc-openapi-webmvc-core/src/test/java/test/org/springdoc/api/app185/Cat.java b/springdoc-openapi-webmvc-core/src/test/java/test/org/springdoc/api/app185/Cat.java
@@ -1,4 +1,4 @@
-package test.org.springdoc.api.app31;
+package test.org.springdoc.api.app185;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 
diff --git a/springdoc-openapi-webmvc-core/src/test/java/test/org/springdoc/api/app185/Dog.java b/springdoc-openapi-webmvc-core/src/test/java/test/org/springdoc/api/app185/Dog.java
@@ -1,4 +1,4 @@
-package test.org.springdoc.api.app31;
+package test.org.springdoc.api.app185;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 
diff --git a/springdoc-openapi-webmvc-core/src/test/java/test/org/springdoc/api/app185/Pet.java b/springdoc-openapi-webmvc-core/src/test/java/test/org/springdoc/api/app185/Pet.java
@@ -1,4 +1,4 @@
-package test.org.springdoc.api.app31;
+package test.org.springdoc.api.app185;
 
 import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
diff --git a/springdoc-openapi-webmvc-core/src/test/java/test/org/springdoc/api/app185/PetController.java b/springdoc-openapi-webmvc-core/src/test/java/test/org/springdoc/api/app185/PetController.java
@@ -1,4 +1,4 @@
-package test.org.springdoc.api.app31;
+package test.org.springdoc.api.app185;
 
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
diff --git a/springdoc-openapi-webmvc-core/src/test/java/test/org/springdoc/api/app185/SpringDocApp185Test.java b/springdoc-openapi-webmvc-core/src/test/java/test/org/springdoc/api/app185/SpringDocApp185Test.java
@@ -1,10 +1,10 @@
-package test.org.springdoc.api.app31;
+package test.org.springdoc.api.app185;
 
 import test.org.springdoc.api.AbstractSpringDocTest;
 
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
-public class SpringDocApp31Test extends AbstractSpringDocTest {
+public class SpringDocApp185Test extends AbstractSpringDocTest {
 
     @SpringBootApplication
     static class SpringDocTestApp {}
diff --git a/springdoc-openapi-webmvc-core/src/test/resources/results/app185.json b/springdoc-openapi-webmvc-core/src/test/resources/results/app185.json
@@ -4,20 +4,24 @@
     "title": "OpenAPI definition",
     "version": "v0"
   },
-  "servers": [{
-    "url": "http://localhost",
-    "description": "Generated server url"
-  }],
+  "servers": [
+    {
+      "url": "http://localhost",
+      "description": "Generated server url"
+    }
+  ],
   "paths": {
     "/dog": {
       "get": {
-        "tags": ["pet-controller"],
+        "tags": [
+          "pet-controller"
+        ],
         "operationId": "getDog",
         "responses": {
           "200": {
             "description": "OK",
             "content": {
-              "application/hal+json": {
+              "*/*": {
                 "schema": {
                   "$ref": "#/components/schemas/Dog"
                 }
@@ -29,21 +33,27 @@
     },
     "/any": {
       "get": {
-        "tags": ["pet-controller"],
+        "tags": [
+          "pet-controller"
+        ],
         "operationId": "getAnyPet",
         "responses": {
           "200": {
             "description": "OK",
             "content": {
-              "application/hal+json": {
+              "*/*": {
                 "schema": {
-                  "oneOf": [{
-                    "$ref": "#/components/schemas/Pet"
-                  }, {
-                    "$ref": "#/components/schemas/Cat"
-                  }, {
-                    "$ref": "#/components/schemas/Dog"
-                  }]
+                  "oneOf": [
+                    {
+                      "$ref": "#/components/schemas/Pet"
+                    },
+                    {
+                      "$ref": "#/components/schemas/Cat"
+                    },
+                    {
+                      "$ref": "#/components/schemas/Dog"
+                    }
+                  ]
                 }
               }
             }
@@ -56,32 +66,40 @@
     "schemas": {
       "Dog": {
         "type": "object",
-        "allOf": [{
-          "$ref": "#/components/schemas/Pet"
-        }, {
-          "type": "object",
-          "properties": {
-            "barks": {
-              "type": "boolean"
+        "allOf": [
+          {
+            "$ref": "#/components/schemas/Pet"
+          },
+          {
+            "type": "object",
+            "properties": {
+              "barks": {
+                "type": "boolean"
+              }
             }
           }
-        }]
+        ]
       },
       "Cat": {
         "type": "object",
-        "allOf": [{
-          "$ref": "#/components/schemas/Pet"
-        }, {
-          "type": "object",
-          "properties": {
-            "meows": {
-              "type": "boolean"
+        "allOf": [
+          {
+            "$ref": "#/components/schemas/Pet"
+          },
+          {
+            "type": "object",
+            "properties": {
+              "meows": {
+                "type": "boolean"
+              }
             }
           }
-        }]
+        ]
       },
       "Pet": {
-        "required": ["type"],
+        "required": [
+          "type"
+        ],
         "type": "object",
         "properties": {
           "name": {
@@ -97,4 +115,4 @@
       }
     }
   }
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -130,12 +130,9 @@ public static Schema extractSchema(Components components, Type returnType, JsonV`
`130`	`130`	`}`
`131`	`131`	`else`
`132`	`132`	`for (Map.Entry<String, Schema> entry : schemaMap.entrySet()) {`
`133`		`- if (!componentSchemas.containsKey(entry.getKey())) {`
`134`		`- componentSchemas.put(entry.getKey(), entry.getValue());`
`135`		`- // If we've seen this schema before but find later it should be polymorphic,`
`136`		`- // replace the existing schema with this richer version.`
`137`		`- } else if (entry.getValue() instanceof ComposedSchema &&`
`138`		`- !(componentSchemas.get(entry.getKey()) instanceof ComposedSchema)) {`
	`133`	`+ // If we've seen this schema before but find later it should be polymorphic,`
	`134`	`+ // replace the existing schema with this richer version.`
	`135`	`+ if (!componentSchemas.containsKey(entry.getKey()) \|\| !entry.getValue().getClass().equals(componentSchemas.get(entry.getKey()).getClass())) {`
`139`	`136`	`componentSchemas.put(entry.getKey(), entry.getValue());`
`140`	`137`	`}`
`141`	`138`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package test.org.springdoc.api.app31;`
	`1`	`+package test.org.springdoc.api.app185;`
`2`	`2`
`3`	`3`	`import io.swagger.v3.oas.annotations.media.Schema;`
`4`	`4`