Skip to content

fixes #278 resolve error prone warnings #279

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 9, 2019
Merged

fixes #278 resolve error prone warnings #279

Show file tree
Hide file tree
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
1 change: 1 addition & 0 deletions codegen-web/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.1.1</version>
<configuration>
<archive>
<manifest>
Expand Down
1 change: 1 addition & 0 deletions codegen-web/src/main/java/com/networknt/codegen/handler/ValidateUploadFileHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
* @author Nicholas Azar
* Created on July 8, 2017.
*/
@Deprecated
@ServiceHandler(id="lightapi.net/codegen/validateUploadFile/0.0.1")
public class ValidateUploadFileHandler implements Handler {
static private final Logger logger = LoggerFactory.getLogger(ValidateUploadFileHandler.class);
Expand Down
2 changes: 1 addition & 1 deletion ...ate-4j/src/main/java/com/networknt/codegen/eventuate/EventuateHybridServiceGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import com.jsoniter.any.Any;
import com.jsoniter.output.JsonStream;
import com.networknt.codegen.Generator;
import org.apache.commons.lang3.StringEscapeUtils;
import org.apache.commons.text.StringEscapeUtils;

import java.io.FileOutputStream;
import java.io.IOException;
Expand Down
4 changes: 1 addition & 3 deletions light-hybrid-4j/src/main/java/com/networknt/codegen/hybrid/HybridServiceGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
package com.networknt.codegen.hybrid;

import com.fasterxml.jackson.databind.ObjectMapper;
import com.jsoniter.ValueType;
import com.jsoniter.any.Any;
import com.jsoniter.output.JsonStream;
import com.networknt.codegen.Generator;
import com.networknt.utility.NioUtils;
import org.apache.commons.lang3.StringEscapeUtils;
import org.apache.commons.text.StringEscapeUtils;

import java.io.FileOutputStream;
import java.io.IOException;
Expand Down
20 changes: 8 additions & 12 deletions light-rest-4j/src/main/java/com/networknt/codegen/rest/YAMLFileParameterizer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,10 @@
package com.networknt.codegen.rest;

import java.io.BufferedReader;
import java.io.File;
import java.io.FileOutputStream;
import java.io.FileReader;
import java.io.FileWriter;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
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;
Expand Down Expand Up @@ -40,6 +34,8 @@

import com.jsoniter.any.Any;

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

public class YAMLFileParameterizer {
private static final Logger logger = LoggerFactory.getLogger(YAMLFileParameterizer.class);
private static final String KEY_SEPARATOR = ".";
Expand Down Expand Up @@ -347,7 +343,7 @@ protected static List<String> listClasspathDir(String dir) {

protected static Node loadResource(String resourceLocation) {
try (InputStream in = getResourceAsStream(resourceLocation);
BufferedReader inputReader = new BufferedReader(new InputStreamReader(in))) {
BufferedReader inputReader = new BufferedReader(new InputStreamReader(in, UTF_8))) {
Composer composer = new Composer(new ParserImpl(new StreamReader(inputReader)), new Resolver());
return composer.getSingleNode();
} catch (Exception e) {
Expand All @@ -361,7 +357,7 @@ protected static List<String> readResource(String resourceLocation) {
List<String> lines = new ArrayList<>();

try (InputStream in = getResourceAsStream(resourceLocation);
InputStreamReader reader = new InputStreamReader(in, StandardCharsets.UTF_8)) {
InputStreamReader reader = new InputStreamReader(in, UTF_8)) {
lines.addAll(IOUtils.readLines(reader));
lines.add(StringUtils.EMPTY); // because trailing empty lines are ignored.
} catch (Exception e) {
Expand All @@ -372,7 +368,7 @@ protected static List<String> readResource(String resourceLocation) {
}

protected static Node loadFile(File file) {
try (FileReader inputReader = new FileReader(file)) {
try (Reader inputReader = Files.newBufferedReader(file.toPath(), UTF_8)) {
Composer composer = new Composer(new ParserImpl(new StreamReader(inputReader)), new Resolver());
return composer.getSingleNode();
} catch (Exception e) {
Expand All @@ -396,7 +392,7 @@ protected static List<String> readFile(File file) {
}

protected static void parameterize(String filename, Node document, List<String> srclines, File destFile, Map<String, Any> generateEnvVars) {
try (FileWriter writer = new FileWriter(destFile)) {
try (Writer writer = Files.newBufferedWriter(destFile.toPath(), UTF_8)) {
if (document instanceof MappingNode) {
List<String> destlines = parameterize(filename, srclines, (MappingNode) document, generateEnvVars);

Expand Down