commit be08b106d7daccf44231347a8ed664ef71285091
author Edwin Kempin <ekempin@google.com> Fri Aug 02 06:48:18 2024 +0000
committer Edwin Kempin <ekempin@google.com> Fri Aug 02 06:49:20 2024 +0000
tree 7ed11fdb39309deb664034208effbc5fa32035a4
parent 6a269396297753d5c50076d3a88d947d311f3deb

Migrate from the deprecated Charsets to StandardCharsets

Migrate from the deprecated Charsets constants (in Guava) to the
StandardCharsets constants (in the JDK).

Release-Notes: skip
Change-Id: Ie3a6cb4311287845a2f53aee7bd868d9321bdb40
Signed-off-by: Edwin Kempin <ekempin@google.com>

java/com/google/gerrit/server/edit/ChangeEditModifier.java

diff --git a/java/com/google/gerrit/server/edit/ChangeEditModifier.java b/java/com/google/gerrit/server/edit/ChangeEditModifier.java
index 565d471..7a89fb3 100644
--- a/java/com/google/gerrit/server/edit/ChangeEditModifier.java
+++ b/java/com/google/gerrit/server/edit/ChangeEditModifier.java
@@ -17,7 +17,6 @@
 import static com.google.gerrit.server.project.ProjectCache.illegalState;
 import static com.google.gerrit.server.update.context.RefUpdateContext.RefUpdateType.CHANGE_MODIFICATION;
 
-import com.google.common.base.Charsets;
 import com.google.errorprone.annotations.CanIgnoreReturnValue;
 import com.google.gerrit.common.Nullable;
 import com.google.gerrit.entities.BooleanProjectConfig;
@@ -59,6 +58,7 @@
 import com.google.inject.Provider;
 import com.google.inject.Singleton;
 import java.io.IOException;
+import java.nio.charset.StandardCharsets;
 import java.time.Instant;
 import java.time.ZoneId;
 import java.util.List;
@@ -716,9 +716,10 @@
         throws MergeConflictException {
       MergeAlgorithm mergeAlgorithm =
           new MergeAlgorithm(DiffAlgorithm.getAlgorithm(SupportedAlgorithm.MYERS));
-      RawText baseMessage = new RawText(commitToModify.getFullMessage().getBytes(Charsets.UTF_8));
-      RawText oldMessage = new RawText(editCommitMessage.getBytes(Charsets.UTF_8));
-      RawText newMessage = new RawText(newCommitMessage.getBytes(Charsets.UTF_8));
+      RawText baseMessage =
+          new RawText(commitToModify.getFullMessage().getBytes(StandardCharsets.UTF_8));
+      RawText oldMessage = new RawText(editCommitMessage.getBytes(StandardCharsets.UTF_8));
+      RawText newMessage = new RawText(newCommitMessage.getBytes(StandardCharsets.UTF_8));
       RawTextComparator textComparator = RawTextComparator.DEFAULT;
       MergeResult<RawText> mergeResult =
           mergeAlgorithm.merge(textComparator, baseMessage, oldMessage, newMessage);