From 8d2e18ed6c11a123472698d0debe03c909a503a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Weing=C3=A4rtner?= Date: Sun, 9 Apr 2017 21:13:34 -0400 Subject: [PATCH] Fix some call for logger.debug that were using regex to create a sring to log --- .../client/ApacheCloudStackClient.java | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/main/java/br/com/autonomiccs/apacheCloudStack/client/ApacheCloudStackClient.java b/src/main/java/br/com/autonomiccs/apacheCloudStack/client/ApacheCloudStackClient.java index 391be4b..d95568d 100644 --- a/src/main/java/br/com/autonomiccs/apacheCloudStack/client/ApacheCloudStackClient.java +++ b/src/main/java/br/com/autonomiccs/apacheCloudStack/client/ApacheCloudStackClient.java @@ -140,7 +140,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("Executing request[%s].", urlRequest); + logger.debug(String.format("Executing request[%s].", urlRequest)); CloseableHttpClient httpClient = createHttpClient(); HttpContext httpContext = createHttpContextWithAuthenticatedSessionUsingUserCredentialsIfNeeded(httpClient, isSecretKeyApiKeyAuthenticationMechanism); try { @@ -178,7 +178,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("Logout result[%s]", returnOfLogout); + logger.debug(String.format("Logout result[%s]", returnOfLogout)); } /** @@ -198,10 +198,8 @@ protected HttpContext createHttpContextWithAuthenticatedSessionUsingUserCredenti * @return returns the created RequestConfig object */ protected RequestConfig createRequestConfig() { - return RequestConfig.custom() - .setConnectTimeout(connectionTimeout * (int) DateUtils.MILLIS_PER_SECOND) - .setConnectionRequestTimeout(connectionTimeout * (int) DateUtils.MILLIS_PER_SECOND) - .setSocketTimeout(connectionTimeout * (int) DateUtils.MILLIS_PER_SECOND).build(); + return RequestConfig.custom().setConnectTimeout(connectionTimeout * (int)DateUtils.MILLIS_PER_SECOND) + .setConnectionRequestTimeout(connectionTimeout * (int)DateUtils.MILLIS_PER_SECOND).setSocketTimeout(connectionTimeout * (int)DateUtils.MILLIS_PER_SECOND).build(); } /** @@ -234,7 +232,7 @@ protected HttpContext createHttpContextWithAuthenticatedSessionUsingUserCredenti if (statusCode != HttpStatus.SC_OK) { throw new ApacheCloudStackClientRequestRuntimeException(statusCode, getResponseAsString(loginResponse), "login"); } - logger.debug("Authentication response:[%s]", getResponseAsString(loginResponse)); + logger.debug(String.format("Authentication response:[%s]", getResponseAsString(loginResponse))); return createHttpContextWithCookies(loginResponse); } catch (IOException e) {