-/**
+/**
* ============LICENSE_START=======================================================
* org.onap.aai
* ================================================================================
if (httpResponse != null) {
httpResponse.setHeader(RESPONSE_HEADER_RESOURCE_VERSION, result.getResultVersion());
}
- ResponseEntity response =
+ ResponseEntity<String> response =
ResponseEntity.status(result.getResultCode()).contentType(MediaType.APPLICATION_JSON).body(output);
logResult(request, HttpStatus.valueOf(response.getStatusCodeValue()));
logResult(request, HttpStatus.valueOf(response.getStatusCodeValue()));
if (httpResponse != null) {
httpResponse.setHeader(RESPONSE_HEADER_RESOURCE_VERSION, result.getResultVersion());
}
- ResponseEntity response =
+ ResponseEntity<String> response =
ResponseEntity.status(result.getResultCode()).contentType(MediaType.APPLICATION_JSON).body(output);
logResult(request, HttpStatus.valueOf(response.getStatusCodeValue()));
if (httpResponse != null) {
httpResponse.setHeader(RESPONSE_HEADER_RESOURCE_VERSION, result.getResultVersion());
}
- ResponseEntity response;
+ ResponseEntity<String> response;
if (output == null) {
response = ResponseEntity.status(result.getResultCode()).build();
} else {
if (httpResponse != null) {
httpResponse.setHeader(RESPONSE_HEADER_RESOURCE_VERSION, result.getResultVersion());
}
- ResponseEntity response =
+ ResponseEntity<String> response =
ResponseEntity.status(result.getResultCode()).contentType(MediaType.APPLICATION_JSON).body(output);
logResult(request, HttpStatus.valueOf(response.getStatusCodeValue()));
? mapper.writerWithDefaultPrettyPrinter().writeValueAsString(result.getError())
: result.getFailureCause();
}
- ResponseEntity response =
+ ResponseEntity<String> response =
ResponseEntity.status(result.getResultCode()).contentType(MediaType.APPLICATION_JSON).body(output);
// Clear the MDC context so that no other transaction inadvertently
* @param headers - The HTTP headers.
* @return - A standard HTTP response.
*/
- private ResponseEntity processQuery(String index, String content, HttpServletRequest request, HttpHeaders headers,
- DocumentStoreInterface documentStore) {
+ private ResponseEntity<String> processQuery(String index, String content, HttpServletRequest request,
+ HttpHeaders headers, DocumentStoreInterface documentStore) {
try {
ObjectMapper mapper = new ObjectMapper();
? mapper.writerWithDefaultPrettyPrinter().writeValueAsString(result.getError())
: result.getFailureCause();
}
- ResponseEntity response =
+ ResponseEntity<String> response =
ResponseEntity.status(result.getResultCode()).contentType(MediaType.APPLICATION_JSON).body(output);
// Clear the MDC context so that no other transaction inadvertently
return output.toString();
}
- private ResponseEntity handleError(HttpServletRequest request, String message, HttpStatus status) {
+ private ResponseEntity<String> handleError(HttpServletRequest request, String message, HttpStatus status) {
logResult(request, status);
return ResponseEntity.status(status).contentType(MediaType.APPLICATION_JSON).body(message);
}
void logResult(HttpServletRequest request, HttpStatus status) {
- logger.info(SearchDbMsgs.PROCESS_REST_REQUEST, (request != null) ? request.getMethod().toString() : "",
+ logger.info(SearchDbMsgs.PROCESS_REST_REQUEST, (request != null) ? request.getMethod() : "",
(request != null) ? request.getRequestURL().toString() : "",
(request != null) ? request.getRemoteHost() : "", Integer.toString(status.value()));
auditLogger.info(SearchDbMsgs.PROCESS_REST_REQUEST,
new LogFields().setField(LogLine.DefinedFields.RESPONSE_CODE, status.value())
.setField(LogLine.DefinedFields.RESPONSE_DESCRIPTION, status.getReasonPhrase()),
- (request != null) ? request.getMethod().toString() : "",
+ (request != null) ? request.getMethod() : "",
(request != null) ? request.getRequestURL().toString() : "",
(request != null) ? request.getRemoteHost() : "", Integer.toString(status.value()));
- // Clear the MDC context so that no other transaction inadvertently
- // uses our transaction id.
+ // Clear the MDC context so that no other transaction inadvertently uses our transaction id.
ApiUtils.clearMdcContext();
}
}