Change report: #1799.

bnasslahsen · bnasslahsen · commit ea87334f0255 · 2022-08-20T18:48:16.000+02:00
diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/configuration/SpringDocConfiguration.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/configuration/SpringDocConfiguration.java
@@ -87,6 +87,7 @@
 import org.springframework.boot.actuate.autoconfigure.endpoint.web.WebEndpointProperties;
 import org.springframework.boot.actuate.autoconfigure.web.server.ConditionalOnManagementPort;
 import org.springframework.boot.actuate.autoconfigure.web.server.ManagementPortType;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingClass;
@@ -169,6 +170,7 @@ AdditionalModelsConverter additionalModelsConverter(ObjectMapperProvider objectM
 	 */
 	@Bean
 	@Lazy(false)
+	@ConditionalOnBean(PropertyCustomizer.class)
 	PropertyCustomizingConverter propertyCustomizingConverter(Optional<List<PropertyCustomizer>> customizers) {
 		return new PropertyCustomizingConverter(customizers);
 	}
diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/converters/PolymorphicModelConverter.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/converters/PolymorphicModelConverter.java
@@ -36,6 +36,7 @@
 import io.swagger.v3.core.converter.ModelConverterContext;
 import io.swagger.v3.core.util.AnnotationsUtils;
 import io.swagger.v3.oas.models.media.ComposedSchema;
+import io.swagger.v3.oas.models.media.ObjectSchema;
 import io.swagger.v3.oas.models.media.Schema;
 import org.springdoc.core.providers.ObjectMapperProvider;
 
@@ -61,14 +62,29 @@ public PolymorphicModelConverter(ObjectMapperProvider springDocObjectMapper) {
 
 	@Override
 	public Schema resolve(AnnotatedType type, ModelConverterContext context, Iterator<ModelConverter> chain) {
-		if (chain.hasNext()) {
-			Schema<?> resolvedSchema = chain.next().resolve(type, context, chain);
-			if (resolvedSchema == null || resolvedSchema.get$ref() == null) return resolvedSchema;
-			return composePolymorphicSchema(type, resolvedSchema, context.getDefinedModels().values());
+		JavaType javaType = springDocObjectMapper.jsonMapper().constructType(type.getType());
+		if (javaType != null) {
+			if (chain.hasNext()) {
+				Schema<?> resolvedSchema = chain.next().resolve(type, context, chain);
+				resolvedSchema = getResolvedSchema(javaType, resolvedSchema);
+				if (resolvedSchema == null || resolvedSchema.get$ref() == null)
+					return resolvedSchema;
+				return composePolymorphicSchema(type, resolvedSchema, context.getDefinedModels().values());
+			}
 		}
 		return null;
 	}
 
+	private static Schema<?> getResolvedSchema(JavaType javaType, Schema<?> resolvedSchema) {
+		if (resolvedSchema instanceof ObjectSchema && resolvedSchema.getProperties() != null){
+			if (resolvedSchema.getProperties().containsKey(javaType.getRawClass().getName()))
+				resolvedSchema = resolvedSchema.getProperties().get(javaType.getRawClass().getName());
+			else if (resolvedSchema.getProperties().containsKey(javaType.getRawClass().getSimpleName()))
+				resolvedSchema = resolvedSchema.getProperties().get(javaType.getRawClass().getSimpleName());
+		}
+		return resolvedSchema;
+	}
+
 	/**
 	 * Compose polymorphic schema schema.
 	 *
diff --git a/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/utils/SpringDocAnnotationsUtils.java b/springdoc-openapi-starter-common/src/main/java/org/springdoc/core/utils/SpringDocAnnotationsUtils.java
@@ -356,13 +356,7 @@ private static MediaType getMediaType(Schema schema, Components components, Json
 						Schema oSchema = mediaType.getSchema();
 						for (SchemaProperty sp: annotationContent.schemaProperties()) {
 							Class<?> schemaImplementation = sp.schema().implementation();
-							boolean isArray = false;
-							if (schemaImplementation == Void.class) {
-								schemaImplementation = sp.array().schema().implementation();
-								if (schemaImplementation != Void.class) {
-									isArray = true;
-								}
-							}
+							boolean isArray = isArray(annotationContent);
 							getSchema(sp.schema(), sp.array(), isArray, schemaImplementation, components, jsonViewAnnotation)
 									.ifPresent(s -> {
 										if ("array".equals(oSchema.getType())) {
diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app192/SpringDocApp192Test.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app192/SpringDocApp192Test.java
@@ -25,5 +25,12 @@
 
 import test.org.springdoc.api.v30.AbstractSpringDocV30Test;
 
+import org.springframework.boot.autoconfigure.SpringBootApplication;
 
-public class SpringDocApp192Test extends AbstractSpringDocV30Test { }
+
+public class SpringDocApp192Test extends AbstractSpringDocV30Test {
+
+	@SpringBootApplication
+	static class SpringDocTestApp {}
+
+}
diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app193/Animal.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app193/Animal.java
@@ -0,0 +1,17 @@
+package test.org.springdoc.api.v30.app193;
+
+
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import io.swagger.v3.oas.annotations.media.Schema;
+
+/**
+ * Interface of the Animal.
+ */
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.WRAPPER_OBJECT)
+@JsonSubTypes({
+    @JsonSubTypes.Type(value = Dog.class, name = "dog"),
+    @JsonSubTypes.Type(value = Cat.class, name = "cat"),
+})
+@Schema(description = "Represents an Animal class.")
+public interface Animal {}
diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app193/BasicController.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app193/BasicController.java
@@ -0,0 +1,28 @@
+package test.org.springdoc.api.v30.app193;
+
+import io.swagger.v3.oas.annotations.Operation;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseStatus;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping(path = "/")
+public class BasicController {
+
+	@GetMapping("/test")
+	@ResponseStatus(HttpStatus.OK)
+	@Operation(summary = "get", description = "Provides a list of books.")
+	public Knowledge get() {
+		return new Books(new Book("Introduction to algorithms"));
+	}
+
+    @GetMapping("/test1")
+    @Operation(summary = "get1", description = "Provides an animal.")
+    public Animal get1() {
+
+        return new Dog("Foo", 12);
+    }
+}
diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app193/Book.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app193/Book.java
@@ -0,0 +1,22 @@
+package test.org.springdoc.api.v30.app193;
+
+
+import io.swagger.v3.oas.annotations.media.Schema;
+
+@Schema(description = "Represents a Book.")
+public class Book {
+
+    private String title;
+
+    public Book(String title) {
+        this.title = title;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+}
diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app193/Books.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app193/Books.java
@@ -0,0 +1,23 @@
+package test.org.springdoc.api.v30.app193;
+
+
+import java.util.ArrayList;
+import java.util.Arrays;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+
+@Schema(description = "Represents a list of Books.")
+public class Books extends ArrayList<Book> implements Knowledge {
+
+    public Books() {
+        super();
+    }
+
+    public Books(Book... books) {
+        this();
+
+        if (books != null) {
+            Arrays.stream(books).forEach(this::add);
+        }
+    }
+}
diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app193/Cat.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app193/Cat.java
@@ -0,0 +1,22 @@
+package test.org.springdoc.api.v30.app193;
+
+
+import io.swagger.v3.oas.annotations.media.Schema;
+
+@Schema(description = "Represents a Cat class.")
+public class Cat implements Animal {
+
+    private Integer speed;
+
+    public Cat(Integer speed) {
+        this.speed = speed;
+    }
+
+    public Integer getSpeed() {
+        return speed;
+    }
+
+    public void setSpeed(Integer speed) {
+        this.speed = speed;
+    }
+}
diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app193/Dog.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app193/Dog.java
@@ -0,0 +1,32 @@
+package test.org.springdoc.api.v30.app193;
+
+
+import io.swagger.v3.oas.annotations.media.Schema;
+
+@Schema(description = "Represents a Dog class.")
+public class Dog implements Animal {
+
+    private String name;
+    private Integer age;
+
+    public Dog(String name, Integer age) {
+        this.name = name;
+        this.age = age;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public Integer getAge() {
+        return age;
+    }
+
+    public void setAge(Integer age) {
+        this.age = age;
+    }
+}
diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app193/Knowledge.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app193/Knowledge.java
@@ -0,0 +1,14 @@
+package test.org.springdoc.api.v30.app193;
+
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import io.swagger.v3.oas.annotations.media.Schema;
+
+/**
+ * Interface of the Knowledge.
+ */
+@Schema(description = "Represents the knowledge.")
+@JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, include = JsonTypeInfo.As.WRAPPER_OBJECT)
+@JsonSubTypes({@JsonSubTypes.Type(value = Books.class)})
+public interface Knowledge {
+}
diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app193/Response.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app193/Response.java
@@ -0,0 +1,18 @@
+package test.org.springdoc.api.v30.app193;
+
+public class Response {
+
+    private Knowledge books;
+
+    public Response(Knowledge books) {
+        this.books = books;
+    }
+
+    public Knowledge getBooks() {
+        return books;
+    }
+
+    public void setBooks(Knowledge books) {
+        this.books = books;
+    }
+}
diff --git a/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app193/SpringDocApp193Test.java b/springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app193/SpringDocApp193Test.java
@@ -0,0 +1,36 @@
+/*
+ *
+ *  *
+ *  *  *
+ *  *  *  * Copyright 2019-2022 the original author or authors.
+ *  *  *  *
+ *  *  *  * Licensed under the Apache License, Version 2.0 (the "License");
+ *  *  *  * you may not use this file except in compliance with the License.
+ *  *  *  * You may obtain a copy of the License at
+ *  *  *  *
+ *  *  *  *      https://www.apache.org/licenses/LICENSE-2.0
+ *  *  *  *
+ *  *  *  * Unless required by applicable law or agreed to in writing, software
+ *  *  *  * distributed under the License is distributed on an "AS IS" BASIS,
+ *  *  *  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  *  *  * See the License for the specific language governing permissions and
+ *  *  *  * limitations under the License.
+ *  *  *
+ *  *
+ *
+ */
+
+package test.org.springdoc.api.v30.app193;
+
+
+import test.org.springdoc.api.v30.AbstractSpringDocV30Test;
+
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+
+public class SpringDocApp193Test extends AbstractSpringDocV30Test {
+
+	@SpringBootApplication
+	static class SpringDocTestApp {}
+
+}
diff --git a/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.0.1/app193.json b/springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.0.1/app193.json
