|
19 | 19 | import com.google.api.core.ApiFuture; |
20 | 20 | import com.google.api.core.SettableApiFuture; |
21 | 21 | import com.google.common.annotations.VisibleForTesting; |
22 | | -import com.google.common.base.Charsets; |
23 | 22 | import com.google.common.base.Strings; |
24 | 23 | import com.google.common.io.BaseEncoding; |
25 | 24 | import com.google.common.net.UrlEscapers; |
|
32 | 31 | import java.net.URI; |
33 | 32 | import java.net.URLDecoder; |
34 | 33 | import java.net.URLEncoder; |
| 34 | +import java.nio.charset.StandardCharsets; |
35 | 35 | import java.security.MessageDigest; |
36 | 36 | import java.security.NoSuchAlgorithmException; |
37 | 37 | import java.util.ArrayList; |
@@ -108,8 +108,8 @@ static Map<String, String> getQueryParamsMap(String queryString) |
108 | 108 | for (String paramPair : paramPairs) { |
109 | 109 | String[] pairParts = paramPair.split("="); |
110 | 110 | // both the first and second part will be encoded now, we must decode them |
111 | | - String decodedKey = URLDecoder.decode(pairParts[0], Charsets.UTF_8.name()); |
112 | | - String decodedValue = URLDecoder.decode(pairParts[1], Charsets.UTF_8.name()); |
| 111 | + String decodedKey = URLDecoder.decode(pairParts[0], StandardCharsets.UTF_8.name()); |
| 112 | + String decodedValue = URLDecoder.decode(pairParts[1], StandardCharsets.UTF_8.name()); |
113 | 113 | String runningValue = paramsMap.get(decodedKey); |
114 | 114 | if (Strings.isNullOrEmpty(runningValue)) { |
115 | 115 | runningValue = decodedValue; |
|
0 commit comments