Merge branch '4-new-query-api' into release-3.0.0-alpha1

Author: greenrobot-team

build.gradle

@@ -28,12 +28,22 @@ buildscript {
         objectboxNativeDependency = "io.objectbox:objectbox-$objectboxPlatform:$ob_native_version"
         println "ObjectBox native dependency: $objectboxNativeDependency"
     }
+
+    ext.kotlin_version = '1.3.61'
+    ext.dokka_version = '0.10.1'
     ext.junit_version = '4.13'
 
     repositories {
         mavenCentral()
         jcenter()
     }
+
+    dependencies {
+        // Add Kotlin plugins once. Apply in sub-projects as required.
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+        classpath "org.jetbrains.dokka:dokka-gradle-plugin:$dokka_version"
+    }
+
 }
 
 allprojects {

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

@@ -19,7 +19,6 @@
 import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
@@ -37,6 +36,7 @@
 import io.objectbox.internal.IdGetter;
 import io.objectbox.internal.ReflectionCache;
 import io.objectbox.query.QueryBuilder;
+import io.objectbox.query.QueryCondition;
 import io.objectbox.relation.RelationInfo;
 
 /**
@@ -555,6 +555,30 @@ public QueryBuilder<T> query() {
         return new QueryBuilder<>(this, store.internalHandle(), store.getDbName(entityClass));
     }
 
+    /**
+     * Applies the given query conditions and returns the builder for further customization, such as result order.
+     * Build the condition using the properties from your entity underscore classes.
+     * <p>
+     * An example with a nested OR condition:
+     * <pre>
+     * # Java
+     * box.query(User_.name.equal("Jane")
+     *         .and(User_.age.less(12)
+     *                 .or(User_.status.equal("child"))));
+     *
+     * # Kotlin
+     * box.query(User_.name.equal("Jane")
+     *         and (User_.age.less(12)
+     *         or User_.status.equal("child")))
+     * </pre>
+     * This method is a shortcut for {@code query().apply(condition)}.
+     *
+     * @see QueryBuilder#apply(QueryCondition)
+     */
+    public QueryBuilder<T> query(QueryCondition<T> queryCondition) {
+        return query().apply(queryCondition);
+    }
+
     public BoxStore getStore() {
         return store;
     }

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

@@ -17,16 +17,26 @@
 package io.objectbox;
 
 import java.io.Serializable;
-import java.util.Collection;
+import java.util.Date;
 
 import javax.annotation.Nullable;
 
 import io.objectbox.annotation.apihint.Internal;
 import io.objectbox.converter.PropertyConverter;
 import io.objectbox.exception.DbException;
-import io.objectbox.query.QueryCondition;
-import io.objectbox.query.QueryCondition.PropertyCondition;
-import io.objectbox.query.QueryCondition.PropertyCondition.Operation;
+import io.objectbox.query.PropertyQueryCondition;
+import io.objectbox.query.PropertyQueryConditionImpl.ByteArrayCondition;
+import io.objectbox.query.PropertyQueryConditionImpl.DoubleCondition;
+import io.objectbox.query.PropertyQueryConditionImpl.DoubleDoubleCondition;
+import io.objectbox.query.PropertyQueryConditionImpl.IntArrayCondition;
+import io.objectbox.query.PropertyQueryConditionImpl.LongArrayCondition;
+import io.objectbox.query.PropertyQueryConditionImpl.LongCondition;
+import io.objectbox.query.PropertyQueryConditionImpl.LongLongCondition;
+import io.objectbox.query.PropertyQueryConditionImpl.NullCondition;
+import io.objectbox.query.PropertyQueryConditionImpl.StringArrayCondition;
+import io.objectbox.query.PropertyQueryConditionImpl.StringCondition;
+import io.objectbox.query.PropertyQueryConditionImpl.StringCondition.Operation;
+import io.objectbox.query.QueryBuilder.StringOrder;
 
 /**
  * Meta data describing a property of an ObjectBox entity.
@@ -90,71 +100,208 @@ public Property(EntityInfo<ENTITY> entity, int ordinal, int id, Class<?> type, S
         this.customType = customType;
     }
 
-    /** Creates an "equal ('=')" condition for this property. */
-    public QueryCondition eq(Object value) {
-        return new PropertyCondition(this, Operation.EQUALS, value);
+    /** Creates an "IS NULL" condition for this property. */
+    public PropertyQueryCondition<ENTITY> isNull() {
+        return new NullCondition<>(this, NullCondition.Operation.IS_NULL);
     }
 
-    /** Creates an "not equal ('&lt;&gt;')" condition for this property. */
-    public QueryCondition notEq(Object value) {
-        return new PropertyCondition(this, Operation.NOT_EQUALS, value);
+    /** Creates an "IS NOT NULL" condition for this property. */
+    public PropertyQueryCondition<ENTITY> notNull() {
+        return new NullCondition<>(this, NullCondition.Operation.NOT_NULL);
     }
 
-    /** Creates an "BETWEEN ... AND ..." condition for this property. */
-    public QueryCondition between(Object value1, Object value2) {
-        Object[] values = {value1, value2};
-        return new PropertyCondition(this, Operation.BETWEEN, values);
+    /** Creates an "equal ('=')" condition for this property. */
+    public PropertyQueryCondition<ENTITY> equal(boolean value) {
+        return new LongCondition<>(this, LongCondition.Operation.EQUAL, value);
     }
 
-    /** Creates an "IN (..., ..., ...)" condition for this property. */
-    public QueryCondition in(Object... inValues) {
-        return new PropertyCondition(this, Operation.IN, inValues);
+    /** Creates a "not equal ('&lt;&gt;')" condition for this property. */
+    public PropertyQueryCondition<ENTITY> notEqual(boolean value) {
+        return new LongCondition<>(this, LongCondition.Operation.NOT_EQUAL, value);
     }
 
     /** Creates an "IN (..., ..., ...)" condition for this property. */
-    public QueryCondition in(Collection<?> inValues) {
-        return in(inValues.toArray());
+    public PropertyQueryCondition<ENTITY> oneOf(int[] values) {
+        return new IntArrayCondition<>(this, IntArrayCondition.Operation.IN, values);
     }
 
-    /** Creates an "greater than ('&gt;')" condition for this property. */
-    public QueryCondition gt(Object value) {
-        return new PropertyCondition(this, Operation.GREATER_THAN, value);
+    /** Creates a "NOT IN (..., ..., ...)" condition for this property. */
+    public PropertyQueryCondition<ENTITY> notOneOf(int[] values) {
+        return new IntArrayCondition<>(this, IntArrayCondition.Operation.NOT_IN, values);
     }
 
-    /** Creates an "less than ('&lt;')" condition for this property. */
-    public QueryCondition lt(Object value) {
-        return new PropertyCondition(this, Operation.LESS_THAN, value);
+    /** Creates an "equal ('=')" condition for this property. */
+    public PropertyQueryCondition<ENTITY> equal(long value) {
+        return new LongCondition<>(this, LongCondition.Operation.EQUAL, value);
     }
 
-    /** Creates an "IS NULL" condition for this property. */
-    public QueryCondition isNull() {
-        return new PropertyCondition(this, Operation.IS_NULL, null);
+    /** Creates a "not equal ('&lt;&gt;')" condition for this property. */
+    public PropertyQueryCondition<ENTITY> notEqual(long value) {
+        return new LongCondition<>(this, LongCondition.Operation.NOT_EQUAL, value);
     }
 
-    /** Creates an "IS NOT NULL" condition for this property. */
-    public QueryCondition isNotNull() {
-        return new PropertyCondition(this, Operation.IS_NOT_NULL, null);
+    /** Creates a "greater than ('&gt;')" condition for this property. */
+    public PropertyQueryCondition<ENTITY> greater(long value) {
+        return new LongCondition<>(this, LongCondition.Operation.GREATER, value);
     }
 
-    /**
-     * @see io.objectbox.query.QueryBuilder#contains(Property, String)
-     */
-    public QueryCondition contains(String value) {
-        return new PropertyCondition(this, Operation.CONTAINS, value);
+    /** Creates a "less than ('&lt;')" condition for this property. */
+    public PropertyQueryCondition<ENTITY> less(long value) {
+        return new LongCondition<>(this, LongCondition.Operation.LESS, value);
     }
 
-    /**
-     * @see io.objectbox.query.QueryBuilder#startsWith(Property, String)
-     */
-    public QueryCondition startsWith(String value) {
-        return new PropertyCondition(this, Operation.STARTS_WITH, value);
+    /** Creates an "IN (..., ..., ...)" condition for this property. */
+    public PropertyQueryCondition<ENTITY> oneOf(long[] values) {
+        return new LongArrayCondition<>(this, LongArrayCondition.Operation.IN, values);
+    }
+
+    /** Creates a "NOT IN (..., ..., ...)" condition for this property. */
+    public PropertyQueryCondition<ENTITY> notOneOf(long[] values) {
+        return new LongArrayCondition<>(this, LongArrayCondition.Operation.NOT_IN, values);
+    }
+
+    /** Creates an "BETWEEN ... AND ..." condition for this property. */
+    public PropertyQueryCondition<ENTITY> between(long lowerBoundary, long upperBoundary) {
+        return new LongLongCondition<>(this, LongLongCondition.Operation.BETWEEN, lowerBoundary, upperBoundary);
     }
 
     /**
-     * @see io.objectbox.query.QueryBuilder#endsWith(Property, String)
+     * Calls {@link #between(double, double)} with {@code value - tolerance} as lower bound and
+     * {@code value + tolerance} as upper bound.
      */
-    public QueryCondition endsWith(String value) {
-        return new PropertyCondition(this, Operation.ENDS_WITH, value);
+    public PropertyQueryCondition<ENTITY> equal(double value, double tolerance) {
+        return new DoubleDoubleCondition<>(this, DoubleDoubleCondition.Operation.BETWEEN,
+                value - tolerance, value + tolerance);
+    }
+
+    /** Creates a "greater than ('&gt;')" condition for this property. */
+    public PropertyQueryCondition<ENTITY> greater(double value) {
+        return new DoubleCondition<>(this, DoubleCondition.Operation.GREATER, value);
+    }
+
+    /** Creates a "less than ('&lt;')" condition for this property. */
+    public PropertyQueryCondition<ENTITY> less(double value) {
+        return new DoubleCondition<>(this, DoubleCondition.Operation.LESS, value);
+    }
+
+    /** Creates an "BETWEEN ... AND ..." condition for this property. */
+    public PropertyQueryCondition<ENTITY> between(double lowerBoundary, double upperBoundary) {
+        return new DoubleDoubleCondition<>(this, DoubleDoubleCondition.Operation.BETWEEN,
+                lowerBoundary, upperBoundary);
+    }
+
+    /** Creates an "equal ('=')" condition for this property. */
+    public PropertyQueryCondition<ENTITY> equal(Date value) {
+        return new LongCondition<>(this, LongCondition.Operation.EQUAL, value);
+    }
+
+    /** Creates a "not equal ('&lt;&gt;')" condition for this property. */
+    public PropertyQueryCondition<ENTITY> notEqual(Date value) {
+        return new LongCondition<>(this, LongCondition.Operation.NOT_EQUAL, value);
+    }
+
+    /** Creates a "greater than ('&gt;')" condition for this property. */
+    public PropertyQueryCondition<ENTITY> greater(Date value) {
+        return new LongCondition<>(this, LongCondition.Operation.GREATER, value);
+    }
+
+    /** Creates a "less than ('&lt;')" condition for this property. */
+    public PropertyQueryCondition<ENTITY> less(Date value) {
+        return new LongCondition<>(this, LongCondition.Operation.LESS, value);
+    }
+
+    /** Creates an "BETWEEN ... AND ..." condition for this property. */
+    public PropertyQueryCondition<ENTITY> between(Date lowerBoundary, Date upperBoundary) {
+        return new LongLongCondition<>(this, LongLongCondition.Operation.BETWEEN, lowerBoundary, upperBoundary);
+    }
+
+    /** Creates an "equal ('=')" condition for this property. */
+    public PropertyQueryCondition<ENTITY> equal(String value) {
+        return new StringCondition<>(this, StringCondition.Operation.EQUAL, value);
+    }
+
+    /** Creates an "equal ('=')" condition for this property. */
+    public PropertyQueryCondition<ENTITY> equal(String value, StringOrder order) {
+        return new StringCondition<>(this, StringCondition.Operation.EQUAL, value, order);
+    }
+
+    /** Creates a "not equal ('&lt;&gt;')" condition for this property. */
+    public PropertyQueryCondition<ENTITY> notEqual(String value) {
+        return new StringCondition<>(this, StringCondition.Operation.NOT_EQUAL, value);
+    }
+
+    /** Creates a "not equal ('&lt;&gt;')" condition for this property. */
+    public PropertyQueryCondition<ENTITY> notEqual(String value, StringOrder order) {
+        return new StringCondition<>(this, StringCondition.Operation.NOT_EQUAL, value, order);
+    }
+
+    /** Creates a "greater than ('&gt;')" condition for this property. */
+    public PropertyQueryCondition<ENTITY> greater(String value) {
+        return new StringCondition<>(this, StringCondition.Operation.GREATER, value);
+    }
+
+    /** Creates a "greater than ('&gt;')" condition for this property. */
+    public PropertyQueryCondition<ENTITY> greater(String value, StringOrder order) {
+        return new StringCondition<>(this, StringCondition.Operation.GREATER, value, order);
+    }
+
+    /** Creates a "less than ('&lt;')" condition for this property. */
+    public PropertyQueryCondition<ENTITY> less(String value) {
+        return new StringCondition<>(this, StringCondition.Operation.LESS, value);
+    }
+
+    /** Creates a "less than ('&lt;')" condition for this property. */
+    public PropertyQueryCondition<ENTITY> less(String value, StringOrder order) {
+        return new StringCondition<>(this, StringCondition.Operation.LESS, value, order);
+    }
+
+    public PropertyQueryCondition<ENTITY> contains(String value) {
+        return new StringCondition<>(this, StringCondition.Operation.CONTAINS, value);
+    }
+
+    public PropertyQueryCondition<ENTITY> contains(String value, StringOrder order) {
+        return new StringCondition<>(this, StringCondition.Operation.CONTAINS, value, order);
+    }
+
+    public PropertyQueryCondition<ENTITY> startsWith(String value) {
+        return new StringCondition<>(this, Operation.STARTS_WITH, value);
+    }
+
+    public PropertyQueryCondition<ENTITY> startsWith(String value, StringOrder order) {
+        return new StringCondition<>(this, Operation.STARTS_WITH, value, order);
+    }
+
+    public PropertyQueryCondition<ENTITY> endsWith(String value) {
+        return new StringCondition<>(this, Operation.ENDS_WITH, value);
+    }
+
+    public PropertyQueryCondition<ENTITY> endsWith(String value, StringOrder order) {
+        return new StringCondition<>(this, Operation.ENDS_WITH, value, order);
+    }
+
+    /** Creates an "IN (..., ..., ...)" condition for this property. */
+    public PropertyQueryCondition<ENTITY> oneOf(String[] values) {
+        return new StringArrayCondition<>(this, StringArrayCondition.Operation.IN, values);
+    }
+
+    /** Creates an "IN (..., ..., ...)" condition for this property. */
+    public PropertyQueryCondition<ENTITY> oneOf(String[] values, StringOrder order) {
+        return new StringArrayCondition<>(this, StringArrayCondition.Operation.IN, values, order);
+    }
+
+    /** Creates an "equal ('=')" condition for this property. */
+    public PropertyQueryCondition<ENTITY> equal(byte[] value) {
+        return new ByteArrayCondition<>(this, ByteArrayCondition.Operation.EQUAL, value);
+    }
+
+    /** Creates a "greater than ('&gt;')" condition for this property. */
+    public PropertyQueryCondition<ENTITY> greater(byte[] value) {
+        return new ByteArrayCondition<>(this, ByteArrayCondition.Operation.GREATER, value);
+    }
+
+    /** Creates a "less than ('&lt;')" condition for this property. */
+    public PropertyQueryCondition<ENTITY> less(byte[] value) {
+        return new ByteArrayCondition<>(this, ByteArrayCondition.Operation.LESS, value);
     }
 
     @Internal