Merge branch 'rudolfgrauberger-improve-support-for-nested-parameterobject'

Author: bnasslahsen

springdoc-openapi-common/src/main/java/org/springdoc/core/MethodParameterPojoExtractor.java

@@ -128,34 +128,37 @@ private static Stream<MethodParameter> extractFrom(Class<?> clazz, String fieldN
 	 * @return the stream
 	 */
 	private static Stream<MethodParameter> fromGetterOfField(Class<?> paramClass, Field field, String fieldNamePrefix) {
-		if (isSimpleType(field.getType()))
+		Class<?> type = extractType(paramClass, field);
+
+		if (Objects.isNull(type))
+			return Stream.empty();
+
+		if (isSimpleType(type))
 			return fromSimpleClass(paramClass, field, fieldNamePrefix);
-		else if (field.getGenericType() instanceof TypeVariable<?>)
-			return extractTypeParameter(paramClass, (TypeVariable<?>) field.getGenericType(), field, fieldNamePrefix);
-		else
-			return extractFrom(field.getType(), fieldNamePrefix + field.getName() + DOT);
+		else {
+			String prefix = fieldNamePrefix + field.getName() + DOT;
+			return extractFrom(type, prefix);
+		}
 	}
 
 	/**
-	 * Extract type parameter stream.
-	 *
-	 * @param owningClass the owning class
-	 * @param genericType the generic type
-	 * @param field the field
-	 * @param fieldNamePrefix the field name prefix
-	 * @return the stream
+	 * Extract the type
+	 * @param paramClass
+	 * @param field
+	 * @return The revoled type or null if it was not a reifiable type
 	 */
-	private static Stream<MethodParameter> extractTypeParameter(
-			Class<?> owningClass,
-			TypeVariable<?> genericType,
-			Field field,
-			String fieldNamePrefix) {
-
-		Type resolvedType = ReturnTypeParser.resolveType(genericType, owningClass);
-		if (resolvedType instanceof Class<?> && isSimpleType((Class<?>) resolvedType)) {
-			return fromSimpleClass(owningClass, field, fieldNamePrefix);
+	private static Class<?> extractType(Class<?> paramClass, Field field) {
+		Class<?> type = field.getType();
+		if (field.getGenericType() instanceof TypeVariable<?>) {
+			Type fieldType = ReturnTypeParser.resolveType(field.getGenericType(), paramClass);
+
+			if (fieldType instanceof Class<?>)
+				type = (Class<?>) fieldType;
+			else	// This is the case for not reifiable types
+				type = null;
 		}
-		return Stream.empty();
+
+		return type;
 	}
 
 	/**

springdoc-openapi-webmvc-core/src/main/java/org/springdoc/webmvc/api/MultipleOpenApiResource.java

@@ -135,7 +135,7 @@ public void afterPropertiesSet() {
 				.addAllOperationCustomizer(globalOperationCustomizerMap.values())
 				.addAllOpenApiMethodFilter(globalOpenApiMethodFilterMap.values())
 		);
-		
+
 		this.groupedOpenApiResources = groupedOpenApis.stream()
 				.collect(Collectors.toMap(GroupedOpenApi::getGroup, item ->
 						{

springdoc-openapi-webmvc-core/src/test/java/test/org/springdoc/api/v30/app190/ConcreteSubclassFromGeneric.java

@@ -0,0 +1,9 @@
+package test.org.springdoc.api.v30.app190;
+
+public class ConcreteSubclassFromGeneric extends SimpleGeneric<MyData> {
+    private String topName;
+
+    public String getTopName() {
+        return topName;
+    }
+}

springdoc-openapi-webmvc-core/src/test/java/test/org/springdoc/api/v30/app190/HelloController.java

@@ -0,0 +1,48 @@
+/*
+ *
+ *  *
+ *  *  *
+ *  *  *  * 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.app190;
+
+
+import org.springdoc.api.annotations.ParameterObject;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+public class HelloController {
+	@GetMapping("/nested")
+	public ResponseEntity<String> nested(@ParameterObject final SimpleOuterClass filter) {
+		return new ResponseEntity<>("{\"Say\": \"Hello\"}", HttpStatus.OK);
+	}
+
+	@GetMapping( "/nestedTypeErasureGeneric")
+	public ResponseEntity<String> nestedTypeErasureGeneric( @ParameterObject final SimpleGeneric<MyData> filter) {
+		return new ResponseEntity<>("{\"Say\": \"Hello\"}", HttpStatus.OK);
+	}
+
+	@GetMapping( "/nestedReifiableGeneric")
+	public ResponseEntity<String> nestedReifiableGeneric( @ParameterObject final ConcreteSubclassFromGeneric filter) {
+		return new ResponseEntity<>("{\"Say\": \"Hello\"}", HttpStatus.OK);
+	}
+}

springdoc-openapi-webmvc-core/src/test/java/test/org/springdoc/api/v30/app190/MyData.java

@@ -0,0 +1,14 @@
+package test.org.springdoc.api.v30.app190;
+
+public class MyData {
+    private String firstName;
+    private Integer maxNumber;
+
+    public Integer getMaxNumber() {
+        return maxNumber;
+    }
+
+    public String getFirstName() {
+        return firstName;
+    }
+}

springdoc-openapi-webmvc-core/src/test/java/test/org/springdoc/api/v30/app190/SimpleGeneric.java

@@ -0,0 +1,15 @@
+package test.org.springdoc.api.v30.app190;
+
+public class SimpleGeneric<T> {
+
+    private String name;
+    private T child;
+
+    public T getChild() {
+        return child;
+    }
+
+    public String getName() {
+        return name;
+    }
+}

springdoc-openapi-webmvc-core/src/test/java/test/org/springdoc/api/v30/app190/SimpleInnerClass.java

@@ -0,0 +1,21 @@
+package test.org.springdoc.api.v30.app190;
+
+public class SimpleInnerClass {
+
+    private SimpleInnerInnerClass innerInnerClass;
+
+    private Boolean name;
+    private Integer maxNumber;
+
+    public Integer getMaxNumber() {
+        return maxNumber;
+    }
+
+    public Boolean getName() {
+        return name;
+    }
+
+    public SimpleInnerInnerClass getInnerInnerClass() {
+        return innerInnerClass;
+    }
+}

springdoc-openapi-webmvc-core/src/test/java/test/org/springdoc/api/v30/app190/SimpleInnerInnerClass.java

@@ -0,0 +1,15 @@
+package test.org.springdoc.api.v30.app190;
+
+public class SimpleInnerInnerClass {
+
+    Boolean name;
+    private Integer maxNumber;
+
+    public Integer getMaxNumber() {
+        return maxNumber;
+    }
+
+    public Boolean getName() {
+        return name;
+    }
+}

springdoc-openapi-webmvc-core/src/test/java/test/org/springdoc/api/v30/app190/SimpleOuterClass.java

@@ -0,0 +1,14 @@
+package test.org.springdoc.api.v30.app190;
+
+public class SimpleOuterClass {
+    private String name;
+    private SimpleInnerClass innerClass;
+
+    public String getName() {
+        return name;
+    }
+
+    public SimpleInnerClass getInnerClass() {
+        return innerClass;
+    }
+}

springdoc-openapi-webmvc-core/src/test/java/test/org/springdoc/api/v30/app190/SpringDocApp190Test.java

@@ -0,0 +1,33 @@
+/*
+ *
+ *  *
+ *  *  *
+ *  *  *  * 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.app190;
+
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import test.org.springdoc.api.v30.AbstractSpringDocV30Test;
+
+public class SpringDocApp190Test extends AbstractSpringDocV30Test {
+
+    @SpringBootApplication
+    static class SpringDocTestApp {}
+
+}