Skip to content

Adds cause message to translated exception #361

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.

Sign up for GitHub

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

Merged
ahmarsuhail merged 1 commit into from
Oct 20, 2025
Merged

Adds cause message to translated exception #361

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 8 additions & 5 deletions ...nt/src/main/java/software/amazon/s3/analyticsaccelerator/exceptions/ExceptionHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,18 +33,21 @@ public enum ExceptionHandler {

INVALID_OBJECT_STATE(
InvalidObjectStateException.class,
(cause, uri) -> createIOException("Object %s is in invalid state", uri, cause)),
(cause, uri) ->
createIOException("Object %s is in invalid state, failed with: %s", uri, cause)),

SDK_CLIENT(
SdkClientException.class,
(cause, uri) -> createIOException("Client error accessing %s", uri, cause)),
(cause, uri) -> createIOException("Client error accessing %s, failed with: %s", uri, cause)),

S3_SERVICE(
S3Exception.class,
(cause, uri) -> createIOException("Server error accessing %s", uri, cause)),
(cause, uri) ->
createIOException("Server error accessing %s, request failed with: %s", uri, cause)),

SDK_GENERAL(
SdkException.class, (cause, uri) -> createIOException("SDK error accessing %s", uri, cause));
SdkException.class,
(cause, uri) -> createIOException("SDK error accessing %s, failed with: %s", uri, cause));

private final Class<? extends Exception> exceptionClass;
private final ExceptionMapper mapper;
Expand Down Expand Up @@ -91,7 +94,7 @@ public static Exception[] getSampleExceptions() {
}

private static IOException createIOException(String message, S3URI uri, Throwable cause) {
return new IOException(String.format(message, uri), cause);
return new IOException(String.format(message, uri, cause.getMessage()), cause);
}

private static FileNotFoundException createFileNotFoundException(String message, S3URI uri) {
Expand Down
15 changes: 11 additions & 4 deletions ...ient/src/test/java/software/amazon/s3/analyticsaccelerator/util/ObjectClientUtilTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,24 +48,31 @@ void testExceptionHandlerWithCompletionException() {
@Test
void testExceptionHandlerWithExecutionException() {
ExecutionException executionException =
new ExecutionException("Execution failed", InvalidObjectStateException.builder().build());
new ExecutionException(
"Execution failed",
InvalidObjectStateException.builder().message("InvalidObjectState").build());

Throwable result = ObjectClientUtil.handleException(S3_URI, executionException);

assertInstanceOf(IOException.class, result);
assertInstanceOf(InvalidObjectStateException.class, result.getCause());
assertEquals("Object s3://test-bucket/test-key is in invalid state", result.getMessage());
assertEquals(
"Object s3://test-bucket/test-key is in invalid state, failed with: InvalidObjectState",
result.getMessage());
}

@Test
void testExceptionHandlerWithSDKClientException() {
SdkClientException sdkClientException = SdkClientException.builder().build();
SdkClientException sdkClientException =
SdkClientException.builder().message("SdkClientException").build();

Throwable result = ObjectClientUtil.handleException(S3_URI, sdkClientException);

assertInstanceOf(IOException.class, result);
assertInstanceOf(SdkClientException.class, result.getCause());
assertEquals("Client error accessing s3://test-bucket/test-key", result.getMessage());
assertEquals(
"Client error accessing s3://test-bucket/test-key, failed with: SdkClientException",
result.getMessage());
}

@Test
Expand Down
Loading