From 399bcb09728b2395f192c04b603b10a6e318cf2a Mon Sep 17 00:00:00 2001 From: Kurt Alfred Kluever Date: Tue, 6 Aug 2024 20:15:38 -0400 Subject: [PATCH] Migrate from the deprecated Charsets constants (in Guava) to the StandardCharsets constants (in the JDK). --- .../com/google/firebase/database/utilities/Utilities.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/google/firebase/database/utilities/Utilities.java b/src/main/java/com/google/firebase/database/utilities/Utilities.java index 5a3c64822..6181071ec 100644 --- a/src/main/java/com/google/firebase/database/utilities/Utilities.java +++ b/src/main/java/com/google/firebase/database/utilities/Utilities.java @@ -19,7 +19,6 @@ import com.google.api.core.ApiFuture; import com.google.api.core.SettableApiFuture; import com.google.common.annotations.VisibleForTesting; -import com.google.common.base.Charsets; import com.google.common.base.Strings; import com.google.common.io.BaseEncoding; import com.google.common.net.UrlEscapers; @@ -32,6 +31,7 @@ import java.net.URI; import java.net.URLDecoder; import java.net.URLEncoder; +import java.nio.charset.StandardCharsets; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import java.util.ArrayList; @@ -108,8 +108,8 @@ static Map getQueryParamsMap(String queryString) for (String paramPair : paramPairs) { String[] pairParts = paramPair.split("="); // both the first and second part will be encoded now, we must decode them - String decodedKey = URLDecoder.decode(pairParts[0], Charsets.UTF_8.name()); - String decodedValue = URLDecoder.decode(pairParts[1], Charsets.UTF_8.name()); + String decodedKey = URLDecoder.decode(pairParts[0], StandardCharsets.UTF_8.name()); + String decodedValue = URLDecoder.decode(pairParts[1], StandardCharsets.UTF_8.name()); String runningValue = paramsMap.get(decodedKey); if (Strings.isNullOrEmpty(runningValue)) { runningValue = decodedValue;