Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixing nullability issue of message and adding test coverage #5907

Merged
merged 3 commits into from
Feb 27, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .changes/next-release/bugfix-AWSSDKforJavav2-4234091.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"type": "bugfix",
"category": "AWS SDK for Java v2",
"contributor": "",
"description": "Fixed an issue in AwsServiceException#getMessage() where it returned an empty string instead of null when the message is null."
}
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,8 @@ public String getMessage() {
joiner.add(diagnostics.toString());
}

return joiner.toString();
String result = joiner.toString();
return result.isEmpty() ? super.getMessage() : result;
}

private String serviceDiagnostics() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,32 @@ private static Stream<Arguments> exceptionMessageTestCases() {
);
}

@ParameterizedTest
@MethodSource("messageNullabilityTestCases")
void getMessage_respectsNullBehavior(String testDescription,
AwsServiceException.Builder builder,
String expectedMessage) {
AwsServiceException e = builder.build();
assertThat(e.getMessage())
.as(testDescription)
.isEqualTo(expectedMessage);
}

private static Stream<Arguments> messageNullabilityTestCases() {
return Stream.of(
Arguments.of(
"No message or details set",
AwsServiceException.builder(),
null
),
Arguments.of(
"Explicitly null message without details",
AwsServiceException.builder().message(null),
null
)
);
}

@Test
public void exceptionMessage_withoutErrorMessage() {
AwsServiceException e = AwsServiceException.builder()
Expand Down
Loading