Skip to content

Commit b8db481

Browse files
authored
Fix json encoding (#185)
1 parent 981d111 commit b8db481

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

modello-core/src/main/java/org/codehaus/modello/plugin/AbstractModelloGenerator.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -294,6 +294,11 @@ protected BuildContext getBuildContext()
294294
protected Writer newWriter( Path path )
295295
{
296296
Charset charset = getEncoding() != null ? Charset.forName( getEncoding() ) : Charset.defaultCharset();
297+
return newWriter( path, charset );
298+
}
299+
300+
protected Writer newWriter( Path path, Charset charset )
301+
{
297302
return new CachingWriter( getBuildContext(), path, charset );
298303
}
299304

modello-plugins/modello-plugin-jsonschema/src/main/java/org/codehaus/modello/plugin/jsonschema/JsonSchemaGenerator.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424

2525
import java.io.File;
2626
import java.io.IOException;
27+
import java.nio.charset.StandardCharsets;
2728
import java.util.LinkedList;
2829
import java.util.List;
2930
import java.util.Properties;
@@ -107,7 +108,7 @@ private void generateJsonSchema( Properties parameters )
107108
.enable( JsonWriteFeature.QUOTE_FIELD_NAMES.mappedFeature() )
108109
.enable( JsonWriteFeature.QUOTE_FIELD_NAMES.mappedFeature() )
109110
.disable( JsonWriteFeature.WRITE_NUMBERS_AS_STRINGS.mappedFeature() )
110-
.createGenerator( newWriter( schemaFile.toPath() ) );
111+
.createGenerator( newWriter( schemaFile.toPath(), StandardCharsets.UTF_8 ) );
111112

112113
generator.useDefaultPrettyPrinter();
113114

0 commit comments

Comments
 (0)