Bad schema return type when created a generic wrapper class for response entity. Fixes #2733

Author: bnasslahsen

springdoc-openapi-starter-common/src/main/java/org/springdoc/core/converters/ConverterUtils.java

@@ -102,15 +102,6 @@ public static boolean isResponseTypeWrapper(Class<?> rawClass) {
 		return RESULT_WRAPPERS_TO_IGNORE.stream().anyMatch(clazz -> clazz.isAssignableFrom(rawClass));
 	}
 
-	/**
-	 * Is exact class
-	 * @param rawClass the raw class
-	 * true if the class is in the list of classes to ignore
-	 */
-	public static boolean isExactClass(Class<?> rawClass) {
-		return RESULT_WRAPPERS_TO_IGNORE.stream().anyMatch(clazz -> clazz == rawClass);
-	}
-
 	/**
 	 * Is response type to ignore boolean.
 	 *

springdoc-openapi-starter-common/src/main/java/org/springdoc/core/converters/ResponseSupportConverter.java

@@ -35,7 +35,9 @@
 import io.swagger.v3.oas.models.media.StringSchema;
 import org.springdoc.core.providers.ObjectMapperProvider;
 
-import static org.springdoc.core.converters.ConverterUtils.*;
+import static org.springdoc.core.converters.ConverterUtils.isFluxTypeWrapper;
+import static org.springdoc.core.converters.ConverterUtils.isResponseTypeToIgnore;
+import static org.springdoc.core.converters.ConverterUtils.isResponseTypeWrapper;
 
 /**
  * The type Response support converter.
@@ -63,7 +65,12 @@ public Schema resolve(AnnotatedType type, ModelConverterContext context, Iterato
 		if (javaType != null) {
 			Class<?> cls = javaType.getRawClass();
 			if (isResponseTypeWrapper(cls) && !isFluxTypeWrapper(cls)) {
-				JavaType innerType = resolveInnerType(javaType);
+				JavaType innerType = javaType.getBindings().getBoundType(0);
+				if(javaType.getSuperClass() !=null 
+						&& javaType.getSuperClass().hasGenericTypes()
+						&& isResponseTypeWrapper(javaType.getSuperClass().getRawClass())
+						&& !Object.class.equals(javaType.getSuperClass().getBindings().getBoundType(0).getRawClass()))
+					innerType = javaType.getSuperClass().getBindings().getBoundType(0);
 				if (innerType == null)
 					return new StringSchema();
 				return context.resolve(new AnnotatedType(innerType)
@@ -76,18 +83,4 @@ else if (isResponseTypeToIgnore(cls))
 		}
 		return (chain.hasNext()) ? chain.next().resolve(type, context, chain) : null;
 	}
-
-	/**
-	 * Resolve inner type java type.
-	 *
-	 * @param javaType the java type
-	 * @return the java type
-	 */
-	private JavaType resolveInnerType(JavaType javaType) {
-		if(!isExactClass(javaType.getRawClass())) {
-			javaType = javaType.getSuperClass();
-		}
-		return javaType.getBindings().getBoundType(0);
-	}
-
 }

springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/app227/HelloController.java renamed to springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app227/HelloController.java

@@ -16,13 +16,15 @@
  *
  */
 
-package test.org.springdoc.api.app227;
+package test.org.springdoc.api.v30.app227;
+
+
+import test.org.springdoc.api.v30.app227.model.Item;
+import test.org.springdoc.api.v30.app227.wrapper.ResponseEntityWrapper;
 
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
-import test.org.springdoc.api.app227.model.Item;
-import test.org.springdoc.api.app227.wrapper.ResponseEntityWrapper;
 
 @RestController
 public class HelloController {

springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app227/SpringDocApp227Test.java

@@ -0,0 +1,30 @@
+/*
+ *
+ *  * Copyright 2019-2024 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.app227;
+
+import test.org.springdoc.api.v30.AbstractSpringDocV30Test;
+
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+public class SpringDocApp227Test extends AbstractSpringDocV30Test {
+
+
+	@SpringBootApplication
+	static class SpringDocTestApp {}
+}

springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/app227/model/Item.java renamed to springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app227/model/Item.java

@@ -1,4 +1,4 @@
-package test.org.springdoc.api.app227.model;
+package test.org.springdoc.api.v30.app227.model;
 
 /**
  * Base item

springdoc-openapi-tests/springdoc-openapi-actuator-webmvc-tests/src/test/java/test/org/springdoc/api/app227/wrapper/ResponseEntityWrapper.java renamed to springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app227/wrapper/ResponseEntityWrapper.java

@@ -1,8 +1,10 @@
-package test.org.springdoc.api.app227.wrapper;
+package test.org.springdoc.api.v30.app227.wrapper;
+
+
+import test.org.springdoc.api.v30.app227.model.Item;
 
 import org.springframework.http.HttpStatusCode;
 import org.springframework.http.ResponseEntity;
-import test.org.springdoc.api.app227.model.Item;
 
 public class ResponseEntityWrapper<T> extends ResponseEntity<Item<T>> {
     public ResponseEntityWrapper(Item<T> body, HttpStatusCode status) {