prepare Query support for byte[]

Author: greenrobot

objectbox-java/src/main/java/io/objectbox/query/Query.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ObjectBox Ltd. All rights reserved.
+ * Copyright 2017-2018 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.
@@ -46,7 +46,6 @@
  * @see QueryBuilder
  */
 @SuppressWarnings({"SameParameterValue", "UnusedReturnValue", "WeakerAccess"})
-@Beta
 public class Query<T> {
 
     native void nativeDestroy(long handle);
@@ -87,6 +86,9 @@ native void nativeSetParameters(long handle, int entityId, int propertyId, @Null
     native void nativeSetParameters(long handle, int entityId, int propertyId, @Nullable String parameterAlias,
                                     String[] values);
 
+    native void nativeSetParameter(long handle, int entityId, int propertyId, @Nullable String parameterAlias,
+                                   byte[] value);
+
     final Box<T> box;
     private final BoxStore store;
     private final boolean hasOrder;
@@ -598,6 +600,24 @@ public Query<T> setParameters(String alias, String[] values) {
         return this;
     }
 
+    /**
+     * Sets a parameter previously given to the {@link QueryBuilder} to new values.
+     */
+    public Query<T> setParameter(Property property, byte[] value) {
+        nativeSetParameter(handle, property.getEntityId(), property.getId(), null, value);
+        return this;
+    }
+
+    /**
+     * Sets a parameter previously given to the {@link QueryBuilder} to new values.
+     *
+     * @param alias as defined using {@link QueryBuilder#parameterAlias(String)}.
+     */
+    public Query<T> setParameter(String alias, byte[] value) {
+        nativeSetParameter(handle, 0, 0, alias, value);
+        return this;
+    }
+
     /**
      * Removes (deletes) all Objects matching the query
      *

objectbox-java/src/main/java/io/objectbox/query/QueryBuilder.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ObjectBox Ltd. All rights reserved.
+ * Copyright 2017-2018 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.
@@ -119,7 +119,6 @@ private native long nativeLink(long handle, long storeHandle, int relationOwnerE
 
     private native void nativeSetParameterAlias(long conditionHandle, String alias);
 
-
     // ------------------------------ (Not)Null------------------------------
 
     private native long nativeNull(long handle, int propertyId);
@@ -161,12 +160,21 @@ private native long nativeLink(long handle, long storeHandle, int relationOwnerE
     private native long nativeIn(long handle, int propertyId, String[] value, boolean caseSensitive);
 
     // ------------------------------ FPs ------------------------------
+
     private native long nativeLess(long handle, int propertyId, double value);
 
     private native long nativeGreater(long handle, int propertyId, double value);
 
     private native long nativeBetween(long handle, int propertyId, double value1, double value2);
 
+    // ------------------------------ Bytes ------------------------------
+
+    private native long nativeEqual(long handle, int propertyId, byte[] value);
+
+    private native long nativeLess(long handle, int propertyId, byte[] value);
+
+    private native long nativeGreater(long handle, int propertyId, byte[] value);
+
     @Internal
     public QueryBuilder(Box<T> box, long storeHandle, String entityName) {
         this.box = box;
@@ -282,6 +290,21 @@ public QueryBuilder<T> sort(Comparator<T> comparator) {
         return this;
     }
 
+
+    /**
+     * Asigns the given alias to the previous condition.
+     *
+     * @param alias The string alias for use with setParameter(s) methods.
+     */
+    public QueryBuilder<T> parameterAlias(String alias) {
+        verifyHandle();
+        if (lastCondition == 0) {
+            throw new IllegalStateException("No previous condition. Before you can assign an alias, you must first have a condition.");
+        }
+        nativeSetParameterAlias(lastCondition, alias);
+        return this;
+    }
+
     /**
      * Creates a link to another entity, for which you also can describe conditions using the returned builder.
      * <p>
@@ -693,12 +716,25 @@ public QueryBuilder<T> between(Property<T> property, double value1, double value
         return this;
     }
 
-    public QueryBuilder<T> parameterAlias(String alias) {
+    ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+    //                                                 Bytes
+    ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+    public QueryBuilder<T> equal(Property<T> property, byte[] value) {
         verifyHandle();
-        if (lastCondition == 0) {
-            throw new IllegalStateException("No previous condition. Before you can assign an alias, you must first have a condition.");
-        }
-        nativeSetParameterAlias(lastCondition, alias);
+        checkCombineCondition(nativeEqual(handle, property.getId(), value));
+        return this;
+    }
+
+    public QueryBuilder<T> less(Property<T> property, byte[] value) {
+        verifyHandle();
+        checkCombineCondition(nativeLess(handle, property.getId(), value));
+        return this;
+    }
+
+    public QueryBuilder<T> greater(Property<T> property, byte[] value) {
+        verifyHandle();
+        checkCombineCondition(nativeGreater(handle, property.getId(), value));
         return this;
     }