Skip to content
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

Jump to bottom

Use UTF-8 charset on writing files #9976

Merged
merged 2 commits into from
Feb 27, 2020
Merged

Use UTF-8 charset on writing files #9976

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
75f49bd
Use UTF-8 charset on writing files
valery1707 Jan 12, 2020
4edfc35
Merge branch 'master' into write-stringToFile-withUtf8
HugoMario Feb 27, 2020
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
Next Next commit
Use UTF-8 charset on writing files
  • Loading branch information
@valery1707
valery1707 committed Jan 12, 2020
commit 75f49bd0ce0fd34d9ec432a56bfac819430978a1
3 changes: 2 additions & 1 deletion modules/swagger-codegen-cli/src/main/java/io/swagger/codegen/cmd/Meta.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
import java.io.File;
import java.io.IOException;
import java.io.Reader;
import java.nio.charset.StandardCharsets;
import java.util.List;
import java.util.Map;

Expand Down Expand Up @@ -115,7 +116,7 @@ public File convert(SupportingFile support) {
LOGGER.info("copying file to {}", outputFile.getAbsolutePath());
}

FileUtils.writeStringToFile(outputFile, formatted);
FileUtils.writeStringToFile(outputFile, formatted, StandardCharsets.UTF_8);
return outputFile;

} catch (IOException e) {
Expand Down
3 changes: 2 additions & 1 deletion modules/swagger-codegen/src/main/java/io/swagger/codegen/MetaGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
import java.io.File;
import java.io.IOException;
import java.io.Reader;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
Expand Down Expand Up @@ -166,7 +167,7 @@ public Reader getTemplate(String name) {
files.add(new File(outputFilename));
} else {
String template = readTemplate(templateDir + File.separator + support.templateFile);
FileUtils.writeStringToFile(new File(outputFilename), template);
FileUtils.writeStringToFile(new File(outputFilename), template, StandardCharsets.UTF_8);
LOGGER.info("copying file to " + outputFilename);
files.add(new File(outputFilename));
}
Expand Down
3 changes: 2 additions & 1 deletion ...wagger-codegen/src/main/java/io/swagger/codegen/languages/JavaJAXRSSpecServerCodegen.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import java.io.File;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.List;
Expand Down Expand Up @@ -166,7 +167,7 @@ public void preprocessSwagger(Swagger swagger) {
//copy input swagger to output folder
try {
String swaggerJson = Json.pretty(swagger);
FileUtils.writeStringToFile(new File(outputFolder + File.separator + "swagger.json"), swaggerJson);
FileUtils.writeStringToFile(new File(outputFolder + File.separator + "swagger.json"), swaggerJson, StandardCharsets.UTF_8);
} catch (IOException e) {
throw new RuntimeException(e.getMessage(), e.getCause());
}
Expand Down
13 changes: 11 additions & 2 deletions modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ScalaGatlingCodegen.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import org.apache.commons.lang3.StringUtils;

import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.util.*;
import java.io.File;

Expand Down Expand Up @@ -252,7 +253,11 @@ public void preprocessSwagger(Swagger swagger) {
operation.setVendorExtension("x-gatling-body-feeder", operation.getOperationId() + "BodyFeeder");
operation.setVendorExtension("x-gatling-body-feeder-params", StringUtils.join(sessionBodyVars, ","));
try {
FileUtils.writeStringToFile(new File(outputFolder + File.separator + dataFolder + File.separator + operation.getOperationId() + "-" + "bodyParams.csv"), StringUtils.join(bodyFeederParams, ","));
FileUtils.writeStringToFile(
new File(outputFolder + File.separator + dataFolder + File.separator + operation.getOperationId() + "-" + "bodyParams.csv"),
StringUtils.join(bodyFeederParams, ","),
StandardCharsets.UTF_8
);
} catch (IOException ioe) {
LOGGER.error("Could not create feeder file for operationId" + operation.getOperationId(), ioe);
}
Expand Down Expand Up @@ -296,7 +301,11 @@ private void prepareGatlingData(Operation operation, Set<Parameter> parameters,
operation.setVendorExtension("x-gatling-" + parameterType.toLowerCase() + "-params", vendorList);
operation.setVendorExtension("x-gatling-" + parameterType.toLowerCase() + "-feeder", operation.getOperationId() + parameterType.toUpperCase() + "Feeder");
try {
FileUtils.writeStringToFile(new File(outputFolder + File.separator + dataFolder + File.separator + operation.getOperationId() + "-" + parameterType.toLowerCase() + "Params.csv"), StringUtils.join(parameterNames, ","));
FileUtils.writeStringToFile(
new File(outputFolder + File.separator + dataFolder + File.separator + operation.getOperationId() + "-" + parameterType.toLowerCase() + "Params.csv"),
StringUtils.join(parameterNames, ","),
StandardCharsets.UTF_8
);
} catch (IOException ioe) {
LOGGER.error("Could not create feeder file for operationId" + operation.getOperationId(), ioe);
}
Expand Down
3 changes: 2 additions & 1 deletion modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SwaggerGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package io.swagger.codegen.languages;

import java.io.File;
import java.nio.charset.StandardCharsets;
import java.util.List;
import java.util.Map;

Expand Down Expand Up @@ -62,7 +63,7 @@ public void processSwagger(Swagger swagger) {

try {
String outputFile = outputFolder + File.separator + this.outputFile;
FileUtils.writeStringToFile(new File(outputFile), swaggerString);
FileUtils.writeStringToFile(new File(outputFile), swaggerString, StandardCharsets.UTF_8);
LOGGER.debug("wrote file to " + outputFile);
} catch (Exception e) {
LOGGER.error(e.getMessage(), e);
Expand Down
3 changes: 2 additions & 1 deletion modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SwaggerYamlGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import org.slf4j.LoggerFactory;

import java.io.File;
import java.nio.charset.StandardCharsets;
import java.util.List;
import java.util.Map;

Expand Down Expand Up @@ -84,7 +85,7 @@ public void processSwagger(Swagger swagger) {
configureMapper(mapper);
String swaggerString = mapper.writeValueAsString(swagger);
String outputFile = outputFolder + File.separator + this.outputFile;
FileUtils.writeStringToFile(new File(outputFile), swaggerString);
FileUtils.writeStringToFile(new File(outputFile), swaggerString, StandardCharsets.UTF_8);
LOGGER.debug("wrote file to " + outputFile);
} catch (Exception e) {
LOGGER.error(e.getMessage(), e);
Expand Down