From e254dedd96241f92808f0a89cc0b4d254c7785f1 Mon Sep 17 00:00:00 2001
From: "J. Brisbin" <jon@jbrisbin.com>
Date: Fri, 11 Mar 2011 16:06:09 -0600
Subject: [PATCH] Tweaks to BasicMappingContext to remove a circular reference

---
 .../data/mapping/BasicMappingConfigurationBuilder.java    | 8 +-------
 .../springframework/data/mapping/BasicMappingContext.java | 4 ++--
 .../data/mapping/model/MappingConfigurationBuilder.java   | 2 +-
 3 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/spring-data-commons-core/src/main/java/org/springframework/data/mapping/BasicMappingConfigurationBuilder.java b/spring-data-commons-core/src/main/java/org/springframework/data/mapping/BasicMappingConfigurationBuilder.java
index 40f691aa9..7283b1ca0 100644
--- a/spring-data-commons-core/src/main/java/org/springframework/data/mapping/BasicMappingConfigurationBuilder.java
+++ b/spring-data-commons-core/src/main/java/org/springframework/data/mapping/BasicMappingConfigurationBuilder.java
@@ -41,12 +41,6 @@ public class BasicMappingConfigurationBuilder implements MappingConfigurationBui
   protected static ConcurrentMap<Class<?>, BeanInfo> beanInfo = new ConcurrentHashMap<Class<?>, BeanInfo>();
   protected Logger log = LoggerFactory.getLogger(getClass());
 
-  protected MappingContext mappingContext;
-
-  public BasicMappingConfigurationBuilder(MappingContext mappingContext) {
-    this.mappingContext = mappingContext;
-  }
-
   @Override
   public <T> boolean isPersistentEntity(Class<T> type) {
     if (type.isAnnotationPresent(Persistent.class)) {
@@ -68,7 +62,7 @@ public class BasicMappingConfigurationBuilder implements MappingConfigurationBui
 
   @SuppressWarnings({"unchecked"})
   @Override
-  public <T> PersistentEntity<T> createPersistentEntity(Class<T> type) throws MappingConfigurationException {
+  public <T> PersistentEntity<T> createPersistentEntity(Class<T> type, MappingContext mappingContext) throws MappingConfigurationException {
     return new BasicPersistentEntity<T>(mappingContext, type);
   }
 
diff --git a/spring-data-commons-core/src/main/java/org/springframework/data/mapping/BasicMappingContext.java b/spring-data-commons-core/src/main/java/org/springframework/data/mapping/BasicMappingContext.java
index 70e3e9b8b..e354d5151 100644
--- a/spring-data-commons-core/src/main/java/org/springframework/data/mapping/BasicMappingContext.java
+++ b/spring-data-commons-core/src/main/java/org/springframework/data/mapping/BasicMappingContext.java
@@ -51,7 +51,7 @@ public class BasicMappingContext implements MappingContext, InitializingBean {
   protected GenericConversionService conversionService = ConversionServiceFactory.createDefaultConversionService();
 
   public BasicMappingContext() {
-    builder = new BasicMappingConfigurationBuilder(this);
+    builder = new BasicMappingConfigurationBuilder();
   }
 
   public BasicMappingContext(MappingConfigurationBuilder builder) {
@@ -83,7 +83,7 @@ public class BasicMappingContext implements MappingContext, InitializingBean {
   public <T> PersistentEntity<T> addPersistentEntity(Class<T> type) {
     if (null == persistentEntities.get(type.getName())) {
       try {
-        PersistentEntity<T> entity = builder.createPersistentEntity(type);
+        PersistentEntity<T> entity = builder.createPersistentEntity(type, this);
         BeanInfo info = Introspector.getBeanInfo(type);
 
         Map<String, PropertyDescriptor> descriptors = new HashMap<String, PropertyDescriptor>();
diff --git a/spring-data-commons-core/src/main/java/org/springframework/data/mapping/model/MappingConfigurationBuilder.java b/spring-data-commons-core/src/main/java/org/springframework/data/mapping/model/MappingConfigurationBuilder.java
index a1278b570..23f79acd9 100644
--- a/spring-data-commons-core/src/main/java/org/springframework/data/mapping/model/MappingConfigurationBuilder.java
+++ b/spring-data-commons-core/src/main/java/org/springframework/data/mapping/model/MappingConfigurationBuilder.java
@@ -26,7 +26,7 @@ public interface MappingConfigurationBuilder {
 
   <T> boolean isPersistentEntity(Class<T> clazz);
 
-  <T> PersistentEntity<T> createPersistentEntity(Class<T> clazz) throws MappingConfigurationException;
+  <T> PersistentEntity<T> createPersistentEntity(Class<T> clazz, MappingContext mappingContext) throws MappingConfigurationException;
 
   boolean isPersistentProperty(Field field, PropertyDescriptor descriptor) throws MappingConfigurationException;