Fixes Wrong redirect with modified spring.mvc.servlet.path #238

Author: springdoc

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

@@ -22,6 +22,7 @@ public final class Constants {
     public static final String APPLICATION_OPENAPI_YAML = "application/vnd.oai.openapi";
     public static final String DEFAULT_SWAGGER_UI_PATH = DEFAULT_PATH_SEPARATOR + "swagger-ui.html";
     public static final String SWAGGER_UI_PATH = "${springdoc.swagger-ui.path:#{T(org.springdoc.core.Constants).DEFAULT_SWAGGER_UI_PATH}}";
+    public static final String MVC_SERVLET_PATH ="${spring.mvc.servlet.path:#{null}}";
     public static final String GET_METHOD = "get";
     public static final String POST_METHOD = "post";
     public static final String PUT_METHOD = "put";

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

@@ -1,6 +1,7 @@
 package org.springdoc.ui;
 
 import io.swagger.v3.oas.annotations.Operation;
+import org.apache.commons.lang3.StringUtils;
 import org.springdoc.core.SwaggerUiConfigProperties;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -26,19 +27,26 @@ class SwaggerWelcome {
     @Value(SWAGGER_UI_PATH)
     private String swaggerPath;
 
+    @Value(MVC_SERVLET_PATH)
+    private String mvcServletPath;
+
     @Autowired
     private SwaggerUiConfigProperties swaggerUiConfig;
 
     @Operation(hidden = true)
     @GetMapping(SWAGGER_UI_PATH)
     public String redirectToUi(HttpServletRequest request) {
         String contextPath = request.getContextPath();
+        if (StringUtils.isNotBlank(mvcServletPath))
+            contextPath += mvcServletPath;
         String uiRootPath = "";
         if (swaggerPath.contains("/")) {
             uiRootPath = swaggerPath.substring(0, swaggerPath.lastIndexOf('/'));
         }
         StringBuilder sbUrl = new StringBuilder();
         sbUrl.append(REDIRECT_URL_PREFIX);
+        if (StringUtils.isNotBlank(mvcServletPath))
+            sbUrl.append(mvcServletPath);
         sbUrl.append(uiRootPath);
         sbUrl.append(SWAGGER_UI_URL);
         if (contextPath.endsWith(DEFAULT_PATH_SEPARATOR)) {