Improve compatibility with new PathMatcher. Fixes #965.

Author: bnasslahsen

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

@@ -305,11 +305,6 @@ public final class Constants {
 	 */
 	public static final String HEALTH_PATTERN = "/health/*";
 
-	/**
-	 * The constant SWAGGER_UI_PATTERN.
-	 */
-	public static final String SWAGGER_UI_PATTERN = SWAGGER_UI_PREFIX + ALL_PATTERN;
-
 	/**
 	 * The constant SPRINGDOC_USE_MANAGEMENT_PORT.
 	 */

springdoc-openapi-ui/src/main/java/org/springdoc/webmvc/ui/SwaggerWebMvcConfigurer.java

@@ -28,10 +28,9 @@
 import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
 
-import static org.springdoc.core.Constants.ALL_PATTERN;
 import static org.springdoc.core.Constants.CLASSPATH_RESOURCE_LOCATION;
 import static org.springdoc.core.Constants.DEFAULT_WEB_JARS_PREFIX_URL;
-import static org.springdoc.core.Constants.SWAGGER_UI_PATTERN;
+import static org.springdoc.core.Constants.SWAGGER_UI_PREFIX;
 import static org.springframework.util.AntPathMatcher.DEFAULT_PATH_SEPARATOR;
 
 /**
@@ -79,8 +78,7 @@ public void addResourceHandlers(ResourceHandlerRegistry registry) {
 		if (actuatorProvider.isPresent() && actuatorProvider.get().isUseManagementPort())
 			uiRootPath.append(actuatorProvider.get().getBasePath());
 
-		uiRootPath.append(ALL_PATTERN);
-		registry.addResourceHandler(uiRootPath + SWAGGER_UI_PATTERN)
+		registry.addResourceHandler(uiRootPath +SWAGGER_UI_PREFIX +"*/**")
 				.addResourceLocations(CLASSPATH_RESOURCE_LOCATION + DEFAULT_WEB_JARS_PREFIX_URL + DEFAULT_PATH_SEPARATOR)
 				.resourceChain(false)
 				.addTransformer(swaggerIndexTransformer);

springdoc-openapi-ui/src/test/java/test/org/springdoc/ui/app3/WebConfig.java

@@ -0,0 +1,40 @@
+/*
+ *
+ *  *
+ *  *  * 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.ui.app3;
+
+/**
+ * @author bnasslashen
+ */
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.PathMatchConfigurer;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+import org.springframework.web.util.pattern.PathPatternParser;
+
+@Configuration
+public class WebConfig implements WebMvcConfigurer {
+
+	@Override
+	public void configurePathMatch(PathMatchConfigurer configurer) {
+		configurer
+				.setPatternParser(new PathPatternParser());
+	}
+}