Skip to content

Make 'ApacheCloudStackClient' serializable #34

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rafaelweingartner merged 1 commit into from
Oct 27, 2017
Merged

Make 'ApacheCloudStackClient' serializable #34

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 15 additions & 9 deletions src/main/java/br/com/autonomiccs/apacheCloudStack/client/ApacheCloudStackClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@

import java.io.IOException;
import java.io.InputStream;
import java.io.Serializable;
import java.io.StringWriter;
import java.io.UnsupportedEncodingException;
import java.net.URI;
Expand Down Expand Up @@ -92,7 +93,15 @@
* Apache CloudStack API client.
* The client is a pair of URL and user credentials ({@link #apacheCloudStackUser}).
*/
public class ApacheCloudStackClient {
public class ApacheCloudStackClient implements Serializable {
/**
* The serial version ID of the current {@link ApacheCloudStackClient}
*/
private static final long serialVersionUID = 1L;

private static Logger LOGGER = LoggerFactory.getLogger(ApacheCloudStackClient.class);
private static Gson GSON = new GsonBuilder().create();

/**
* This flag indicates if we are going to validate the server certificate in case of HTTPS connections.
* The default value is 'true', meaning that we always validate the server HTTPS certificate.
Expand Down Expand Up @@ -124,9 +133,6 @@ public class ApacheCloudStackClient {
*/
private boolean shouldRequestsExpire = true;

private Gson gson = new GsonBuilder().create();
private Logger logger = LoggerFactory.getLogger(getClass());

/**
* The API URL used to access Apache CloudStack API.
* Ex: https://cloud.domain.com/client/api
Expand All @@ -153,7 +159,7 @@ public ApacheCloudStackClient(String url, ApacheCloudStackUser apacheCloudStackU
public String executeRequest(ApacheCloudStackRequest request) {
boolean isSecretKeyApiKeyAuthenticationMechanism = StringUtils.isNotBlank(this.apacheCloudStackUser.getApiKey());
String urlRequest = createApacheCloudStackApiUrlRequest(request, isSecretKeyApiKeyAuthenticationMechanism);
logger.debug(String.format("Executing request[%s].", urlRequest));
LOGGER.debug(String.format("Executing request[%s].", urlRequest));
CloseableHttpClient httpClient = createHttpClient();
HttpContext httpContext = createHttpContextWithAuthenticatedSessionUsingUserCredentialsIfNeeded(httpClient, isSecretKeyApiKeyAuthenticationMechanism);
try {
Expand All @@ -179,7 +185,7 @@ protected String executeRequestGetResponseAsString(String urlRequest, CloseableH
}
throw new ApacheCloudStackClientRequestRuntimeException(requestStatus.getStatusCode(), getResponseAsString(response), urlRequest.toString());
} catch (IOException e) {
logger.error(String.format("Error while executing request [%s]", urlRequest));
LOGGER.error(String.format("Error while executing request [%s]", urlRequest));
throw new ApacheCloudStackClientRuntimeException(e);
}
}
Expand All @@ -191,7 +197,7 @@ protected String executeRequestGetResponseAsString(String urlRequest, CloseableH
protected void executeUserLogout(CloseableHttpClient httpClient, HttpContext httpContext) {
String urlRequest = createApacheCloudStackApiUrlRequest(new ApacheCloudStackRequest("logout").addParameter("response", "json"), false);
String returnOfLogout = executeRequestGetResponseAsString(urlRequest, httpClient, httpContext);
logger.debug(String.format("Logout result[%s]", returnOfLogout));
LOGGER.debug(String.format("Logout result[%s]", returnOfLogout));
}

/**
Expand Down Expand Up @@ -245,7 +251,7 @@ protected HttpContext createHttpContextWithAuthenticatedSessionUsingUserCredenti
if (statusCode != HttpStatus.SC_OK) {
throw new ApacheCloudStackClientRequestRuntimeException(statusCode, getResponseAsString(loginResponse), "login");
}
logger.debug(String.format("Authentication response:[%s]", getResponseAsString(loginResponse)));
LOGGER.debug(String.format("Authentication response:[%s]", getResponseAsString(loginResponse)));

return createHttpContextWithCookies(loginResponse);
} catch (IOException e) {
Expand Down Expand Up @@ -532,7 +538,7 @@ protected Date getExpirationDate() {
public <T> T executeRequest(ApacheCloudStackRequest request, Class<T> clazz) {
request.addParameter("response", "json");
String response = executeRequest(request);
return gson.fromJson(response, clazz);
return GSON.fromJson(response, clazz);
}

/**
Expand Down