DATAMONGO-298 - CustomConversions now also considers sub-types of Number as simple.

CustomConversions now delegates to MongoSimpleTypes.HOLDER.isSimpleType(…) instead of maintaining an additional list of Mongo-primitive types. Added DBObject to the list of Mongo-primitive types.

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/CustomConversions.java

@@ -17,13 +17,11 @@ package org.springframework.data.mongodb.core.convert;
 
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Date;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Locale;
 import java.util.Set;
 
-import org.bson.types.ObjectId;
 import org.springframework.core.GenericTypeResolver;
 import org.springframework.core.convert.TypeDescriptor;
 import org.springframework.core.convert.converter.Converter;
@@ -37,8 +35,6 @@ import org.springframework.data.mongodb.core.convert.MongoConverters.StringToBig
 import org.springframework.data.mongodb.core.mapping.MongoSimpleTypes;
 import org.springframework.util.Assert;
 
-import com.mongodb.DBObject;
-
 /**
  * Value object to capture custom conversion. That is essentially a {@link List} of converters and some additional logic
  * around them. The converters are pretty much builds up two sets of types which Mongo basic types {@see #MONGO_TYPES}
@@ -50,10 +46,6 @@ import com.mongodb.DBObject;
  */
 public class CustomConversions {
 
-	@SuppressWarnings({ "unchecked" })
-	private static final List<Class<?>> MONGO_TYPES = Arrays.asList(Number.class, Date.class, ObjectId.class,
-			String.class, DBObject.class);
-
 	private final Set<ConvertiblePair> readingPairs;
 	private final Set<ConvertiblePair> writingPairs;
 	private final Set<Class<?>> customSimpleTypes;
@@ -279,8 +271,8 @@ public class CustomConversions {
 	 * @param type
 	 * @return
 	 */
-	private static boolean isMongoBasicType(Class<?> type) {
-		return MONGO_TYPES.contains(type);
+	private boolean isMongoBasicType(Class<?> type) {
+		return MongoSimpleTypes.HOLDER.isSimpleType(type);
 	}
 
 	private enum CustomToStringConverter implements GenericConverter {

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/MongoSimpleTypes.java

@@ -24,6 +24,7 @@ import org.bson.types.CodeWScope;
 import org.bson.types.ObjectId;
 import org.springframework.data.mapping.model.SimpleTypeHolder;
 
+import com.mongodb.DBObject;
 import com.mongodb.DBRef;
 
 /**
@@ -46,6 +47,7 @@ public abstract class MongoSimpleTypes {
 		simpleTypes.add(DBRef.class);
 		simpleTypes.add(ObjectId.class);
 		simpleTypes.add(CodeWScope.class);
+		simpleTypes.add(DBObject.class);
 		MONGO_SIMPLE_TYPES = Collections.unmodifiableSet(simpleTypes);
 	}
 

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/CustomConversionsUnitTests.java

@@ -55,7 +55,7 @@ public class CustomConversionsUnitTests {
 	}
 
 	/**
-	 * @see DATADOC-240
+	 * @see DATAMONGO-240
 	 */
 	@Test
 	public void considersObjectIdToBeSimpleType() {
@@ -68,7 +68,7 @@ public class CustomConversionsUnitTests {
 	}
 	
 	/**
-	 * @see DATADOC-240
+	 * @see DATAMONGO-240
 	 */
 	@Test
 	public void considersCustomConverterForSimpleType() {
@@ -106,7 +106,7 @@ public class CustomConversionsUnitTests {
 	}
 
 	/**
-	 * @see DATADOC-259
+	 * @see DATAMONGO-259
 	 */
 	@Test
 	public void doesNotConsiderTypeSimpleIfOnlyReadConverterIsRegistered() {
@@ -114,6 +114,18 @@ public class CustomConversionsUnitTests {
 		assertThat(conversions.isSimpleType(UUID.class), is(false));
 	}
 	
+	
+	/**
+	 * @see DATAMONGO-298
+	 */
+	@Test
+	public void discoversConvertersForSubtypesOfMongoTypes() {
+		
+		CustomConversions conversions = new CustomConversions(Arrays.asList(StringToIntegerConverter.INSTANCE));
+		assertThat(conversions.hasCustomReadTarget(String.class, Integer.class), is(true));
+		assertThat(conversions.hasCustomWriteTarget(String.class, Integer.class), is(true));
+	}
+	
 	enum UuidToStringConverter implements Converter<UUID, String> {
 		INSTANCE;
 
@@ -142,4 +154,11 @@ public class CustomConversionsUnitTests {
 			return 0L;
 		}
 	}
+	
+	enum StringToIntegerConverter implements Converter<String, Integer> {
+		INSTANCE;
+		public Integer convert(String source) {
+			return 0;
+		}
+	}
 }