Merge branch 'dev-latest' into sync

Author: greenrobot-team

Jenkinsfile

@@ -22,6 +22,10 @@ pipeline {
                         "-PpreferredUsername=$MVN_REPO_LOGIN_USR " +
                         "-PpreferredPassword=$MVN_REPO_LOGIN_PSW " +
                         "-PversionPostFix=$versionPostfix"
+        // Note: for key use Jenkins secret file with PGP key as text in ASCII-armored format.
+        ORG_GRADLE_PROJECT_signingKeyFile = credentials('objectbox_signing_key')
+        ORG_GRADLE_PROJECT_signingKeyId = credentials('objectbox_signing_key_id')
+        ORG_GRADLE_PROJECT_signingPassword = credentials('objectbox_signing_key_password')
     }
 
     options {
@@ -54,6 +58,7 @@ pipeline {
                         "--tests io.objectbox.FunctionalTestSuite " +
                         "--tests io.objectbox.test.proguard.ObfuscatedEntityTest " +
                         "--tests io.objectbox.rx.QueryObserverTest " +
+                        "--tests io.objectbox.rx3.QueryObserverTest " +
                         "spotbugsMain assemble"
             }
         }

build.gradle

@@ -1,7 +1,7 @@
 buildscript {
     ext {
         // Typically, only edit those two:
-        def objectboxVersionNumber = '2.5.2' // without "-SNAPSHOT", e.g. '2.5.0' or '2.4.0-RC'
+        def objectboxVersionNumber = '2.6.0' // 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
@@ -20,6 +20,9 @@ buildscript {
         ob_native_dep = "io.objectbox:objectbox-$objectboxPlatform:$nativeVersion"
 
         junit_version = '4.13'
+        mockito_version = '3.3.3'
+        kotlin_version = '1.3.72'
+        dokka_version = '0.10.1'
 
         println "version=$ob_version"
         println "objectboxNativeDependency=$ob_native_dep"
@@ -34,6 +37,8 @@ buildscript {
     }
 
     dependencies {
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+        classpath "org.jetbrains.dokka:dokka-gradle-plugin:$dokka_version"
         classpath "gradle.plugin.com.github.spotbugs.snom:spotbugs-gradle-plugin:4.0.5"
     }
 }
@@ -64,9 +69,16 @@ def projectNamesToPublish = [
         'objectbox-java-api',
         'objectbox-java',
         'objectbox-kotlin',
-        'objectbox-rxjava'
+        'objectbox-rxjava',
+        'objectbox-rxjava3'
 ]
 
+def hasSigningProperties() {
+    return (project.hasProperty('signingKeyId')
+            && project.hasProperty('signingKeyFile')
+            && project.hasProperty('signingPassword'))
+}
+
 configure(subprojects.findAll { projectNamesToPublish.contains(it.name) }) {
     apply plugin: 'maven'
     apply plugin: 'signing'
@@ -82,8 +94,9 @@ configure(subprojects.findAll { projectNamesToPublish.contains(it.name) }) {
     }
 
     signing {
-        if (project.hasProperty('signing.keyId') && project.hasProperty('signing.password') &&
-                project.hasProperty('signing.secretKeyRingFile')) {
+        if (hasSigningProperties()) {
+            String signingKey = new File(signingKeyFile).text
+            useInMemoryPgpKeys(signingKeyId, signingKey, signingPassword)
             sign configurations.archives
         } else {
             println "Signing information missing/incomplete for ${project.name}"
@@ -104,6 +117,10 @@ configure(subprojects.findAll { projectNamesToPublish.contains(it.name) }) {
                     } else if (preferredRepo != null
                             && project.hasProperty('preferredUsername') 
                             && project.hasProperty('preferredPassword')) {
+                        if (!hasSigningProperties()) {
+                            throw new InvalidUserDataException("To upload to repo signing is required.")
+                        }
+
                         configuration = configurations.deployerJars
 
                         // replace placeholders
@@ -129,7 +146,7 @@ configure(subprojects.findAll { projectNamesToPublish.contains(it.name) }) {
 
                         println "Uploading archives to $sonatypeRepositoryUrl."
                     } else {
-                        println "WARNING: preferredRepo NOT set, can not upload archives."
+                        println "WARNING: preferredRepo or credentials NOT set, can not upload archives."
                     }
 
                     pom.project {

objectbox-java-api/build.gradle

@@ -1,16 +1,16 @@
-apply plugin: 'java'
+apply plugin: 'java-library'
 
 sourceCompatibility = JavaVersion.VERSION_1_8
 targetCompatibility = JavaVersion.VERSION_1_8
 
 task javadocJar(type: Jar, dependsOn: javadoc) {
-    classifier = 'javadoc'
+    archiveClassifier.set('javadoc')
     from 'build/docs/javadoc'
 }
 
 task sourcesJar(type: Jar) {
     from sourceSets.main.allSource
-    classifier = 'sources'
+    archiveClassifier.set('sources')
 }
 
 artifacts {

objectbox-java-api/src/main/java/io/objectbox/annotation/DefaultValue.java

@@ -0,0 +1,18 @@
+package io.objectbox.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Defines the Java code of the default value to use for a property, when getting an existing entity and the database
+ * value for the property is null.
+ * <p>
+ * Currently only {@code @DefaultValue("")} is supported.
+ */
+@Retention(RetentionPolicy.CLASS)
+@Target({ElementType.FIELD})
+public @interface DefaultValue {
+    String value();
+}

objectbox-java/build.gradle

@@ -1,15 +1,14 @@
-apply plugin: 'java'
+apply plugin: 'java-library'
 apply plugin: "com.github.spotbugs"
 
 sourceCompatibility = JavaVersion.VERSION_1_8
 targetCompatibility = JavaVersion.VERSION_1_8
 
 dependencies {
-    compile fileTree(include: ['*.jar'], dir: 'libs')
-    compile project(':objectbox-java-api')
-    compile 'org.greenrobot:essentials:3.0.0-RC1'
-    compile 'com.google.flatbuffers:flatbuffers-java:1.11.1'
-    compile 'com.google.code.findbugs:jsr305:3.0.2'
+    api project(':objectbox-java-api')
+    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'
 }
 
 spotbugs {
@@ -102,13 +101,13 @@ task packageJavadocForWeb(type: Zip, dependsOn: javadocForWeb) {
 }
 
 task javadocJar(type: Jar, dependsOn: javadoc) {
-    classifier = 'javadoc'
+    archiveClassifier.set('javadoc')
     from 'build/docs/javadoc'
 }
 
 task sourcesJar(type: Jar) {
     from sourceSets.main.allSource
-    classifier = 'sources'
+    archiveClassifier.set('sources')
 }
 
 artifacts {

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

@@ -62,19 +62,31 @@
 public class BoxStore implements Closeable {
 
     /** On Android used for native library loading. */
-    @Nullable public static Object context;
-    @Nullable public static Object relinker;
+    @Nullable private static Object context;
+    @Nullable private static Object relinker;
 
     /** Change so ReLinker will update native library when using workaround loading. */
-    public static final String JNI_VERSION = "2.5.1";
+    public static final String JNI_VERSION = "2.6.0-RC";
 
-    private static final String VERSION = "2.5.2-2020-02-10";
+    private static final String VERSION = "2.6.0-2020-04-30";
     private static BoxStore defaultStore;
 
     /** Currently used DB dirs with values from {@link #getCanonicalPath(File)}. */
     private static final Set<String> openFiles = new HashSet<>();
     private static volatile Thread openFilesCheckerThread;
 
+    @Nullable
+    @Internal
+    public static synchronized Object getContext() {
+        return context;
+    }
+
+    @Nullable
+    @Internal
+    public static synchronized Object getRelinker() {
+        return relinker;
+    }
+
     /**
      * Convenience singleton instance which gets set up using {@link BoxStoreBuilder#buildDefault()}.
      * <p>
@@ -304,16 +316,19 @@ static boolean isFileOpen(final String canonicalPath) {
         synchronized (openFiles) {
             if (!openFiles.contains(canonicalPath)) return false;
         }
-        if (openFilesCheckerThread == null || !openFilesCheckerThread.isAlive()) {
+        Thread checkerThread = BoxStore.openFilesCheckerThread;
+        if (checkerThread == null || !checkerThread.isAlive()) {
             // Use a thread to avoid finalizers that block us
-            openFilesCheckerThread = new Thread(() -> {
+            checkerThread = new Thread(() -> {
                 isFileOpenSync(canonicalPath, true);
-                openFilesCheckerThread = null; // Clean ref to itself
+                BoxStore.openFilesCheckerThread = null; // Clean ref to itself
             });
-            openFilesCheckerThread.setDaemon(true);
-            openFilesCheckerThread.start();
+            checkerThread.setDaemon(true);
+
+            BoxStore.openFilesCheckerThread = checkerThread;
+            checkerThread.start();
             try {
-                openFilesCheckerThread.join(500);
+                checkerThread.join(500);
             } catch (InterruptedException e) {
                 e.printStackTrace();
             }

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

@@ -27,6 +27,7 @@
 import java.io.OutputStream;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 import javax.annotation.Nonnull;
@@ -107,10 +108,11 @@ private BoxStoreBuilder() {
     /** Called internally from the generated class "MyObjectBox". Check MyObjectBox.builder() to get an instance. */
     @Internal
     public BoxStoreBuilder(byte[] model) {
-        this.model = model;
         if (model == null) {
             throw new IllegalArgumentException("Model may not be null");
         }
+        // Future-proofing: copy to prevent external modification.
+        this.model = Arrays.copyOf(model, model.length);
     }
 
     /**

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 ObjectBox Ltd. All rights reserved.
+ * Copyright 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.

objectbox-java/src/main/java/io/objectbox/converter/NullToEmptyStringConverter.java

@@ -0,0 +1,22 @@
+package io.objectbox.converter;
+
+import javax.annotation.Nullable;
+
+/**
+ * Used as a converter if a property is annotated with {@link io.objectbox.annotation.DefaultValue @DefaultValue("")}.
+ */
+public class NullToEmptyStringConverter implements PropertyConverter<String, String> {
+
+    @Override
+    public String convertToDatabaseValue(String entityProperty) {
+        return entityProperty;
+    }
+
+    @Override
+    public String convertToEntityProperty(@Nullable String databaseValue) {
+        if (databaseValue == null) {
+            return "";
+        }
+        return databaseValue;
+    }
+}

objectbox-java/src/main/java/io/objectbox/internal/NativeLibraryLoader.java

@@ -181,22 +181,22 @@ private static void checkUnpackLib(String filename) {
     }
 
     private static boolean loadLibraryAndroid() {
-        if (BoxStore.context == null) {
+        if (BoxStore.getContext() == null) {
             return false;
         }
 
         //noinspection TryWithIdenticalCatches
         try {
             Class<?> context = Class.forName("android.content.Context");
-            if (BoxStore.relinker == null) {
+            if (BoxStore.getRelinker() == null) {
                 // use default ReLinker
                 Class<?> relinker = Class.forName("com.getkeepsafe.relinker.ReLinker");
                 Method loadLibrary = relinker.getMethod("loadLibrary", context, String.class, String.class);
-                loadLibrary.invoke(null, BoxStore.context, OBJECTBOX_JNI, BoxStore.JNI_VERSION);
+                loadLibrary.invoke(null, BoxStore.getContext(), OBJECTBOX_JNI, BoxStore.JNI_VERSION);
             } else {
                 // use custom ReLinkerInstance
-                Method loadLibrary = BoxStore.relinker.getClass().getMethod("loadLibrary", context, String.class, String.class);
-                loadLibrary.invoke(BoxStore.relinker, BoxStore.context, OBJECTBOX_JNI, BoxStore.JNI_VERSION);
+                Method loadLibrary = BoxStore.getRelinker().getClass().getMethod("loadLibrary", context, String.class, String.class);
+                loadLibrary.invoke(BoxStore.getRelinker(), BoxStore.getContext(), OBJECTBOX_JNI, BoxStore.JNI_VERSION);
             }
         } catch (NoSuchMethodException e) {
             return false;