From 708fa6fea433248e06bb88b9b921fa8e4e31e635 Mon Sep 17 00:00:00 2001
From: Oliver Gierke <ogierke@gopivotal.com>
Date: Thu, 6 Jun 2013 08:49:41 +0200
Subject: [PATCH] DATAGRAPh-354 - Fixed configuration order to ensure correct
 MappingContext initialization.

Fixed test config after refactorings in Spring Data Neo4j core module. Polished pom slightly.
---
 spring-data-neo4j-aspects/pom.xml                            | 1 -
 .../aspects/support/Neo4jGraphPersistenceTests-context.xml   | 5 ++++-
 .../data/neo4j/config/Neo4jConfiguration.java                | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/spring-data-neo4j-aspects/pom.xml b/spring-data-neo4j-aspects/pom.xml
index 67cc0c1b1..f3b1c84ac 100644
--- a/spring-data-neo4j-aspects/pom.xml
+++ b/spring-data-neo4j-aspects/pom.xml
@@ -7,7 +7,6 @@
 
 	<name>Spring Data Neo4j - AspectJ Advanced Mapping</name>
 	<description>Advanced Mapping support for Spring Data Neo4j</description>
-	<version>2.3.0.BUILD-SNAPSHOT</version>
 
 	<parent>
 		<groupId>org.springframework.data</groupId>
diff --git a/spring-data-neo4j-aspects/src/test/resources/org/springframework/data/neo4j/aspects/support/Neo4jGraphPersistenceTests-context.xml b/spring-data-neo4j-aspects/src/test/resources/org/springframework/data/neo4j/aspects/support/Neo4jGraphPersistenceTests-context.xml
index 2a1c46a41..fe5cfdfef 100644
--- a/spring-data-neo4j-aspects/src/test/resources/org/springframework/data/neo4j/aspects/support/Neo4jGraphPersistenceTests-context.xml
+++ b/spring-data-neo4j-aspects/src/test/resources/org/springframework/data/neo4j/aspects/support/Neo4jGraphPersistenceTests-context.xml
@@ -31,7 +31,7 @@
 
     <bean id="conversionService" class="org.springframework.data.neo4j.fieldaccess.Neo4jConversionServiceFactoryBean"/>
     <bean id="indexCreationMappingEventListener" class="org.springframework.data.neo4j.support.mapping.IndexCreationMappingEventListener">
-        <constructor-arg ref="template"/>
+        <constructor-arg ref="indexProvider" />
     </bean>
 
 
@@ -57,6 +57,9 @@
         <constructor-arg name="infrastructure" ref="mappingInfrastructure"/>
     </bean>
 
+	<bean id="indexProvider" class="org.springframework.data.neo4j.support.index.IndexProviderImpl">
+		<constructor-arg ref="graphDatabase" />
+	</bean>
 
     <bean id="entityStateHandler" class="org.springframework.data.neo4j.support.mapping.EntityStateHandler">
         <constructor-arg ref="mappingContext"/>
diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/config/Neo4jConfiguration.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/config/Neo4jConfiguration.java
index ff9a28727..6495b6616 100644
--- a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/config/Neo4jConfiguration.java
+++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/config/Neo4jConfiguration.java
@@ -97,6 +97,7 @@ public abstract class Neo4jConfiguration {
     }
 
     @Bean
+    @DependsOn("neo4jMappingContext")
     public MappingInfrastructureFactoryBean mappingInfrastructure() throws Exception {
         MappingInfrastructureFactoryBean factoryBean = new MappingInfrastructureFactoryBean();
         factoryBean.setGraphDatabaseService(getGraphDatabaseService());
@@ -253,7 +254,6 @@ public abstract class Neo4jConfiguration {
         return new DelegatingGraphDatabase(graphDatabaseService);
     }
 
-    // didn't help @DependsOn({"neo4jTemplate","neo4jTransactionManager","neo4jMappingContext"})
     @Bean
     public ConfigurationCheck configurationCheck() throws Exception {
         return new ConfigurationCheck(neo4jTemplate(),neo4jTransactionManager());