fixes #137 Typed query isn't type-safe

Author: zigzago

kmongo-annotation-processor/src/test/kotlin/org/litote/kmongo/PathTest.kt

@@ -17,6 +17,7 @@
 package org.litote.kmongo
 
 import org.junit.Test
+import org.litote.kmongo.model.SimpleReferenced2Data
 import org.litote.kmongo.model.SubData2_
 import org.litote.kmongo.model.TestData_
 import org.litote.kmongo.model.other.SimpleReferencedData
@@ -73,7 +74,7 @@ class PathTest {
 
         //check compilation
         if (false)
-            (TestData_.Map2.keyProjection(Locale.ENGLISH) eq SimpleReferencedData()).json
+            (TestData_.Map2.keyProjection(Locale.ENGLISH) eq SimpleReferenced2Data()).json
 
         assertEquals(
             "set.$.labels.zh_CN",

kmongo-property/src/main/kotlin/kotlin/internal/Annotations.kt

@@ -0,0 +1,21 @@
+/*
+ * Copyright (C) 2017/2019 Litote
+ *
+ * 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.
+ */
+
+package kotlin.internal
+
+@Target(AnnotationTarget.TYPE_PARAMETER)
+@Retention(AnnotationRetention.BINARY)
+internal annotation class OnlyInputTypes

kmongo-property/src/main/kotlin/org/litote/kmongo/Filters.kt

@@ -25,6 +25,7 @@ import org.bson.BsonType
 import org.bson.Document
 import org.bson.conversions.Bson
 import java.util.regex.Pattern
+import kotlin.internal.OnlyInputTypes
 import kotlin.reflect.KProperty
 
 /**
@@ -34,9 +35,9 @@ import kotlin.reflect.KProperty
  * @param value     the value
  * @param <T>   the value type
  * @return the filter
- * @mongodb.driver.manual reference/operator/query/eq $eq
+ * @mongodb.driveDr.manual reference/operator/query/eq $eq
  */
-infix fun <T> KProperty<T>.eq(value: T): Bson = Filters.eq(path(), value)
+infix fun <@OnlyInputTypes T, V : T> KProperty<T?>.eq(value: V): Bson = Filters.eq(path(), value)
 
 /**
  * Creates a filter that matches all documents where the value of the property contains the specified value. Note that this doesn't
@@ -52,7 +53,7 @@ infix fun <T> KProperty<T>.eq(value: T): Bson = Filters.eq(path(), value)
  * @return the filter
  * @mongodb.driver.manual reference/operator/query/eq/#op._S_eq
  */
-infix fun <T> KProperty<Collection<T>?>.contains(value: T): Bson = Filters.eq(path(), value)
+infix fun <@OnlyInputTypes T> KProperty<Iterable<T?>?>.contains(value: T): Bson = Filters.eq(path(), value)
 
 /**
  * Creates a filter that matches all documents where the value of the field name does not equal the specified value.
@@ -62,7 +63,7 @@ infix fun <T> KProperty<Collection<T>?>.contains(value: T): Bson = Filters.eq(pa
  * @return the filter
  * @mongodb.driver.manual reference/operator/query/ne $ne
  */
-infix fun <T> KProperty<T>.ne(value: T): Bson = Filters.ne(path(), value)
+infix fun <@OnlyInputTypes T> KProperty<T?>.ne(value: T): Bson = Filters.ne(path(), value)
 
 /**
  * Creates a filter that matches all documents where the value of the given property is less than the specified value.
@@ -72,7 +73,7 @@ infix fun <T> KProperty<T>.ne(value: T): Bson = Filters.ne(path(), value)
  * @return the filter
  * @mongodb.driver.manual reference/operator/query/lt $lt
  */
-infix fun <T> KProperty<T>.lt(item: T): Bson = Filters.lt(path(), item)
+infix fun <@OnlyInputTypes T> KProperty<T?>.lt(item: T): Bson = Filters.lt(path(), item)
 
 /**
  * Creates a filter that matches all documents where the value of the given property is greater than the specified value.
@@ -82,7 +83,7 @@ infix fun <T> KProperty<T>.lt(item: T): Bson = Filters.lt(path(), item)
  * @return the filter
  * @mongodb.driver.manual reference/operator/query/gt $gt
  */
-infix fun <T> KProperty<T>.gt(value: T): Bson = Filters.gt(path(), value)
+infix fun <@OnlyInputTypes T> KProperty<T?>.gt(value: T): Bson = Filters.gt(path(), value)
 
 /**
  * Creates a filter that matches all documents where the value of the given property is less than or equal to the specified value.
@@ -92,7 +93,7 @@ infix fun <T> KProperty<T>.gt(value: T): Bson = Filters.gt(path(), value)
  * @return the filter
  * @mongodb.driver.manual reference/operator/query/lte $lte
  */
-infix fun <T> KProperty<T>.lte(value: T): Bson = Filters.lte(path(), value)
+infix fun <@OnlyInputTypes T> KProperty<T?>.lte(value: T): Bson = Filters.lte(path(), value)
 
 /**
  * Creates a filter that matches all documents where the value of the given property is greater than or equal to the specified value.
@@ -102,7 +103,7 @@ infix fun <T> KProperty<T>.lte(value: T): Bson = Filters.lte(path(), value)
  * @return the filter
  * @mongodb.driver.manual reference/operator/query/gte $gte
  */
-infix fun <T> KProperty<T>.gte(value: T): Bson = Filters.gte(path(), value)
+infix fun <@OnlyInputTypes T> KProperty<T?>.gte(value: T): Bson = Filters.gte(path(), value)
 
 /**
  * Creates a filter that matches all documents where the value of a property equals any value in the list of specified values.
@@ -112,7 +113,7 @@ infix fun <T> KProperty<T>.gte(value: T): Bson = Filters.gte(path(), value)
  * @return the filter
  * @mongodb.driver.manual reference/operator/query/in $in
  */
-infix fun <T> KProperty<T>.`in`(values: Iterable<T>): Bson = Filters.`in`(path(), values)
+infix fun <@OnlyInputTypes T> KProperty<T?>.`in`(values: Iterable<T>): Bson = Filters.`in`(path(), values)
 
 /**
  * Creates a filter that matches all documents where the value of a property equals any value in the list of specified values.
@@ -122,7 +123,8 @@ infix fun <T> KProperty<T>.`in`(values: Iterable<T>): Bson = Filters.`in`(path()
  * @return the filter
  * @mongodb.driver.manual reference/operator/query/in $in
  */
-infix fun <T> KProperty<T>.contains(values: Iterable<T>): Bson = `in`(values)
+@JvmName("inArray")
+infix fun <@OnlyInputTypes T> KProperty<Iterable<T>?>.`in`(values: Iterable<T>): Bson = Filters.`in`(path(), values)
 
 /**
  * Creates a filter that matches all documents where the value of a property does not equal any of the specified values or does not exist.
@@ -132,7 +134,19 @@ infix fun <T> KProperty<T>.contains(values: Iterable<T>): Bson = `in`(values)
  * @return the filter
  * @mongodb.driver.manual reference/operator/query/nin $nin
  */
-infix fun <T> KProperty<T>.nin(values: Iterable<T>): Bson = Filters.nin(path(), values)
+infix fun <@OnlyInputTypes T> KProperty<T?>.nin(values: Iterable<T>): Bson = Filters.nin(path(), values)
+
+/**
+ * Creates a filter that matches all documents where the value of a property does not equal any of the specified values or does not exist.
+ *
+ * @param values    the list of values
+ * @param <T>   the value type
+ * @return the filter
+ * @mongodb.driver.manual reference/operator/query/nin $nin
+ */
+@JvmName("ninArray")
+infix fun <@OnlyInputTypes T> KProperty<Iterable<T>?>.nin(values: Iterable<T>): Bson = Filters.nin(path(), values)
+
 
 /**
  * Creates a filter that performs a logical AND of the provided list of filters.  Note that this will only generate a "$and"
@@ -355,7 +369,7 @@ fun <TExpression> expr(expression: TExpression): Bson = Filters.expr(expression)
  * @return the filter
  * @mongodb.driver.manual reference/operator/query/all $all
  */
-infix fun <T> KProperty<T>.all(values: Iterable<T>): Bson = Filters.all(path(), values)
+infix fun <@OnlyInputTypes T> KProperty<Iterable<T>?>.all(values: Iterable<T>): Bson = Filters.all(path(), values)
 
 /**
  * Creates a filter that matches all documents where the value of a property is an array that contains all the specified values.
@@ -365,7 +379,7 @@ infix fun <T> KProperty<T>.all(values: Iterable<T>): Bson = Filters.all(path(),
  * @return the filter
  * @mongodb.driver.manual reference/operator/query/all $all
  */
-fun <T> KProperty<T>.all(vararg values: T): Bson = Filters.all(path(), *values)
+fun <@OnlyInputTypes T> KProperty<Iterable<T>?>.all(vararg values: T): Bson = Filters.all(path(), *values)
 
 /**
  * Creates a filter that matches all documents containing a property that is an array where at least one member of the array matches the
@@ -375,7 +389,7 @@ fun <T> KProperty<T>.all(vararg values: T): Bson = Filters.all(path(), *values)
  * @return the filter
  * @mongodb.driver.manual reference/operator/query/elemMatch $elemMatch
  */
-infix fun <T> KProperty<Collection<T>>.elemMatch(filter: Bson): Bson = Filters.elemMatch(path(), filter)
+infix fun <T> KProperty<Iterable<T>>.elemMatch(filter: Bson): Bson = Filters.elemMatch(path(), filter)
 
 /**
  * Creates a filter that matches all documents where the value of a property is an array of the specified size.

kmongo-property/src/main/kotlin/org/litote/kmongo/Properties.kt

@@ -33,7 +33,7 @@ operator fun <T0, T1, T2> KProperty1<T0, T1?>.div(p2: KProperty1<T1, T2?>): KPro
  * Returns a collection composed property. For example Friend.addresses / Address.postalCode = "addresses.postalCode".
  */
 @JvmName("divCol")
-operator fun <T0, T1, T2> KProperty1<T0, Collection<T1>?>.div(p2: KProperty1<T1, T2?>): KProperty1<T0, T2?> =
+operator fun <T0, T1, T2> KProperty1<T0, Iterable<T1>?>.div(p2: KProperty1<T1, T2?>): KProperty1<T0, T2?> =
     KPropertyPath(this, p2)
 
 /**
@@ -52,7 +52,7 @@ fun <T> KProperty<T>.path(): String =
 /**
  * Returns a collection property.
  */
-val <T> KProperty1<out Any?, Collection<T>>.colProperty: KCollectionSimplePropertyPath<out Any?, T>
+val <T> KProperty1<out Any?, Iterable<T>>.colProperty: KCollectionSimplePropertyPath<out Any?, T>
     get() = KCollectionSimplePropertyPath(null, this)