Updating DDB tests to assert on correct value. Adding in getMessage override on AwsServiceException

Author: spfink

core/aws-core/src/main/java/software/amazon/awssdk/awscore/exception/AwsServiceException.java

@@ -53,6 +53,18 @@ public AwsErrorDetails awsErrorDetails() {
         return awsErrorDetails;
     }
 
+    @Override
+    public String getMessage() {
+        if (awsErrorDetails != null) {
+            return awsErrorDetails().errorMessage() +
+                    " (Service: " + awsErrorDetails().serviceName() +
+                    ", Status Code: " + statusCode() +
+                    ", Request ID: " + requestId() + ")";
+        }
+
+        return super.getMessage();
+    }
+
     @Override
     public boolean isClockSkewException() {
         return Optional.ofNullable(awsErrorDetails)

services/dynamodb/src/it/java/software/amazon/awssdk/services/dynamodb/DynamoDbJavaClientExceptionIntegrationTest.java

@@ -52,7 +52,7 @@ public void testResourceNotFoundException() {
             Assert.fail("ResourceNotFoundException is expected.");
         } catch (ResourceNotFoundException e) {
             Assert.assertNotNull(e.awsErrorDetails().errorCode());
-            Assert.assertNotNull(e.getMessage());
+            Assert.assertNotNull(e.awsErrorDetails().errorMessage());
             Assert.assertNotNull(e.awsErrorDetails().rawResponse());
         }
     }

services/dynamodb/src/it/java/software/amazon/awssdk/services/dynamodb/DynamoServiceIntegrationTest.java

@@ -154,7 +154,7 @@ public void testErrorHandling() throws Exception {
             fail("Expected an exception to be thrown");
         } catch (AwsServiceException exception) {
             assertNotEmpty(exception.awsErrorDetails().errorCode());
-            assertNotEmpty(exception.getMessage());
+            assertNotEmpty(exception.awsErrorDetails().errorMessage());
             assertNotEmpty(exception.requestId());
             assertNotEmpty(exception.awsErrorDetails().serviceName());
             assertTrue(exception.statusCode() >= 400);
@@ -209,7 +209,7 @@ public void testBatchWriteTooManyItemsErrorHandling() throws Exception {
             dynamo.batchWriteItem(BatchWriteItemRequest.builder().requestItems(requestItems).build());
         } catch (AwsServiceException exception) {
             assertEquals("ValidationException", exception.awsErrorDetails().errorCode());
-            assertNotEmpty(exception.getMessage());
+            assertNotEmpty(exception.awsErrorDetails().errorMessage());
             assertNotEmpty(exception.requestId());
             assertNotEmpty(exception.awsErrorDetails().serviceName());
             assertEquals(400, exception.statusCode());