From 8b74643e0738bd0266e510a422bf71cc67604f37 Mon Sep 17 00:00:00 2001 From: Tomasz Wrobel Date: Wed, 18 Mar 2020 14:35:36 +0100 Subject: Improve exceptions logging in certservice client Issue-ID: AAF-1107 Signed-off-by: Tomasz Wrobel Change-Id: I94a6477a7b1f086b698be4f0388e7a3ded0cd0f3 --- .../certservice/client/httpclient/HttpClient.java | 45 ++++++++++------------ .../exception/CertServiceApiResponseException.java | 13 +++---- .../httpclient/exception/HttpClientException.java | 10 ++--- .../httpclient/model/ErrorCertServiceResponse.java | 13 ++----- 4 files changed, 35 insertions(+), 46 deletions(-) (limited to 'certServiceClient/src/main/java/org/onap/aaf/certservice/client/httpclient') diff --git a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/httpclient/HttpClient.java b/certServiceClient/src/main/java/org/onap/aaf/certservice/client/httpclient/HttpClient.java index 30f881bb..0cb88051 100644 --- a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/httpclient/HttpClient.java +++ b/certServiceClient/src/main/java/org/onap/aaf/certservice/client/httpclient/HttpClient.java @@ -63,14 +63,18 @@ public class HttpClient { return extractCertServiceResponse(httpResponse); } catch (IOException e) { - LOGGER.error("Failed execute request to API for URL: {}{} . Exception message: {}", + LOGGER.error("Failed execute request to API for URL: {}{} , exception message: {}", certServiceAddress, caName, e.getMessage()); throw new HttpClientException(e); } } - private int getStatusCode(HttpResponse httpResponse) { - return httpResponse.getStatusLine().getStatusCode(); + private HttpGet createHttpRequest(String caName, String csr, String pk) { + String url = certServiceAddress + caName; + HttpGet httpGet = new HttpGet(url); + httpGet.addHeader(CSR_HEADER_NAME, csr); + httpGet.addHeader(PK_HEADER_NAME, pk); + return httpGet; } private CertServiceResponse extractCertServiceResponse(HttpResponse httpResponse) @@ -84,34 +88,25 @@ public class HttpClient { return gson.fromJson(jsonResponse, CertServiceResponse.class); } - private String getStringResponse(HttpEntity httpEntity) throws HttpClientException { - try { - return EntityUtils.toString(httpEntity, CHARSET_UTF_8); - } catch (IOException e) { - LOGGER.error("Cannot parse response to string", e); - throw new HttpClientException(e); - } - } - - private HttpGet createHttpRequest(String caName, String csr, String pk) { - String url = certServiceAddress + caName; - HttpGet httpGet = new HttpGet(url); - httpGet.addHeader(CSR_HEADER_NAME, csr); - httpGet.addHeader(PK_HEADER_NAME, pk); - return httpGet; - } - - private CertServiceApiResponseException generateApiResponseException(HttpResponse httpResponse) throws HttpClientException { String stringResponse = getStringResponse(httpResponse.getEntity()); ErrorCertServiceResponse errorCertServiceResponse = gson.fromJson(stringResponse, ErrorCertServiceResponse.class); - String messageFromApi = errorCertServiceResponse.getMessage(); - String path = errorCertServiceResponse.getPath(); - int httpResponseCode = getStatusCode(httpResponse); + return new CertServiceApiResponseException(getStatusCode(httpResponse), errorCertServiceResponse.getMessage()); + } + + private int getStatusCode(HttpResponse httpResponse) { + return httpResponse.getStatusLine().getStatusCode(); + } - return new CertServiceApiResponseException(certServiceAddress + path, httpResponseCode, messageFromApi); + private String getStringResponse(HttpEntity httpEntity) throws HttpClientException { + try { + return EntityUtils.toString(httpEntity, CHARSET_UTF_8); + } catch (IOException e) { + LOGGER.error("Cannot parse response to string, exception message: {}", e.getMessage()); + throw new HttpClientException(e); + } } } diff --git a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/httpclient/exception/CertServiceApiResponseException.java b/certServiceClient/src/main/java/org/onap/aaf/certservice/client/httpclient/exception/CertServiceApiResponseException.java index 7286318f..151c2a1c 100644 --- a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/httpclient/exception/CertServiceApiResponseException.java +++ b/certServiceClient/src/main/java/org/onap/aaf/certservice/client/httpclient/exception/CertServiceApiResponseException.java @@ -20,23 +20,22 @@ package org.onap.aaf.certservice.client.httpclient.exception; -import org.onap.aaf.certservice.client.api.ExitCode; +import org.onap.aaf.certservice.client.api.ExitStatus; import org.onap.aaf.certservice.client.api.ExitableException; public class CertServiceApiResponseException extends ExitableException { - private static final ExitCode EXIT_CODE = ExitCode.CERT_SERVICE_API_CONNECTION_EXCEPTION; + private static final ExitStatus EXIT_STATUS = ExitStatus.CERT_SERVICE_API_CONNECTION_EXCEPTION; - public CertServiceApiResponseException(String url, int responseCode, String messageFromAPI) { + public CertServiceApiResponseException(int responseCode, String messageFromAPI) { - super(String.format("Request failed for URL '%s'. Response code: %d . Message from API: %s", - url, + super(String.format("CertService HTTP unsuccessful response. Response code: %d . Message from Service: %s", responseCode, messageFromAPI)); } @Override - public int applicationExitCode() { - return EXIT_CODE.getValue(); + public ExitStatus applicationExitStatus() { + return EXIT_STATUS; } } diff --git a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/httpclient/exception/HttpClientException.java b/certServiceClient/src/main/java/org/onap/aaf/certservice/client/httpclient/exception/HttpClientException.java index 28f83073..697d152a 100644 --- a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/httpclient/exception/HttpClientException.java +++ b/certServiceClient/src/main/java/org/onap/aaf/certservice/client/httpclient/exception/HttpClientException.java @@ -20,18 +20,18 @@ package org.onap.aaf.certservice.client.httpclient.exception; -import org.onap.aaf.certservice.client.api.ExitCode; +import org.onap.aaf.certservice.client.api.ExitStatus; import org.onap.aaf.certservice.client.api.ExitableException; public class HttpClientException extends ExitableException { - private static final ExitCode EXIT_CODE = ExitCode.HTTP_CLIENT_EXCEPTION; + private static final ExitStatus EXIT_STATUS = ExitStatus.HTTP_CLIENT_EXCEPTION; - public HttpClientException(Throwable e) { + public HttpClientException(Throwable e){ super(e); } @Override - public int applicationExitCode() { - return EXIT_CODE.getValue(); + public ExitStatus applicationExitStatus() { + return EXIT_STATUS; } } diff --git a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/httpclient/model/ErrorCertServiceResponse.java b/certServiceClient/src/main/java/org/onap/aaf/certservice/client/httpclient/model/ErrorCertServiceResponse.java index 6fe99ce5..4a9efcb4 100644 --- a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/httpclient/model/ErrorCertServiceResponse.java +++ b/certServiceClient/src/main/java/org/onap/aaf/certservice/client/httpclient/model/ErrorCertServiceResponse.java @@ -22,19 +22,14 @@ package org.onap.aaf.certservice.client.httpclient.model; public class ErrorCertServiceResponse { - private final String message; - private final String path; + private final String errorMessage; - public ErrorCertServiceResponse(String message, String path) { - this.message = message; - this.path = path; + public ErrorCertServiceResponse(String errorMessage) { + this.errorMessage = errorMessage; } public String getMessage() { - return message; + return errorMessage; } - public String getPath() { - return path; - } } -- cgit 1.2.3-korg