Merge pull request #9976 from valery1707/write-stringToFile-withUtf8

Use UTF-8 charset on writing files

modules/swagger-codegen-cli/src/main/java/io/swagger/codegen/cmd/Meta.java

@@ -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;
 
@@ -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) {

modules/swagger-codegen/src/main/java/io/swagger/codegen/MetaGenerator.java

@@ -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;
@@ -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));
  }

modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaJAXRSSpecServerCodegen.java

@@ -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;
@@ -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());
  }

modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ScalaGatlingCodegen.java

@@ -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;
 
@@ -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);
  }
@@ -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);
  }

modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SwaggerGenerator.java

@@ -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;
 
@@ -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);

modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SwaggerYamlGenerator.java

@@ -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;
 
@@ -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);