DATAMONGO-1008 - DefaultIndexOperations no considers 2dsphere, too.

We now also check for 2dsphere when inspecting index keys and create an geo IndexField in that case.

Original pull request: #210.

Author: christophstrobl

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/DefaultIndexOperations.java

@@ -25,6 +25,7 @@
 import org.springframework.data.mongodb.core.index.IndexField;
 import org.springframework.data.mongodb.core.index.IndexInfo;
 import org.springframework.util.Assert;
+import org.springframework.util.ObjectUtils;
 
 import com.mongodb.DBCollection;
 import com.mongodb.DBObject;
@@ -140,7 +141,7 @@ private List<IndexInfo> getIndexData(List<DBObject> dbObjectList) {
 
 						Object value = keyDbObject.get(key);
 
-						if ("2d".equals(value)) {
+						if (isGeoIndex(value)) {
 							indexFields.add(IndexField.geo(key));
 						} else {
 
@@ -167,4 +168,8 @@ private List<IndexInfo> getIndexData(List<DBObject> dbObjectList) {
 			}
 		});
 	}
+
+	private boolean isGeoIndex(Object indexType) {
+		return ObjectUtils.nullSafeEquals("2d", indexType) || ObjectUtils.nullSafeEquals("2dsphere", indexType);
+	}
 }

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/DefaultIndexOperationsIntegrationTests.java

@@ -0,0 +1,97 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.mongodb.core;
+
+import static org.hamcrest.core.Is.*;
+import static org.junit.Assert.*;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.mongodb.core.index.IndexInfo;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.util.ClassUtils;
+import org.springframework.util.ObjectUtils;
+
+import com.mongodb.BasicDBObject;
+import com.mongodb.DBCollection;
+import com.mongodb.DBObject;
+
+/**
+ * @author Christoph Strobl
+ */
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration("classpath:infrastructure.xml")
+public class DefaultIndexOperationTests {
+
+	private static final String COLLECTION_NAME = ClassUtils.getShortNameAsProperty(DefaultIndexOperationTests.class);
+	private static final DBObject GEO_SPHERE_2D = new BasicDBObject("loaction", "2dsphere");
+
+	@Autowired MongoTemplate template;
+	private DefaultIndexOperations indexOps;
+	private DBCollection collection;
+
+	@Before
+	public void setUp() {
+
+		this.collection = this.template.getDb().getCollection(COLLECTION_NAME);
+		dropAllIndexes();
+
+		indexOps = new DefaultIndexOperations(template, COLLECTION_NAME);
+	}
+
+	/**
+	 * @see DATAMONGO-1008
+	 */
+	@Test
+	public void getIndexInfoShouldBeAbleToRead2dsphereIndex() {
+
+		createIndex(GEO_SPHERE_2D);
+
+		IndexInfo info = findAndReturnIndexInfo(GEO_SPHERE_2D);
+		assertThat(info.getIndexFields().get(0).isGeo(), is(true));
+	}
+
+	private IndexInfo findAndReturnIndexInfo(DBObject keys) {
+		return findAndReturnIndexInfo(indexOps.getIndexInfo(), keys);
+	}
+
+	@SuppressWarnings("deprecation")
+	private IndexInfo findAndReturnIndexInfo(Iterable<IndexInfo> candidates, DBObject keys) {
+		return findAndReturnIndexInfo(candidates, DBCollection.genIndexName(keys));
+	}
+
+	private IndexInfo findAndReturnIndexInfo(Iterable<IndexInfo> candidates, String name) {
+
+		for (IndexInfo info : candidates) {
+			if (ObjectUtils.nullSafeEquals(name, info.getName())) {
+				return info;
+			}
+		}
+		throw new AssertionError(String.format("Index with %s was not found", name));
+	}
+
+	private void createIndex(DBObject keys) {
+		template.getDb().getCollection(COLLECTION_NAME).createIndex(keys);
+	}
+
+	private void dropAllIndexes() {
+		this.collection.dropIndexes();
+	}
+
+}