From 09ed4aaf240125b247f22840a7356ba3e97c92e1 Mon Sep 17 00:00:00 2001
From: Oliver Gierke <info@olivergierke.de>
Date: Mon, 23 Jul 2012 16:41:28 +0200
Subject: [PATCH] DATAMONGO-489 - Ensure read collections get converted to
 appropriate target type.

When reading BasicDBLists we now make sure the resulting collection is converted into the actual target type eventually. It might be an array and thus need an additional round of massaging before being returned as value.
---
 .../core/convert/MappingMongoConverter.java   |  4 ++--
 .../MappingMongoConverterUnitTests.java       | 22 +++++++++++++++++++
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/MappingMongoConverter.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/MappingMongoConverter.java
index da069ad6f..759d2f74e 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/MappingMongoConverter.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/MappingMongoConverter.java
@@ -728,7 +728,7 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 	 * @return the converted {@link Collections}, will never be {@literal null}.
 	 */
 	@SuppressWarnings("unchecked")
-	private Collection<?> readCollectionOrArray(TypeInformation<?> targetType, BasicDBList sourceValue) {
+	private Object readCollectionOrArray(TypeInformation<?> targetType, BasicDBList sourceValue) {
 
 		Assert.notNull(targetType);
 
@@ -750,7 +750,7 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
 			}
 		}
 
-		return items;
+		return getPotentiallyConvertedSimpleRead(items, targetType.getType());
 	}
 
 	/**
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/MappingMongoConverterUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/MappingMongoConverterUnitTests.java
index 49b05d912..5c31cec92 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/MappingMongoConverterUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/MappingMongoConverterUnitTests.java
@@ -1095,6 +1095,27 @@ public class MappingMongoConverterUnitTests {
 		assertThat(result.complexId.innerId, is(4711L));
 	}
 
+	/**
+	 * @see DATAMONGO-489
+	 */
+	@Test
+	public void readsArraysAsMapValuesCorrectly() {
+
+		BasicDBList list = new BasicDBList();
+		list.add("Foo");
+		list.add("Bar");
+
+		DBObject map = new BasicDBObject("key", list);
+		DBObject wrapper = new BasicDBObject("mapOfStrings", map);
+
+		ClassWithMapProperty result = converter.read(ClassWithMapProperty.class, wrapper);
+		assertThat(result.mapOfStrings, is(notNullValue()));
+
+		String[] values = result.mapOfStrings.get("key");
+		assertThat(values, is(notNullValue()));
+		assertThat(values, is(arrayWithSize(2)));
+	}
+
 	static class GenericType<T> {
 		T content;
 	}
@@ -1156,6 +1177,7 @@ public class MappingMongoConverterUnitTests {
 		Map<Locale, String> map;
 		Map<String, List<String>> mapOfLists;
 		Map<String, Object> mapOfObjects;
+		Map<String, String[]> mapOfStrings;
 	}
 
 	static class ClassWithNestedMaps {