Add requireNonNull checks to Dbi

at055612 · at055612 · commit e53956d8bcf8 · 2025-11-17T15:29:13.000Z
diff --git a/src/main/java/org/lmdbjava/Dbi.java b/src/main/java/org/lmdbjava/Dbi.java
@@ -78,11 +78,14 @@ public final class Dbi<T> {
       final boolean nativeCb,
       final BufferProxy<T> proxy,
       final DbiFlagSet dbiFlagSet) {
+
     if (SHOULD_CHECK) {
       if (nativeCb && comparator == null) {
         throw new IllegalArgumentException("Is nativeCb is true, you must supply a comparator");
       }
+      requireNonNull(env);
       requireNonNull(txn);
+      requireNonNull(proxy);
       requireNonNull(dbiFlagSet);
       txn.checkReady();
     }
diff --git a/src/test/java/org/lmdbjava/DbiTest.java b/src/test/java/org/lmdbjava/DbiTest.java
@@ -120,6 +120,78 @@ void close() {
         .isInstanceOf(ConstantDerivedException.class);
   }
 
+  @Test
+  void constructorArgsNullEnv() {
+    assertThatThrownBy(
+            () -> {
+              try (Txn<ByteBuffer> txn = env.txnWrite()) {
+                new Dbi<>(
+                    null,
+                    txn,
+                    "foo".getBytes(Env.DEFAULT_NAME_CHARSET),
+                    PROXY_OPTIMAL,
+                    DbiFlagSet.EMPTY);
+              }
+            })
+        .isInstanceOf(NullPointerException.class);
+  }
+
+  @Test
+  void constructorArgsNullTxn() {
+    assertThatThrownBy(
+            () -> {
+              new Dbi<>(
+                  env,
+                  null,
+                  "foo".getBytes(Env.DEFAULT_NAME_CHARSET),
+                  PROXY_OPTIMAL,
+                  DbiFlagSet.EMPTY);
+            })
+        .isInstanceOf(NullPointerException.class);
+  }
+
+  @Test
+  void constructorArgsNullProxy() {
+    assertThatThrownBy(
+            () -> {
+              try (Txn<ByteBuffer> txn = env.txnWrite()) {
+                new Dbi<>(
+                    env, txn, "foo".getBytes(Env.DEFAULT_NAME_CHARSET), null, DbiFlagSet.EMPTY);
+              }
+            })
+        .isInstanceOf(NullPointerException.class);
+  }
+
+  @Test
+  void constructorArgsNullFlags() {
+    assertThatThrownBy(
+            () -> {
+              try (Txn<ByteBuffer> txn = env.txnWrite()) {
+                new Dbi<>(env, txn, "foo".getBytes(Env.DEFAULT_NAME_CHARSET), PROXY_OPTIMAL, null);
+              }
+            })
+        .isInstanceOf(NullPointerException.class);
+  }
+
+  @Test
+  void constructorArgsNullNativeCallbackComparator() {
+    assertThatThrownBy(
+            () -> {
+              try (Txn<ByteBuffer> txn = env.txnWrite()) {
+                new Dbi<>(
+                    env,
+                    txn,
+                    "foo".getBytes(Env.DEFAULT_NAME_CHARSET),
+                    null,
+                    true,
+                    PROXY_OPTIMAL,
+                    DbiFlagSet.EMPTY);
+              }
+            })
+        .isInstanceOf(IllegalArgumentException.class)
+        .hasMessageContaining("Is nativeCb is true, you must supply a comparator");
+  }
+
   @Test
   void customComparator() {
     final Comparator<ByteBuffer> reverseOrder =
