Updated the naive host/port resolution strategy

paulprogrammer · Apr 11, 2015 · 164b174 · 164b174
1 parent 13f663d
commit 164b174
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
@@ -4,7 +4,7 @@ ext {
   groovy = "2.4.3"
   spock = "1.0-groovy-2.4"
   guava = "18.0"
-  springHateoas = "0.10.0.RELEASE"
+  springHateoas = "0.17.0.RELEASE"
   slf4j = "1.7.12"
   mockito = "1.10.19"
   servlet = "3.0.1"
@@ -32,7 +32,8 @@ ext {
           ],
           spring        : [
                   "org.springframework.plugin:spring-plugin-core:${springPluginVersion}",
-                  "org.springframework.plugin:spring-plugin-metadata:${springPluginVersion}"
+                  "org.springframework.plugin:spring-plugin-metadata:${springPluginVersion}",
+                  "org.springframework.hateoas:spring-hateoas:${springHateoas}"
           ],
           springProvided: [
                   "org.springframework:spring-core:$spring",

diff --git a/...ngfox-swagger2/src/main/java/springfox/documentation/swagger2/web/Swagger2Controller.java b/...ngfox-swagger2/src/main/java/springfox/documentation/swagger2/web/Swagger2Controller.java
@@ -34,7 +34,9 @@
 import springfox.documentation.spring.web.DocumentationCache;
 import springfox.documentation.swagger2.mappers.ServiceModelToSwagger2Mapper;
 
-import javax.servlet.ServletRequest;
+import java.net.URI;
+
+import static org.springframework.hateoas.mvc.ControllerLinkBuilder.*;
 
 @Controller
 @ApiIgnore
@@ -52,16 +54,16 @@ public class Swagger2Controller {
   public
   @ResponseBody
   ResponseEntity<Swagger> getDocumentation(
-          @RequestParam(value = "group", required = false) String swaggerGroup, ServletRequest request) {
+          @RequestParam(value = "group", required = false) String swaggerGroup) {
 
     String groupName = Optional.fromNullable(swaggerGroup).or("default");
     Documentation documentation = documentationCache.documentationByGroup(groupName);
     if (documentation == null) {
       return new ResponseEntity<Swagger>(HttpStatus.NOT_FOUND);
     }
     Swagger swagger = mapper.mapDocumentation(documentation);
-    //TODO - this will be problematic when behind a proxy
-    swagger.host(String.format("%s:%s", request.getServerName(), request.getServerPort()));
+    URI uri = linkTo(Swagger2Controller.class).toUri();
+    swagger.host(String.format("%s:%s", uri.getHost(), uri.getPort()));
     return new ResponseEntity<Swagger>(swagger, HttpStatus.OK);
   }