Dynamically define ApiGroups does not work. Fixes #2584

Author: bnasslahsen

springdoc-openapi-starter-common/src/main/java/org/springdoc/core/conditions/MultipleOpenApiGroupsCondition.java

@@ -24,6 +24,8 @@
 package org.springdoc.core.conditions;
 
 
+import java.util.Collection;
+
 import org.springdoc.core.models.GroupedOpenApi;
 
 import org.springframework.boot.autoconfigure.condition.AnyNestedCondition;
@@ -59,4 +61,9 @@ static class OnGroupedOpenApiBean {}
 	@ConditionalOnProperty(name = GROUP_CONFIG_FIRST_PROPERTY)
 	static class OnGroupConfigProperty {}
 
+	/**
+	 * The type On list grouped open api bean.
+	 */
+	@ConditionalOnBean(value = GroupedOpenApi.class, parameterizedContainer = Collection.class)
+	static class OnListGroupedOpenApiBean {}
 }

springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app177/AnnotatedController.java

@@ -26,6 +26,8 @@
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
+import java.util.Arrays;
+import java.util.List;
 
 import org.springdoc.core.filters.OpenApiMethodFilter;
 import org.springdoc.core.models.GroupedOpenApi;
@@ -65,27 +67,23 @@ public String notAnnotatedPost() {
 	}
 
 	@Bean
-	public GroupedOpenApi group1OpenApi() {
-		return GroupedOpenApi.builder()
+	public List<GroupedOpenApi> apis() {
+		GroupedOpenApi group1OpenApi = GroupedOpenApi.builder()
 				.group("annotatedGroup1")
 				.addOpenApiMethodFilter(method -> method.isAnnotationPresent(Group1.class))
 				.build();
-	}
 
-	@Bean
-	public GroupedOpenApi group2OpenApi() {
-		return GroupedOpenApi.builder()
+		GroupedOpenApi group2OpenApi = GroupedOpenApi.builder()
 				.group("annotatedGroup2")
 				.addOpenApiMethodFilter(method -> method.isAnnotationPresent(Group2.class))
 				.build();
-	}
 
-	@Bean
-	public GroupedOpenApi group3OpenApi() {
-		return GroupedOpenApi.builder()
+		GroupedOpenApi group3OpenApi = GroupedOpenApi.builder()
 				.group("annotatedCombinedGroup")
 				.addOpenApiMethodFilter(method -> method.isAnnotationPresent(Group1.class) || method.isAnnotationPresent(Group2.class))
 				.build();
+
+		return Arrays.asList(group1OpenApi, group2OpenApi, group3OpenApi);
 	}
 
 	@Bean