BoxStore: do not warn on (Java)/allow null (Kotlin) DbExceptionListener.

Author: greenrobot-team

objectbox-java/src/main/java/io/objectbox/BoxStore.java

@@ -16,7 +16,6 @@
 
 package io.objectbox;
 
-import io.objectbox.annotation.apihint.Beta;
 import org.greenrobot.essentials.collections.LongHashMap;
 
 import java.io.Closeable;
@@ -40,6 +39,7 @@
 import javax.annotation.Nullable;
 import javax.annotation.concurrent.ThreadSafe;
 
+import io.objectbox.annotation.apihint.Beta;
 import io.objectbox.annotation.apihint.Experimental;
 import io.objectbox.annotation.apihint.Internal;
 import io.objectbox.converter.PropertyConverter;
@@ -165,7 +165,7 @@ static native void nativeRegisterCustomType(long store, int entityId, int proper
 
     static native int nativeCleanStaleReadTransactions(long store);
 
-    static native void nativeSetDbExceptionListener(long store, DbExceptionListener dbExceptionListener);
+    static native void nativeSetDbExceptionListener(long store, @Nullable DbExceptionListener dbExceptionListener);
 
     static native void nativeSetDebugFlags(long store, int debugFlags);
 
@@ -1027,10 +1027,12 @@ private void verifyObjectBrowserNotRunning() {
     }
 
     /**
-     * The given listener will be called when an exception is thrown.
-     * This for example allows a central error handling, e.g. a special logging for DB related exceptions.
+     * Sets a listener that will be called when an exception is thrown. Replaces a previously set listener.
+     * Set to {@code null} to remove the listener.
+     * <p>
+     * This for example allows central error handling or special logging for database-related exceptions.
      */
-    public void setDbExceptionListener(DbExceptionListener dbExceptionListener) {
+    public void setDbExceptionListener(@Nullable DbExceptionListener dbExceptionListener) {
         nativeSetDbExceptionListener(handle, dbExceptionListener);
     }
 

tests/objectbox-java-test/src/test/java/io/objectbox/exception/ExceptionTest.java

@@ -16,16 +16,64 @@
 
 package io.objectbox.exception;
 
-import io.objectbox.AbstractObjectBoxTest;
 import org.junit.Test;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import io.objectbox.AbstractObjectBoxTest;
+
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertThrows;
+import static org.junit.Assert.assertTrue;
 
+/**
+ * Tests related to {@link DbExceptionListener}.
+ */
 public class ExceptionTest extends AbstractObjectBoxTest {
 
+    @Test
+    public void exceptionListener_null_works() {
+        store.setDbExceptionListener(null);
+    }
+
+    @Test
+    public void exceptionListener_removing_works() {
+        AtomicBoolean replacedListenerCalled = new AtomicBoolean(false);
+        DbExceptionListener listenerRemoved = e -> replacedListenerCalled.set(true);
+
+        store.setDbExceptionListener(listenerRemoved);
+        store.setDbExceptionListener(null);
+
+        assertThrows(
+                DbException.class,
+                () -> DbExceptionListenerJni.nativeThrowException(store.getNativeStore(), 0)
+        );
+        assertFalse("Replaced DbExceptionListener was called.", replacedListenerCalled.get());
+    }
+
+    @Test
+    public void exceptionListener_replacing_works() {
+        AtomicBoolean replacedListenerCalled = new AtomicBoolean(false);
+        DbExceptionListener listenerReplaced = e -> replacedListenerCalled.set(true);
+
+        AtomicBoolean newListenerCalled = new AtomicBoolean(false);
+        DbExceptionListener listenerNew = e -> newListenerCalled.set(true);
+
+        store.setDbExceptionListener(listenerReplaced);
+        store.setDbExceptionListener(listenerNew);
+
+        assertThrows(
+                DbException.class,
+                () -> DbExceptionListenerJni.nativeThrowException(store.getNativeStore(), 0)
+        );
+        assertFalse("Replaced DbExceptionListener was called.", replacedListenerCalled.get());
+        assertTrue("New DbExceptionListener was NOT called.", newListenerCalled.get());
+    }
+
     @Test
     public void testThrowExceptions() {
         final List<Exception> exs = new ArrayList<>();