diff options
author | efiacor <fiachra.corcoran@est.tech> | 2021-12-14 12:12:11 +0000 |
---|---|---|
committer | efiacor <fiachra.corcoran@est.tech> | 2021-12-14 12:12:16 +0000 |
commit | 1e0b9be28b9b4a06a5fb322c7c014dbb2705cdd1 (patch) | |
tree | 264a218a48d6a0d87f01b8128da14c1eeb7fc14b /src/main/java | |
parent | 58a6137c826c7b2127f16ed2c916d0a27cff29a8 (diff) |
[DMAAP-CLIENT] Package upgrades for Jjakarta
Signed-off-by: efiacor <fiachra.corcoran@est.tech>
Change-Id: I92977c4a940cb164708a7baef53e384b54838370
Issue-ID: DMAAP-1691
Diffstat (limited to 'src/main/java')
-rw-r--r-- | src/main/java/org/onap/dmaap/mr/client/impl/MRBaseClient.java | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/src/main/java/org/onap/dmaap/mr/client/impl/MRBaseClient.java b/src/main/java/org/onap/dmaap/mr/client/impl/MRBaseClient.java index 9522c90..f45895a 100644 --- a/src/main/java/org/onap/dmaap/mr/client/impl/MRBaseClient.java +++ b/src/main/java/org/onap/dmaap/mr/client/impl/MRBaseClient.java @@ -27,17 +27,17 @@ package org.onap.dmaap.mr.client.impl; import com.att.nsa.apiClient.http.CacheUse; import com.att.nsa.apiClient.http.HttpClient; import java.net.MalformedURLException; +import java.nio.charset.StandardCharsets; import java.util.Collection; import java.util.Set; import java.util.TreeSet; import java.util.concurrent.TimeUnit; import javax.ws.rs.client.WebTarget; import javax.ws.rs.core.Response; - +import org.apache.commons.codec.binary.Base64; import org.apache.http.HttpException; import org.apache.http.HttpStatus; import org.glassfish.jersey.client.ClientConfig; -import org.glassfish.jersey.internal.util.Base64; import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; @@ -120,7 +120,8 @@ public class MRBaseClient extends HttpClient implements MRClient { WebTarget target = null; Response response = null; target = DmaapClientUtil.getTarget(clientConfig, path, username, password); - String encoding = Base64.encodeAsString(username + ":" + password); + Base64 base64 = new Base64(); + String encoding = base64.encodeAsString((username + ":" + password).getBytes(StandardCharsets.UTF_8)); response = DmaapClientUtil.postResponsewtBasicAuth(target, encoding, data, contentType); @@ -152,7 +153,8 @@ public class MRBaseClient extends HttpClient implements MRClient { WebTarget target = null; Response response = null; target = DmaapClientUtil.getTarget(clientConfig, path, username, password); - String encoding = Base64.encodeAsString(username + ":" + password); + Base64 base64 = new Base64(); + String encoding = base64.encodeAsString((username + ":" + password).getBytes(StandardCharsets.UTF_8)); response = DmaapClientUtil.postResponsewtBasicAuth(target, encoding, data, contentType); @@ -222,7 +224,8 @@ public class MRBaseClient extends HttpClient implements MRClient { response = DmaapClientUtil.getResponsewtCambriaAuth(target, username, password); } else { target = DmaapClientUtil.getTarget(clientConfig, path, username, password); - String encoding = Base64.encodeAsString(username + ":" + password); + Base64 base64 = new Base64(); + String encoding = base64.encodeAsString((username + ":" + password).getBytes(StandardCharsets.UTF_8)); response = DmaapClientUtil.getResponsewtBasicAuth(target, encoding); @@ -244,7 +247,8 @@ public class MRBaseClient extends HttpClient implements MRClient { response = DmaapClientUtil.getResponsewtCambriaAuth(target, username, password); } else { target = DmaapClientUtil.getTarget(clientConfig, path, username, password); - String encoding = Base64.encodeAsString(username + ":" + password); + Base64 base64 = new Base64(); + String encoding = base64.encodeAsString((username + ":" + password).getBytes(StandardCharsets.UTF_8)); response = DmaapClientUtil.getResponsewtBasicAuth(target, encoding); } MRClientFactory.setHTTPHeadersMap(response.getHeaders()); |