Enabling PathPatternParser causes endpoints to be ignored. Fixes #1034.

Author: bnasslahsen

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

@@ -53,11 +53,13 @@
 import org.springframework.beans.factory.ObjectFactory;
 import org.springframework.core.annotation.AnnotatedElementUtils;
 import org.springframework.core.annotation.AnnotationUtils;
+import org.springframework.util.CollectionUtils;
 import org.springframework.util.MimeType;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.method.HandlerMethod;
 import org.springframework.web.servlet.ModelAndView;
+import org.springframework.web.servlet.mvc.condition.PathPatternsRequestCondition;
 import org.springframework.web.servlet.mvc.condition.PatternsRequestCondition;
 import org.springframework.web.servlet.mvc.method.RequestMappingInfo;
 import org.springframework.web.servlet.mvc.method.RequestMappingInfoHandlerMapping;
@@ -233,9 +235,8 @@ protected void calculatePath(Map<String, Object> restControllers, Map<RequestMap
 		for (Map.Entry<RequestMappingInfo, HandlerMethod> entry : entries) {
 			RequestMappingInfo requestMappingInfo = entry.getKey();
 			HandlerMethod handlerMethod = entry.getValue();
-			PatternsRequestCondition patternsRequestCondition = requestMappingInfo.getPatternsCondition();
-			if (patternsRequestCondition != null) {
-				Set<String> patterns = patternsRequestCondition.getPatterns();
+			Set<String> patterns = getActivePatterns(requestMappingInfo);
+			if (!CollectionUtils.isEmpty(patterns)) {
 				Map<String, String> regexMap = new LinkedHashMap<>();
 				for (String pattern : patterns) {
 					String operationPath = PathUtils.parsePath(pattern, regexMap);
@@ -256,6 +257,25 @@ && isFilterCondition(handlerMethod, operationPath, produces, consumes, headers))
 		}
 	}
 
+	/**
+	 * Gets active patterns.
+	 *
+	 * @param requestMappingInfo the request mapping info
+	 * @return the active patterns
+	 */
+	private Set<String> getActivePatterns(RequestMappingInfo requestMappingInfo) {
+		Set<String> patterns = null;
+		PatternsRequestCondition patternsRequestCondition = requestMappingInfo.getPatternsCondition();
+		if (patternsRequestCondition != null)
+			patterns = patternsRequestCondition.getPatterns();
+		else {
+			PathPatternsRequestCondition pathPatternsRequestCondition = requestMappingInfo.getPathPatternsCondition();
+			if (pathPatternsRequestCondition != null)
+				patterns = pathPatternsRequestCondition.getPatternValues();
+		}
+		return patterns;
+	}
+
 	/**
 	 * By reversed request mapping infos comparator.
 	 *
@@ -297,7 +317,7 @@ protected boolean isRestController(Map<String, Object> restControllers, HandlerM
 	 */
 	protected void calculateServerUrl(HttpServletRequest request, String apiDocsUrl) {
 		super.initOpenAPIBuilder();
-		String calculatedUrl = getServerUrl(request,apiDocsUrl);
+		String calculatedUrl = getServerUrl(request, apiDocsUrl);
 		openAPIService.setServerBaseUrl(calculatedUrl);
 	}
 
@@ -310,4 +330,5 @@ protected void calculateServerUrl(HttpServletRequest request, String apiDocsUrl)
 	 */
 	protected abstract String getServerUrl(HttpServletRequest request, String apiDocsUrl);
 
+
 }

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

@@ -0,0 +1,30 @@
+package test.org.springdoc.api.app152;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.servlet.config.annotation.PathMatchConfigurer;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+import org.springframework.web.util.pattern.PathPatternParser;
+
+@RestController
+@RequestMapping("/api")
+public class HelloController {
+
+	@GetMapping
+	public String helloWorld() {
+		return "ok";
+	}
+
+	@Configuration
+	public class WebConfig implements WebMvcConfigurer {
+
+		@Override
+		public void configurePathMatch(PathMatchConfigurer configurer) {
+			configurer.setPatternParser(new PathPatternParser());
+		}
+
+	}
+
+}

springdoc-openapi-webmvc-core/src/test/java/test/org/springdoc/api/app152/SpringDocApp152Test.java

@@ -0,0 +1,34 @@
+/*
+ *
+ *  * 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.app152;
+
+
+import test.org.springdoc.api.AbstractSpringDocTest;
+
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+/**
+ * Tests Spring meta-annotations as method parameters
+ */
+public class SpringDocApp152Test extends AbstractSpringDocTest {
+
+	@SpringBootApplication
+	static class SpringDocTestApp {}
+
+}

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

@@ -0,0 +1,37 @@
+{
+  "openapi": "3.0.1",
+  "info": {
+    "title": "OpenAPI definition",
+    "version": "v0"
+  },
+  "servers": [
+    {
+      "url": "http://localhost",
+      "description": "Generated server url"
+    }
+  ],
+  "paths": {
+    "/api": {
+      "get": {
+        "tags": [
+          "hello-controller"
+        ],
+        "operationId": "helloWorld",
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "*/*": {
+                "schema": {
+                  "type": "string"
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  },
+  "components": {}
+}
+