Skip to content

switch to jackson and refactor to support more generators #531

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 7 commits into from
Feb 19, 2021
Merged

switch to jackson and refactor to support more generators #531

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
59dad78
fixes #528 complete the graphql, hybrid and openapi
stevehu Feb 16, 2021
f0d8059
fixes #528 change OpenApiGenerator to interface for default methods
stevehu Feb 16, 2021
c756664
fixes #528 add Lambda generator
stevehu Feb 18, 2021
852e910
fixes #528 sync the codegen with the latest petstore in example
stevehu Feb 18, 2021
9c6b63b
fixes #528 compare between old and new for GraphqlGeneratorTest
stevehu Feb 18, 2021
4984eae
fixes #528 compare the generated projects for hybrid test cases
stevehu Feb 18, 2021
22e251a
fixes #528 update the lambda config
stevehu Feb 18, 2021
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
9 changes: 4 additions & 5 deletions codegen-cli/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,14 +50,13 @@
<groupId>com.networknt</groupId>
<artifactId>light-graphql-4j-generator</artifactId>
</dependency>

<dependency>
<groupId>com.jsoniter</groupId>
<artifactId>jsoniter</artifactId>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-yaml</artifactId>
</dependency>
<dependency>
<groupId>org.javassist</groupId>
<artifactId>javassist</artifactId>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
Expand Down
68 changes: 50 additions & 18 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 @@ -3,22 +3,33 @@
import com.beust.jcommander.JCommander;
import com.beust.jcommander.Parameter;
import com.beust.jcommander.ParameterException;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.ObjectReader;
import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
import com.fizzed.rocker.runtime.RockerRuntime;
import com.jsoniter.JsonIterator;
import com.jsoniter.any.Any;
import com.networknt.codegen.rest.YAMLFileParameterizer;
import com.networknt.utility.NioUtils;
import org.apache.commons.lang3.StringUtils;

import java.net.URL;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.util.Map;
import java.util.Set;
import static java.io.File.separator;

/**
* Created by steve on 24/04/17.
*/
public class Cli {
private static final String JSON="json";
private static final String YAML="yaml";
private static final String YML="yml";
private static final String GRAPHQLS = "graphqls";

private ObjectMapper objectMapper = new ObjectMapper(new YAMLFactory());

@Parameter(names={"--framework", "-f"}, required = true,
description = "The framework template to be used as scaffolding to the generated code.")
Expand Down Expand Up @@ -75,37 +86,58 @@ public void run(JCommander jCommander) throws Exception {
Set<String> frameworks = registry.getFrameworks();
if(frameworks.contains(framework)) {
Generator generator = registry.getGenerator(framework);
Object anyModel = null;
Object modelNode = null;
// model can be empty in some cases.
if(model != null) {
// check if model is json or not before loading.
if(model.endsWith("json")) {
if(Utils.isUrl(model)) {
anyModel = JsonIterator.deserialize(Utils.urlToByteArray(new URL(model)));
String ext = NioUtils.getFileExtension(model);
if(StringUtils.equalsIgnoreCase(ext, JSON)) {
if (Utils.isUrl(model)) {
modelNode = Generator.jsonMapper.readTree(Utils.urlToByteArray(new URL(model)));
} else {
anyModel = JsonIterator.deserialize(Files.readAllBytes(Paths.get(model)));
modelNode = Generator.jsonMapper.readTree(Files.readAllBytes(Paths.get(model)));
}
} else {
} else if(StringUtils.equalsIgnoreCase(ext, YML) || StringUtils.equalsIgnoreCase(ext, YAML)) {
if (Utils.isUrl(model)) {
modelNode = Generator.yamlMapper.readTree(Utils.urlToByteArray(new URL(model)));
} else {
modelNode = Generator.yamlMapper.readTree(Files.readAllBytes(Paths.get(model)));
}
} else if(StringUtils.equalsIgnoreCase(ext, GRAPHQLS)) {
if(Utils.isUrl(model)) {
anyModel = new String(Utils.urlToByteArray(new URL(model)), StandardCharsets.UTF_8);
modelNode = new String(Utils.urlToByteArray(new URL(model)), StandardCharsets.UTF_8);
} else {
anyModel = new String(Files.readAllBytes(Paths.get(model)), StandardCharsets.UTF_8);
modelNode = new String(Files.readAllBytes(Paths.get(model)), StandardCharsets.UTF_8);
}
} else {
throw new UnsupportedOperationException("Unknown model file format " + ext);
}
}

Any anyConfig = null;
JsonNode configNode = null;
if(config != null) {
if(Utils.isUrl(config)) {
anyConfig = JsonIterator.deserialize(Utils.urlToByteArray(new URL(config)));
String ext = NioUtils.getFileExtension(config);
if (StringUtils.equalsIgnoreCase(ext, JSON)) {
if (Utils.isUrl(config)) {
configNode = Generator.jsonMapper.readTree(Utils.urlToByteArray(new URL(config)));
} else {
configNode = Generator.jsonMapper.readTree(Files.readAllBytes(Paths.get(config)));
}
} else if (StringUtils.equalsIgnoreCase(ext, YML)||StringUtils.equalsIgnoreCase(ext, YAML)) {
if (Utils.isUrl(config)) {
configNode = Generator.yamlMapper.readTree(Utils.urlToByteArray(new URL(config)));
} else {
configNode = Generator.yamlMapper.readTree(Files.readAllBytes(Paths.get(config)));
}
} else {
anyConfig = JsonIterator.deserialize(Files.readAllBytes(Paths.get(config)));
throw new UnsupportedOperationException("Unknow file format " + ext);
}

}
if(parameterizationDir != null) {
YAMLFileParameterizer.rewriteAll(parameterizationDir, output + separator + YAMLFileParameterizer.DEFAULT_DEST_DIR, anyConfig.asMap().get(YAMLFileParameterizer.GENERATE_ENV_VARS).asMap());
Map<String, Object> map = Generator.jsonMapper.convertValue(configNode.get(YAMLFileParameterizer.GENERATE_ENV_VARS), new TypeReference<Map<String, Object>>(){});
YAMLFileParameterizer.rewriteAll(parameterizationDir, output + separator + YAMLFileParameterizer.DEFAULT_DEST_DIR, map);
}
generator.generate(output, anyModel, anyConfig);
generator.generate(output, modelNode, configNode);
System.out.println("A project has been generated successfully in " + output + " folder. Have fun!!!");
} else {
System.out.printf("Invalid framework: %s\navaliable frameworks:\n", framework);
Expand Down
49 changes: 19 additions & 30 deletions ...t/codegen/rest/YAMLFileParameterizer.java → ...worknt/codegen/YAMLFileParameterizer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,10 @@
package com.networknt.codegen.rest;
package com.networknt.codegen;

import java.io.*;
import java.net.URL;
import java.net.URLDecoder;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.Enumeration;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.*;
import java.util.jar.JarEntry;
import java.util.jar.JarFile;
import java.util.stream.Collectors;
Expand All @@ -32,7 +24,6 @@
import org.yaml.snakeyaml.reader.StreamReader;
import org.yaml.snakeyaml.resolver.Resolver;

import com.jsoniter.any.Any;

import static java.nio.charset.StandardCharsets.UTF_8;

Expand Down Expand Up @@ -60,16 +51,16 @@ public class YAMLFileParameterizer {
* @param dir - file dir
* @param generateEnvVars - config
*/
public static void rewriteAll(String dir, Map<String, Any> generateEnvVars) {
public static void rewriteAll(String dir, Map<String, Object> generateEnvVars) {
if (logger.isDebugEnabled()) {
logger.debug("rewriting files in {}", dir);
}

generateEnvVars.put(KEY_IN_PLACE, Any.wrap(true));
generateEnvVars.put(KEY_IN_PLACE, true);
rewriteFiles(new File(dir), new File(dir), generateEnvVars);
}

public static void rewriteAll(String srcLocation, String destDir, Map<String, Any> generateEnvVars) {
public static void rewriteAll(String srcLocation, String destDir, Map<String, Object> generateEnvVars) {

if (logger.isDebugEnabled()) {
logger.debug("rewriting files in {}", srcLocation);
Expand All @@ -82,7 +73,7 @@ public static void rewriteAll(String srcLocation, String destDir, Map<String, An
}
}

public static void rewriteFiles(File sourceDir, File destDir, Map<String, Any> generateEnvVars) {
public static void rewriteFiles(File sourceDir, File destDir, Map<String, Object> generateEnvVars) {
if (!sourceDir.exists() || !sourceDir.isDirectory()) {
logger.error("{} does not exist or is not a folder.", sourceDir);
return;
Expand Down Expand Up @@ -111,7 +102,7 @@ public static void rewriteFiles(File sourceDir, File destDir, Map<String, Any> g
}
}

public static void rewriteResources(String resourceLocation, String destDir, Map<String, Any> generateEnvVars) {
public static void rewriteResources(String resourceLocation, String destDir, Map<String, Object> generateEnvVars) {
if (StringUtils.isBlank(resourceLocation)) {
return;
}
Expand Down Expand Up @@ -180,7 +171,7 @@ public static void copyResources(String resourceLocation, String destDir) {
}
}

public static void rewriteResource(String filename, String resourceLocation, String destFilename, Map<String, Any> generateEnvVars) {
public static void rewriteResource(String filename, String resourceLocation, String destFilename, Map<String, Object> generateEnvVars) {
if (logger.isDebugEnabled()) {
logger.debug("rewriting resource {}", resourceLocation);
}
Expand All @@ -197,7 +188,7 @@ public static void rewriteResource(String filename, String resourceLocation, Str
}
}

public static void rewriteFile(File srcFile, File destFile, Map<String, Any> generateEnvVars) {
public static void rewriteFile(File srcFile, File destFile, Map<String, Object> generateEnvVars) {
if (logger.isDebugEnabled()) {
logger.debug("rewriting file {}", srcFile.getAbsolutePath());
}
Expand Down Expand Up @@ -260,9 +251,9 @@ protected static String resolveLocation(String location) {
return location;
}

protected static boolean getValue(Map<String, Any> generateEnvVars, String key) {
protected static boolean getValue(Map<String, Object> generateEnvVars, String key) {
if (generateEnvVars.containsKey(key)) {
return generateEnvVars.get(key).toBoolean();
return (Boolean)generateEnvVars.get(key);
}

return false;
Expand Down Expand Up @@ -391,7 +382,7 @@ protected static List<String> readFile(File file) {
return lines;
}

protected static void parameterize(String filename, Node document, List<String> srclines, File destFile, Map<String, Any> generateEnvVars) {
protected static void parameterize(String filename, Node document, List<String> srclines, File destFile, Map<String, Object> generateEnvVars) {
try (Writer writer = Files.newBufferedWriter(destFile.toPath(), UTF_8)) {
if (document instanceof MappingNode) {
List<String> destlines = parameterize(filename, srclines, (MappingNode) document, generateEnvVars);
Expand All @@ -407,7 +398,7 @@ protected static void parameterize(String filename, Node document, List<String>
}
}

protected static List<String> parameterize(String filename, List<String> srclines, MappingNode node, Map<String, Any> generateEnvVars) {
protected static List<String> parameterize(String filename, List<String> srclines, MappingNode node, Map<String, Object> generateEnvVars) {
List<String> destlines = new ArrayList<>();

List<NodeTuple> tuples = node.getValue();
Expand Down Expand Up @@ -490,33 +481,31 @@ protected static String stripExtension (String str) {
return str.substring(0, pos);
}

protected static Set<String> buildFileExcludeSet(String sourceDir, Map<String, Any> generateEnvVars) {
protected static Set<String> buildFileExcludeSet(String sourceDir, Map<String, Object> generateEnvVars) {
if (generateEnvVars.containsKey(KEY_EXCLUDE)) {
return buildFileExcludeSet(sourceDir, generateEnvVars.get(KEY_EXCLUDE).asList());
return buildFileExcludeSet(sourceDir, (List)generateEnvVars.get(KEY_EXCLUDE));
}

return Collections.emptySet();
}

protected static Set<String> buildFileExcludeSet(String sourceDir, Collection<Any> excludes) {
protected static Set<String> buildFileExcludeSet(String sourceDir, Collection<String> excludes) {
return excludes.stream()
.map(Any::toString)
.filter(StringUtils::isNotBlank)
.map(s->sourceDir+normalizeFilename(s))
.collect(Collectors.toSet());
}

protected static Set<String> buildResourceExcludeSet(String resourceLocation, Map<String, Any> generateEnvVars) {
protected static Set<String> buildResourceExcludeSet(String resourceLocation, Map<String, Object> generateEnvVars) {
if (generateEnvVars.containsKey(KEY_EXCLUDE)) {
return buildResourceExcludeSet(resourceLocation, generateEnvVars.get(KEY_EXCLUDE).asList());
return buildResourceExcludeSet(resourceLocation, (List)generateEnvVars.get(KEY_EXCLUDE));
}

return Collections.emptySet();
}

protected static Set<String> buildResourceExcludeSet(String resourceLocation, Collection<Any> excludes) {
protected static Set<String> buildResourceExcludeSet(String resourceLocation, Collection<String> excludes) {
return excludes.stream()
.map(Any::toString)
.filter(StringUtils::isNotBlank)
.map(s->toNonNullString(getResourceURL(resourceLocation+s)))
.collect(Collectors.toSet());
Expand Down
2 changes: 1 addition & 1 deletion codegen-cli/src/main/resources/config/service.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
singletons:
# Generator interface implementations
- com.networknt.codegen.Generator:
- com.networknt.codegen.rest.OpenApiGenerator
- com.networknt.codegen.rest.OpenApiLightGenerator
- com.networknt.codegen.hybrid.HybridServerGenerator
- com.networknt.codegen.hybrid.HybridServiceGenerator
- com.networknt.codegen.graphql.GraphqlGenerator
Expand Down
21 changes: 21 additions & 0 deletions codegen-cli/src/test/java/com/networknt/codegen/CliTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,28 @@
package com.networknt.codegen;

import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.ObjectReader;
import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
import com.networknt.config.Config;
import org.junit.Test;

/**
* Created by steve on 24/04/17.
*/
public class CliTest {
private ObjectMapper objectMapper = new ObjectMapper(new YAMLFactory());
private final ObjectReader reader = objectMapper.reader();

@Test
public void testJsonModel() throws Exception {
JsonNode modelNode = reader.readTree(CliTest.class.getClassLoader().getResourceAsStream("openapi.json"));
System.out.println(modelNode);
}

@Test
public void testYamlModel() throws Exception {
JsonNode modelNode = reader.readTree(CliTest.class.getClassLoader().getResourceAsStream("openapi.yaml"));
System.out.println(modelNode);
}
}
Loading