Skip to content

Commit 6e78b8b

Browse files
authored
refactor: avoid logging on WebApplicationException (#4555)
1 parent c79e11c commit 6e78b8b

File tree

2 files changed

+21
-5
lines changed

2 files changed

+21
-5
lines changed

extensions/common/http/jersey-core/src/main/java/org/eclipse/edc/web/jersey/mapper/UnexpectedExceptionMapper.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,11 @@ public UnexpectedExceptionMapper(Monitor monitor) {
4444

4545
@Override
4646
public Response toResponse(Throwable exception) {
47-
monitor.severe("JerseyExtension: Unexpected exception caught", exception);
48-
if (exception instanceof WebApplicationException) {
49-
return ((WebApplicationException) exception).getResponse();
47+
if (exception instanceof WebApplicationException webApplicationException) {
48+
return webApplicationException.getResponse();
5049
}
5150

51+
monitor.severe("JerseyExtension: Unexpected exception caught", exception);
5252
var status = exceptionMap.getOrDefault(exception.getClass(), INTERNAL_SERVER_ERROR);
5353

5454
return Response.status(status).build();

extensions/common/http/jersey-core/src/test/java/org/eclipse/edc/web/jersey/mapper/UnexpectedExceptionMapperTest.java

+18-2
Original file line numberDiff line numberDiff line change
@@ -28,20 +28,36 @@
2828
import java.util.stream.Stream;
2929

3030
import static org.assertj.core.api.Assertions.assertThat;
31+
import static org.mockito.ArgumentMatchers.anyString;
32+
import static org.mockito.ArgumentMatchers.same;
3133
import static org.mockito.Mockito.mock;
34+
import static org.mockito.Mockito.verify;
35+
import static org.mockito.Mockito.verifyNoInteractions;
3236

3337
class UnexpectedExceptionMapperTest {
3438

39+
private final Monitor monitor = mock(Monitor.class);
40+
private final UnexpectedExceptionMapper mapper = new UnexpectedExceptionMapper(monitor);
41+
3542
@ParameterizedTest
3643
@ArgumentsSource(JakartaApiExceptions.class)
44+
void toResponse_jakartaExceptions(Throwable throwable, int expectedCode) {
45+
try (var response = mapper.toResponse(throwable)) {
46+
assertThat(response.getStatus()).isEqualTo(expectedCode);
47+
assertThat(response.getStatusInfo().getReasonPhrase()).isNotBlank();
48+
assertThat(response.getEntity()).isNull();
49+
verifyNoInteractions(monitor);
50+
}
51+
}
52+
53+
@ParameterizedTest
3754
@ArgumentsSource(JavaExceptions.class)
3855
void toResponse_unexpectedExceptions(Throwable throwable, int expectedCode) {
39-
var mapper = new UnexpectedExceptionMapper(mock(Monitor.class));
40-
4156
try (var response = mapper.toResponse(throwable)) {
4257
assertThat(response.getStatus()).isEqualTo(expectedCode);
4358
assertThat(response.getStatusInfo().getReasonPhrase()).isNotBlank();
4459
assertThat(response.getEntity()).isNull();
60+
verify(monitor).severe(anyString(), same(throwable));
4561
}
4662
}
4763

0 commit comments

Comments
 (0)