Skip to content

fixes #143 #144

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 1 commit into from
Apr 19, 2018
Merged

fixes #143 #144

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
32 changes: 21 additions & 11 deletions codegen-cli/src/main/java/com/networknt/codegen/Cli.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import com.beust.jcommander.JCommander;
import com.beust.jcommander.Parameter;
import com.beust.jcommander.ParameterException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.jsoniter.JsonIterator;
import com.jsoniter.any.Any;
Expand Down Expand Up @@ -29,23 +30,29 @@ public class Cli {
"This can be in differing expected formats, given the intended framework type to generate. " +
"Please see the documentation for the most up to date usage.")
String model;
@Parameter(names={"--config", "-c"},
@Parameter(names={"--config", "-c"}, required = true,
description = "Configuration parameters in the form of a file to be passed into your service.")
String config;
@Parameter(names={"--output", "-o"},
description = "The output location of the folder which contains the generated codebase.")
String output;
String output = ".";

@Parameter(names={"--help", "-h"}, help = true)
private boolean help;

public static void main(String ... argv) {
Cli cli = new Cli();
JCommander jCommander = JCommander.newBuilder()
.addObject(cli)
.build();
jCommander.parse(argv);
cli.run(jCommander);
try {
Cli cli = new Cli();
JCommander jCommander = JCommander.newBuilder()
.addObject(cli)
.build();
jCommander.parse(argv);
cli.run(jCommander);
} catch (ParameterException e)
{
System.out.println("Command line parameter error: " + e.getLocalizedMessage());
e.usage();
}
}

public void run(JCommander jCommander) {
Expand Down Expand Up @@ -88,14 +95,17 @@ public void run(JCommander jCommander) {
anyConfig = JsonIterator.deserialize(Files.readAllBytes(Paths.get(config)));
}
}
generator.generate(output, anyModel, anyConfig);
generator.generate(output, anyModel, anyConfig);
System.out.println("A project has been generated successfully in " + output + " folder. Have fun!!!");
} catch (Exception e) {
e.printStackTrace();
}
} else {
System.out.printf("Invalid framework %s", framework);
System.out.printf("Invalid framework: %s\navaliable frameworks:\n", framework);
for(String frm : frameworks) {
System.out.println("\t"+frm);
}
}
System.out.println("A project has been generated successfully in " + output + " folder. Have fun!!!");
}

private boolean isUrl(String location) {
Expand Down