From 31123bea3d6ff18b2248421984b7cc465c4778eb Mon Sep 17 00:00:00 2001
From: Andreas Schildbach <andreas@schildbach.de>
Date: Fri, 17 Mar 2023 10:46:19 +0100
Subject: [PATCH] Preconditions: add generic `check()` that allows to supply a
 custom exception

Also adds tests.
---
 .../bitcoinj/base/internal/Preconditions.java | 21 ++++++++-----
 .../base/internal/PreconditionsTest.java      | 31 +++++++++++++++++++
 2 files changed, 45 insertions(+), 7 deletions(-)
 create mode 100644 core/src/test/java/org/bitcoinj/base/internal/PreconditionsTest.java

diff --git a/core/src/main/java/org/bitcoinj/base/internal/Preconditions.java b/core/src/main/java/org/bitcoinj/base/internal/Preconditions.java
index a18c45a3f..50d2a9c2a 100644
--- a/core/src/main/java/org/bitcoinj/base/internal/Preconditions.java
+++ b/core/src/main/java/org/bitcoinj/base/internal/Preconditions.java
@@ -25,8 +25,7 @@ public class Preconditions {
      * @throws IllegalArgumentException if {@code expression} is false
      */
     public static void checkArgument(boolean expression) {
-        if (!expression)
-            throw new IllegalArgumentException();
+        check(expression, IllegalArgumentException::new);
     }
 
     /**
@@ -36,8 +35,7 @@ public class Preconditions {
      * @throws IllegalArgumentException if {@code expression} is false
      */
     public static void checkArgument(boolean expression, Supplier<String> messageSupplier) {
-        if (!expression)
-            throw new IllegalArgumentException(messageSupplier.get());
+        check(expression, () -> new IllegalArgumentException(messageSupplier.get()));
     }
 
     /**
@@ -47,8 +45,7 @@ public class Preconditions {
      * @throws IllegalStateException if {@code expression} is false
      */
     public static void checkState(boolean expression) {
-        if (!expression)
-            throw new IllegalStateException();
+        check(expression, IllegalStateException::new);
     }
 
     /**
@@ -59,7 +56,17 @@ public class Preconditions {
      * @throws IllegalStateException if {@code expression} is false
      */
     public static void checkState(boolean expression, Supplier<String> messageSupplier) {
+        check(expression, () -> new IllegalStateException(messageSupplier.get()));
+    }
+
+    /**
+     * Ensures the truth of an expression, throwing a custom exception if untrue.
+     * @param expression a boolean expression
+     * @param exceptionSupplier supplier of the exception to be thrown
+     * @throws X if {@code expression} is false
+     */
+    public static <X extends Throwable> void check(boolean expression, Supplier<? extends X> exceptionSupplier) throws X {
         if (!expression)
-            throw new IllegalStateException(messageSupplier.get());
+            throw exceptionSupplier.get();
     }
 }
diff --git a/core/src/test/java/org/bitcoinj/base/internal/PreconditionsTest.java b/core/src/test/java/org/bitcoinj/base/internal/PreconditionsTest.java
new file mode 100644
index 000000000..72e5906e4
--- /dev/null
+++ b/core/src/test/java/org/bitcoinj/base/internal/PreconditionsTest.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright by the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bitcoinj.base.internal;
+
+import org.junit.Test;
+
+public class PreconditionsTest {
+    @Test
+    public void check_true() {
+        Preconditions.check(true, ArithmeticException::new);
+    }
+
+    @Test(expected = ArithmeticException.class)
+    public void check_false() {
+        Preconditions.check(false, ArithmeticException::new);
+    }
+}