Skip to content

Commit a5bf2c4

Browse files
fgreinacherfrantuma
authored andcommitted
fix: use GENERATOR_HOST variable in server generation
1 parent fc79c75 commit a5bf2c4

File tree

1 file changed

+20
-16
lines changed

1 file changed

+20
-16
lines changed

modules/swagger-generator/src/main/java/io/swagger/generator/resource/SwaggerResource.java

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -91,19 +91,7 @@ public Response generateClient(
9191
throws Exception {
9292

9393
String filename = Generator.generateClient(language, opts);
94-
String host = System.getenv("GENERATOR_HOST");
95-
96-
if (StringUtils.isBlank(host)) {
97-
String scheme = request.getHeader("X-SSL");
98-
String port = "";
99-
if ("1".equals(scheme)) {
100-
scheme = "https";
101-
} else {
102-
scheme = request.getScheme();
103-
port = ":" + request.getServerPort();
104-
}
105-
host = scheme + "://" + request.getServerName() + port;
106-
}
94+
String host = getHost(request);
10795

10896
if (filename != null) {
10997
String code = String.valueOf(UUID.randomUUID().toString());
@@ -192,9 +180,7 @@ public Response generateServerForLanguage(@Context HttpServletRequest request, @
192180
String filename = Generator.generateServer(framework, opts);
193181
System.out.println("generated name: " + filename);
194182

195-
String host =
196-
request.getScheme() + "://" + request.getServerName() + ":"
197-
+ request.getServerPort();
183+
String host = getHost(request);
198184

199185
if (filename != null) {
200186
String code = String.valueOf(UUID.randomUUID().toString());
@@ -209,4 +195,22 @@ public Response generateServerForLanguage(@Context HttpServletRequest request, @
209195
return Response.status(500).build();
210196
}
211197
}
198+
199+
private String getHost(HttpServletRequest request) {
200+
String host = System.getenv("GENERATOR_HOST");
201+
202+
if (StringUtils.isBlank(host)) {
203+
String scheme = request.getHeader("X-SSL");
204+
String port = "";
205+
if ("1".equals(scheme)) {
206+
scheme = "https";
207+
} else {
208+
scheme = request.getScheme();
209+
port = ":" + request.getServerPort();
210+
}
211+
host = scheme + "://" + request.getServerName() + port;
212+
}
213+
214+
return host;
215+
}
212216
}

0 commit comments

Comments
 (0)