Merge pull request #11738 from fgreinacher/fix/use-generator-host

fix: use information in generator host for generating spec

Author: HugoMario

modules/swagger-generator/src/main/java/io/swagger/generator/Bootstrap.java

@@ -38,9 +38,10 @@ public void init(ServletConfig config) throws ServletException {
                 if (scheme != null) {
                     bc.setSchemes(new String[] { scheme });
                 }
-                String host = hostURI.getHost();
-                if (host != null) {
-                    bc.setHost(host);
+                String authority = hostURI.getAuthority();
+                if (authority != null) {
+                    // In Swagger host refers to host _and_ port, a.k.a. the URI authority
+                    bc.setHost(authority);
                 }
                 bc.setBasePath(hostURI.getPath() + "/api");
             } catch(URISyntaxException e) {

modules/swagger-generator/src/main/java/io/swagger/generator/DynamicSwaggerConfig.java

@@ -7,12 +7,15 @@
 import io.swagger.models.Operation;
 import io.swagger.models.Path;
 import io.swagger.models.Swagger;
+import io.swagger.models.Scheme;
 import io.swagger.models.parameters.Parameter;
 import io.swagger.models.parameters.PathParameter;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
+import java.util.stream.Collectors;
 
 public class DynamicSwaggerConfig extends BeanConfig {
     static List<String> clients = new ArrayList<String>();
@@ -73,6 +76,15 @@ public Swagger configure(Swagger swagger) {
             }
         }
 
-        return swagger.info(getInfo()).host(getHost()).basePath("/api");
+        Swagger result = swagger
+            .info(getInfo())
+            .host(getHost())
+            .basePath(getBasePath());
+
+        if (getSchemes() != null) {
+            result = result.schemes(Arrays.stream(getSchemes()).map(s -> Scheme.forValue(s)).collect(Collectors.toList()));
+        }
+
+        return result;
     }
 }