DATAMONGO-1139 - MongoQueryCreator now only uses $nearSpherical if non-neutral Metric is used.

Fixed the evaluation of the Distance for a near clause handed into a query method. Previously we evaluated against null, which will never result in true as Distance returns Metrics.NEUTRAL by default.

Author: odrotbohm

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/MongoQueryCreator.java

@@ -25,6 +25,7 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.geo.Distance;
+import org.springframework.data.geo.Metrics;
 import org.springframework.data.geo.Point;
 import org.springframework.data.geo.Shape;
 import org.springframework.data.mapping.context.MappingContext;
@@ -211,7 +212,7 @@ private Criteria from(Part part, MongoPersistentProperty property, Criteria crit
 				if (distance == null) {
 					return criteria.near(point);
 				} else {
-					if (distance.getMetric() != null) {
+					if (!Metrics.NEUTRAL.equals(distance.getMetric())) {
 						criteria.nearSphere(point);
 					} else {
 						criteria.near(point);

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/query/MongoQueryCreatorUnitTests.java

@@ -41,6 +41,7 @@
 import org.springframework.data.geo.Point;
 import org.springframework.data.mapping.context.MappingContext;
 import org.springframework.data.mongodb.core.Person;
+import org.springframework.data.mongodb.core.Venue;
 import org.springframework.data.mongodb.core.convert.MongoConverter;
 import org.springframework.data.mongodb.core.mapping.DBRef;
 import org.springframework.data.mongodb.core.mapping.Field;
@@ -466,6 +467,22 @@ public void shouldCreateRegexWhenUsingNotContainsOnStringProperty() {
 		assertThat(query, is(query(where("username").regex(".*thew.*").not())));
 	}
 
+	/**
+	 * @see DATAMONGO-1139
+	 */
+	@Test
+	public void createsNonShericalNearForDistanceWithDefaultMetric() {
+
+		Point point = new Point(1.0, 1.0);
+		Distance distance = new Distance(1.0);
+
+		PartTree tree = new PartTree("findByLocationNear", Venue.class);
+		MongoQueryCreator creator = new MongoQueryCreator(tree, getAccessor(converter, point, distance), context);
+		Query query = creator.createQuery();
+
+		assertThat(query, is(query(where("location").near(point).maxDistance(1.0))));
+	}
+
 	interface PersonRepository extends Repository<Person, Long> {
 
 		List<Person> findByLocationNearAndFirstname(Point location, Distance maxDistance, String firstname);

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/query/StubParameterAccessor.java

@@ -34,6 +34,7 @@
 class StubParameterAccessor implements MongoParameterAccessor {
 
 	private final Object[] values;
+	private Distance distance;
 
 	/**
 	 * Creates a new {@link ConvertingParameterAccessor} backed by a {@link StubParameterAccessor} simply returning the
@@ -48,7 +49,14 @@ public static ConvertingParameterAccessor getAccessor(MongoWriter<Object> conver
 	}
 
 	public StubParameterAccessor(Object... values) {
+
 		this.values = values;
+
+		for (Object value : values) {
+			if (value instanceof Distance) {
+				this.distance = (Distance) value;
+			}
+		}
 	}
 
 	/*
@@ -88,7 +96,7 @@ public Sort getSort() {
 	 * @see org.springframework.data.mongodb.repository.MongoParameterAccessor#getMaxDistance()
 	 */
 	public Distance getMaxDistance() {
-		return null;
+		return distance;
 	}
 
 	/*