Add infix extension functions for Property condition methods.

Author: greenrobot-team

objectbox-kotlin/src/main/kotlin/io/objectbox/kotlin/Property.kt

@@ -0,0 +1,165 @@
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+@file:Suppress("unused") // Public API.
+
+package io.objectbox.kotlin
+
+import io.objectbox.Property
+import io.objectbox.query.PropertyQueryCondition
+import java.util.*
+
+
+// Boolean
+/** Creates an "equal ('=')" condition for this property. */
+infix fun <T> Property<T>.equal(value: Boolean): PropertyQueryCondition<T> {
+    return equal(value)
+}
+
+/** Creates a "not equal ('&lt;&gt;')" condition for this property. */
+infix fun <T> Property<T>.notEqual(value: Boolean): PropertyQueryCondition<T> {
+    return notEqual(value)
+}
+
+// IntArray
+/** Creates an "IN (..., ..., ...)" condition for this property. */
+infix fun <T> Property<T>.oneOf(value: IntArray): PropertyQueryCondition<T> {
+    return oneOf(value)
+}
+
+/** Creates a "NOT IN (..., ..., ...)" condition for this property. */
+infix fun <T> Property<T>.notOneOf(value: IntArray): PropertyQueryCondition<T> {
+    return notOneOf(value)
+}
+
+// Long
+/** Creates an "equal ('=')" condition for this property. */
+infix fun <T> Property<T>.equal(value: Long): PropertyQueryCondition<T> {
+    return equal(value)
+}
+
+/** Creates a "not equal ('&lt;&gt;')" condition for this property. */
+infix fun <T> Property<T>.notEqual(value: Long): PropertyQueryCondition<T> {
+    return notEqual(value)
+}
+
+/** Creates a "greater than ('&gt;')" condition for this property. */
+infix fun <T> Property<T>.greater(value: Long): PropertyQueryCondition<T> {
+    return greater(value)
+}
+
+/** Creates a "less than ('&lt;')" condition for this property. */
+infix fun <T> Property<T>.less(value: Long): PropertyQueryCondition<T> {
+    return less(value)
+}
+
+// LongArray
+/** Creates an "IN (..., ..., ...)" condition for this property. */
+infix fun <T> Property<T>.oneOf(value: LongArray): PropertyQueryCondition<T> {
+    return oneOf(value)
+}
+
+/** Creates a "NOT IN (..., ..., ...)" condition for this property. */
+infix fun <T> Property<T>.notOneOf(value: LongArray): PropertyQueryCondition<T> {
+    return notOneOf(value)
+}
+
+// Double
+/** Creates a "greater than ('&gt;')" condition for this property. */
+infix fun <T> Property<T>.greater(value: Double): PropertyQueryCondition<T> {
+    return greater(value)
+}
+
+/** Creates a "less than ('&lt;')" condition for this property. */
+infix fun <T> Property<T>.less(value: Double): PropertyQueryCondition<T> {
+    return less(value)
+}
+
+// Date
+/** Creates an "equal ('=')" condition for this property. */
+infix fun <T> Property<T>.equal(value: Date): PropertyQueryCondition<T> {
+    return equal(value)
+}
+
+/** Creates a "not equal ('&lt;&gt;')" condition for this property. */
+infix fun <T> Property<T>.notEqual(value: Date): PropertyQueryCondition<T> {
+    return notEqual(value)
+}
+
+/** Creates a "greater than ('&gt;')" condition for this property. */
+infix fun <T> Property<T>.greater(value: Date): PropertyQueryCondition<T> {
+    return greater(value)
+}
+
+/** Creates a "less than ('&lt;')" condition for this property. */
+infix fun <T> Property<T>.less(value: Date): PropertyQueryCondition<T> {
+    return less(value)
+}
+
+// String
+/** Creates an "equal ('=')" condition for this property. */
+infix fun <T> Property<T>.equal(value: String): PropertyQueryCondition<T> {
+    return equal(value)
+}
+
+/** Creates a "not equal ('&lt;&gt;')" condition for this property. */
+infix fun <T> Property<T>.notEqual(value: String): PropertyQueryCondition<T> {
+    return notEqual(value)
+}
+
+/** Creates a "greater than ('&gt;')" condition for this property. */
+infix fun <T> Property<T>.greater(value: String): PropertyQueryCondition<T> {
+    return greater(value)
+}
+
+/** Creates a "less than ('&lt;')" condition for this property. */
+infix fun <T> Property<T>.less(value: String): PropertyQueryCondition<T> {
+    return less(value)
+}
+
+infix fun <T> Property<T>.contains(value: String): PropertyQueryCondition<T> {
+    return contains(value)
+}
+
+infix fun <T> Property<T>.startsWith(value: String): PropertyQueryCondition<T> {
+    return startsWith(value)
+}
+
+infix fun <T> Property<T>.endsWith(value: String): PropertyQueryCondition<T> {
+    return endsWith(value)
+}
+
+// Array<String>
+/** Creates an "IN (..., ..., ...)" condition for this property. */
+infix fun <T> Property<T>.oneOf(value: Array<String>): PropertyQueryCondition<T> {
+    return oneOf(value)
+}
+
+// ByteArray
+/** Creates an "equal ('=')" condition for this property. */
+infix fun <T> Property<T>.equal(value: ByteArray): PropertyQueryCondition<T> {
+    return equal(value)
+}
+
+/** Creates a "greater than ('&gt;')" condition for this property. */
+infix fun <T> Property<T>.greater(value: ByteArray): PropertyQueryCondition<T> {
+    return greater(value)
+}
+
+/** Creates a "less than ('&lt;')" condition for this property. */
+infix fun <T> Property<T>.less(value: ByteArray): PropertyQueryCondition<T> {
+    return less(value)
+}

tests/objectbox-java-test/src/test/java/io/objectbox/query/QueryTestK.kt

@@ -1,10 +1,7 @@
 package io.objectbox.query
 
 import io.objectbox.TestEntity_
-import io.objectbox.kotlin.and
-import io.objectbox.kotlin.inValues
-import io.objectbox.kotlin.or
-import io.objectbox.kotlin.query
+import io.objectbox.kotlin.*
 import org.junit.Assert.assertEquals
 import org.junit.Test
 
@@ -36,8 +33,8 @@ class QueryTestK : AbstractQueryTest() {
 
         // suggested query API
         val newQuery = box.query(
-                (TestEntity_.simpleInt.less(12) or TestEntity_.simpleLong.oneOf(longArrayOf(1012)))
-                        and TestEntity_.simpleString.equal("Fry")
+                (TestEntity_.simpleInt less 12 or (TestEntity_.simpleLong oneOf longArrayOf(1012)))
+                        and (TestEntity_.simpleString equal "Fry")
         ).order(TestEntity_.simpleInt).build()
         val resultsNew = newQuery.find()
         assertEquals(2, resultsNew.size)
@@ -46,15 +43,15 @@ class QueryTestK : AbstractQueryTest() {
 
         val newQueryOr = box.query(
                 // (EQ OR EQ) AND LESS
-                (TestEntity_.simpleString.equal("Fry") or TestEntity_.simpleString.equal("Sarah"))
-                        and TestEntity_.simpleInt.less(12)
+                (TestEntity_.simpleString equal "Fry" or (TestEntity_.simpleString equal "Sarah"))
+                        and (TestEntity_.simpleInt less 12)
         ).build().find()
         assertEquals(1, newQueryOr.size) // only the Fry age 10
 
         val newQueryAnd = box.query(
                 // EQ OR (EQ AND LESS)
-                TestEntity_.simpleString.equal("Fry") or
-                        (TestEntity_.simpleString.equal("Sarah") and TestEntity_.simpleInt.less(12))
+                TestEntity_.simpleString equal "Fry" or
+                        (TestEntity_.simpleString equal "Sarah" and (TestEntity_.simpleInt less 12))
         ).build().find()
         assertEquals(3, newQueryAnd.size) // all Fry's
     }
@@ -63,8 +60,8 @@ class QueryTestK : AbstractQueryTest() {
     fun intLessAndGreater() {
         putTestEntitiesScalars()
         val query = box.query(
-                TestEntity_.simpleInt.greater(2003)
-                        and TestEntity_.simpleShort.less(2107)
+                TestEntity_.simpleInt greater 2003
+                        and (TestEntity_.simpleShort less 2107)
         ).build()
         assertEquals(3, query.count())
     }
@@ -84,7 +81,7 @@ class QueryTestK : AbstractQueryTest() {
 
         val valuesInt = intArrayOf(1, 1, 2, 3, 2003, 2007, 2002, -1)
         val query = box.query(
-                TestEntity_.simpleInt.oneOf(valuesInt).alias("int")
+                (TestEntity_.simpleInt oneOf(valuesInt)).alias("int")
         ).build()
         assertEquals(3, query.count())
 
@@ -102,7 +99,7 @@ class QueryTestK : AbstractQueryTest() {
     fun or() {
         putTestEntitiesScalars()
         val query = box.query(
-                TestEntity_.simpleInt.equal(2007) or TestEntity_.simpleLong.equal(3002)
+                TestEntity_.simpleInt equal 2007 or (TestEntity_.simpleLong equal 3002)
         ).build()
         val entities = query.find()
         assertEquals(2, entities.size.toLong())
@@ -115,7 +112,7 @@ class QueryTestK : AbstractQueryTest() {
         putTestEntitiesScalars()
         // Result if OR precedence (wrong): {}, AND precedence (expected): {2008}
         val query = box.query(
-                TestEntity_.simpleInt.equal(2006) and TestEntity_.simpleInt.equal(2007) or TestEntity_.simpleInt.equal(2008)
+                TestEntity_.simpleInt equal 2006 and (TestEntity_.simpleInt equal 2007) or (TestEntity_.simpleInt equal 2008)
         ).build()
         val entities = query.find()
         assertEquals(1, entities.size.toLong())