diff options
author | aosull01 <adrian.osullivan@huawei.com> | 2019-03-20 16:49:49 +0000 |
---|---|---|
committer | aosull01 <adrian.osullivan@huawei.com> | 2019-03-21 17:33:14 +0000 |
commit | 8d1454a7f2083f097aceb368ed64bf4c05be0b80 (patch) | |
tree | 69a8d016c30e28040e5c429de75e52044ca8490b | |
parent | 726031bf80339a3c23cc52f89a403e86afa301f4 (diff) |
Remove logging from scehduled polling
Change-Id: Ia70ee01e4a0755c63fe84de40749847677da5dc9
Issue-ID: EXTAPI-221
Signed-off-by: aosull01 <adrian.osullivan@huawei.com>
-rw-r--r-- | src/main/java/org/onap/nbi/apis/serviceorder/SoClient.java | 512 |
1 files changed, 262 insertions, 250 deletions
diff --git a/src/main/java/org/onap/nbi/apis/serviceorder/SoClient.java b/src/main/java/org/onap/nbi/apis/serviceorder/SoClient.java index deb1443..c9d12a3 100644 --- a/src/main/java/org/onap/nbi/apis/serviceorder/SoClient.java +++ b/src/main/java/org/onap/nbi/apis/serviceorder/SoClient.java @@ -1,14 +1,15 @@ /** * Copyright (c) 2018 Orange * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at + * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except + * in compliance with the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. + * Unless required by applicable law or agreed to in writing, software distributed under the License + * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express + * or implied. See the License for the specific language governing permissions and limitations under + * the License. */ package org.onap.nbi.apis.serviceorder; @@ -40,292 +41,303 @@ import org.springframework.web.client.RestTemplate; @Service public class SoClient { - public static final String RESPONSE_STATUS = "response status : "; - public static final String RETURNS = " returns "; - public static final String ERROR_ON_CALLING = "error on calling "; - @Autowired - private RestTemplate restTemplate; - - @Value("${so.host}") - private String soHostname; - - @Value("${so.api.id}") - private String soApiId; - - @Value("${so.header.authorization}") - private String soHeaderAuthorization; - - private static final String HEADER_AUTHORIZATION = "Authorization"; - private static final String X_FROM_APP_ID = "X-FromAppId"; - - private static final Logger LOGGER = LoggerFactory.getLogger(SoClient.class); - - private String createSoUrl; - private String createE2ESoUrl; - private String getSoStatus; - private String getE2ESoStatus; - private String deleteE2ESoUrl; - private String deleteSoUrl; - private String SoHealthCheck; - - - @PostConstruct - private void setUpAndLogSOUrl() { - createSoUrl = new StringBuilder().append(soHostname) - .append(OnapComponentsUrlPaths.MSO_CREATE_SERVICE_INSTANCE_PATH).toString(); - createE2ESoUrl = new StringBuilder().append(soHostname) - .append(OnapComponentsUrlPaths.MSO_CREATE_E2ESERVICE_INSTANCE_PATH).toString(); - deleteSoUrl = new StringBuilder().append(soHostname) - .append(OnapComponentsUrlPaths.MSO_DELETE_REQUEST_STATUS_PATH).toString(); - deleteE2ESoUrl = new StringBuilder().append(soHostname) - .append(OnapComponentsUrlPaths.MSO_DELETE_E2ESERVICE_INSTANCE_PATH).toString(); - getSoStatus = new StringBuilder().append(soHostname).append(OnapComponentsUrlPaths.MSO_GET_REQUEST_STATUS_PATH) - .toString(); - getE2ESoStatus = new StringBuilder().append(soHostname) - .append(OnapComponentsUrlPaths.MSO_GET_E2EREQUEST_STATUS_PATH).toString(); - SoHealthCheck = new StringBuilder().append(soHostname) - .append(OnapComponentsUrlPaths.MSO_HEALTH_CHECK).toString(); - - LOGGER.info("SO create service url : " + createSoUrl); - LOGGER.info("SO create e2e service url : " + createE2ESoUrl); - LOGGER.info("SO delete service url : " + deleteSoUrl); - LOGGER.info("SO delete e2e service url : " + deleteE2ESoUrl); - LOGGER.info("SO get so status url : " + getSoStatus); - LOGGER.info("SO get e2e so status url : " + getE2ESoStatus); - LOGGER.info("SO healthCheck : " + SoHealthCheck); - + public static final String RESPONSE_STATUS = "response status : "; + public static final String RETURNS = " returns "; + public static final String ERROR_ON_CALLING = "error on calling "; + @Autowired + private RestTemplate restTemplate; + + @Value("${so.host}") + private String soHostname; + + @Value("${so.api.id}") + private String soApiId; + + @Value("${so.header.authorization}") + private String soHeaderAuthorization; + + private static final String HEADER_AUTHORIZATION = "Authorization"; + private static final String X_FROM_APP_ID = "X-FromAppId"; + + private static final Logger LOGGER = LoggerFactory.getLogger(SoClient.class); + + private String createSoUrl; + private String createE2ESoUrl; + private String getSoStatus; + private String getE2ESoStatus; + private String deleteE2ESoUrl; + private String deleteSoUrl; + private String SoHealthCheck; + + + @PostConstruct + private void setUpAndLogSOUrl() { + createSoUrl = new StringBuilder().append(soHostname) + .append(OnapComponentsUrlPaths.MSO_CREATE_SERVICE_INSTANCE_PATH).toString(); + createE2ESoUrl = new StringBuilder().append(soHostname) + .append(OnapComponentsUrlPaths.MSO_CREATE_E2ESERVICE_INSTANCE_PATH).toString(); + deleteSoUrl = new StringBuilder().append(soHostname) + .append(OnapComponentsUrlPaths.MSO_DELETE_REQUEST_STATUS_PATH).toString(); + deleteE2ESoUrl = new StringBuilder().append(soHostname) + .append(OnapComponentsUrlPaths.MSO_DELETE_E2ESERVICE_INSTANCE_PATH).toString(); + getSoStatus = new StringBuilder().append(soHostname) + .append(OnapComponentsUrlPaths.MSO_GET_REQUEST_STATUS_PATH).toString(); + getE2ESoStatus = new StringBuilder().append(soHostname) + .append(OnapComponentsUrlPaths.MSO_GET_E2EREQUEST_STATUS_PATH).toString(); + SoHealthCheck = new StringBuilder().append(soHostname) + .append(OnapComponentsUrlPaths.MSO_HEALTH_CHECK).toString(); + + LOGGER.info("SO create service url : " + createSoUrl); + LOGGER.info("SO create e2e service url : " + createE2ESoUrl); + LOGGER.info("SO delete service url : " + deleteSoUrl); + LOGGER.info("SO delete e2e service url : " + deleteE2ESoUrl); + LOGGER.info("SO get so status url : " + getSoStatus); + LOGGER.info("SO get e2e so status url : " + getE2ESoStatus); + LOGGER.info("SO healthCheck : " + SoHealthCheck); + + } + + + public ResponseEntity<CreateServiceInstanceResponse> callCreateServiceInstance( + MSOPayload msoPayload) { + + if (LOGGER.isDebugEnabled()) { + LOGGER.debug("Calling SO CreateServiceInstance with msoPayload : " + msoPayload.toString()); } + try { + ResponseEntity<CreateServiceInstanceResponse> response = restTemplate.exchange(createSoUrl, + HttpMethod.POST, new HttpEntity<>(msoPayload, buildRequestHeader()), + CreateServiceInstanceResponse.class); + + logResponsePost(createSoUrl, response); + return response; + + } catch (BackendFunctionalException e) { + LOGGER.error( + ERROR_ON_CALLING + createSoUrl + " ," + e.getHttpStatus() + " , " + e.getBodyResponse()); + return new ResponseEntity(e.getBodyResponse(), e.getHttpStatus()); + } catch (ResourceAccessException e) { + LOGGER.error(ERROR_ON_CALLING + createSoUrl + " ," + e.getMessage()); + return new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR); + } + } - public ResponseEntity<CreateServiceInstanceResponse> callCreateServiceInstance(MSOPayload msoPayload) { + public ResponseEntity<CreateE2EServiceInstanceResponse> callE2ECreateServiceInstance( + MSOE2EPayload msoPayloadE2E) { - if (LOGGER.isDebugEnabled()) { - LOGGER.debug("Calling SO CreateServiceInstance with msoPayload : " + msoPayload.toString()); - } + if (LOGGER.isDebugEnabled()) { + LOGGER.debug( + "Calling SO CreateServiceInstanceE2E with msoPayload : " + msoPayloadE2E.toString()); + } - try { - ResponseEntity<CreateServiceInstanceResponse> response = restTemplate.exchange(createSoUrl, HttpMethod.POST, - new HttpEntity<>(msoPayload, buildRequestHeader()), CreateServiceInstanceResponse.class); + try { + ResponseEntity<CreateE2EServiceInstanceResponse> response = restTemplate.exchange( + createE2ESoUrl, HttpMethod.POST, new HttpEntity<>(msoPayloadE2E, buildRequestHeader()), + CreateE2EServiceInstanceResponse.class); + + logE2EResponsePost(createE2ESoUrl, response); + return response; + + } catch (BackendFunctionalException e) { + LOGGER.error( + ERROR_ON_CALLING + createSoUrl + " ," + e.getHttpStatus() + " , " + e.getBodyResponse()); + return new ResponseEntity(e.getBodyResponse(), e.getHttpStatus()); + } catch (ResourceAccessException e) { + LOGGER.error(ERROR_ON_CALLING + createE2ESoUrl + " ," + e.getMessage()); + return new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR); + } + } - logResponsePost(createSoUrl, response); - return response; + public ResponseEntity<CreateServiceInstanceResponse> callDeleteServiceInstance( + MSOPayload msoPayload, String serviceId) { - } catch (BackendFunctionalException e) { - LOGGER.error(ERROR_ON_CALLING + createSoUrl + " ," + e.getHttpStatus() + " , " + e.getBodyResponse()); - return new ResponseEntity(e.getBodyResponse(), e.getHttpStatus()); - } catch (ResourceAccessException e) { - LOGGER.error(ERROR_ON_CALLING + createSoUrl + " ," + e.getMessage()); - return new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR); - } + if (LOGGER.isDebugEnabled()) { + LOGGER.debug("Calling SO DeleteServiceInstance with msoPayload : " + msoPayload.toString()); } - public ResponseEntity<CreateE2EServiceInstanceResponse> callE2ECreateServiceInstance(MSOE2EPayload msoPayloadE2E) { + String url = deleteSoUrl + serviceId; - if (LOGGER.isDebugEnabled()) { - LOGGER.debug("Calling SO CreateServiceInstanceE2E with msoPayload : " + msoPayloadE2E.toString()); - } + try { + ResponseEntity<CreateServiceInstanceResponse> response = restTemplate.exchange(url, + HttpMethod.DELETE, new HttpEntity<>(msoPayload, buildRequestHeader()), + CreateServiceInstanceResponse.class); - try { - ResponseEntity<CreateE2EServiceInstanceResponse> response = restTemplate - .exchange(createE2ESoUrl, HttpMethod.POST, - new HttpEntity<>(msoPayloadE2E, buildRequestHeader()), CreateE2EServiceInstanceResponse.class); + logResponsePost(url, response); + return response; - logE2EResponsePost(createE2ESoUrl, response); - return response; - - } catch (BackendFunctionalException e) { - LOGGER.error(ERROR_ON_CALLING + createSoUrl + " ," + e.getHttpStatus() + " , " + e.getBodyResponse()); - return new ResponseEntity(e.getBodyResponse(), e.getHttpStatus()); - } catch (ResourceAccessException e) { - LOGGER.error(ERROR_ON_CALLING + createE2ESoUrl + " ," + e.getMessage()); - return new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR); - } + } catch (BackendFunctionalException e) { + LOGGER.error(ERROR_ON_CALLING + url + " ," + e); + return new ResponseEntity<>(e.getHttpStatus()); + } catch (ResourceAccessException e) { + LOGGER.error(ERROR_ON_CALLING + url + " ," + e); + return new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR); } - public ResponseEntity<CreateServiceInstanceResponse> callDeleteServiceInstance(MSOPayload msoPayload, - String serviceId) { - - if (LOGGER.isDebugEnabled()) { - LOGGER.debug("Calling SO DeleteServiceInstance with msoPayload : " + msoPayload.toString()); - } - - String url = deleteSoUrl + serviceId; - - try { - ResponseEntity<CreateServiceInstanceResponse> response = restTemplate.exchange(url, HttpMethod.DELETE, - new HttpEntity<>(msoPayload, buildRequestHeader()), CreateServiceInstanceResponse.class); + } - logResponsePost(url, response); - return response; + public ResponseEntity<CreateE2EServiceInstanceResponse> callE2EDeleteServiceInstance( + String globalSubscriberId, String serviceType, String serviceInstanceId) { - } catch (BackendFunctionalException e) { - LOGGER.error(ERROR_ON_CALLING + url + " ," + e); - return new ResponseEntity<>(e.getHttpStatus()); - } catch (ResourceAccessException e) { - LOGGER.error(ERROR_ON_CALLING + url + " ," + e); - return new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR); - } + String url = deleteE2ESoUrl + serviceInstanceId; + MSODeleteE2EPayload msoDeleteE2EPayload = new MSODeleteE2EPayload(); + msoDeleteE2EPayload.setGlobalSubscriberId(globalSubscriberId); + msoDeleteE2EPayload.setServiceType(serviceType); + if (LOGGER.isDebugEnabled()) { + LOGGER.debug("Calling SO DeleteE2EServiceInstance with url : " + url + + " MSODeleteE2EPayload : " + msoDeleteE2EPayload.toString()); } - public ResponseEntity<CreateE2EServiceInstanceResponse> callE2EDeleteServiceInstance(String globalSubscriberId, - String serviceType, - String serviceInstanceId) { - - String url = deleteE2ESoUrl + serviceInstanceId; - MSODeleteE2EPayload msoDeleteE2EPayload = new MSODeleteE2EPayload(); - msoDeleteE2EPayload.setGlobalSubscriberId(globalSubscriberId); - msoDeleteE2EPayload.setServiceType(serviceType); - - if (LOGGER.isDebugEnabled()) { - LOGGER.debug("Calling SO DeleteE2EServiceInstance with url : " + url + " MSODeleteE2EPayload : " - + msoDeleteE2EPayload.toString()); - } - - try { - ResponseEntity<DeleteE2EServiceInstanceResponse> deleteresponse = restTemplate - .exchange(url, HttpMethod.DELETE, - new HttpEntity<>(msoDeleteE2EPayload, buildRequestHeader()), - DeleteE2EServiceInstanceResponse.class); - - // For E2E Services , Create and Delete Service responses are different, to maintain consistentcy with ServiceInstances - // Copy contents of DeleteE2EServiceInstanceResponse to CreateE2EServiceInstanceResponse - CreateE2EServiceInstanceResponse dummyresponse = new CreateE2EServiceInstanceResponse(); - ServiceResponse serviceResponse = new ServiceResponse(); - dummyresponse.setService(serviceResponse); - dummyresponse.getService().setOperationId(deleteresponse.getBody().getOperationId()); - dummyresponse.getService().setServiceId(serviceInstanceId); - - ResponseEntity<CreateE2EServiceInstanceResponse> response = new ResponseEntity(dummyresponse, - deleteresponse.getStatusCode()); - logE2EResponsePost(url, response); - return response; - - } catch (BackendFunctionalException e) { - LOGGER.error(ERROR_ON_CALLING + url + " ," + e); - return new ResponseEntity<>(e.getHttpStatus()); - } catch (ResourceAccessException e) { - LOGGER.error(ERROR_ON_CALLING + url + " ," + e); - return new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR); - } + try { + ResponseEntity<DeleteE2EServiceInstanceResponse> deleteresponse = restTemplate.exchange(url, + HttpMethod.DELETE, new HttpEntity<>(msoDeleteE2EPayload, buildRequestHeader()), + DeleteE2EServiceInstanceResponse.class); + + // For E2E Services , Create and Delete Service responses are different, to maintain + // consistentcy with ServiceInstances + // Copy contents of DeleteE2EServiceInstanceResponse to CreateE2EServiceInstanceResponse + CreateE2EServiceInstanceResponse dummyresponse = new CreateE2EServiceInstanceResponse(); + ServiceResponse serviceResponse = new ServiceResponse(); + dummyresponse.setService(serviceResponse); + dummyresponse.getService().setOperationId(deleteresponse.getBody().getOperationId()); + dummyresponse.getService().setServiceId(serviceInstanceId); + + ResponseEntity<CreateE2EServiceInstanceResponse> response = + new ResponseEntity(dummyresponse, deleteresponse.getStatusCode()); + logE2EResponsePost(url, response); + return response; + + } catch (BackendFunctionalException e) { + LOGGER.error(ERROR_ON_CALLING + url + " ," + e); + return new ResponseEntity<>(e.getHttpStatus()); + } catch (ResourceAccessException e) { + LOGGER.error(ERROR_ON_CALLING + url + " ," + e); + return new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR); } + } - private void logResponsePost(String url, ResponseEntity<CreateServiceInstanceResponse> response) { - LOGGER.info(RESPONSE_STATUS + response.getStatusCodeValue()); - if (LOGGER.isDebugEnabled()) { - LOGGER.debug("response body : {}", response.getBody().toString()); - } - - if (LOGGER.isWarnEnabled() && !response.getStatusCode().equals(HttpStatus.CREATED)) { - LOGGER.warn("HTTP call SO on {} returns {} , {}", url, response.getStatusCodeValue(), - response.getBody().toString()); - } + private void logResponsePost(String url, ResponseEntity<CreateServiceInstanceResponse> response) { + LOGGER.info(RESPONSE_STATUS + response.getStatusCodeValue()); + if (LOGGER.isDebugEnabled()) { + LOGGER.debug("response body : {}", response.getBody().toString()); } - private void logE2EResponsePost(String url, ResponseEntity<CreateE2EServiceInstanceResponse> response) { - LOGGER.info(RESPONSE_STATUS + response.getStatusCodeValue()); - if (LOGGER.isDebugEnabled()) { - LOGGER.debug("response body : {}", response.getBody().toString()); - } - - if (LOGGER.isWarnEnabled() && !response.getStatusCode().equals(HttpStatus.CREATED)) { - LOGGER.warn("HTTP call SO on {} returns {} , {}", url, response.getStatusCodeValue(), - response.getBody().toString()); - } + if (LOGGER.isWarnEnabled() && !response.getStatusCode().equals(HttpStatus.CREATED)) { + LOGGER.warn("HTTP call SO on {} returns {} , {}", url, response.getStatusCodeValue(), + response.getBody().toString()); } + } - public GetRequestStatusResponse callGetRequestStatus(String requestId) { - String url = getSoStatus + requestId; - - try { - - ResponseEntity<GetRequestStatusResponse> response = restTemplate.exchange(url, HttpMethod.GET, - new HttpEntity<>(buildRequestHeader()), GetRequestStatusResponse.class); - logResponseGet(url, response); - if (null == response) { - return null; - } else { - return response.getBody(); - } + private void logE2EResponsePost(String url, + ResponseEntity<CreateE2EServiceInstanceResponse> response) { + LOGGER.info(RESPONSE_STATUS + response.getStatusCodeValue()); + if (LOGGER.isDebugEnabled()) { + LOGGER.debug("response body : {}", response.getBody().toString()); + } - } catch (BackendFunctionalException | ResourceAccessException e) { - LOGGER.error(ERROR_ON_CALLING + url + " ," + e); - return null; - } + if (LOGGER.isWarnEnabled() && !response.getStatusCode().equals(HttpStatus.CREATED)) { + LOGGER.warn("HTTP call SO on {} returns {} , {}", url, response.getStatusCodeValue(), + response.getBody().toString()); } + } + + public GetRequestStatusResponse callGetRequestStatus(String requestId) { + String url = getSoStatus + requestId; + try { - public void callCheckConnectivity() { - String url = SoHealthCheck; - restTemplate.exchange(url, HttpMethod.GET, - new HttpEntity<>(buildRequestHeader()), String.class); + ResponseEntity<GetRequestStatusResponse> response = restTemplate.exchange(url, HttpMethod.GET, + new HttpEntity<>(buildRequestHeader()), GetRequestStatusResponse.class); + logResponseGet(url, response); + if (null == response) { + return null; + } else { + return response.getBody(); + } + } catch (BackendFunctionalException | ResourceAccessException e) { + LOGGER.error(ERROR_ON_CALLING + url + " ," + e); + return null; } + } - public GetE2ERequestStatusResponse callE2EGetRequestStatus(String operationId, String serviceId) { - String callUrlFormated = getE2ESoStatus.replace("$serviceId", serviceId); - callUrlFormated = callUrlFormated.replace("$operationId", operationId); + public void callCheckConnectivity() { + String url = SoHealthCheck; + restTemplate.exchange(url, HttpMethod.GET, new HttpEntity<>(buildRequestHeader()), + String.class); - if (LOGGER.isDebugEnabled()) { - LOGGER.debug("Calling SO callE2EGetRequestStatus with url : " + callUrlFormated); - } + } - try { + public GetE2ERequestStatusResponse callE2EGetRequestStatus(String operationId, String serviceId) { - ResponseEntity<GetE2ERequestStatusResponse> response = restTemplate - .exchange(callUrlFormated, HttpMethod.GET, - new HttpEntity<>(buildRequestHeader()), GetE2ERequestStatusResponse.class); - logE2EResponseGet(callUrlFormated, response); - if (null == response) { - return null; - } else { - return response.getBody(); - } + String callUrlFormated = getE2ESoStatus.replace("$serviceId", serviceId); + callUrlFormated = callUrlFormated.replace("$operationId", operationId); - } catch (BackendFunctionalException | ResourceAccessException e) { - LOGGER.error(ERROR_ON_CALLING + callUrlFormated + " ," + e); - return null; - } + if (LOGGER.isDebugEnabled()) { + LOGGER.debug("Calling SO callE2EGetRequestStatus with url : " + callUrlFormated); } - private void logResponseGet(String url, ResponseEntity<GetRequestStatusResponse> response) { - if (response != null) { - if (LOGGER.isDebugEnabled()) { - LOGGER.debug("response body : {}", response.getBody().toString()); - } - LOGGER.info("response status : {}", response.getStatusCodeValue()); - if (LOGGER.isWarnEnabled() && !response.getStatusCode().equals(HttpStatus.OK)) { - LOGGER.warn("HTTP call SO on {} returns {} , {}", url, response.getStatusCodeValue(), - response.getBody().toString()); - } - } else { - LOGGER.info("no response calling url {}", url); - } + try { + + ResponseEntity<GetE2ERequestStatusResponse> response = + restTemplate.exchange(callUrlFormated, HttpMethod.GET, + new HttpEntity<>(buildRequestHeader()), GetE2ERequestStatusResponse.class); + logE2EResponseGet(callUrlFormated, response); + if (null == response) { + return null; + } else { + return response.getBody(); + } + + } catch (BackendFunctionalException | ResourceAccessException e) { + LOGGER.error(ERROR_ON_CALLING + callUrlFormated + " ," + e); + return null; } - - private void logE2EResponseGet(String url, ResponseEntity<GetE2ERequestStatusResponse> response) { - if (response != null) { - if (LOGGER.isDebugEnabled()) { - LOGGER.debug("response body : {}", response.getBody().toString()); - } - LOGGER.info("response status : {}", response.getStatusCodeValue()); - if (LOGGER.isWarnEnabled() && !response.getStatusCode().equals(HttpStatus.OK)) { - LOGGER.warn("HTTP call SO on {} returns {} , {}", url, response.getStatusCodeValue(), - response.getBody().toString()); - } - } else { - LOGGER.info("no response calling url {}", url); - } + } + + private void logResponseGet(String url, ResponseEntity<GetRequestStatusResponse> response) { + if (response != null) { + if (LOGGER.isDebugEnabled()) { + LOGGER.debug("response status : {} , response body : {}", response.getStatusCodeValue(), + response.getBody().toString()); + } + if (LOGGER.isWarnEnabled() && !response.getStatusCode().equals(HttpStatus.OK)) { + LOGGER.warn("HTTP call SO on {} returns {} , {}", url, response.getStatusCodeValue(), + response.getBody().toString()); + } + } else { + if (LOGGER.isWarnEnabled()) { + LOGGER.warn("no response calling url {}", url); + } } - - private HttpHeaders buildRequestHeader() { - HttpHeaders httpHeaders = new HttpHeaders(); - httpHeaders.add(HEADER_AUTHORIZATION, soHeaderAuthorization); - httpHeaders.add(X_FROM_APP_ID, soApiId); - httpHeaders.add("Accept", "application/json"); - httpHeaders.add("Content-Type", "application/json"); - return httpHeaders; + } + + private void logE2EResponseGet(String url, ResponseEntity<GetE2ERequestStatusResponse> response) { + if (response != null) { + if (LOGGER.isDebugEnabled()) { + LOGGER.debug("response status : {} , response body : {}", response.getStatusCodeValue(), + response.getBody().toString()); + } + if (LOGGER.isWarnEnabled() && !response.getStatusCode().equals(HttpStatus.OK)) { + LOGGER.warn("HTTP call SO on {} returns {} , {}", url, response.getStatusCodeValue(), + response.getBody().toString()); + } + } else { + if (LOGGER.isWarnEnabled()) { + LOGGER.warn("no response calling url {}", url); + } } + } + + private HttpHeaders buildRequestHeader() { + HttpHeaders httpHeaders = new HttpHeaders(); + httpHeaders.add(HEADER_AUTHORIZATION, soHeaderAuthorization); + httpHeaders.add(X_FROM_APP_ID, soApiId); + httpHeaders.add("Accept", "application/json"); + httpHeaders.add("Content-Type", "application/json"); + return httpHeaders; + } } |