Skip to content

Issue 287 #289

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
stevehu merged 2 commits into from
May 3, 2019
Merged

Issue 287 #289

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
be145d6
fixes #287
GavinChenYan Apr 25, 2019
abd72c3
fix issues
GavinChenYan Apr 26, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions light-rest-4j/src/main/java/com/networknt/codegen/rest/OpenApiGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ public class OpenApiGenerator implements Generator {
boolean enableParamDescription = true;
boolean generateModelOnly = false;
boolean generateValuesYml = false;
boolean regeneratePomFile = true;

public OpenApiGenerator() {
typeMapping.put("array", "java.util.List");
Expand Down Expand Up @@ -116,6 +117,7 @@ public void generate(final String targetPath, Object model, Any config) throws I
skipServerInfo = config.toBoolean("skipServerInfo");
regenerateCodeOnly = config.toBoolean("specChangeCodeReGenOnly");
enableParamDescription = config.toBoolean("enableParamDescription");
regeneratePomFile = config.toBoolean("regeneratePomFile");

generateValuesYml = config.toBoolean("generateValuesYml");

Expand All @@ -134,7 +136,10 @@ public void generate(final String targetPath, Object model, Any config) throws I
// if set to true, regenerate the code only (handlers, model and the handler.yml, potentially affected by operation changes
if (!regenerateCodeOnly) {
// generate configurations, project, masks, certs, etc
transfer(targetPath, "", "pom.xml", templates.rest.openapi.pom.template(config));
if (regeneratePomFile) {
transfer(targetPath, "", "pom.xml", templates.rest.openapi.pom.template(config));
}


transferMaven(targetPath);
// There is only one port that should be exposed in Dockerfile, otherwise, the service
Expand Down Expand Up @@ -181,10 +186,6 @@ public void generate(final String targetPath, Object model, Any config) throws I
transfer(targetPath, ("src.main.resources").replace(".", separator), "logback.xml", templates.rest.logback.template());
transfer(targetPath, ("src.test.resources").replace(".", separator), "logback-test.xml", templates.rest.logback.template());

// routing handler
transfer(targetPath, ("src.main.resources.config").replace(".", separator), "handler.yml",
templates.rest.openapi.handlerYml.template(serviceId, handlerPackage, operationList, prometheusMetrics, !skipHealthCheck, !skipServerInfo));

// exclusion list for Config module
transfer(targetPath, ("src.main.resources.config").replace(".", separator), "config.yml", templates.rest.openapi.config.template());

Expand All @@ -200,6 +201,10 @@ public void generate(final String targetPath, Object model, Any config) throws I
YAMLFileParameterizer.rewriteAll(targetPath + separator + YAMLFileParameterizer.DEFAULT_DEST_DIR, config.get(YAMLFileParameterizer.GENERATE_ENV_VARS).asMap());
}
}
// routing handler
transfer(targetPath, ("src.main.resources.config").replace(".", separator), "handler.yml",
templates.rest.openapi.handlerYml.template(serviceId, handlerPackage, operationList, prometheusMetrics, !skipHealthCheck, !skipServerInfo));

}

// model
Expand Down