DATAMONGO-2138 - Cleanup code

Author: TjeuKayim

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

@@ -315,7 +315,7 @@ class TypedCriteriaBuilder {
 		addOperation { andDocumentStructureMatches(schema) }
 
 	/**
-	 * Use [BitwiseCriteriaOperators] as gateway to create a criterion using one of the
+	 * Use [Criteria.BitwiseCriteriaOperators] as gateway to create a criterion using one of the
 	 * [bitwise operators](https://docs.mongodb.com/manual/reference/operator/query-bitwise/) like
 	 * `$bitsAllClear`.
 	 *
@@ -358,7 +358,7 @@ class TypedCriteriaBuilder {
 	fun and(vararg builders: TypedCriteria) = addOperatorWithCriteria(builders, Criteria::andOperator)
 
 	private fun addOperatorWithCriteria(builders: Array<out TypedCriteria>, operation: Criteria.(Array<Criteria>) -> Criteria) {
-		val otherCriteria = builders.map { TypedCriteriaBuilder().apply(it) }.map { it.criteria }
+		val otherCriteria = builders.map { typedCriteria(it) }
 		criteria.operation(otherCriteria.toTypedArray())
 	}
 

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

@@ -22,20 +22,17 @@ package org.springframework.data.mongodb.core.query
  * @sample typedCriteriaSample
  * @author Tjeu Kayim
  */
-fun typedCriteria(criteria: TypedCriteria): Criteria {
-	val builder = TypedCriteriaBuilder().apply(criteria)
-	return builder.criteria
-}
+fun typedCriteria(criteria: TypedCriteria): Criteria =
+	TypedCriteriaBuilder().apply(criteria).criteria
 
 /**
  * Shorthand for `Query(typedCriteria())`.
  *
  * @see typedCriteria
  * @author Tjeu Kayim
  */
-fun typedQuery(criteria: TypedCriteria): Query {
-	return Query(typedCriteria(criteria))
-}
+fun typedQuery(criteria: TypedCriteria): Query =
+	Query(typedCriteria(criteria))
 
 private fun typedCriteriaSample() {
 	class Author(val name: String)