From e23d73d55e983ff50e7724904657c5b4a704f304 Mon Sep 17 00:00:00 2001
From: Oliver Gierke <ogierke@gopivotal.com>
Date: Sun, 12 May 2013 23:50:42 +0200
Subject: [PATCH] DATACMNS-379 - Adapt to changes in Spring Data Commons.

---
 pom.xml                                            |  9 ++++++++-
 .../config/MappingMongoConverterParser.java        |  1 +
 .../convert/MappingMongoConverterUnitTests.java    |  3 +--
 .../core/mapping/MongoMappingContextUnitTests.java | 14 --------------
 4 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/pom.xml b/pom.xml
index 9ebfc0dce..bf927ecbd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
 	<properties>
 		<project.type>multi</project.type>
 		<dist.id>spring-data-mongodb</dist.id>
-		<springdata.commons>1.5.1.RELEASE</springdata.commons>
+		<springdata.commons>1.5.2.BUILD-SNAPSHOT</springdata.commons>
 		<mongo>2.10.1</mongo>
 	</properties>
 	
@@ -89,4 +89,11 @@
 		</dependency>
 	</dependencies>
 
+	<repositories>
+		<repository>
+			<id>spring-libs-snapshot</id>
+			<url>http://repo.springsource.org/libs-snapshot-local</url>
+		</repository>
+	</repositories>
+
 </project>
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MappingMongoConverterParser.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MappingMongoConverterParser.java
index 94fcc7df4..d2c7bcd9b 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MappingMongoConverterParser.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MappingMongoConverterParser.java
@@ -118,6 +118,7 @@ public class MappingMongoConverterParser implements BeanDefinitionParser {
 					.genericBeanDefinition(MongoPersistentEntityIndexCreator.class);
 			indexHelperBuilder.addConstructorArgReference(ctxRef);
 			indexHelperBuilder.addConstructorArgReference(dbFactoryRef);
+			indexHelperBuilder.addDependsOn(ctxRef);
 
 			parserContext.registerBeanComponent(new BeanComponentDefinition(indexHelperBuilder.getBeanDefinition(),
 					INDEX_HELPER));
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/MappingMongoConverterUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/MappingMongoConverterUnitTests.java
index 65be46cf9..9dcb99454 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/MappingMongoConverterUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/MappingMongoConverterUnitTests.java
@@ -45,7 +45,6 @@ import org.mockito.Mock;
 import org.mockito.runners.MockitoJUnitRunner;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.ApplicationContext;
-import org.springframework.context.event.ContextRefreshedEvent;
 import org.springframework.core.convert.converter.Converter;
 import org.springframework.data.annotation.Id;
 import org.springframework.data.annotation.PersistenceConstructor;
@@ -88,7 +87,7 @@ public class MappingMongoConverterUnitTests {
 
 		mappingContext = new MongoMappingContext();
 		mappingContext.setApplicationContext(context);
-		mappingContext.onApplicationEvent(new ContextRefreshedEvent(context));
+		mappingContext.afterPropertiesSet();
 
 		converter = new MappingMongoConverter(factory, mappingContext);
 		converter.afterPropertiesSet();
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/MongoMappingContextUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/MongoMappingContextUnitTests.java
index 641e4f241..d34a1c667 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/MongoMappingContextUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/MongoMappingContextUnitTests.java
@@ -18,7 +18,6 @@ package org.springframework.data.mongodb.core.mapping;
 import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.*;
 
-import java.lang.reflect.Field;
 import java.util.AbstractMap;
 import java.util.Collections;
 import java.util.Map;
@@ -29,9 +28,7 @@ import org.mockito.Mock;
 import org.mockito.runners.MockitoJUnitRunner;
 import org.springframework.context.ApplicationContext;
 import org.springframework.data.annotation.Id;
-import org.springframework.data.mapping.context.AbstractMappingContext;
 import org.springframework.data.mapping.model.MappingException;
-import org.springframework.util.ReflectionUtils;
 
 import com.mongodb.DBRef;
 
@@ -69,17 +66,6 @@ public class MongoMappingContextUnitTests {
 		assertThat(context.getPersistentEntity(DBRef.class), is(nullValue()));
 	}
 
-	@Test
-	public void populatesAbstractMappingContextsApplicationCorrectly() {
-
-		MongoMappingContext context = new MongoMappingContext();
-		context.setApplicationContext(applicationContext);
-
-		Field field = ReflectionUtils.findField(AbstractMappingContext.class, "applicationContext");
-		ReflectionUtils.makeAccessible(field);
-		assertThat(ReflectionUtils.getField(field, context), is(notNullValue()));
-	}
-
 	/**
 	 * @see DATAMONGO-638
 	 */