keep compatibility with spring-boot-1

Author: bnasslahsen

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

@@ -48,6 +48,8 @@ public final class Constants {
 
 	public static final String NULL = ":#{null}";
 
+	public static final String MVC_SERVLET_PATH = "${spring.mvc.servlet.path"+ NULL +"}";
+
 	public static final String SPRINGDOC_SWAGGER_UI_URL_VALUE = "${" + SPRINGDOC_SWAGGER_UI_URL + NULL + "}";
 
 	public static final String SPRINGDOC_OAUTH2_REDIRECT_URL = "springdoc.swagger-ui.oauth2RedirectUrl";

springdoc-openapi-ui/src/main/java/org/springdoc/ui/SwaggerConfig.java

@@ -28,7 +28,6 @@
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.boot.autoconfigure.web.servlet.WebMvcProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
@@ -71,8 +70,8 @@ public void addResourceHandlers(ResourceHandlerRegistry registry) {
 
 	@Bean
 	@ConditionalOnProperty(name = SPRINGDOC_SWAGGER_UI_ENABLED, matchIfMissing = true)
-	public SwaggerWelcome swaggerWelcome(SwaggerUiConfigProperties swaggerUiConfig, SpringDocConfigProperties springDocConfigProperties, WebMvcProperties webMvcProperties) {
-		return new SwaggerWelcome( swaggerUiConfig,  springDocConfigProperties,  webMvcProperties);
+	public SwaggerWelcome swaggerWelcome(SwaggerUiConfigProperties swaggerUiConfig, SpringDocConfigProperties springDocConfigProperties) {
+		return new SwaggerWelcome( swaggerUiConfig,  springDocConfigProperties);
 	}
 
 	@Bean

springdoc-openapi-ui/src/main/java/org/springdoc/ui/SwaggerWelcome.java

@@ -23,37 +23,38 @@
 import javax.servlet.http.HttpServletRequest;
 
 import io.swagger.v3.oas.annotations.Operation;
+import org.apache.commons.lang3.StringUtils;
 import org.springdoc.core.SpringDocConfigProperties;
 import org.springdoc.core.SpringDocConfiguration;
 import org.springdoc.core.SwaggerUiConfigProperties;
 
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.boot.autoconfigure.web.servlet.WebMvcProperties;
 import org.springframework.http.MediaType;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.support.ServletUriComponentsBuilder;
 import org.springframework.web.util.UriComponentsBuilder;
 
+import static org.springdoc.core.Constants.MVC_SERVLET_PATH;
 import static org.springdoc.core.Constants.SPRINGDOC_SWAGGER_UI_ENABLED;
 import static org.springdoc.core.Constants.SWAGGER_CONFIG_URL;
 import static org.springdoc.core.Constants.SWAGGER_UI_PATH;
 import static org.springdoc.core.Constants.SWAGGER_UI_URL;
-import static org.springframework.util.AntPathMatcher.DEFAULT_PATH_SEPARATOR;
 import static org.springframework.web.servlet.view.UrlBasedViewResolver.REDIRECT_URL_PREFIX;
 
 @Controller
 @ConditionalOnProperty(name = SPRINGDOC_SWAGGER_UI_ENABLED, matchIfMissing = true)
 @ConditionalOnBean(SpringDocConfiguration.class)
 public class SwaggerWelcome extends AbstractSwaggerWelcome {
 
-	private final WebMvcProperties webMvcProperties;
+	@Value(MVC_SERVLET_PATH)
+	private String mvcServletPath;
 
-	public SwaggerWelcome(SwaggerUiConfigProperties swaggerUiConfig, SpringDocConfigProperties springDocConfigProperties, WebMvcProperties webMvcProperties) {
+	public SwaggerWelcome(SwaggerUiConfigProperties swaggerUiConfig, SpringDocConfigProperties springDocConfigProperties) {
 		super(swaggerUiConfig, springDocConfigProperties);
-		this.webMvcProperties = webMvcProperties;
 	}
 
 	@Operation(hidden = true)
@@ -75,17 +76,15 @@ public Map<String, Object> openapiYaml(HttpServletRequest request) {
 
 	@Override
 	protected void calculateUiRootPath(StringBuilder... sbUrls) {
-		String mvcServletPath = webMvcProperties.getServlet().getPath();
 		StringBuilder sbUrl = new StringBuilder();
-		if (!DEFAULT_PATH_SEPARATOR.equals(mvcServletPath))
+		if (StringUtils.isNotBlank(mvcServletPath))
 			sbUrl.append(mvcServletPath);
 		super.calculateUiRootPath(sbUrl);
 	}
 
 	@Override
 	protected String buildUrl(String contextPath, final String docsUrl) {
-		String mvcServletPath = webMvcProperties.getServlet().getPath();
-		if (!DEFAULT_PATH_SEPARATOR.equals(mvcServletPath))
+		if (StringUtils.isNotBlank(mvcServletPath))
 			contextPath += mvcServletPath;
 		return super.buildUrl(contextPath,docsUrl);
 	}