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.

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

Jump to bottom

fix: catch exceptions in the StatusResultRetryProcess #4458

Merged
merged 1 commit into from
Sep 6, 2024
Merged

fix: catch exceptions in the StatusResultRetryProcess #4458

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
9 changes: 8 additions & 1 deletion ...achine-lib/src/main/java/org/eclipse/edc/statemachine/retry/StatusResultRetryProcess.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import java.util.function.Supplier;

import static java.lang.String.format;
import static org.eclipse.edc.spi.response.ResponseStatus.FATAL_ERROR;

/**
* Provides retry capabilities to a synchronous process that returns a {@link StatusResult} object
Expand All @@ -45,7 +46,13 @@ public StatusResultRetryProcess(E entity, Supplier<StatusResult<C>> process, Mon
@Override
boolean process(E entity, String description) {
monitor.debug(format("%s: ID %s. %s", entity.getClass().getSimpleName(), entity.getId(), description));
var result = process.get();

StatusResult<C> result;
try {
result = process.get();
} catch (Exception e) {
result = StatusResult.failure(FATAL_ERROR, "Unexpected exception thrown %s: %s".formatted(e, e.getMessage()));
}

handleResult(entity, description, result);

Expand Down
19 changes: 19 additions & 0 deletions ...ne-lib/src/test/java/org/eclipse/edc/statemachine/retry/StatusResultRetryProcessTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@

package org.eclipse.edc.statemachine.retry;

import org.eclipse.edc.spi.EdcException;
import org.eclipse.edc.spi.monitor.Monitor;
import org.eclipse.edc.spi.response.ResponseFailure;
import org.eclipse.edc.spi.response.StatusResult;
Expand All @@ -29,8 +30,11 @@
import static org.assertj.core.api.Assertions.assertThat;
import static org.eclipse.edc.spi.response.ResponseStatus.ERROR_RETRY;
import static org.eclipse.edc.spi.response.ResponseStatus.FATAL_ERROR;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.same;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyNoInteractions;
import static org.mockito.Mockito.when;

class StatusResultRetryProcessTest {
Expand Down Expand Up @@ -93,4 +97,19 @@ void shouldExecuteOnRetry_whenFailureAndRetriesHaveNotBeenExhausted() {

verify(onFailure).accept(entity, statusResult.getFailure());
}


@Test
void shouldCallFatalError_whenExceptionIsThrown() {
when(process.get()).thenThrow(new EdcException("code throws an exception"));
var entity = TestEntity.Builder.newInstance().id(UUID.randomUUID().toString()).clock(clock).build();
var retryProcess = new StatusResultRetryProcess<>(entity, process, mock(Monitor.class), clock, configuration);

var result = retryProcess.onSuccess(onSuccess).onFatalError(onFatalError).execute("any");

assertThat(result).isTrue();
verify(process).get();
verify(onFatalError).accept(same(entity), any());
verifyNoInteractions(onSuccess);
}
}
Loading