Skip to content

Commit 6c87d66

Browse files
committed
Use UTF-8 explicitly in metadata cache read/write
Signed-off-by: Arthit Suriyawongkul <arthit@gmail.com>
1 parent d199eb5 commit 6c87d66

1 file changed

Lines changed: 2 additions & 7 deletions

File tree

src/main/java/org/spdx/utility/DownloadCache.java

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,7 @@
1919

2020
import java.io.BufferedInputStream;
2121
import java.io.BufferedOutputStream;
22-
import java.io.BufferedReader;
23-
import java.io.BufferedWriter;
2422
import java.io.File;
25-
import java.io.FileReader;
26-
import java.io.FileWriter;
2723
import java.io.IOException;
2824
import java.io.InputStream;
2925
import java.io.OutputStream;
@@ -425,8 +421,7 @@ private URL processPossibleRedirect(final HttpURLConnection connection, final bo
425421
*/
426422
private HashMap<String,String> readMetadataFile(final File metadataFile) {
427423
HashMap<String,String> result;
428-
try {
429-
final Reader r = new BufferedReader(new FileReader(metadataFile));
424+
try (final Reader r = Files.newBufferedReader(metadataFile.toPath(), StandardCharsets.UTF_8)) {
430425
result = new Gson().fromJson(r, new TypeToken<HashMap<String, String>>(){}.getType());
431426
}
432427
catch (IOException ioe) {
@@ -442,7 +437,7 @@ private HashMap<String,String> readMetadataFile(final File metadataFile) {
442437
* @throws IOException When an IO error of some kind occurs.
443438
*/
444439
private void writeMetadataFile(final File metadataFile, HashMap<String,String> metadata) throws IOException {
445-
try (final Writer w = new BufferedWriter(new FileWriter(metadataFile))) {
440+
try (final Writer w = Files.newBufferedWriter(metadataFile.toPath(), StandardCharsets.UTF_8)) {
446441
new Gson().toJson(metadata, new TypeToken<HashMap<String, String>>(){}.getType(), w);
447442
w.flush();
448443
}

0 commit comments

Comments
 (0)