From a330301b6ae717c7e0ab76791382217d3fe06a34 Mon Sep 17 00:00:00 2001 From: Oliver Gierke Date: Fri, 19 Aug 2011 21:11:24 +0200 Subject: [PATCH] SimpleTypeHolder considers Object to be a simple type. --- .../data/mapping/model/SimpleTypeHolder.java | 3 +++ .../data/mapping/SimpleTypeHolderUnitTests.java | 6 ++++++ 2 files changed, 9 insertions(+) diff --git a/spring-data-commons-core/src/main/java/org/springframework/data/mapping/model/SimpleTypeHolder.java b/spring-data-commons-core/src/main/java/org/springframework/data/mapping/model/SimpleTypeHolder.java index dc2949f9d..950b9ab31 100644 --- a/spring-data-commons-core/src/main/java/org/springframework/data/mapping/model/SimpleTypeHolder.java +++ b/spring-data-commons-core/src/main/java/org/springframework/data/mapping/model/SimpleTypeHolder.java @@ -116,6 +116,9 @@ public class SimpleTypeHolder { */ 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/spring-data-commons-core/src/test/java/org/springframework/data/mapping/SimpleTypeHolderUnitTests.java b/spring-data-commons-core/src/test/java/org/springframework/data/mapping/SimpleTypeHolderUnitTests.java index 49c93fbb1..624ebba28 100644 --- a/spring-data-commons-core/src/test/java/org/springframework/data/mapping/SimpleTypeHolderUnitTests.java +++ b/spring-data-commons-core/src/test/java/org/springframework/data/mapping/SimpleTypeHolderUnitTests.java @@ -86,4 +86,10 @@ public class SimpleTypeHolderUnitTests { 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)); + } }