Skip to content

Commit 8743f31

Browse files
committed
Use standard charset
1 parent 78a4369 commit 8743f31

File tree

3 files changed

+7
-5
lines changed
  • exist-core/src/main/java/org/exist/source
  • extensions/modules
    • file/src/main/java/org/exist/xquery/modules/file
    • process/src/main/java/org/exist/xquery/modules/process

3 files changed

+7
-5
lines changed

exist-core/src/main/java/org/exist/source/URLSource.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ public Reader getReader() throws IOException {
150150
}
151151
Reader reader = null;
152152
if (responseCode != HttpURLConnection.HTTP_NOT_FOUND) {
153-
reader = new InputStreamReader(connection.getInputStream(), "UTF-8");
153+
reader = new InputStreamReader(connection.getInputStream(), StandardCharsets.UTF_8);
154154
}
155155
connection = null;
156156
return reader;

extensions/modules/file/src/main/java/org/exist/xquery/modules/file/Sync.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import java.io.InputStream;
2626
import java.io.OutputStreamWriter;
2727
import java.io.Writer;
28+
import java.nio.charset.StandardCharsets;
2829
import java.nio.file.Files;
2930
import java.nio.file.Path;
3031
import java.nio.file.StandardCopyOption;
@@ -213,7 +214,7 @@ private void saveXML(final Path targetDir, final DocumentImpl doc, final MemTree
213214
if (isRepoXML) {
214215
processRepoDesc(targetFile, doc, sax, output);
215216
} else {
216-
try(final Writer writer = new OutputStreamWriter(Files.newOutputStream(targetFile), "UTF-8")) {
217+
try(final Writer writer = new OutputStreamWriter(Files.newOutputStream(targetFile), StandardCharsets.UTF_8)) {
217218
sax.setOutput(writer, DEFAULT_PROPERTIES);
218219
Serializer serializer = context.getBroker().getSerializer();
219220
serializer.reset();
@@ -244,7 +245,7 @@ private void processRepoDesc(final Path targetFile, final DocumentImpl doc, fina
244245
final DocumentBuilder builder = DocumentBuilderFactory.newInstance().newDocumentBuilder();
245246
final Document original = builder.parse(targetFile.toFile());
246247

247-
try (final Writer writer = new OutputStreamWriter(Files.newOutputStream(targetFile), "UTF-8")) {
248+
try (final Writer writer = new OutputStreamWriter(Files.newOutputStream(targetFile), StandardCharsets.UTF_8)) {
248249
sax.setOutput(writer, DEFAULT_PROPERTIES);
249250

250251
final StreamSource stylesource = new StreamSource(Sync.class.getResourceAsStream("repo.xsl"));

extensions/modules/process/src/main/java/org/exist/xquery/modules/process/Execute.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
import javax.xml.stream.XMLStreamException;
3636
import javax.xml.stream.XMLStreamReader;
3737
import java.io.*;
38+
import java.nio.charset.StandardCharsets;
3839
import java.nio.file.Path;
3940
import java.nio.file.Paths;
4041
import java.util.*;
@@ -130,7 +131,7 @@ public Sequence eval(final Sequence[] args, final Sequence contextSequence) thro
130131
try {
131132
Process process = pb.start();
132133
if (stdin != null) {
133-
try(final Writer writer = new BufferedWriter(new OutputStreamWriter(process.getOutputStream(), "UTF-8"))) {
134+
try(final Writer writer = new BufferedWriter(new OutputStreamWriter(process.getOutputStream(), StandardCharsets.UTF_8))) {
134135
for (final String line : stdin) {
135136
writer.write(line);
136137
}
@@ -191,7 +192,7 @@ private ElementImpl createReport(int exitValue, List<String> output, List<String
191192
}
192193

193194
private List<String> readOutput(Process process) throws XPathException {
194-
try(final BufferedReader reader = new BufferedReader(new InputStreamReader(process.getInputStream(), "UTF-8"))) {
195+
try(final BufferedReader reader = new BufferedReader(new InputStreamReader(process.getInputStream(), StandardCharsets.UTF_8))) {
195196
List<String> output = new ArrayList<>(31);
196197

197198
String line;

0 commit comments

Comments
 (0)