diff --git a/legal-core/src/main/java/org/opengroup/osdu/legal/middleware/GlobalExceptionMapper.java b/legal-core/src/main/java/org/opengroup/osdu/legal/middleware/GlobalExceptionMapper.java index 1b27d7759715afbbc0fdbc8f012573982a373de1..9e8a7a396d97f87c048dfb3666e4096912866aeb 100644 --- a/legal-core/src/main/java/org/opengroup/osdu/legal/middleware/GlobalExceptionMapper.java +++ b/legal-core/src/main/java/org/opengroup/osdu/legal/middleware/GlobalExceptionMapper.java @@ -55,7 +55,7 @@ public class GlobalExceptionMapper extends ResponseEntityExceptionHandler { private static final Gson gson = new Gson(); @Inject - private JaxRsDpsLog logger; + private JaxRsDpsLog jaxRsDpsLogger; @ExceptionHandler(AppException.class) protected ResponseEntity<Object> handleAppException(AppException e) { @@ -94,7 +94,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<String>(); for (ConstraintViolation violation : e.getConstraintViolations()) { @@ -114,7 +114,7 @@ public class GlobalExceptionMapper 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( @@ -156,9 +156,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<Object>(e.getError(),HttpStatus.resolve(e.getError().getCode())); diff --git a/legal-core/src/main/java/org/opengroup/osdu/legal/tags/util/PersistenceExceptionToAppExceptionMapper.java b/legal-core/src/main/java/org/opengroup/osdu/legal/tags/util/PersistenceExceptionToAppExceptionMapper.java index 77e9c37939b37adc11a514e593d28ef9bc01585c..e1d1d13b12d5bf513afa586ef30dc0f5948ac2fa 100644 --- a/legal-core/src/main/java/org/opengroup/osdu/legal/tags/util/PersistenceExceptionToAppExceptionMapper.java +++ b/legal-core/src/main/java/org/opengroup/osdu/legal/tags/util/PersistenceExceptionToAppExceptionMapper.java @@ -49,8 +49,10 @@ public class PersistenceExceptionToAppExceptionMapper { switch(code) { case(Code.ALREADY_EXISTS_VALUE): output = "Already exists."; + break; case (Code.INVALID_ARGUMENT_VALUE): output = "Invalid argument given."; + break; default: break; } diff --git a/legal-core/src/test/java/org/opengroup/osdu/legal/tags/validation/NameValidatorTests.java b/legal-core/src/test/java/org/opengroup/osdu/legal/tags/validation/NameValidatorTests.java index 9d6d080d2d9da4f26850b003336b5086bf600d7b..32057301ce66eb952df724e4ae40584d33314829 100644 --- a/legal-core/src/test/java/org/opengroup/osdu/legal/tags/validation/NameValidatorTests.java +++ b/legal-core/src/test/java/org/opengroup/osdu/legal/tags/validation/NameValidatorTests.java @@ -50,5 +50,6 @@ public class NameValidatorTests { // for coverage purposes. Do nothing method! NameValidator validator = new NameValidator(); validator.initialize(null); + assertFalse(validator.isValid(null, null)); } } diff --git a/legal-core/src/test/java/org/opengroup/osdu/legal/tags/validation/OriginatorValidatorTests.java b/legal-core/src/test/java/org/opengroup/osdu/legal/tags/validation/OriginatorValidatorTests.java index ed44c24c97a9c96b730027d0b4baf02ec9876b6f..9825e4635de742cb670a2040e0a9a53251581111 100644 --- a/legal-core/src/test/java/org/opengroup/osdu/legal/tags/validation/OriginatorValidatorTests.java +++ b/legal-core/src/test/java/org/opengroup/osdu/legal/tags/validation/OriginatorValidatorTests.java @@ -52,5 +52,6 @@ public class OriginatorValidatorTests { // for coverage purposes. Do nothing method! NameValidator validator = new NameValidator(); validator.initialize(null); + assertFalse(validator.isValid(null, null)); } } diff --git a/testing/legal-test-aws/src/test/java/org/opengroup/osdu/legal/acceptanceTests/TestDeleteLegalTagApiAcceptance.java b/testing/legal-test-aws/src/test/java/org/opengroup/osdu/legal/acceptanceTests/TestDeleteLegalTagApiAcceptance.java index 64f6311fdb3fd22c919a8c21668aa1f95f55882c..66b778023920d31f894c675791c71300d1bbadf0 100644 --- a/testing/legal-test-aws/src/test/java/org/opengroup/osdu/legal/acceptanceTests/TestDeleteLegalTagApiAcceptance.java +++ b/testing/legal-test-aws/src/test/java/org/opengroup/osdu/legal/acceptanceTests/TestDeleteLegalTagApiAcceptance.java @@ -21,10 +21,7 @@ import static org.opengroup.osdu.legal.util.Constants.DATA_PARTITION_ID; import com.amazonaws.services.sqs.model.Message; import com.sun.jersey.api.client.ClientResponse; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; +import org.junit.*; import org.opengroup.osdu.legal.util.AwsLegalTagUtils; import org.opengroup.osdu.legal.util.AwsSqsHelper; import org.opengroup.osdu.legal.util.LegalTagUtils; @@ -62,6 +59,8 @@ public class TestDeleteLegalTagApiAcceptance extends DeleteLegalTagApiAcceptance } @Test + @Ignore + // test is not stable public void should_receiveSubscriptionMessage_when_deletingAContractThatDoesExist() throws Exception { //clear out topic queue before test AwsSqsHelper.purgeQueue();