DATAMONGO-2138 - TypedCriteria.chain()

Author: TjeuKayim

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

@@ -35,11 +35,15 @@ import kotlin.reflect.KProperty1
  * @since 2.2
  */
 class TypedCriteria(
-	val operation: Criteria.() -> Criteria,
-	property: KProperty<*>? = null
+	private val operation: Criteria.() -> Criteria,
+	private val property: KProperty<*>? = null
 ) : CriteriaDefinition {
-	val name = property?.let(::nestedFieldName)
-	val criteria by lazy { operation(name?.let(::Criteria) ?: Criteria()) }
+	val criteria by lazy { chain(Criteria()) }
+
+	fun chain(start: Criteria): Criteria {
+		return (if (property == null) start else start.and(nestedFieldName(property)))
+			.operation()
+	}
 
 	override fun getCriteriaObject(): Document = criteria.criteriaObject
 

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

@@ -28,9 +28,7 @@ import org.springframework.data.mongodb.core.find
  * @see typedQuery
  */
 fun typedCriteria(vararg operations: TypedCriteria): Criteria {
-	return operations.fold(Criteria()) { chain, head ->
-		head.operation(if (head.name == null) chain else chain.and(head.name))
-	}
+	return operations.fold(Criteria()) { chain, operation -> operation.chain(chain) }
 }
 
 /**