DATAMONGO-2138 - Lambda Syntax for Typed Queries

Author: TjeuKayim

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

@@ -33,23 +33,30 @@ class TypedCriteria(
 	override fun getKey(): String? = criteria.key
 }
 
-fun typedCriteria(vararg typedCriteria: TypedCriteria): CriteriaDefinition {
-	return typedCriteria.fold(Criteria()) { chain, head -> head.operation(chain.and(head.name))}
+fun typedCriteria(criteria: TypedCriteriaBuilder.() -> Unit): CriteriaDefinition {
+	val builder = TypedCriteriaBuilder().apply(criteria)
+	return builder.chain.fold(Criteria()) { chain, head -> head.operation(chain.and(head.name)) }
 }
 
-infix fun <T> KProperty<T>.isEqualTo(value: T) = buildCriteria { isEqualTo(value) }
-infix fun <T> KProperty<T>.ne(value: T) = buildCriteria { ne(value) }
-infix fun <T> KProperty<T>.lt(value: T) = buildCriteria { lt(value) }
-infix fun <T> KProperty<T>.lte(value: T) = buildCriteria { lte(value) }
-infix fun <T> KProperty<T>.gt(value: T) = buildCriteria { gt(value) }
-infix fun <T> KProperty<T>.gte(value: T) = buildCriteria { gte(value) }
-infix fun <T> KProperty<T>.inValues(value: Collection<T>) = buildCriteria { `in`(value) }
-fun <T> KProperty<T>.inValues(vararg o: Any) = buildCriteria { `in`(*o) }
-infix fun <T> KProperty<T>.nin(value: Collection<T>) = buildCriteria { nin(value) }
-fun <T> KProperty<T>.nin(vararg o: Any) = buildCriteria { nin(*o) }
-fun KProperty<Number>.mod(value: Number, remainder: Number) = buildCriteria { mod(value, remainder) }
-infix fun <T : Collection<*>> KProperty<T>.all(value: T) = buildCriteria { all(value) }
-fun <T> KProperty<T>.all(vararg o: Any) = buildCriteria { all(*o) }
-infix fun KProperty<Collection<*>>.size(s: Int) = buildCriteria { size(s) }
-
-private fun <T> KProperty<T>.buildCriteria(operation: Criteria.() -> Criteria) = TypedCriteria(this, operation)
+class TypedCriteriaBuilder {
+	val chain = mutableListOf<TypedCriteria>()
+
+	infix fun <T> KProperty<T>.isEqualTo(value: T) = buildCriteria { isEqualTo(value) }
+	infix fun <T> KProperty<T>.ne(value: T) = buildCriteria { ne(value) }
+	infix fun <T> KProperty<T>.lt(value: T) = buildCriteria { lt(value) }
+	infix fun <T> KProperty<T>.lte(value: T) = buildCriteria { lte(value) }
+	infix fun <T> KProperty<T>.gt(value: T) = buildCriteria { gt(value) }
+	infix fun <T> KProperty<T>.gte(value: T) = buildCriteria { gte(value) }
+	infix fun <T> KProperty<T>.inValues(value: Collection<T>) = buildCriteria { `in`(value) }
+	fun <T> KProperty<T>.inValues(vararg o: Any) = buildCriteria { `in`(*o) }
+	infix fun <T> KProperty<T>.nin(value: Collection<T>) = buildCriteria { nin(value) }
+	fun <T> KProperty<T>.nin(vararg o: Any) = buildCriteria { nin(*o) }
+	fun KProperty<Number>.mod(value: Number, remainder: Number) = buildCriteria { mod(value, remainder) }
+	infix fun <T : Collection<*>> KProperty<T>.all(value: T) = buildCriteria { all(value) }
+	fun <T> KProperty<T>.all(vararg o: Any) = buildCriteria { all(*o) }
+	infix fun KProperty<Collection<*>>.size(s: Int) = buildCriteria { size(s) }
+
+	private fun <T> KProperty<T>.buildCriteria(operation: Criteria.() -> Criteria) {
+		chain.add(TypedCriteria(this, operation))
+	}
+}

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

@@ -19,6 +19,6 @@ package org.springframework.data.mongodb.core.query
  * Create a new Query with one or more TypedCriteria.
  * @author Tjeu Kayim
  */
-fun typedQuery(vararg criteria: TypedCriteria): Query {
-	return Query(typedCriteria(*criteria))
+fun typedQuery(criteria: TypedCriteriaBuilder.() -> Unit): Query {
+	return Query(typedCriteria(criteria))
 }

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

@@ -27,109 +27,109 @@ import org.springframework.data.mongodb.core.mapping.Document
 class TypedCriteriaExtensionsTest {
 	@Test
 	fun `Typed query gt and isEqualTo`() {
-		val typed = typedCriteria(
-			Book::price gt 1100,
+		val typed = typedCriteria {
+			Book::price gt 1100
 			Book::available isEqualTo true
-		)
+		}
 		val classic = Criteria("price").gt(1100)
 			.and("available").isEqualTo(true)
 		assertCriteriaEquals(classic, typed)
 	}
 
 	@Test
 	fun `Typed criteria isEqualTo`() {
-		val typed = Book::name isEqualTo "Moby-Dick"
+		val typed = typedCriteria {Book::name isEqualTo "Moby-Dick"}
 		val classic = Criteria("name").isEqualTo("Moby-Dick")
 		assertCriteriaEquals(classic, typed)
 	}
 
 	@Test
 	fun `Typed criteria ne`() {
-		val typed = Book::name ne "Moby-Dick"
+		val typed = typedCriteria {Book::name ne "Moby-Dick"}
 		val classic = Criteria("name").ne("Moby-Dick")
 		assertCriteriaEquals(classic, typed)
 	}
 
 	@Test
 	fun `Typed criteria lt`() {
-		val typed = Book::price lt 100
+		val typed = typedCriteria {Book::price lt 100}
 		val classic = Criteria("price").lt(100)
 		assertCriteriaEquals(classic, typed)
 	}
 
 	@Test
 	fun `Typed criteria lte`() {
-		val typed = Book::price lte 100
+		val typed = typedCriteria {Book::price lte 100}
 		val classic = Criteria("price").lte(100)
 		assertCriteriaEquals(classic, typed)
 	}
 
 	@Test
 	fun `Typed criteria gt`() {
-		val typed = Book::price gt 100
+		val typed = typedCriteria {Book::price gt 100}
 		val classic = Criteria("price").gt(100)
 		assertCriteriaEquals(classic, typed)
 	}
 
 	@Test
 	fun `Typed criteria gte`() {
-		val typed = Book::price gte 100
+		val typed = typedCriteria {Book::price gte 100}
 		val classic = Criteria("price").gte(100)
 		assertCriteriaEquals(classic, typed)
 	}
 
 	@Test
 	fun `Typed criteria inValues`() {
-		val typed = Book::price.inValues(1, 2, 3)
+		val typed = typedCriteria {Book::price.inValues(1, 2, 3)}
 		val classic = Criteria("price").inValues(1, 2, 3)
 		assertCriteriaEquals(classic, typed)
 	}
 
 	@Test
 	fun `Typed criteria inValues list`() {
-		val typed = Book::price inValues listOf(1, 2, 3)
+		val typed = typedCriteria {Book::price inValues listOf(1, 2, 3)}
 		val classic = Criteria("price").inValues(listOf(1, 2, 3))
 		assertCriteriaEquals(classic, typed)
 	}
 
 	@Test
 	fun `Typed criteria nin`() {
-		val typed = Book::price.nin(1, 2, 3)
+		val typed = typedCriteria {Book::price.nin(1, 2, 3)}
 		val classic = Criteria("price").nin(1, 2, 3)
 		assertCriteriaEquals(classic, typed)
 	}
 
 	@Test
 	fun `Typed criteria nin list`() {
-		val typed = Book::price nin listOf(1, 2, 3)
+		val typed = typedCriteria {Book::price nin listOf(1, 2, 3)}
 		val classic = Criteria("price").nin(listOf(1, 2, 3))
 		assertCriteriaEquals(classic, typed)
 	}
 
 	@Test
 	fun `Typed criteria mod`() {
-		val typed = Book::price.mod(2, 3)
+		val typed = typedCriteria {Book::price.mod(2, 3)}
 		val classic = Criteria("price").mod(2, 3)
 		assertCriteriaEquals(classic, typed)
 	}
 
 	@Test
 	fun `Typed criteria all`() {
-		val typed = Book::authors.all(1, 2, 3)
+		val typed = typedCriteria {Book::authors.all(1, 2, 3)}
 		val classic = Criteria("authors").all(1, 2, 3)
 		assertCriteriaEquals(classic, typed)
 	}
 
 	@Test
 	fun `Typed criteria all list`() {
-		val typed = Book::authors all listOf(1, 2, 3)
+		val typed = typedCriteria {Book::authors all listOf(1, 2, 3)}
 		val classic = Criteria("authors").all(listOf(1, 2, 3))
 		assertCriteriaEquals(classic, typed)
 	}
 
 	@Test
 	fun `Typed criteria size`() {
-		val typed = Book::authors size 4
+		val typed = typedCriteria {Book::authors size 4}
 		val classic = Criteria("authors").size(4)
 		assertCriteriaEquals(classic, typed)
 	}

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

@@ -32,16 +32,16 @@ class TypedQueryExtensionsTest {
 				.and("available").isEqualTo(true)
 		)
 
-		val typed = typedQuery(
-			Book::price gt 1100,
+		val typed = typedQuery {
+			Book::price gt 1100
 			Book::available isEqualTo true
-		)
+		}
 
 		assertEquals(classic.queryObject, typed.queryObject)
 	}
 
 	@Test
 	fun `Typed Query`() {
-		typedQuery(Book::name lte 123)
+		typedQuery { Book::name lte 123 }
 	}
 }