Simplify building from context path using ServletRequestPathUtils

Author: jamesmissen

springdoc-openapi-starter-webflux-ui/src/main/java/org/springdoc/webflux/ui/SwaggerWelcomeCommon.java

@@ -110,7 +110,7 @@ protected Map<String, Object> getSwaggerUiConfig(ServerWebExchange exchange) {
 	 * @param swaggerUiConfigParameters the swagger ui config parameters
 	 * @param exchange                  the exchange
 	 */
-	void buildFromCurrentContextPath(SwaggerUiConfigParameters swaggerUiConfigParameters, ServerWebExchange exchange) {
+	protected void buildFromCurrentContextPath(SwaggerUiConfigParameters swaggerUiConfigParameters, ServerWebExchange exchange) {
 		super.init(swaggerUiConfigParameters);
 
 		String contextPath = exchange.getRequest().getPath().contextPath().value();

springdoc-openapi-starter-webmvc-ui/src/main/java/org/springdoc/webmvc/ui/SwaggerWelcomeCommon.java

@@ -41,8 +41,8 @@
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.util.ForwardedHeaderUtils;
+import org.springframework.web.util.ServletRequestPathUtils;
 import org.springframework.web.util.UriComponentsBuilder;
-import org.springframework.web.util.UrlPathHelper;
 
 /**
  * The type Swagger welcome common.
@@ -51,8 +51,6 @@
  */
 public abstract class SwaggerWelcomeCommon extends AbstractSwaggerWelcome {
 
-	private final UrlPathHelper urlPathHelper = new UrlPathHelper();
-
 	/**
 	 * Instantiates a new Abstract swagger welcome.
 	 *
@@ -112,11 +110,11 @@ protected void calculateOauth2RedirectUrl(SwaggerUiConfigParameters swaggerUiCon
 	 * @param swaggerUiConfigParameters the swagger ui config parameters
 	 * @param request                   the request
 	 */
-	void buildFromCurrentContextPath(SwaggerUiConfigParameters swaggerUiConfigParameters, HttpServletRequest request) {
+	protected void buildFromCurrentContextPath(SwaggerUiConfigParameters swaggerUiConfigParameters, HttpServletRequest request) {
 		super.init(swaggerUiConfigParameters);
 
-		String pathWithinServletMapping = urlPathHelper.getPathWithinServletMapping(request);
-		String contextPath = request.getContextPath() + (!StringUtils.isBlank(pathWithinServletMapping) ? request.getServletPath() : "");
+		String servletPath = ServletRequestPathUtils.getServletPathPrefix(request);
+		String contextPath = request.getContextPath() + (servletPath != null ? servletPath : "");
 		swaggerUiConfigParameters.setContextPath(contextPath);
 
 		URI uri = URI.create(request.getRequestURL().toString());