Improve the support of Pageable. Fixes #496

Author: bnasslahsen

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

@@ -36,6 +36,7 @@
 import io.swagger.v3.oas.annotations.Hidden;
 import io.swagger.v3.oas.annotations.OpenAPIDefinition;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.tags.Tags;
 import io.swagger.v3.oas.models.Components;
 import io.swagger.v3.oas.models.OpenAPI;
 import io.swagger.v3.oas.models.Operation;
@@ -116,7 +117,7 @@ public class OpenAPIBuilder {
 		this.openApiBuilderCustomisers = openApiBuilderCustomisers;
 	}
 
-	private static String splitCamelCase(String str) {
+	public static String splitCamelCase(String str) {
 		return str.replaceAll(
 				String.format(
 						"%s|%s|%s",
@@ -180,13 +181,21 @@ public boolean isServersPresent() {
 	}
 
 	public Operation buildTags(HandlerMethod handlerMethod, Operation operation, OpenAPI openAPI) {
+
 		// class tags
-		Set<Tag> classTags =
-				AnnotatedElementUtils.findAllMergedAnnotations(handlerMethod.getBeanType(), Tag.class);
+		Set<Tags> tagsSet = AnnotatedElementUtils
+				.findAllMergedAnnotations(handlerMethod.getBeanType(), Tags.class);
+		Set<Tag> classTags = tagsSet.stream()
+				.flatMap(x -> Stream.of(x.value())).collect(Collectors.toSet());
+		classTags.addAll(AnnotatedElementUtils.findAllMergedAnnotations(handlerMethod.getBeanType(), Tag.class));
 
 		// method tags
-		Set<Tag> methodTags =
-				AnnotatedElementUtils.findAllMergedAnnotations(handlerMethod.getMethod(), Tag.class);
+		tagsSet = AnnotatedElementUtils
+				.findAllMergedAnnotations(handlerMethod.getMethod(), Tags.class);
+		Set<Tag> methodTags = tagsSet.stream()
+				.flatMap(x -> Stream.of(x.value())).collect(Collectors.toSet());
+		methodTags.addAll(AnnotatedElementUtils.findAllMergedAnnotations(handlerMethod.getMethod(), Tag.class));
+
 
 		List<Tag> allTags = new ArrayList<>();
 		Set<String> tagsStr = new HashSet<>();
@@ -213,12 +222,12 @@ public Operation buildTags(HandlerMethod handlerMethod, Operation operation, Ope
 				.getTags(allTags.toArray(new Tag[0]), true);
 
 		if (tags.isPresent()) {
-			Set<io.swagger.v3.oas.models.tags.Tag> tagsSet = tags.get();
+			Set<io.swagger.v3.oas.models.tags.Tag> tagSet = tags.get();
 			// Existing tags
 			List<io.swagger.v3.oas.models.tags.Tag> openApiTags = openAPI.getTags();
 			if (!CollectionUtils.isEmpty(openApiTags))
-				tagsSet.addAll(openApiTags);
-			openAPI.setTags(new ArrayList<>(tagsSet));
+				tagSet.addAll(openApiTags);
+			openAPI.setTags(new ArrayList<>(tagSet));
 		}
 
 		// Handle SecurityRequirement at operation level

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

@@ -0,0 +1,39 @@
+/*
+ *
+ *  * Copyright 2019-2020 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.app100;
+
+import javax.validation.constraints.NotNull;
+
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.tags.Tags;
+
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@Tags(value = @Tag(name="hello-ap1"))
+public class HelloController {
+
+	@GetMapping(value = "/search", produces = { "application/xml", "application/json" })
+	@Tags(value = @Tag(name="hello-ap2"))
+	public PersonDTO getAllPets(@NotNull String toto) {
+		return null;
+	}
+
+}

springdoc-openapi-webmvc-core/src/test/java/test/org/springdoc/api/app100/PersonDTO.java

@@ -0,0 +1,63 @@
+/*
+ *
+ *  * Copyright 2019-2020 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.app100;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+
+@Schema
+public class PersonDTO {
+	private String email;
+
+	private String firstName;
+
+	private String lastName;
+
+	public PersonDTO() {
+	}
+
+	public PersonDTO(final String email, final String firstName, final String lastName) {
+		this.email = email;
+		this.firstName = firstName;
+		this.lastName = lastName;
+	}
+
+	public String getEmail() {
+		return email;
+	}
+
+	public void setEmail(final String email) {
+		this.email = email;
+	}
+
+	public String getFirstName() {
+		return firstName;
+	}
+
+	public void setFirstName(final String firstName) {
+		this.firstName = firstName;
+	}
+
+	public String getLastName() {
+		return lastName;
+	}
+
+	public void setLastName(final String lastName) {
+		this.lastName = lastName;
+	}
+}

springdoc-openapi-webmvc-core/src/test/java/test/org/springdoc/api/app100/SpringDocApp100Test.java

@@ -0,0 +1,31 @@
+/*
+ *
+ *  * Copyright 2019-2020 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.app100;
+
+
+import test.org.springdoc.api.AbstractSpringDocTest;
+
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+public class SpringDocApp100Test extends AbstractSpringDocTest {
+
+    @SpringBootApplication
+    static class SpringDocTestApp {}
+
+}

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

@@ -1,9 +1,8 @@
 package test.org.springdoc.api.app99;
 
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import io.swagger.v3.oas.annotations.responses.ApiResponses;
+
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;

springdoc-openapi-webmvc-core/src/test/java/test/org/springdoc/api/app99/SpringDocApp99Test.java

@@ -19,9 +19,10 @@
 package test.org.springdoc.api.app99;
 
 
+import test.org.springdoc.api.AbstractSpringDocTest;
+
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.test.context.ActiveProfiles;
-import test.org.springdoc.api.AbstractSpringDocTest;
 
 @ActiveProfiles("99")
 public class SpringDocApp99Test extends AbstractSpringDocTest {

springdoc-openapi-webmvc-core/src/test/resources/results/app100.json

@@ -0,0 +1,69 @@
+{
+  "openapi": "3.0.1",
+  "info": {
+    "title": "OpenAPI definition",
+    "version": "v0"
+  },
+  "servers": [
+    {
+      "url": "http://localhost",
+      "description": "Generated server url"
+    }
+  ],
+  "paths": {
+    "/search": {
+      "get": {
+        "tags": [
+          "hello-ap1",
+          "hello-ap2"
+        ],
+        "operationId": "getAllPets",
+        "parameters": [
+          {
+            "name": "toto",
+            "in": "query",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "default response",
+            "content": {
+              "application/xml": {
+                "schema": {
+                  "$ref": "#/components/schemas/PersonDTO"
+                }
+              },
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/PersonDTO"
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  },
+  "components": {
+    "schemas": {
+      "PersonDTO": {
+        "type": "object",
+        "properties": {
+          "email": {
+            "type": "string"
+          },
+          "firstName": {
+            "type": "string"
+          },
+          "lastName": {
+            "type": "string"
+          }
+        }
+      }
+    }
+  }
+}