|
23 | 23 | import java.security.NoSuchAlgorithmException; |
24 | 24 | import java.text.SimpleDateFormat; |
25 | 25 | import java.util.ArrayList; |
| 26 | +import java.util.Base64; |
26 | 27 | import java.util.Date; |
27 | 28 | import java.util.List; |
28 | 29 | import java.util.Map; |
|
34 | 35 | import javax.crypto.Mac; |
35 | 36 | import javax.crypto.spec.SecretKeySpec; |
36 | 37 |
|
37 | | -import org.apache.commons.codec.binary.Base64; |
38 | 38 | import org.apache.commons.lang3.StringEscapeUtils; |
39 | 39 | import org.apache.commons.lang3.StringUtils; |
40 | 40 | import org.apache.commons.lang3.Validate; |
@@ -195,12 +195,12 @@ private String getSignature(Request request, ClientCredential credential, String |
195 | 195 |
|
196 | 196 | private String signAndEncode(String stringToSign, String signingKey) throws RequestSigningException { |
197 | 197 | byte[] signatureBytes = sign(stringToSign, signingKey); |
198 | | - return Base64.encodeBase64String(signatureBytes); |
| 198 | + return Base64.getEncoder().encodeToString(signatureBytes); |
199 | 199 | } |
200 | 200 |
|
201 | 201 | private String getSigningKey(String timeStamp, String clientSecret) throws RequestSigningException { |
202 | 202 | byte[] signingKeyBytes = sign(timeStamp, clientSecret); |
203 | | - return Base64.encodeBase64String(signingKeyBytes); |
| 203 | + return Base64.getEncoder().encodeToString(signingKeyBytes); |
204 | 204 | } |
205 | 205 |
|
206 | 206 | private String getDataToSign(String canonicalizedRequest, String authData) { |
@@ -315,15 +315,15 @@ private String getContentHash(String requestMethod, byte[] requestBody, int maxB |
315 | 315 | lengthToHash = maxBodySize; |
316 | 316 | } else { |
317 | 317 | if (log.isTraceEnabled()) { |
318 | | - log.trace("Content (Base64): {}", Base64.encodeBase64String(requestBody)); |
| 318 | + log.trace("Content (Base64): {}", Base64.getEncoder().encodeToString(requestBody)); |
319 | 319 | } |
320 | 320 | } |
321 | 321 |
|
322 | 322 | byte[] digestBytes = getHash(requestBody, 0, lengthToHash); |
323 | | - log.debug("Content hash (Base64): {}", Base64.encodeBase64String(digestBytes)); |
| 323 | + log.debug("Content hash (Base64): {}", Base64.getEncoder().encodeToString(digestBytes)); |
324 | 324 |
|
325 | 325 | // (mgawinec) I removed support for non-retryable content, that used to reset the content for downstream handlers |
326 | | - return Base64.encodeBase64String(digestBytes); |
| 326 | + return Base64.getEncoder().encodeToString(digestBytes); |
327 | 327 | } |
328 | 328 |
|
329 | 329 | } |
0 commit comments