loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

[NodeJS] make serverPort configurable via CLI option (#7899)

Browse Source 
* Add "serverPort" option

* Use port number passed via CLI option if specified

* Replace hand-written param name with the constant

* Rename serverPort -> defaultServerPort

* Fix failed test

https://travis-ci.org/swagger-api/swagger-codegen/builds/357674590
This commit is contained in:
Akihito Nakano 2018-03-26 00:12:15 +09:00 committed by William Cheng
parent fc7e083467
commit 6d88d073ca
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/NodeJSServerCodegen.java
View File

@ -28,10 +28,11 @@ public class NodeJSServerCodegen extends DefaultCodegen implements CodegenConfig
protected String implFolder = "service";
public static final String GOOGLE_CLOUD_FUNCTIONS = "googleCloudFunctions";
public static final String EXPORTED_NAME = "exportedName";
public static final String SERVER_PORT = "serverPort";
protected String apiVersion = "1.0.0";
protected int serverPort = 8080;
protected String projectName = "swagger-server";
protected String defaultServerPort = "8080";
protected boolean googleCloudFunctions;
protected String exportedName;
@ -82,7 +83,6 @@ public class NodeJSServerCodegen extends DefaultCodegen implements CodegenConfig
* are available in models, apis, and supporting files
*/
additionalProperties.put("apiVersion", apiVersion);
additionalProperties.put("serverPort", serverPort);
additionalProperties.put("implFolder", implFolder);
supportingFiles.add(new SupportingFile("writer.mustache", ("utils").replace(".", File.separator), "writer.js"));
@ -96,6 +96,8 @@ public class NodeJSServerCodegen extends DefaultCodegen implements CodegenConfig
"When the generated code will be deployed to Google Cloud Functions, this option can be "
+ "used to update the name of the exported function. By default, it refers to the "
+ "basePath. This does not affect normal standalone nodejs server code."));
cliOptions.add(new CliOption(SERVER_PORT,
"TCP port to listen on."));
}
@Override
@ -318,7 +320,7 @@ public class NodeJSServerCodegen extends DefaultCodegen implements CodegenConfig
@Override
public void preprocessSwagger(Swagger swagger) {
String host = swagger.getHost();
String port = "8080";
String port = defaultServerPort;
if (!StringUtils.isEmpty(host)) {
String[] parts = host.split(":");
@ -331,7 +333,10 @@ public class NodeJSServerCodegen extends DefaultCodegen implements CodegenConfig
LOGGER.warn("'host' in the specification is empty or undefined. Default to http://localhost.");
}
this.additionalProperties.put("serverPort", port);
if (additionalProperties.containsKey(SERVER_PORT)) {
port = additionalProperties.get(SERVER_PORT).toString();
}
this.additionalProperties.put(SERVER_PORT, port);
if (swagger.getInfo() != null) {
Info info = swagger.getInfo();

2
modules/swagger-codegen/src/test/java/io/swagger/codegen/options/NodeJSServerOptionsProvider.java
View File

@ -12,6 +12,7 @@ public class NodeJSServerOptionsProvider implements OptionsProvider {
public static final String GOOGLE_CLOUD_FUNCTIONS = "false";
public static final String EXPORTED_NAME = "exported";
public static final String ALLOW_UNICODE_IDENTIFIERS_VALUE = "false";
public static final String SERVER_PORT = "8080";
@Override
@ -26,6 +27,7 @@ public class NodeJSServerOptionsProvider implements OptionsProvider {
.put(CodegenConstants.ENSURE_UNIQUE_PARAMS, ENSURE_UNIQUE_PARAMS_VALUE)
.put(NodeJSServerCodegen.GOOGLE_CLOUD_FUNCTIONS, GOOGLE_CLOUD_FUNCTIONS)
.put(NodeJSServerCodegen.EXPORTED_NAME, EXPORTED_NAME)
.put(NodeJSServerCodegen.SERVER_PORT, SERVER_PORT)
.put(CodegenConstants.ALLOW_UNICODE_IDENTIFIERS, ALLOW_UNICODE_IDENTIFIERS_VALUE)
.build();
}