Merge branch 'aws-integration' into 'master'

Refactor code to SonarQube standards

See merge request !366

indexer-core/src/main/java/org/opengroup/osdu/indexer/error/GlobalExceptionMapperCore.java

@@ -39,7 +39,7 @@ import java.io.IOException;
 public class GlobalExceptionMapperCore extends ResponseEntityExceptionHandler {
 
     @Autowired
-    private JaxRsDpsLog logger;
+    private JaxRsDpsLog jaxRsDpsLogger;
 
     @ExceptionHandler(AppException.class)
     protected ResponseEntity<Object> handleAppException(AppException e) {
@@ -67,7 +67,7 @@ public class GlobalExceptionMapperCore extends ResponseEntityExceptionHandler {
     @ExceptionHandler(IOException.class)
     public ResponseEntity<Object> handleIOException(IOException e) {
         if (StringUtils.containsIgnoreCase(ExceptionUtils.getRootCauseMessage(e), "Broken pipe")) {
-            this.logger.warning("Client closed the connection while request still being processed");
+            this.jaxRsDpsLogger.warning("Client closed the connection while request still being processed");
             return null;
         } else {
             return this.getErrorResponse(
@@ -96,13 +96,13 @@ public class GlobalExceptionMapperCore extends ResponseEntityExceptionHandler {
 
         if( e.getCause() instanceof Exception) {
             Exception original = (Exception) e.getCause();
-            this.logger.error(original.getMessage(), original);
+            this.jaxRsDpsLogger.error(original.getMessage(), original);
         }
 
         if (e.getError().getCode() > 499) {
-            this.logger.error(exceptionMsg, e);
+            this.jaxRsDpsLogger.error(exceptionMsg, e);
         } else {
-            this.logger.warning(exceptionMsg, e);
+            this.jaxRsDpsLogger.warning(exceptionMsg, e);
         }
 
         // Support for non standard HttpStatus Codes