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

fix regression introduced in #1792 #1796

Merged
merged 1 commit into from
Nov 6, 2023
Merged

fix regression introduced in #1792 #1796

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
16 changes: 11 additions & 5 deletions base/model/src/main/java/org/eclipse/ditto/base/model/exceptions/DittoJsonException.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,10 @@ private static URI extractHref(final RuntimeException toWrap) {
public static <I, T> T wrapJsonRuntimeException(final Function<I, T> function, final I input) {
try {
return function.apply(input);
} catch (final JsonRuntimeException | IllegalArgumentException | NullPointerException e) {
} catch (final JsonRuntimeException
| IllegalArgumentException
| NullPointerException
| UnsupportedOperationException e) {
throw new DittoJsonException(e);
}
// "ditto-json" library also throws IllegalArgumentException when for example strings which may not be empty
Expand All @@ -128,9 +131,9 @@ public static <T> T wrapJsonRuntimeException(final Supplier<T> supplier) {
try {
return supplier.get();
} catch (final JsonRuntimeException
| IllegalArgumentException
| NullPointerException
| UnsupportedOperationException e) {
| IllegalArgumentException
| NullPointerException
| UnsupportedOperationException e) {
throw new DittoJsonException(e);
}
// "ditto-json" library also throws IllegalArgumentException when for example strings which may not be empty
Expand All @@ -156,7 +159,10 @@ public static <T, R> R wrapJsonRuntimeException(final T argument, final DittoHea
final BiFunction<T, DittoHeaders, R> function) {
try {
return function.apply(argument, dittoHeaders);
} catch (final JsonRuntimeException | IllegalArgumentException | NullPointerException e) {
} catch (final JsonRuntimeException
| IllegalArgumentException
| NullPointerException
| UnsupportedOperationException e) {
throw new DittoJsonException(e, dittoHeaders);
}
// "ditto-json" library also throws IllegalArgumentException when for example strings which may not be empty
Expand Down
Loading