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

DATADOC-80 renamed setConverters to setCustomConverters and made signature consistent between Simple and mapping converters

Browse Source
This commit is contained in:
Thomas Risberg
2011-05-18 17:59:42 -04:00
parent bf5fc0ff1f
commit 63d9d35cba
8 changed files with 21 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -125,7 +125,7 @@ public class MappingMongoConverterParser extends AbstractBeanDefinitionParser {
converterBeans.add(parseConverter(listenerElement, parserContext));
}
}
converterBuilder.addPropertyValue("converters", converterBeans);
converterBuilder.addPropertyValue("customConverters", converterBeans);
}
return converterBuilder.getBeanDefinition();

2
spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/convert/MappingMongoConverter.java
View File

@@ -113,7 +113,7 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
*
* @param converters
*/
public void setConverters(List<Converter<?, ?>> converters) {
public void setCustomConverters(List<Converter<?, ?>> converters) {
if (null != converters) {
for (Converter<?, ?> c : converters) {
registerConverter(c);

2
spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/convert/SimpleMongoConverter.java
View File

@@ -171,7 +171,7 @@ public class SimpleMongoConverter extends AbstractMongoConverter implements Init
*
* @param converters
*/
public void setConverters(Set<?> converters) {
public void setCustomConverters(List<Converter<?, ?>> converters) {
for (Object converter : converters) {
boolean added = false;
if (converter instanceof Converter) {

24
spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/SimpleMongoConverterTests.java
View File

@@ -15,22 +15,22 @@
*/
package org.springframework.data.document.mongodb;
import static org.hamcrest.Matchers.*;
import static org.junit.Assert.*;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.notNullValue;
import static org.hamcrest.Matchers.nullValue;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
import java.lang.reflect.Field;
import java.math.BigInteger;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import com.mongodb.BasicDBObject;
import com.mongodb.DBObject;
import com.mongodb.util.JSON;
import org.hamcrest.CoreMatchers;
import org.joda.time.LocalDate;
@@ -42,6 +42,10 @@ import org.springframework.data.document.mongodb.SomeEnumTest.StringEnum;
import org.springframework.data.document.mongodb.convert.SimpleMongoConverter;
import org.springframework.util.ReflectionUtils;
import com.mongodb.BasicDBObject;
import com.mongodb.DBObject;
import com.mongodb.util.JSON;
public class SimpleMongoConverterTests {
static final String SIMPLE_JSON = "{ \"map\" : { \"foo\" : 3 , \"bar\" : 4}, \"number\" : 15 }";
@@ -323,11 +327,11 @@ public class SimpleMongoConverterTests {
@Test
public void convertsJodaTimeTypesCorrectly() {
Set<Converter<?, ?>> converters = new HashSet<Converter<?, ?>>();
List<Converter<?, ?>> converters = new ArrayList<Converter<?, ?>>();
converters.add(new LocalDateToDateConverter());
converters.add(new DateToLocalDateConverter());
converter.setConverters(converters);
converter.setCustomConverters(converters);
AnotherPerson person = new AnotherPerson();
person.birthDate = new LocalDate();

2
spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/TestMongoConfiguration.java
View File

@@ -34,7 +34,7 @@ public class TestMongoConfiguration extends AbstractMongoConfiguration {
List<Converter<?, ?>> converterList = new ArrayList<Converter<?, ?>>();
converterList.add(new org.springframework.data.document.mongodb.PersonReadConverter());
converterList.add(new org.springframework.data.document.mongodb.PersonWriteConverter());
converter.setConverters(converterList);
converter.setCustomConverters(converterList);
}

2
spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/convert/CustomConvertersUnitTests.java
View File

@@ -68,7 +68,7 @@ public class CustomConvertersUnitTests {
when(dbObjectToBarConverter.convert(any(DBObject.class))).thenReturn(new Bar());
converter = new MappingMongoConverter(context);
converter.setConverters(Arrays.asList(barToDBObjectConverter, dbObjectToBarConverter));
converter.setCustomConverters(Arrays.asList(barToDBObjectConverter, dbObjectToBarConverter));
}
@Test

2
spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/mapping/MappingMongoConverterUnitTests.java
View File

@@ -80,7 +80,7 @@ public class MappingMongoConverterUnitTests {
mappingContext.setCustomSimpleTypes(customSimpleTypes);
converter = new MappingMongoConverter(mappingContext);
converter.setConverters(converters);
converter.setCustomConverters(converters);
converter.afterPropertiesSet();
Person person = new Person();

2
spring-data-mongodb/src/test/resources/template-mapping.xml
View File

@@ -16,7 +16,7 @@
<bean id="mappingConverter1" class="org.springframework.data.document.mongodb.convert.MappingMongoConverter">
<constructor-arg ref="mappingContext" />
<property name="converters">
<property name="customConverters">
<list>
<bean class="org.springframework.data.document.mongodb.PersonReadConverter"/>
<bean class="org.springframework.data.document.mongodb.PersonWriteConverter"/>