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;
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);
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);
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);
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());
package org.onap.dmaap.mr.client.impl;
+import java.nio.charset.StandardCharsets;
import org.apache.http.HttpException;
import org.glassfish.jersey.client.ClientConfig;
-import org.glassfish.jersey.internal.util.Base64;
+import org.apache.commons.codec.binary.Base64;
import org.glassfish.jersey.internal.util.collection.StringKeyIgnoreCaseMultivaluedMap;
import org.json.JSONException;
import org.json.JSONObject;
Mockito.when(response.getStatus()).thenReturn(200);
Mockito.when(response.readEntity(String.class)).thenReturn("{\"test\":\"test\"}");
Mockito.when(response.getHeaders()).thenReturn(map);
-
+ Base64 base64 = new Base64();
Mockito.when(DmaapClientUtil.getResponsewtBasicAuth(DmaapClientUtil.getTarget(getClientConfig(), "/path"),
- Base64.encodeAsString("username:password"))).thenReturn(response);
+ base64.encodeAsString(("username:password").getBytes(StandardCharsets.UTF_8)))).thenReturn(response);
JSONObject result = mrBaseClient.get("/path", "username", "password", "HTTPAAF");
assertEquals(200, result.getInt("status"));
Mockito.when(response.getStatus()).thenReturn(200);
Mockito.when(response.readEntity(String.class)).thenReturn("{\"test\":\"test\"}");
Mockito.when(response.getHeaders()).thenReturn(map);
-
+ Base64 base64 = new Base64();
Mockito.when(DmaapClientUtil.getResponsewtBasicAuth(DmaapClientUtil.getTarget(getClientConfig(), "/path"),
- Base64.encodeAsString("username:password"))).thenReturn(response);
+ base64.encodeAsString(("username:password").getBytes(StandardCharsets.UTF_8)))).thenReturn(response);
mrBaseClient.getResponse("/path", "username", "password", "HTTPAAF");
assertTrue(true);
Mockito.when(response.getStatus()).thenReturn(200);
Mockito.when(response.readEntity(String.class)).thenReturn("{\"test\":\"test\"}");
Mockito.when(response.getHeaders()).thenReturn(map);
-
+ Base64 base64 = new Base64();
Mockito.when(DmaapClientUtil.postResponsewtBasicAuth(DmaapClientUtil.getTarget(getClientConfig(), "/path"),
- Base64.encodeAsString("username:password"), ("{\"test\":\"test\"}").getBytes(), "application/json")).thenReturn(response);
+ base64.encodeAsString(("username:password").getBytes(StandardCharsets.UTF_8)), ("{\"test\":\"test\"}").getBytes(), "application/json")).thenReturn(response);
mrBaseClient.post("/path", ("{\"test\":\"test\"}").getBytes(), "application/json", "username",
"password", "HTTPAUTH");
public void testPost_error() throws JSONException, HttpException {
ResponseBuilder responseBuilder = Response.ok();
- Mockito
- .when(DmaapClientUtil.getResponsewtBasicAuth(DmaapClientUtil.getTarget(getClientConfig(), "/path"),
- Base64.encodeAsString("username:password")))
- .thenReturn(
+ Base64 base64 = new Base64();
+ Mockito.when(DmaapClientUtil.getResponsewtBasicAuth(DmaapClientUtil.getTarget(getClientConfig(), "/path"),
+ base64.encodeAsString(("username:password").getBytes(StandardCharsets.UTF_8)))).thenReturn(
responseBuilder.header("transactionid", "transactionid").entity("{\"test\":\"test\"}").build());
mrBaseClient.post("/path", ("{\"test\":\"test\"}").getBytes(), "application/json", null, null,
Mockito.when(response.getStatus()).thenReturn(200);
Mockito.when(response.readEntity(String.class)).thenReturn("{\"test\":\"test\"}");
Mockito.when(response.getHeaders()).thenReturn(map);
-
+ Base64 base64 = new Base64();
Mockito.when(DmaapClientUtil.postResponsewtBasicAuth(DmaapClientUtil.getTarget(getClientConfig(), "/path"),
- Base64.encodeAsString("username:password"), ("{\"test\":\"test\"}").getBytes(), "application/json")).thenReturn(response);
+ base64.encodeAsString(("username:password").getBytes(StandardCharsets.UTF_8)), ("{\"test\":\"test\"}").getBytes(), "application/json")).thenReturn(response);
mrBaseClient.postWithResponse("/path", ("{\"test\":\"test\"}").getBytes(), "application/json",
"username", "password", "HTTPAUTH");
public void testPostWithResponse_error() throws JSONException, HttpException {
ResponseBuilder responseBuilder = Response.ok();
- Mockito
- .when(DmaapClientUtil.getResponsewtBasicAuth(DmaapClientUtil.getTarget(getClientConfig(), "/path"),
- Base64.encodeAsString("username:password")))
- .thenReturn(
- responseBuilder.header("transactionid", "transactionid").entity("{\"test\":\"test\"}").build());
+ Base64 base64 = new Base64();
+ Mockito.when(DmaapClientUtil.getResponsewtBasicAuth(DmaapClientUtil.getTarget(getClientConfig(), "/path"),
+ base64.encodeAsString(("username:password").getBytes(StandardCharsets.UTF_8)))).thenReturn(
+ responseBuilder.header("transactionid", "transactionid").entity("{\"test\":\"test\"}").build());
mrBaseClient.postWithResponse("/path", ("{\"test\":\"test\"}").getBytes(), "application/json", null,
null, "HTTPAUTH");