Merge branch 'bug/3351/fix-swagger-ui-calls'

relates to #3351
springfox · Jun 30, 2020 · 03a10e6 · 03a10e6
2 parents c289294 + 98789a4
commit 03a10e6
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/...wagger2/src/main/java/springfox/documentation/swagger2/web/Swagger2ControllerWebFlux.java b/...wagger2/src/main/java/springfox/documentation/swagger2/web/Swagger2ControllerWebFlux.java
@@ -84,6 +84,7 @@ public ResponseEntity<Json> getDocumentation(
       return new ResponseEntity<>(HttpStatus.NOT_FOUND);
     }
     Swagger swagger = mapper.mapDocumentation(documentation);
+    swagger.basePath(isEmpty(request.getPath().contextPath().value()) ? "/" : request.getPath().contextPath().value());
     if (isEmpty(swagger.getHost())) {
       swagger.host(request.getURI().getAuthority());
     }

diff --git a/...swagger2/src/main/java/springfox/documentation/swagger2/web/Swagger2ControllerWebMvc.java b/...swagger2/src/main/java/springfox/documentation/swagger2/web/Swagger2ControllerWebMvc.java
@@ -95,6 +95,8 @@ public ResponseEntity<Json> getDocumentation(
     }
     Swagger swagger = mapper.mapDocumentation(documentation);
     UriComponents uriComponents = componentsFrom(servletRequest, swagger.getBasePath());
+    String basePath = isEmpty(uriComponents.getPath()) ? "/" : uriComponents.getPath();
+    swagger.basePath(basePath.replace(servletRequest.getContextPath(), ""));
     if (isEmpty(swagger.getHost())) {
       swagger.host(hostName(uriComponents));
     }

diff --git a/...agger2/src/test/groovy/springfox/documentation/swagger2/web/Swagger2ControllerSpec.groovy b/...agger2/src/test/groovy/springfox/documentation/swagger2/web/Swagger2ControllerSpec.groovy
@@ -107,8 +107,8 @@ class Swagger2ControllerSpec extends DocumentationContextSpec
     where:
     prefix        | expectedPath
     "/fooservice" | "/fooservice/servletPath"
-    "/"           | "/contextPath/servletPath"
-    ""            | "/contextPath/servletPath"
+    "/"           | "/servletPath"
+    ""            | "/servletPath"
   }
 
   def "Should omit port number if it is -1"() {