Merge branch 'dev' into sync

# Conflicts:
#	objectbox-java/src/main/java/io/objectbox/BoxStore.java
#	tests/objectbox-java-test/src/test/java/io/objectbox/BoxStoreTest.java

Author: greenrobot

README.md

@@ -1,16 +1,12 @@
 <img width="466" src="https://raw.githubusercontent.com/objectbox/objectbox-java/master/logo.png">
 
-# Do you ♥️ using ObjectBox?
 [![Follow ObjectBox on Twitter](https://img.shields.io/twitter/follow/ObjectBox_io.svg?style=flat-square&logo=twitter&color=fff)](https://twitter.com/ObjectBox_io)
 
-We want to [hear about your app](https://docs.google.com/forms/d/e/1FAIpQLScIYiOIThcq-AnDVoCvnZOMgxO4S-fBtDSFPQfWldJnhi2c7Q/viewform)!
-It will - literally - take just a minute, but help us a lot. Thank you!​ 🙏​
-
 # ObjectBox Java (Kotlin, Android)
 ObjectBox is a superfast object-oriented database with strong relation support.
 ObjectBox is embedded into your Android, Linux, macOS, or Windows app.
 
-**Latest version: [2.5.1 (2020/02/10)](https://docs.objectbox.io/#objectbox-changelog)**
+**Latest version: [2.7.0 (2020/07/30)](https://docs.objectbox.io/#objectbox-changelog)**
 
 Demo code using ObjectBox:
 
@@ -29,15 +25,15 @@ Besides JVM based languages like Java and Kotlin, ObjectBox also offers:
 * [ObjectBox Swift](https://github.com/objectbox/objectbox-swift): build fast mobile apps for iOS (and macOS) 
 * [ObjectBox Dart/Flutter](https://github.com/objectbox/objectbox-dart): cross-plattform for mobile and desktop apps (beta) 
 * [ObjectBox Go](https://github.com/objectbox/objectbox-go): great for data-driven tools and small server applications 
-* [ObjectBox C API](https://github.com/objectbox/objectbox-c): native speed with zero copy access to FlatBuffer objects
+* [ObjectBox C and C++](https://github.com/objectbox/objectbox-c): native speed with zero copy access to FlatBuffer objects
 
 Gradle setup
 ------------
 Add this to your root build.gradle (project level): 
 
 ```groovy
 buildscript {
-    ext.objectboxVersion = '2.5.1'
+    ext.objectboxVersion = '2.7.0'
     dependencies {
         classpath "io.objectbox:objectbox-gradle-plugin:$objectboxVersion"
     }
@@ -72,7 +68,7 @@ Box<Playlist> box = boxStore.boxFor(Playlist.class);
 
 The `Box` object gives you access to all major functions, like `put`, `get`, `remove`, and `query`.
 
-For details please check the [docs](http://objectbox.io/documentation/).     
+For details please check the [docs](https://docs.objectbox.io).     
 
 Links
 -----
@@ -88,6 +84,8 @@ We love to get your feedback
 Let us know how we are doing: [2 minute questionnaire](https://docs.google.com/forms/d/e/1FAIpQLSe_fq-FlBThK_96bkHv1oEDizoHwEu_b6M4FJkMv9V5q_Or9g/viewform?usp=sf_link).
 Thanks!
 
+Also, we want to [hear about your app](https://docs.google.com/forms/d/e/1FAIpQLScIYiOIThcq-AnDVoCvnZOMgxO4S-fBtDSFPQfWldJnhi2c7Q/viewform)!
+It will - literally - take just a minute, but help us a lot. Thank you!​ 🙏​
 
 License
 -------

build.gradle

@@ -1,7 +1,7 @@
 buildscript {
     ext {
         // Typically, only edit those two:
-        def objectboxVersionNumber = '2.6.0' // without "-SNAPSHOT", e.g. '2.5.0' or '2.4.0-RC'
+        def objectboxVersionNumber = '2.7.1' // without "-SNAPSHOT", e.g. '2.5.0' or '2.4.0-RC'
         def objectboxVersionRelease = false  // set to true for releasing to ignore versionPostFix to avoid e.g. "-dev" versions
 
         // version post fix: '-<value>' or '' if not defined; e.g. used by CI to pass in branch name

objectbox-java/build.gradle

@@ -9,10 +9,13 @@ dependencies {
     implementation 'org.greenrobot:essentials:3.0.0-RC1'
     implementation 'com.google.flatbuffers:flatbuffers-java:1.12.0'
     api 'com.google.code.findbugs:jsr305:3.0.2'
+
+    compileOnly 'com.github.spotbugs:spotbugs-annotations:4.0.4'
 }
 
 spotbugs {
     ignoreFailures = true
+    excludeFilter = file("spotbugs-exclude.xml")
 }
 
 javadoc {

objectbox-java/spotbugs-exclude.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<FindBugsFilter>
+    <Match>
+        <!-- Exclude FlatBuffers generated code. -->
+        <Class name="~io\.objectbox\.model\.Model.*" />
+    </Match>
+</FindBugsFilter>

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

@@ -317,6 +317,21 @@ public List<T> getAll() {
         }
     }
 
+    /**
+     * Check if an object with the given ID exists in the database.
+     * This is more efficient than a {@link #get(long)} and comparing against null.
+     * @since 2.7
+     * @return true if a object with the given ID was found, false otherwise
+     */
+    public boolean contains(long id) {
+        Cursor<T> reader = getReader();
+        try {
+            return reader.seek(id);
+        } finally {
+            releaseReader(reader);
+        }
+    }
+
     /**
      * Puts the given object in the box (aka persisting it). If this is a new entity (its ID property is 0), a new ID
      * will be assigned to the entity (and returned). If the entity was already put in the box before, it will be

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2019 ObjectBox Ltd. All rights reserved.
+ * Copyright 2017-2020 ObjectBox Ltd. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
 
 package io.objectbox;
 
+import io.objectbox.annotation.apihint.Beta;
 import org.greenrobot.essentials.collections.LongHashMap;
 
 import java.io.Closeable;
@@ -66,9 +67,9 @@ public class BoxStore implements Closeable {
     @Nullable private static Object relinker;
 
     /** Change so ReLinker will update native library when using workaround loading. */
-    public static final String JNI_VERSION = "2.6.0-RC";
+    public static final String JNI_VERSION = "2.7.0";
 
-    private static final String VERSION = "2.6.0-2020-04-30";
+    private static final String VERSION = "2.7.0-2020-07-30";
     private static BoxStore defaultStore;
 
     /** Currently used DB dirs with values from {@link #getCanonicalPath(File)}. */
@@ -138,7 +139,13 @@ public static String getVersionNative() {
      */
     public static native void testUnalignedMemoryAccess();
 
-    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.
+     */
+    static native long nativeCreateWithFlatOptions(byte[] options, byte[] model);
+
+    static native boolean nativeIsReadOnly(long store);
 
     static native void nativeDelete(long store);
 
@@ -170,6 +177,10 @@ static native void nativeRegisterCustomType(long store, int entityId, int proper
 
     static native boolean nativeIsObjectBrowserAvailable();
 
+    native long nativeSizeOnDisk(long store);
+
+    native long nativeValidate(long store, long pageLimit, boolean checkLeafLevel);
+
     static native int nativeGetSupportedSync();
 
     public static boolean isObjectBrowserAvailable() {
@@ -242,10 +253,9 @@ public static boolean isSyncServerAvailable() {
         canonicalPath = getCanonicalPath(directory);
         verifyNotAlreadyOpen(canonicalPath);
 
-        handle = nativeCreate(canonicalPath, builder.maxSizeInKByte, builder.maxReaders, builder.model);
+        handle = nativeCreateWithFlatOptions(builder.buildFlatStoreOptions(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 {
@@ -360,6 +370,16 @@ static boolean isFileOpenSync(String canonicalPath, boolean runFinalization) {
         }
     }
 
+    /**
+     * The size in bytes occupied by the data file on disk.
+     *
+     * @return 0 if the size could not be determined (does not throw unless this store was already closed)
+     */
+    public long sizeOnDisk() {
+        checkOpen();
+        return nativeSizeOnDisk(handle);
+    }
+
     /**
      * Explicitly call {@link #close()} instead to avoid expensive finalization.
      */
@@ -464,6 +484,14 @@ public boolean isClosed() {
         return closed;
     }
 
+    /**
+     * Whether the store was created using read-only mode.
+     * If true the schema is not updated and write transactions are not possible.
+     */
+    public boolean isReadOnly() {
+        return nativeIsReadOnly(handle);
+    }
+
     /**
      * Closes the BoxStore and frees associated resources.
      * This method is useful for unit tests;
@@ -926,6 +954,24 @@ public String diagnose() {
         return nativeDiagnose(handle);
     }
 
+    /**
+     * Validate database pages, a lower level storage unit (integrity check).
+     * Do not call this inside a transaction (currently unsupported).
+     * @param pageLimit the maximum of pages to validate (e.g. to limit time spent on validation).
+     *        Pass zero set no limit and thus validate all pages.
+     * @param checkLeafLevel Flag to validate leaf pages. These do not point to other pages but contain data.
+     * @return Number of pages validated, which may be twice the given pageLimit as internally there are "two DBs".
+     * @throws DbException if validation failed to run (does not tell anything about DB file consistency).
+     * @throws io.objectbox.exception.FileCorruptException if the DB file is actually inconsistent (corrupt).
+     */
+    @Beta
+    public long validate(long pageLimit, boolean checkLeafLevel) {
+        if (pageLimit < 0) {
+            throw new IllegalArgumentException("pageLimit must be zero or positive");
+        }
+        return nativeValidate(handle, pageLimit, checkLeafLevel);
+    }
+
     public int cleanStaleReadTransactions() {
         return nativeCleanStaleReadTransactions(handle);
     }