Spring/spring-data-commons
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Tweaks to BasicMappingContext to remove a circular reference

Browse Source
This commit is contained in:
J. Brisbin
2011-03-11 16:06:09 -06:00
parent 158ee85d93
commit e254dedd96
3 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spring-data-commons-core/src/main/java/org/springframework/data/mapping/BasicMappingConfigurationBuilder.java
View File

@@ -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);
}

4
spring-data-commons-core/src/main/java/org/springframework/data/mapping/BasicMappingContext.java
View File

@@ -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>();

2
spring-data-commons-core/src/main/java/org/springframework/data/mapping/model/MappingConfigurationBuilder.java
View File

@@ -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;