DATAMONGO-2138 - Restrict GeoJson properties

Author: TjeuKayim

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

@@ -237,7 +237,7 @@ class TypedCriteriaBuilder {
 	 * $centerSphere](https://docs.mongodb.com/manual/reference/operator/query/centerSphere/)
 	 * @see Criteria.withinSphere
 	 */
-	infix fun KProperty<*>.withinSphere(circle: Circle) = addOperation { withinSphere(circle) }
+	infix fun KProperty<GeoJson<*>>.withinSphere(circle: Circle) = addOperation { withinSphere(circle) }
 
 	/**
 	 * Creates a geospatial criterion using a $geoWithin operation.
@@ -246,15 +246,15 @@ class TypedCriteriaBuilder {
 	 * $geoWithin](https://docs.mongodb.com/manual/reference/operator/query/geoWithin/)
 	 * @see Criteria.within
 	 */
-	infix fun KProperty<*>.within(shape: Shape) = addOperation { within(shape) }
+	infix fun KProperty<GeoJson<*>>.within(shape: Shape) = addOperation { within(shape) }
 
 	/**
 	 * Creates a geospatial criterion using a $near operation.
 	 *
 	 * See [MongoDB Query operator: $near](https://docs.mongodb.com/manual/reference/operator/query/near/)
 	 * @see Criteria.near
 	 */
-	infix fun KProperty<*>.near(point: Point) = addOperation { near(point) }
+	infix fun KProperty<GeoJson<*>>.near(point: Point) = addOperation { near(point) }
 
 	/**
 	 * Creates a geospatial criterion using a $nearSphere operation. This is only available for Mongo 1.7 and
@@ -264,14 +264,14 @@ class TypedCriteriaBuilder {
 	 * $nearSphere](https://docs.mongodb.com/manual/reference/operator/query/nearSphere/)
 	 * @see Criteria.nearSphere
 	 */
-	infix fun KProperty<*>.nearSphere(point: Point) = addOperation { nearSphere(point) }
+	infix fun KProperty<GeoJson<*>>.nearSphere(point: Point) = addOperation { nearSphere(point) }
 
 	/**
 	 * Creates criterion using `$geoIntersects` operator which matches intersections of the given `geoJson`
 	 * structure and the documents one. Requires MongoDB 2.4 or better.
 	 * @see Criteria.intersects
 	 */
-	infix fun KProperty<*>.intersects(geoJson: GeoJson<*>) = addOperation { intersects(geoJson) }
+	infix fun KProperty<GeoJson<*>>.intersects(geoJson: GeoJson<*>) = addOperation { intersects(geoJson) }
 
 	/**
 	 * Creates a geo-spatial criterion using a $maxDistance operation, for use with $near
@@ -280,14 +280,14 @@ class TypedCriteriaBuilder {
 	 * $maxDistance](https://docs.mongodb.com/manual/reference/operator/query/maxDistance/)
 	 * @see Criteria.maxDistance
 	 */
-	infix fun KProperty<*>.maxDistance(d: Double) = addOperation { maxDistance(d) }
+	infix fun KProperty<GeoJson<*>>.maxDistance(d: Double) = addOperation { maxDistance(d) }
 
 	/**
 	 * Creates a geospatial criterion using a $minDistance operation, for use with $near or
 	 * $nearSphere.
 	 * @see Criteria.minDistance
 	 */
-	infix fun KProperty<*>.minDistance(d: Double) = addOperation { minDistance(d) }
+	infix fun KProperty<GeoJson<*>>.minDistance(d: Double) = addOperation { minDistance(d) }
 
 	/**
 	 * Creates a criterion using the $elemMatch operator

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

@@ -32,18 +32,6 @@ import java.util.regex.Pattern
  */
 class TypedCriteriaExtensionsTests {
 
-	data class Book(
-		val title: String = "Moby-Dick",
-		val price: Int = 123,
-		val available: Boolean = true,
-		val categories: List<String> = emptyList(),
-		val author: Author = Author("Herman Melville")
-	)
-
-	data class Author(
-		val name: String
-	)
-
 	@Test
 	fun `typedQuery should equal Query`() {
 
@@ -272,60 +260,60 @@ class TypedCriteriaExtensionsTests {
 	fun `withinSphere() typed criteria should equal classic criteria`() {
 
 		val value = Circle(Point(1.0, 2.0), 3.0)
-		val typed = typedCriteria { Book::title withinSphere value }
-		val classic = Criteria("title").withinSphere(value)
+		val typed = typedCriteria { Building::location withinSphere value }
+		val classic = Criteria("location").withinSphere(value)
 		assertEqualCriteria(typed, classic)
 	}
 
 	@Test
 	fun `within() typed criteria should equal classic criteria`() {
 
 		val value = Circle(Point(1.0, 2.0), 3.0)
-		val typed = typedCriteria { Book::title within value }
-		val classic = Criteria("title").within(value)
+		val typed = typedCriteria { Building::location within value }
+		val classic = Criteria("location").within(value)
 		assertEqualCriteria(typed, classic)
 	}
 
 	@Test
 	fun `near() typed criteria should equal classic criteria`() {
 
 		val value = Point(1.0, 2.0)
-		val typed = typedCriteria { Book::title near value }
-		val classic = Criteria("title").near(value)
+		val typed = typedCriteria { Building::location near value }
+		val classic = Criteria("location").near(value)
 		assertEqualCriteria(typed, classic)
 	}
 
 	@Test
 	fun `nearSphere() typed criteria should equal classic criteria`() {
 
 		val value = Point(1.0, 2.0)
-		val typed = typedCriteria { Book::title nearSphere value }
-		val classic = Criteria("title").nearSphere(value)
+		val typed = typedCriteria { Building::location nearSphere value }
+		val classic = Criteria("location").nearSphere(value)
 		assertEqualCriteria(typed, classic)
 	}
 
 	@Test
 	fun `intersects() typed criteria should equal classic criteria`() {
 
 		val value = GeoJsonPoint(1.0, 2.0)
-		val typed = typedCriteria { Book::title intersects value }
-		val classic = Criteria("title").intersects(value)
+		val typed = typedCriteria { Building::location intersects value }
+		val classic = Criteria("location").intersects(value)
 		assertEqualCriteria(typed, classic)
 	}
 
 	@Test
 	fun `maxDistance() typed criteria should equal classic criteria`() {
 
-		val typed = typedCriteria { Book::title maxDistance 3.0 }
-		val classic = Criteria("title").maxDistance(3.0)
+		val typed = typedCriteria { Building::location maxDistance 3.0 }
+		val classic = Criteria("location").maxDistance(3.0)
 		assertEqualCriteria(typed, classic)
 	}
 
 	@Test
 	fun `minDistance() typed criteria should equal classic criteria`() {
 
-		val typed = typedCriteria { Book::title minDistance 3.0 }
-		val classic = Criteria("title").minDistance(3.0)
+		val typed = typedCriteria { Building::location minDistance 3.0 }
+		val classic = Criteria("location").minDistance(3.0)
 		assertEqualCriteria(typed, classic)
 	}
 
@@ -452,4 +440,20 @@ class TypedCriteriaExtensionsTests {
 		assertThat(typed.criteriaObject).isEqualTo(classic.criteriaObject)
 		assertThat(typed).isEqualTo(classic)
 	}
+
+	data class Book(
+		val title: String = "Moby-Dick",
+		val price: Int = 123,
+		val available: Boolean = true,
+		val categories: List<String> = emptyList(),
+		val author: Author = Author()
+	)
+
+	data class Author(
+		val name: String = "Herman Melville"
+	)
+
+	data class Building(
+		val location: GeoJsonPoint = GeoJsonPoint(5.481573, 51.451726)
+	)
 }