Fix base exception message (#264)

* Fix base exception message

* Address comment

* Revert "Address comment"

This reverts commit 599aa56.

Author: Wenbing Li

src/main/java/software/amazon/cloudformation/exceptions/BaseHandlerException.java

@@ -26,7 +26,7 @@ public abstract class BaseHandlerException extends RuntimeException {
 
     protected BaseHandlerException(final Throwable cause,
                                    final HandlerErrorCode errorCode) {
-        super(null, cause);
+        super(cause.getMessage(), cause);
         this.errorCode = errorCode;
     }
 
@@ -36,4 +36,10 @@ protected BaseHandlerException(final String message,
         super(message, cause);
         this.errorCode = errorCode;
     }
+
+    protected BaseHandlerException(final String message,
+                                   final HandlerErrorCode errorCode) {
+        super(message);
+        this.errorCode = errorCode;
+    }
 }

src/main/java/software/amazon/cloudformation/exceptions/CfnInvalidCredentialsException.java

@@ -22,10 +22,10 @@ public class CfnInvalidCredentialsException extends BaseHandlerException {
     private static final HandlerErrorCode ERROR_CODE = HandlerErrorCode.InvalidCredentials;
 
     public CfnInvalidCredentialsException() {
-        this(null);
+        super(ERROR_CODE.getMessage(), ERROR_CODE);
     }
 
     public CfnInvalidCredentialsException(final Throwable cause) {
-        super(ERROR_CODE.getMessage(), cause, ERROR_CODE);
+        super(cause, ERROR_CODE);
     }
 }

src/test/java/software/amazon/cloudformation/exceptions/CfnAccessDeniedExceptionTests.java

@@ -48,4 +48,11 @@ public void cfnAccessDeniedException_errorCodeIsAppropriate() {
             throw new CfnAccessDeniedException(new RuntimeException());
         }).satisfies(exception -> assertEquals(HandlerErrorCode.AccessDenied, exception.getErrorCode()));
     }
+
+    @Test
+    public void cfnAccessDeniedException_errorMessage() {
+        assertThatExceptionOfType(CfnAccessDeniedException.class).isThrownBy(() -> {
+            throw new CfnAccessDeniedException(new RuntimeException("something wrong"));
+        }).satisfies(exception -> assertEquals("something wrong", exception.getMessage()));
+    }
 }

src/test/java/software/amazon/cloudformation/exceptions/CfnAlreadyExistsExceptionTests.java

@@ -79,4 +79,11 @@ public void cfnAlreadyExistsException_errorCodeIsAppropriate() {
             throw new CfnAlreadyExistsException(new RuntimeException());
         }).satisfies(exception -> assertEquals(HandlerErrorCode.AlreadyExists, exception.getErrorCode()));
     }
+
+    @Test
+    public void cfnAlreadyExistsException_errorMessage() {
+        assertThatExceptionOfType(CfnAlreadyExistsException.class).isThrownBy(() -> {
+            throw new CfnAlreadyExistsException(new RuntimeException("something wrong"));
+        }).satisfies(exception -> assertEquals("something wrong", exception.getMessage()));
+    }
 }

src/test/java/software/amazon/cloudformation/exceptions/CfnGeneralServiceExceptionTests.java

@@ -49,4 +49,11 @@ public void cfnGeneralServiceException_errorCodeIsAppropriate() {
             throw new CfnGeneralServiceException(new RuntimeException());
         }).satisfies(exception -> assertEquals(HandlerErrorCode.GeneralServiceException, exception.getErrorCode()));
     }
+
+    @Test
+    public void cfnGeneralServiceException_errorMessage() {
+        assertThatExceptionOfType(CfnGeneralServiceException.class).isThrownBy(() -> {
+            throw new CfnGeneralServiceException(new RuntimeException("something wrong"));
+        }).satisfies(exception -> assertEquals("something wrong", exception.getMessage()));
+    }
 }

src/test/java/software/amazon/cloudformation/exceptions/CfnInvalidCredentialsExceptionTests.java

@@ -31,7 +31,7 @@ public void cfnInvalidCredentialsException_isBaseHandlerException() {
     public void cfnInvalidCredentialsException_singleArgConstructorHasMessage() {
         assertThatExceptionOfType(CfnInvalidCredentialsException.class).isThrownBy(() -> {
             throw new CfnInvalidCredentialsException(new RuntimeException());
-        }).withCauseInstanceOf(RuntimeException.class).withMessageContaining("Invalid credentials");
+        }).withCauseInstanceOf(RuntimeException.class).withMessage(null);
     }
 
     @Test
@@ -47,4 +47,11 @@ public void cfnInvalidCredentialsException_errorCodeIsAppropriate() {
             throw new CfnInvalidCredentialsException(new RuntimeException());
         }).satisfies(exception -> assertEquals(HandlerErrorCode.InvalidCredentials, exception.getErrorCode()));
     }
+
+    @Test
+    public void cfnInvalidCredentialsException_errorMessage() {
+        assertThatExceptionOfType(CfnInvalidCredentialsException.class).isThrownBy(() -> {
+            throw new CfnInvalidCredentialsException(new RuntimeException("something wrong"));
+        }).satisfies(exception -> assertEquals("something wrong", exception.getMessage()));
+    }
 }

src/test/java/software/amazon/cloudformation/exceptions/CfnInvalidRequestExceptionTests.java

@@ -48,4 +48,11 @@ public void cfnInvalidRequestException_errorCodeIsAppropriate() {
             throw new CfnInvalidRequestException(new RuntimeException());
         }).satisfies(exception -> assertEquals(HandlerErrorCode.InvalidRequest, exception.getErrorCode()));
     }
+
+    @Test
+    public void cfnInvalidRequestException_errorCodeMessage() {
+        assertThatExceptionOfType(CfnInvalidRequestException.class).isThrownBy(() -> {
+            throw new CfnInvalidRequestException(new RuntimeException("something wrong"));
+        }).satisfies(exception -> assertEquals("something wrong", exception.getMessage()));
+    }
 }

src/test/java/software/amazon/cloudformation/exceptions/CfnNetworkFailureExceptionTests.java

@@ -48,4 +48,11 @@ public void cfnNetworkFailureException_errorCodeIsAppropriate() {
             throw new CfnNetworkFailureException(new RuntimeException());
         }).satisfies(exception -> assertEquals(HandlerErrorCode.NetworkFailure, exception.getErrorCode()));
     }
+
+    @Test
+    public void cfnNetworkFailureException_errorMessage() {
+        assertThatExceptionOfType(CfnNetworkFailureException.class).isThrownBy(() -> {
+            throw new CfnNetworkFailureException(new RuntimeException("something wrong"));
+        }).satisfies(exception -> assertEquals("something wrong", exception.getMessage()));
+    }
 }

src/test/java/software/amazon/cloudformation/exceptions/CfnNotFoundExceptionTests.java

@@ -79,4 +79,11 @@ public void cfnNotFoundException_errorCodeIsAppropriate() {
             throw new CfnNotFoundException(new RuntimeException());
         }).satisfies(exception -> assertEquals(HandlerErrorCode.NotFound, exception.getErrorCode()));
     }
+
+    @Test
+    public void cfnNotFoundException_errorMessage() {
+        assertThatExceptionOfType(CfnNotFoundException.class).isThrownBy(() -> {
+            throw new CfnNotFoundException(new RuntimeException("something wrong"));
+        }).satisfies(exception -> assertEquals("something wrong", exception.getMessage()));
+    }
 }

src/test/java/software/amazon/cloudformation/exceptions/CfnNotStabilizedExceptionTests.java

@@ -49,4 +49,11 @@ public void cfnNotStabilizedException_errorCodeIsAppropriate() {
             throw new CfnNotStabilizedException(new RuntimeException());
         }).satisfies(exception -> assertEquals(HandlerErrorCode.NotStabilized, exception.getErrorCode()));
     }
+
+    @Test
+    public void cfnNotStabilizedException_errorMessage() {
+        assertThatExceptionOfType(CfnNotStabilizedException.class).isThrownBy(() -> {
+            throw new CfnNotStabilizedException(new RuntimeException("something wrong"));
+        }).satisfies(exception -> assertEquals("something wrong", exception.getMessage()));
+    }
 }