Specify UTF-8 instead of platform default charset in some files Implicit use of the platform default charset can result in e.g. non-ASCII characters being silently replaced with '?' in many environments. Change-Id: Id84326a124ac46c2179680e98e8f40bf4ec37cce

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/ChangeRevisionNote.java b/gerrit-server/src/main/java/com/google/gerrit/server/notedb/ChangeRevisionNote.java
index b95c92a..482cca4 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/ChangeRevisionNote.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/notedb/ChangeRevisionNote.java

@@ -92,7 +92,7 @@
       int offset) throws IOException {
     try (InputStream is = new ByteArrayInputStream(
         raw, offset, raw.length - offset);
-        Reader r = new InputStreamReader(is)) {
+        Reader r = new InputStreamReader(is, UTF_8)) {
       return noteUtil.getGson().fromJson(r, RevisionNoteData.class);
     }
   }
@@ -109,6 +109,6 @@
     }
     int start = p.value;
     p.value = end + END_SIGNATURE.length;
-    return new String(bytes, start, p.value);
+    return new String(bytes, start, p.value, UTF_8);
   }
 }

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/RevisionNoteBuilder.java b/gerrit-server/src/main/java/com/google/gerrit/server/notedb/RevisionNoteBuilder.java
index 8eacb1c..8491f57 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/RevisionNoteBuilder.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/notedb/RevisionNoteBuilder.java

@@ -139,7 +139,7 @@
     data.comments = COMMENT_ORDER.sortedCopy(comments.values());
     data.pushCert = pushCert;
 
-    try (OutputStreamWriter osw = new OutputStreamWriter(out)) {
+    try (OutputStreamWriter osw = new OutputStreamWriter(out, UTF_8)) {
       noteUtil.getGson().toJson(data, osw);
     }
   }

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/RobotCommentsRevisionNote.java b/gerrit-server/src/main/java/com/google/gerrit/server/notedb/RobotCommentsRevisionNote.java
index e007ff3..0dca408 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/RobotCommentsRevisionNote.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/notedb/RobotCommentsRevisionNote.java

@@ -14,6 +14,8 @@
 
 package com.google.gerrit.server.notedb;
 
+import static java.nio.charset.StandardCharsets.UTF_8;
+
 import com.google.gerrit.reviewdb.client.RobotComment;
 
 import org.eclipse.jgit.lib.ObjectId;
@@ -40,7 +42,7 @@
       throws IOException {
     try (InputStream is = new ByteArrayInputStream(
         raw, offset, raw.length - offset);
-        Reader r = new InputStreamReader(is)) {
+        Reader r = new InputStreamReader(is, UTF_8)) {
       return noteUtil.getGson().fromJson(r,
           RobotCommentsRevisionNoteData.class).comments;
     }