DATAMONGO-2138 - Create TypedQuery and TypedCriteria

Author: TjeuKayim

spring-data-mongodb/src/main/kotlin/org/springframework/data/mongodb/core/query/TypedCriteria.kt

@@ -0,0 +1,44 @@
+/*
+ * Copyright 2010-2018 the original author or authors.
+ *
+ * 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 org.springframework.data.mongodb.core.query
+
+import org.bson.Document
+import kotlin.reflect.KProperty1
+
+/**
+ * @author Tjeu Kayim
+ */
+class TypedCriteria<DOC> : CriteriaDefinition<DOC> {
+	override fun getCriteriaObject(): Document = chain.criteriaObject
+
+	override fun getKey(): String? = chain.key
+
+	private var chain = Criteria()
+
+	infix fun <T : Any> KProperty1<DOC, T>.gt(value: T) {
+		chain = chain.and(name).gt(value)
+	}
+
+	infix fun <T : Any> KProperty1<DOC, T>.isEqualTo(value: T) {
+		chain = chain.and(name).isEqualTo(value)
+	}
+}
+
+fun <T> typedCriteria(block: TypedCriteria<T>.() -> Unit): CriteriaDefinition<T> {
+	val typedCriteria = TypedCriteria<T>()
+	typedCriteria.block()
+	return typedCriteria
+}

spring-data-mongodb/src/main/kotlin/org/springframework/data/mongodb/core/query/TypedQuery.kt

@@ -0,0 +1,31 @@
+/*
+ * Copyright 2010-2018 the original author or authors.
+ *
+ * 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 org.springframework.data.mongodb.core.query
+
+/**
+ * Type safe query builder.
+ *
+ * @author Tjeu Kayim
+ */
+class TypedQuery<T : Any>(
+	criteria: CriteriaDefinition<T>? = null
+) : GenericQuery<T> {
+	override val query = if (criteria == null) Query() else Query(criteria)
+}
+
+fun <T: Any> typedQuery(block: TypedCriteria<T>.() -> Unit): TypedQuery<T> {
+	return TypedQuery(typedCriteria(block))
+}

spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/query/TypedQueryTest.kt

@@ -0,0 +1,83 @@
+/*
+ * Copyright 2010-2018 the original author or authors.
+ *
+ * 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 org.springframework.data.mongodb.core.query
+
+import com.nhaarman.mockito_kotlin.mock
+import org.bson.types.ObjectId
+import org.junit.Assert.assertEquals
+import org.junit.Test
+import org.springframework.data.mongodb.core.MongoOperations
+import org.springframework.data.mongodb.core.find
+import org.springframework.data.mongodb.core.mapping.Document
+
+/**
+ * @author Tjeu Kayim
+ */
+class TypedQueryTest {
+
+	val operations: MongoOperations = mock()
+
+	@Test
+	fun `Typed query gt and isEqualTo`() {
+		val classic = Criteria("price").gt(1100)
+			.and("available").isEqualTo(true)
+
+		val typed = typedCriteria<Book> {
+			Book::price gt 1100
+			Book::available isEqualTo true
+		}
+
+		assertEquals(classic.criteriaObject, typed.criteriaObject)
+	}
+
+	@Test
+	fun `MongoOperations find by typed query`() {
+		operations.find<Book>(typedQuery { Book::price gt 1100 })
+	}
+
+	@Test
+	fun `Test TypedQuery`() {
+		val classic = Query(
+			Criteria()
+				.and("price").gt(1100)
+				.and("available").isEqualTo(true)
+		)
+
+		val typed = typedQuery<Book> {
+			Book::price gt 1100
+			Book::available isEqualTo true
+		}.query
+
+		assertEquals(classic.queryObject, typed.queryObject)
+	}
+}
+
+@Document("books")
+data class Book(
+	val id: ObjectId,
+	val name: String,
+	val price: Int,
+	val available: Boolean
+)
+
+@Document("books")
+data class AnotherBook(
+	val id: ObjectId,
+	val name: String,
+	val price: Int,
+	val available: Boolean
+)