Merge pull request #32826 from vespa-engine/hakonhall/add-uncheck-of-…

…supplier-throwing-interruptedexception Add uncheck of supplier throwing InterruptedException
vespa-engine · Nov 10, 2024 · c527f3e · c527f3e
2 parents edce103 + f5bbbe0
commit c527f3e
Show file tree

Hide file tree

Showing 2 changed files with 61 additions and 32 deletions.
diff --git a/vespajlib/abi-spec.json b/vespajlib/abi-spec.json
@@ -3803,6 +3803,19 @@
     ],
     "fields" : [ ]
   },
+  "com.yahoo.yolean.Exceptions$SupplierThrowingInterruptedException" : {
+    "superClass" : "java.lang.Object",
+    "interfaces" : [ ],
+    "attributes" : [
+      "public",
+      "interface",
+      "abstract"
+    ],
+    "methods" : [
+      "public abstract java.lang.Object get()"
+    ],
+    "fields" : [ ]
+  },
   "com.yahoo.yolean.Exceptions" : {
     "superClass" : "java.lang.Object",
     "interfaces" : [ ],
@@ -3822,6 +3835,7 @@
       "public static java.lang.Object uncheck(com.yahoo.yolean.Exceptions$SupplierThrowingIOException)",
       "public static varargs java.lang.Object uncheck(com.yahoo.yolean.Exceptions$SupplierThrowingIOException, java.lang.String, java.lang.String[])",
       "public static java.lang.Object uncheckAndIgnore(com.yahoo.yolean.Exceptions$SupplierThrowingIOException, java.lang.Class)",
+      "public static java.lang.Object uncheckInterrupted(com.yahoo.yolean.Exceptions$SupplierThrowingInterruptedException)",
       "public static java.lang.RuntimeException throwUnchecked(java.lang.Throwable)"
     ],
     "fields" : [ ]

diff --git a/vespajlib/src/main/java/com/yahoo/yolean/Exceptions.java b/vespajlib/src/main/java/com/yahoo/yolean/Exceptions.java
@@ -61,6 +61,11 @@ public static <T extends Throwable> Optional<T> findCause(Throwable t, Class<T>
         return Optional.empty();
     }
 
+    @FunctionalInterface
+    public interface RunnableThrowingIOException {
+        void run() throws IOException;
+    }
+
     /**
      * Wraps any IOException thrown from a runnable in an UncheckedIOException.
      */
@@ -72,22 +77,6 @@ public static void uncheck(RunnableThrowingIOException runnable) {
         }
     }
 
-    public static void uncheckInterrupted(RunnableThrowingInterruptedException runnable) {
-        try {
-            runnable.run();
-        } catch (InterruptedException e) {
-            throw new UncheckedInterruptedException(e, false);
-        }
-    }
-
-    public static void uncheckInterruptedAndRestoreFlag(RunnableThrowingInterruptedException runnable) {
-        try {
-            runnable.run();
-        } catch (InterruptedException e) {
-            throw new UncheckedInterruptedException(e, true);
-        }
-    }
-
     /**
      * Wraps any IOException thrown from a runnable in an UncheckedIOException w/message.
      */
@@ -124,23 +113,21 @@ public static <T extends IOException> void uncheckAndIgnore(RunnableThrowingIOEx
     }
 
     @FunctionalInterface
-    public interface RunnableThrowingIOException {
-        void run() throws IOException;
+    public interface FunctionThrowingIOException<T, R> {
+        R map(T t) throws IOException;
     }
 
-    @FunctionalInterface public interface RunnableThrowingInterruptedException { void run() throws InterruptedException; }
-
-    /**
-     * Wraps any IOException thrown from a function in an UncheckedIOException.
-     */
+    /** Wraps any IOException thrown from a function in an UncheckedIOException. */
     public static <T, R> Function<T, R> uncheck(FunctionThrowingIOException<T, R> function) {
         return t -> uncheck(() -> function.map(t));
     }
-    @FunctionalInterface public interface FunctionThrowingIOException<T, R> { R map(T t) throws IOException; }
 
-    /**
-     * Wraps any IOException thrown from a supplier in an UncheckedIOException.
-     */
+    @FunctionalInterface
+    public interface SupplierThrowingIOException<T> {
+        T get() throws IOException;
+    }
+
+    /** Wraps any IOException thrown from a supplier in an UncheckedIOException. */
     public static <T> T uncheck(SupplierThrowingIOException<T> supplier) {
         try {
             return supplier.get();
@@ -149,9 +136,7 @@ public static <T> T uncheck(SupplierThrowingIOException<T> supplier) {
         }
     }
 
-    /**
-     * Wraps any IOException thrown from a supplier in an UncheckedIOException w/message.
-     */
+    /** Wraps any IOException thrown from a supplier in an UncheckedIOException w/message. */
     public static <T> T uncheck(SupplierThrowingIOException<T> supplier, String format, String... args) {
         try {
             return supplier.get();
@@ -185,8 +170,38 @@ public static <R, T extends IOException> R uncheckAndIgnore(SupplierThrowingIOEx
     }
 
     @FunctionalInterface
-    public interface SupplierThrowingIOException<T> {
-        T get() throws IOException;
+    public interface RunnableThrowingInterruptedException {
+        void run() throws InterruptedException;
+    }
+
+    @FunctionalInterface
+    public interface SupplierThrowingInterruptedException<T> {
+        T get() throws InterruptedException;
+    }
+
+    public static void uncheckInterrupted(RunnableThrowingInterruptedException runnable) {
+        try {
+            runnable.run();
+        } catch (InterruptedException e) {
+            throw new UncheckedInterruptedException(e, false);
+        }
+    }
+
+    public static void uncheckInterruptedAndRestoreFlag(RunnableThrowingInterruptedException runnable) {
+        try {
+            runnable.run();
+        } catch (InterruptedException e) {
+            throw new UncheckedInterruptedException(e, true);
+        }
+    }
+
+    /** Wraps an InterruptedException in an UncheckedInterruptedException. */
+    public static <T> T uncheckInterrupted(SupplierThrowingInterruptedException<T> supplier) {
+        try {
+            return supplier.get();
+        } catch (InterruptedException e) {
+            throw new UncheckedInterruptedException(e);
+        }
     }
 
     /**