Merge branch 'aws-integration' into 'master'

Refactor code to SonarQube standards

See merge request !252

partition-core/src/main/java/org/opengroup/osdu/partition/middleware/GlobalExceptionMapper.java

@@ -28,8 +28,6 @@ import com.google.gson.Gson;
 import javassist.NotFoundException;
 import org.opengroup.osdu.core.common.logging.JaxRsDpsLog;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.core.Ordered;
-import org.springframework.core.annotation.Order;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -55,7 +53,7 @@ public class GlobalExceptionMapper extends ResponseEntityExceptionHandler {
     private static final Gson gson = new Gson();
 
     @Autowired
-    private JaxRsDpsLog logger;
+    private JaxRsDpsLog jaxRsDpsLogger;
 
     @ExceptionHandler(AppException.class)
     protected ResponseEntity<Object> handleAppException(AppException e) {
@@ -94,7 +92,7 @@ public class GlobalExceptionMapper extends ResponseEntityExceptionHandler {
 
     @ExceptionHandler(ConstraintViolationException.class)
     protected ResponseEntity<Object> handleConstraintValidationException(ConstraintViolationException e) {
-        logger.error("Validation exception", e);
+        jaxRsDpsLogger.error("Validation exception", e);
 
         List<String> msgs = new ArrayList<>();
         for (ConstraintViolation<?> violation : e.getConstraintViolations()) {
@@ -134,9 +132,9 @@ public class GlobalExceptionMapper extends ResponseEntityExceptionHandler {
         String exceptionMsg = e.getError().getMessage();
 
         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);
         }
 
         return new ResponseEntity<>(gson.toJson(exceptionMsg), HttpStatus.resolve(e.getError().getCode()));

partition-core/src/test/java/org/opengroup/osdu/partition/api/PartitionApiTest.java

@@ -82,6 +82,9 @@ public class PartitionApiTest {
     public void should_return204_when_givenUpdatingValidPartitionId() {
         String partitionId = "partition1";
         this.sut.patch(partitionId, partitionInfo);
+
+        ResponseEntity<Map<String, Property>> result = this.sut.get(partitionId);
+        assertEquals(HttpStatus.OK, result.getStatusCode());
     }
 
     @Test

provider/partition-aws/src/main/java/org/opengroup/osdu/partition/provider/aws/security/AuthorizationService.java

@@ -79,19 +79,13 @@ public class AuthorizationService implements IAuthorizationService {
 
 
             memberEmail = headers.getUserId();
-            if(memberEmail != null)
-            {
-                if(memberEmail.equals(spu_email)){
-                    return true;
-                }
-                else{
-                    throw  AppException.createUnauthorized("Unauthorized. The user is not Service Principal");
-                }
-            }
             if(memberEmail == null){
                 throw  AppException.createUnauthorized("Unauthorized. The JWT token could not be validated");
+            } else if(memberEmail.equals(spu_email)){
+                return true;
+            } else{
+                throw  AppException.createUnauthorized("Unauthorized. The user is not Service Principal");
             }
-
         }
         catch (AppException appE) {
             throw appE;
@@ -99,11 +93,7 @@ public class AuthorizationService implements IAuthorizationService {
         catch (Exception e) {
             throw new AppException(HttpStatus.INTERNAL_SERVER_ERROR.value(), "Authentication Failure", e.getMessage(), e);
         }
-        return false;
     }
 
-
-
-
 }