From e7a69c3d5b0e2d7b64ed60cd7b592c8fadedbb42 Mon Sep 17 00:00:00 2001 From: Denis Stepanov Date: Thu, 15 Oct 2015 10:04:12 +0200 Subject: [PATCH] Set UTF-8 default encoding --- .../accurest/wiremock/RecursiveFilesConverter.groovy | 5 +++-- .../accurest/wiremock/WireMockToDslConverter.groovy | 6 ++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/accurest-converters/src/main/groovy/io/codearte/accurest/wiremock/RecursiveFilesConverter.groovy b/accurest-converters/src/main/groovy/io/codearte/accurest/wiremock/RecursiveFilesConverter.groovy index 0f74866305..8f71f8955b 100644 --- a/accurest-converters/src/main/groovy/io/codearte/accurest/wiremock/RecursiveFilesConverter.groovy +++ b/accurest-converters/src/main/groovy/io/codearte/accurest/wiremock/RecursiveFilesConverter.groovy @@ -4,6 +4,7 @@ import groovy.io.FileType import groovy.transform.CompileStatic import groovy.util.logging.Slf4j +import java.nio.charset.StandardCharsets import java.nio.file.Files import java.nio.file.Path import java.nio.file.Paths @@ -28,10 +29,10 @@ class RecursiveFilesConverter { if (!singleFileConverter.canHandleFileName(sourceFile.name)) { return } - String convertedContent = singleFileConverter.convertContent(sourceFile.text) + String convertedContent = singleFileConverter.convertContent(sourceFile.getText(StandardCharsets.UTF_8.toString())) Path absoluteTargetPath = createAndReturnTargetDirectory(sourceFile) File newGroovyFile = createTargetFileWithProperName(absoluteTargetPath, sourceFile) - newGroovyFile.text = convertedContent + newGroovyFile.setText(convertedContent, StandardCharsets.UTF_8.toString()) } catch (Exception e) { throw new ConversionAccurestException("Unable to make convertion of ${sourceFile.name}", e) } diff --git a/accurest-converters/src/main/groovy/io/codearte/accurest/wiremock/WireMockToDslConverter.groovy b/accurest-converters/src/main/groovy/io/codearte/accurest/wiremock/WireMockToDslConverter.groovy index e7a2a45f97..4107d2dcdf 100644 --- a/accurest-converters/src/main/groovy/io/codearte/accurest/wiremock/WireMockToDslConverter.groovy +++ b/accurest-converters/src/main/groovy/io/codearte/accurest/wiremock/WireMockToDslConverter.groovy @@ -8,6 +8,8 @@ import groovy.xml.XmlUtil import io.codearte.accurest.dsl.GroovyDsl import nl.flotsam.xeger.Xeger +import java.nio.charset.StandardCharsets + import static org.apache.commons.lang3.StringEscapeUtils.escapeJava class WireMockToDslConverter { @@ -154,11 +156,11 @@ class WireMockToDslConverter { if (!it.name.endsWith('json')) { return } - String dslFromWireMockStub = fromWireMockStub(it.text) + String dslFromWireMockStub = fromWireMockStub(it.getText(StandardCharsets.UTF_8.toString())) String dslWrappedWithFactoryMethod = wrapWithFactoryMethod(dslFromWireMockStub) File newGroovyFile = new File(it.parent, it.name.replaceAll('json', 'groovy')) println("Creating new groovy file [$newGroovyFile.path]") - newGroovyFile.text = dslWrappedWithFactoryMethod + newGroovyFile.setText(dslWrappedWithFactoryMethod, StandardCharsets.UTF_8.toString()) } catch (Exception e) { System.err.println(e) }