loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

Use UTF-8 charset on writing files (#4984)

Browse Source
This commit is contained in:
valery1707 2020-01-13 10:26:56 +03:00 committed by William Cheng
parent b22f7f033f
commit b22fde6caa
3 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modules/openapi-generator-cli/src/main/java/org/openapitools/codegen/cmd/Meta.java
View File

@ -36,6 +36,7 @@ import org.slf4j.LoggerFactory;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.io.Reader; import java.io.Reader;
import java.nio.charset.StandardCharsets;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -159,7 +160,7 @@ public class Meta implements Runnable {
LOGGER.info("copying file to {}", outputFile.getAbsolutePath()); LOGGER.info("copying file to {}", outputFile.getAbsolutePath());
} }
FileUtils.writeStringToFile(outputFile, formatted); FileUtils.writeStringToFile(outputFile, formatted, StandardCharsets.UTF_8);
return outputFile; return outputFile;
} catch (IOException e) { } catch (IOException e) {

3
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/OpenAPIGenerator.java
View File

@ -29,6 +29,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import java.io.File; import java.io.File;
import java.nio.charset.StandardCharsets;
import java.util.EnumSet; import java.util.EnumSet;
public class OpenAPIGenerator extends DefaultCodegen implements CodegenConfig { public class OpenAPIGenerator extends DefaultCodegen implements CodegenConfig {
@ -75,7 +76,7 @@ public class OpenAPIGenerator extends DefaultCodegen implements CodegenConfig {
try { try {
String outputFile = outputFolder + File.separator + "openapi.json"; String outputFile = outputFolder + File.separator + "openapi.json";
FileUtils.writeStringToFile(new File(outputFile), jsonOpenAPI); FileUtils.writeStringToFile(new File(outputFile), jsonOpenAPI, StandardCharsets.UTF_8);
LOGGER.info("wrote file to " + outputFile); LOGGER.info("wrote file to " + outputFile);
} catch (Exception e) { } catch (Exception e) {
LOGGER.error(e.getMessage(), e); LOGGER.error(e.getMessage(), e);

13
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaGatlingCodegen.java
View File

@ -35,6 +35,7 @@ import org.slf4j.LoggerFactory;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.util.*; import java.util.*;
public class ScalaGatlingCodegen extends AbstractScalaCodegen implements CodegenConfig { public class ScalaGatlingCodegen extends AbstractScalaCodegen implements CodegenConfig {
@ -312,7 +313,11 @@ public class ScalaGatlingCodegen extends AbstractScalaCodegen implements Codegen
operation.setVendorExtension("x-gatling-body-feeder", operation.getOperationId() + "BodyFeeder"); operation.setVendorExtension("x-gatling-body-feeder", operation.getOperationId() + "BodyFeeder");
operation.setVendorExtension("x-gatling-body-feeder-params", StringUtils.join(sessionBodyVars, ",")); operation.setVendorExtension("x-gatling-body-feeder-params", StringUtils.join(sessionBodyVars, ","));
try { 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) { } catch (IOException ioe) {
LOGGER.error("Could not create feeder file for operationId" + operation.getOperationId(), ioe); LOGGER.error("Could not create feeder file for operationId" + operation.getOperationId(), ioe);
} }
@ -358,7 +363,11 @@ public class ScalaGatlingCodegen extends AbstractScalaCodegen implements Codegen
operation.addExtension("x-gatling-" + parameterType.toLowerCase(Locale.ROOT) + "-params", vendorList); operation.addExtension("x-gatling-" + parameterType.toLowerCase(Locale.ROOT) + "-params", vendorList);
operation.addExtension("x-gatling-" + parameterType.toLowerCase(Locale.ROOT) + "-feeder", operation.getOperationId() + parameterType.toUpperCase(Locale.ROOT) + "Feeder"); operation.addExtension("x-gatling-" + parameterType.toLowerCase(Locale.ROOT) + "-feeder", operation.getOperationId() + parameterType.toUpperCase(Locale.ROOT) + "Feeder");
try { try {
FileUtils.writeStringToFile(new File(outputFolder + File.separator + dataFolder + File.separator + operation.getOperationId() + "-" + parameterType.toLowerCase(Locale.ROOT) + "Params.csv"), StringUtils.join(parameterNames, ",")); FileUtils.writeStringToFile(
new File(outputFolder + File.separator + dataFolder + File.separator + operation.getOperationId() + "-" + parameterType.toLowerCase(Locale.ROOT) + "Params.csv"),
StringUtils.join(parameterNames, ","),
StandardCharsets.UTF_8
);
} catch (IOException ioe) { } catch (IOException ioe) {
LOGGER.error("Could not create feeder file for operationId" + operation.getOperationId(), ioe); LOGGER.error("Could not create feeder file for operationId" + operation.getOperationId(), ioe);
} }