Skip to content

Fix/issue216 and 217 #226

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 12 commits into from
Feb 15, 2019
Merged

Fix/issue216 and 217 #226

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
ce5c216
generate parameterized configs for handlers - #216, #217
dz-1 Feb 12, 2019
16de56c
Merge branch 'develop' of https://github.com/networknt/light-codegen …
dz-1 Feb 12, 2019
1ccdefd
clean up
dz-1 Feb 12, 2019
4059b9b
make the config 'generateEnvVars' optional - #216, #217
dz-1 Feb 12, 2019
a7161a6
clean up
dz-1 Feb 12, 2019
bdccc61
fix file loading defect - #216, #217
dz-1 Feb 13, 2019
281d751
fix formatting issue - #216, #217
dz-1 Feb 13, 2019
d4a95ef
refine filtering condition
dz-1 Feb 13, 2019
baef552
fix defect of read files in jar - #216, #217
dz-1 Feb 13, 2019
b21879c
add 'exclude' config and rewrite all config files - #216, #217
dz-1 Feb 14, 2019
5fa16e0
Merge branch 'develop' into fix/issue216_and_217
NicholasAzar Feb 15, 2019
83d4820
Fix a failing test
NicholasAzar Feb 15, 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
4 changes: 4 additions & 0 deletions light-rest-4j/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,10 @@
<groupId>com.thoughtworks.qdox</groupId>
<artifactId>qdox</artifactId>
</dependency>
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
Expand Down
46 changes: 33 additions & 13 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
@@ -1,15 +1,6 @@
package com.networknt.codegen.rest;

import com.jsoniter.JsonIterator;
import com.jsoniter.ValueType;
import com.jsoniter.any.Any;
import com.jsoniter.output.JsonStream;
import com.networknt.codegen.Generator;
import com.networknt.codegen.Utils;
import com.networknt.jsonoverlay.Overlay;
import com.networknt.oas.OpenApiParser;
import com.networknt.oas.model.*;
import com.networknt.oas.model.impl.OpenApi3Impl;
import static java.io.File.separator;

import java.io.ByteArrayInputStream;
import java.io.IOException;
Expand All @@ -20,11 +11,33 @@
import java.nio.file.Files;
import java.nio.file.Paths;
import java.nio.file.StandardCopyOption;
import java.util.*;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.stream.Collectors;

import static java.io.File.separator;
import com.jsoniter.JsonIterator;
import com.jsoniter.ValueType;
import com.jsoniter.any.Any;
import com.jsoniter.output.JsonStream;
import com.networknt.codegen.Generator;
import com.networknt.codegen.Utils;
import com.networknt.jsonoverlay.Overlay;
import com.networknt.oas.OpenApiParser;
import com.networknt.oas.model.Example;
import com.networknt.oas.model.MediaType;
import com.networknt.oas.model.OpenApi3;
import com.networknt.oas.model.Operation;
import com.networknt.oas.model.Parameter;
import com.networknt.oas.model.Path;
import com.networknt.oas.model.Response;
import com.networknt.oas.model.Schema;
import com.networknt.oas.model.Server;
import com.networknt.oas.model.impl.OpenApi3Impl;

/**
* The input for OpenAPI 3.0 generator include config with json format
Expand Down Expand Up @@ -107,7 +120,7 @@ public void generate(String targetPath, Object model, Any config) throws IOExcep
enableParamDescription = config.toBoolean("enableParamDescription");

generateValuesYml = config.toBoolean("generateValuesYml");

String version = config.toString("version").trim();
String serviceId = config.get("groupId").toString().trim() + "." + config.get("artifactId").toString().trim() + "-" + config.get("version").toString().trim();

Expand Down Expand Up @@ -173,6 +186,13 @@ public void generate(String targetPath, Object model, Any config) throws IOExcep
// values.yml file, transfer only if explicitly set in the config.json
if(generateValuesYml)
transfer(targetPath, ("src.main.resources.config").replace(".", separator), "values.yml", templates.rest.openapi.values.template());

//always copy resources
YAMLFileParameterizer.copyResources(YAMLFileParameterizer.DEFAULT_RESOURCE_LOCATION, targetPath+separator+YAMLFileParameterizer.DEFAULT_DEST_DIR);

if (config.keys().contains(YAMLFileParameterizer.GENERATE_ENV_VARS)) {
YAMLFileParameterizer.rewriteAll(targetPath+separator+YAMLFileParameterizer.DEFAULT_DEST_DIR, config.get(YAMLFileParameterizer.GENERATE_ENV_VARS).asMap());
}
}
}

Expand Down
Loading