Merge pull request #1796 from eclipse-ditto/bugfix/ditto-json-excepti…

…on-handling fix regression introduced in #1792
eclipse-ditto · Nov 6, 2023 · 23f057a · 23f057a
2 parents bb6444e + fe58303
commit 23f057a
Showing 1 changed file with 11 additions and 5 deletions.
diff --git a/base/model/src/main/java/org/eclipse/ditto/base/model/exceptions/DittoJsonException.java b/base/model/src/main/java/org/eclipse/ditto/base/model/exceptions/DittoJsonException.java
@@ -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
@@ -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
@@ -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