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

DATADOC-119 improved the converter parsing

Browse Source
This commit is contained in:
Thomas Risberg
2011-05-12 09:18:06 -04:00
parent 0b50e58020
commit 35629f5370
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/config/MappingMongoConverterParser.java
View File

@@ -19,11 +19,13 @@ package org.springframework.data.document.mongodb.config;
import java.util.List;
import java.util.Set;
import org.springframework.beans.BeanMetadataElement;
import org.springframework.beans.MutablePropertyValues;
import org.springframework.beans.factory.BeanDefinitionStoreException;
import org.springframework.beans.factory.NoSuchBeanDefinitionException;
import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.beans.factory.config.BeanDefinitionHolder;
import org.springframework.beans.factory.config.RuntimeBeanNameReference;
import org.springframework.beans.factory.config.RuntimeBeanReference;
import org.springframework.beans.factory.parsing.CompositeComponentDefinition;
import org.springframework.beans.factory.support.AbstractBeanDefinition;
@@ -145,23 +147,21 @@ public class MappingMongoConverterParser extends AbstractBeanDefinitionParser {
return classes;
}
public BeanDefinition parseConverter(Element element, ParserContext parserContext) {
public BeanMetadataElement parseConverter(Element element, ParserContext parserContext) {
String converterRef= element.getAttribute("ref");
if (StringUtils.hasText(converterRef)) {
//TODO: need to make this work for beans not in the registry yet
BeanDefinition converterBean = parserContext.getRegistry().getBeanDefinition(converterRef);
return converterBean;
return new RuntimeBeanReference(converterRef);
}
Element beanElement = DomUtils.getChildElementByTagName(element, "bean");
if (beanElement != null) {
BeanDefinitionHolder beanDef = parserContext.getDelegate().parseBeanDefinitionElement(beanElement);
beanDef = parserContext.getDelegate().decorateBeanDefinitionIfRequired(beanElement, beanDef);
return beanDef.getBeanDefinition();
return beanDef;
}
parserContext.getReaderContext().error(
"Element <converter> must specify either 'ref' or contain a bean definition for the converter", element);
"Element <converter> must specify 'ref' or contain a bean definition for the converter", element);
return null;
}
}

4
spring-data-mongodb/src/test/resources/org/springframework/data/document/mongodb/config/MongoNamespaceTests-context.xml
View File

@@ -12,8 +12,6 @@
<mongo:mongo id="defaultMongo" host="localhost" port="27017"/>
<bean id="readConverter" class="org.springframework.data.document.mongodb.PersonReadConverter"/>
<mongo:mapping-converter>
<mongo:custom-converters>
<mongo:converter ref="readConverter"/>
@@ -23,6 +21,8 @@
</mongo:custom-converters>
</mongo:mapping-converter>
<bean id="readConverter" class="org.springframework.data.document.mongodb.PersonReadConverter"/>
<bean id="mongoTemplate" class="org.springframework.data.document.mongodb.MongoTemplate">
<constructor-arg name="mongo" ref="mongo"/>
<constructor-arg name="databaseName" value="database"/>