SimpleTypeHolder considers Object to be a simple type.

systay · Aug 19, 2011 · a330301 · a330301
1 parent 2f5c4cd
commit a330301
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/...a-commons-core/src/main/java/org/springframework/data/mapping/model/SimpleTypeHolder.java b/...a-commons-core/src/main/java/org/springframework/data/mapping/model/SimpleTypeHolder.java
@@ -116,6 +116,9 @@ public SimpleTypeHolder(Set<? extends Class<?>> customSimpleTypes, SimpleTypeHol
 	 */
 	public boolean isSimpleType(Class<?> type) {
 		Assert.notNull(type);
+		if (Object.class.equals(type)) {
+			return true;
+		}		
 		for (Class<?> clazz : simpleTypes) {
 			if (type == clazz || clazz.isAssignableFrom(type)) {
 				return true;

diff --git a/...ommons-core/src/test/java/org/springframework/data/mapping/SimpleTypeHolderUnitTests.java b/...ommons-core/src/test/java/org/springframework/data/mapping/SimpleTypeHolderUnitTests.java
@@ -86,4 +86,10 @@ public void createsHolderFromAnotherOneCorrectly() {
 		assertThat(second.isSimpleType(SimpleTypeHolder.class), is(true));
 		assertThat(second.isSimpleType(SimpleTypeHolderUnitTests.class), is(true));
 	}
+
+	@Test
+	public void considersObjectToBeSimpleType() {
+		SimpleTypeHolder holder = new SimpleTypeHolder();
+		assertThat(holder.isSimpleType(Object.class), is(true));
+	}
 }