From 6c87d6664d2601fba6070f410c01cd55c9f6b456 Mon Sep 17 00:00:00 2001 From: Arthit Suriyawongkul Date: Fri, 17 Jul 2026 02:51:56 +0100 Subject: [PATCH] Use UTF-8 explicitly in metadata cache read/write Signed-off-by: Arthit Suriyawongkul --- src/main/java/org/spdx/utility/DownloadCache.java | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/main/java/org/spdx/utility/DownloadCache.java b/src/main/java/org/spdx/utility/DownloadCache.java index b2edf0eae..5a23bda58 100644 --- a/src/main/java/org/spdx/utility/DownloadCache.java +++ b/src/main/java/org/spdx/utility/DownloadCache.java @@ -19,11 +19,7 @@ import java.io.BufferedInputStream; import java.io.BufferedOutputStream; -import java.io.BufferedReader; -import java.io.BufferedWriter; import java.io.File; -import java.io.FileReader; -import java.io.FileWriter; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; @@ -425,8 +421,7 @@ private URL processPossibleRedirect(final HttpURLConnection connection, final bo */ private HashMap readMetadataFile(final File metadataFile) { HashMap result; - try { - final Reader r = new BufferedReader(new FileReader(metadataFile)); + try (final Reader r = Files.newBufferedReader(metadataFile.toPath(), StandardCharsets.UTF_8)) { result = new Gson().fromJson(r, new TypeToken>(){}.getType()); } catch (IOException ioe) { @@ -442,7 +437,7 @@ private HashMap readMetadataFile(final File metadataFile) { * @throws IOException When an IO error of some kind occurs. */ private void writeMetadataFile(final File metadataFile, HashMap metadata) throws IOException { - try (final Writer w = new BufferedWriter(new FileWriter(metadataFile))) { + try (final Writer w = Files.newBufferedWriter(metadataFile.toPath(), StandardCharsets.UTF_8)) { new Gson().toJson(metadata, new TypeToken>(){}.getType(), w); w.flush(); }