From e47ddf4bf27285f0da146401039b72a992f20d19 Mon Sep 17 00:00:00 2001
From: Oliver Gierke <info@olivergierke.de>
Date: Mon, 13 Jun 2011 13:23:33 -0700
Subject: [PATCH] Polished MonogoPersistentEntityIndexCreator.

Fixed generics warnings and the index key being set to the field name in any case now. setting the index name is now only affecting the name.
---
 .../MongoPersistentEntityIndexCreator.java    | 34 +++++++++++--------
 .../event/MongoMappingEventPublisher.java     |  7 ++--
 2 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/mapping/MongoPersistentEntityIndexCreator.java b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/mapping/MongoPersistentEntityIndexCreator.java
index 3e1730e75..b37b1b217 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/mapping/MongoPersistentEntityIndexCreator.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/mapping/MongoPersistentEntityIndexCreator.java
@@ -36,7 +36,6 @@ import org.springframework.data.document.mongodb.index.Indexed;
 import org.springframework.data.document.mongodb.query.GeospatialIndex;
 import org.springframework.data.mapping.PropertyHandler;
 import org.springframework.data.mapping.event.MappingContextEvent;
-import org.springframework.data.mapping.model.PersistentProperty;
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 
@@ -47,14 +46,19 @@ import org.springframework.util.StringUtils;
  * @author Jon Brisbin <jbrisbin@vmware.com>
  * @author Oliver Gierke
  */
-public class MongoPersistentEntityIndexCreator implements ApplicationListener<MappingContextEvent> {
+public class MongoPersistentEntityIndexCreator implements ApplicationListener<MappingContextEvent<MongoPersistentEntity<MongoPersistentProperty>, MongoPersistentProperty>> {
 
 	private static final Log log = LogFactory.getLog(MongoPersistentEntityIndexCreator.class);
 
-	private Set<Class<?>> classesSeen = Collections.newSetFromMap(new ConcurrentHashMap<Class<?>, Boolean>());
-
+	private final Set<Class<?>> classesSeen = Collections.newSetFromMap(new ConcurrentHashMap<Class<?>, Boolean>());
 	private final MongoDbFactory mongoDbFactory;
 
+	/**
+	 * Creats a new {@link MongoPersistentEntityIndexCreator} for the given {@link MongoMappingContext} and {@link MongoDbFactory}.
+	 * 
+	 * @param mappingContext must not be {@@iteral null}
+	 * @param mongoDbFactory must not be {@@iteral null}
+	 */
 	public MongoPersistentEntityIndexCreator(MongoMappingContext mappingContext, MongoDbFactory mongoDbFactory) {
 
 		Assert.notNull(mongoDbFactory);
@@ -66,11 +70,12 @@ public class MongoPersistentEntityIndexCreator implements ApplicationListener<Ma
 		}
 	}
 
-	/* (non-Javadoc)
-		* @see org.springframework.context.ApplicationListener#onApplicationEvent(org.springframework.context.ApplicationEvent)
-		*/
-	public void onApplicationEvent(MappingContextEvent event) {
-		checkForIndexes((MongoPersistentEntity<?>) event.getPersistentEntity());
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.context.ApplicationListener#onApplicationEvent(org.springframework.context.ApplicationEvent)
+	 */
+	public void onApplicationEvent(MappingContextEvent<MongoPersistentEntity<MongoPersistentProperty>, MongoPersistentProperty> event) {
+		checkForIndexes(event.getPersistentEntity());
 	}
 
 	protected void checkForIndexes(final MongoPersistentEntity<?> entity) {
@@ -96,13 +101,13 @@ public class MongoPersistentEntityIndexCreator implements ApplicationListener<Ma
 				}
 			}
 
-			entity.doWithProperties(new PropertyHandler() {
-				public void doWithPersistentProperty(PersistentProperty persistentProperty) {
+			entity.doWithProperties(new PropertyHandler<MongoPersistentProperty>() {
+				public void doWithPersistentProperty(MongoPersistentProperty persistentProperty) {
 					Field field = persistentProperty.getField();
 					if (field.isAnnotationPresent(Indexed.class)) {
 						Indexed index = field.getAnnotation(Indexed.class);
 						String name = index.name();
-						if ("".equals(name)) {
+						if (!StringUtils.hasText(name)) {
 							name = field.getName();
 						} else {
 							if (!name.equals(field.getName()) && index.unique() && !index.sparse()) {
@@ -122,9 +127,9 @@ public class MongoPersistentEntityIndexCreator implements ApplicationListener<Ma
 
 						GeoSpatialIndexed index = field.getAnnotation(GeoSpatialIndexed.class);
 
-						GeospatialIndex indexObject = new GeospatialIndex(StringUtils.hasText(index.name()) ? index.name() : field
-								.getName());
+						GeospatialIndex indexObject = new GeospatialIndex(persistentProperty.getFieldName());
 						indexObject.withMin(index.min()).withMax(index.max());
+						indexObject.named(StringUtils.hasText(index.name()) ? index.name() : field.getName());
 
 						String collection = StringUtils.hasText(index.collection()) ? index.collection() : entity.getCollection();
 						mongoDbFactory.getDb().getCollection(collection).ensureIndex(indexObject.getIndexKeys(), indexObject.getIndexOptions());
@@ -139,7 +144,6 @@ public class MongoPersistentEntityIndexCreator implements ApplicationListener<Ma
 
 			classesSeen.add(type);
 		}
-
 	}
 
 	protected void ensureIndex(String collection,
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/mapping/event/MongoMappingEventPublisher.java b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/mapping/event/MongoMappingEventPublisher.java
index 29c31f6d9..6974a1197 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/mapping/event/MongoMappingEventPublisher.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/mapping/event/MongoMappingEventPublisher.java
@@ -18,7 +18,9 @@ package org.springframework.data.document.mongodb.mapping.event;
 
 import org.springframework.context.ApplicationEvent;
 import org.springframework.context.ApplicationEventPublisher;
+import org.springframework.data.document.mongodb.mapping.MongoPersistentEntity;
 import org.springframework.data.document.mongodb.mapping.MongoPersistentEntityIndexCreator;
+import org.springframework.data.document.mongodb.mapping.MongoPersistentProperty;
 import org.springframework.data.mapping.event.MappingContextEvent;
 
 /**
@@ -32,10 +34,11 @@ public class MongoMappingEventPublisher implements ApplicationEventPublisher {
 		this.indexCreator = indexCreator;
 	}
 
+	@SuppressWarnings("unchecked")
 	public void publishEvent(ApplicationEvent event) {
 		if (event instanceof MappingContextEvent) {
-			indexCreator.onApplicationEvent((MappingContextEvent<?, ?>) event);
+			indexCreator
+					.onApplicationEvent((MappingContextEvent<MongoPersistentEntity<MongoPersistentProperty>, MongoPersistentProperty>) event);
 		}
 	}
-
 }