Set debug flags using options, remove usePreviousCommitOnValida....

Author: greenrobot-team

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

@@ -139,12 +139,6 @@ public static String getVersionNative() {
      */
     public static native void testUnalignedMemoryAccess();
 
-    /**
-     * @deprecated Use {@link #nativeCreateWithFlatOptions(byte[], byte[])} instead.
-     */
-    @Deprecated
-    static native long nativeCreate(String directory, long maxDbSizeInKByte, int maxReaders, byte[] model);
-
     /**
      * Creates a native BoxStore instance with FlatBuffer {@link io.objectbox.model.FlatStoreOptions} {@code options}
      * and a {@link ModelBuilder} {@code model}. Returns the handle of the native store instance.
@@ -234,7 +228,6 @@ public static boolean isObjectBrowserAvailable() {
         handle = nativeCreateWithFlatOptions(buildFlatStoreOptions(builder, canonicalPath), builder.model);
         int debugFlags = builder.debugFlags;
         if (debugFlags != 0) {
-            nativeSetDebugFlags(handle, debugFlags);
             debugTxRead = (debugFlags & DebugFlags.LOG_TRANSACTIONS_READ) != 0;
             debugTxWrite = (debugFlags & DebugFlags.LOG_TRANSACTIONS_WRITE) != 0;
         } else {
@@ -289,17 +282,20 @@ private byte[] buildFlatStoreOptions(BoxStoreBuilder builder, String canonicalPa
         FlatStoreOptions.addDirectoryPath(fbb, directoryPathOffset);
         FlatStoreOptions.addMaxDbSizeInKByte(fbb, builder.maxSizeInKByte);
         FlatStoreOptions.addMaxReaders(fbb, builder.maxReaders);
-        // FlatStoreOptions.addDebugFlags(fbb, builder.debugFlags); // TODO Use this instead of nativeSetDebugFlags?
-        // TODO Add new values.
-        FlatStoreOptions.addReadOnly(fbb, builder.readOnly);
-        FlatStoreOptions.addUsePreviousCommit(fbb, builder.usePreviousCommit);
-        FlatStoreOptions.addUsePreviousCommitOnValidationFailure(fbb, builder.usePreviousCommitOnValidationFailure);
-        if (builder.validateOnOpenMode != 0) {
-            FlatStoreOptions.addValidateOnOpen(fbb, builder.validateOnOpenMode);
-            if (builder.validateOnOpenPageLimit != 0) {
-                FlatStoreOptions.addValidateOnOpenPageLimit(fbb, builder.validateOnOpenPageLimit);
+        int validateOnOpenMode = builder.validateOnOpenMode;
+        if (validateOnOpenMode != 0) {
+            FlatStoreOptions.addValidateOnOpen(fbb, validateOnOpenMode);
+            long validateOnOpenPageLimit = builder.validateOnOpenPageLimit;
+            if (validateOnOpenPageLimit != 0) {
+                FlatStoreOptions.addValidateOnOpenPageLimit(fbb, validateOnOpenPageLimit);
             }
         }
+        FlatStoreOptions.addUsePreviousCommit(fbb, builder.usePreviousCommit);
+        FlatStoreOptions.addReadOnly(fbb, builder.readOnly);
+        int debugFlags = builder.debugFlags;
+        if (debugFlags != 0) {
+            FlatStoreOptions.addDebugFlags(fbb, debugFlags);
+        }
 
         int offset = FlatStoreOptions.endFlatStoreOptions(fbb);
         fbb.finish(offset);

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

@@ -94,7 +94,6 @@ public class BoxStoreBuilder {
 
     boolean readOnly;
     boolean usePreviousCommit;
-    boolean usePreviousCommitOnValidationFailure;
 
     int validateOnOpenMode;
     long validateOnOpenPageLimit;
@@ -325,32 +324,10 @@ public BoxStoreBuilder readOnly() {
      * It is recommended to use this with {@link #readOnly()} to ensure no data is lost.
      */
     public BoxStoreBuilder usePreviousCommit() {
-        if (usePreviousCommitOnValidationFailure) {
-            throw new IllegalStateException("Can not use together with usePreviousCommitOnValidationFailure()");
-        }
         this.usePreviousCommit = true;
         return this;
     }
 
-    /**
-     * If consistency checks fail during opening the DB, ObjectBox
-     * automatically switches to the previous commit. This way, this constitutes
-     * an auto-recover mode from severe failures.
-     * <p>
-     * However, keep in mind that any consistency failure
-     * is an indication that something is very wrong with OS/hardware and thus you may possibly alert your users.
-     *
-     * @see #usePreviousCommit()
-     * @see #validateOnOpen(int)
-     */
-    public BoxStoreBuilder usePreviousCommitOnValidationFailure() {
-        if (usePreviousCommit) {
-            throw new IllegalStateException("Can not use together with usePreviousCommit()");
-        }
-        this.usePreviousCommitOnValidationFailure = true;
-        return this;
-    }
-
     /**
      * When a database is opened, ObjectBox can perform additional consistency checks on its database structure.
      * Reliable file systems already guarantee consistency, so this is primarily meant to deal with unreliable