From 5650b068edd4f6b23639143e7672a31c65772c60 Mon Sep 17 00:00:00 2001 From: Oliver Gierke Date: Fri, 10 Jun 2011 15:03:08 -0700 Subject: [PATCH] =?UTF-8?q?DATACMNS-31=20-=20Added=20null=20check=20to=20S?= =?UTF-8?q?impleTypeHolder.isSimpleType(=E2=80=A6).?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The MappingBeanHelper mentioned in the ticket was recently replaced by SimpleTypeHolder. --- .../springframework/data/mapping/SimpleTypeHolder.java | 1 + .../data/mapping/SimpleTypeHolderUnitTests.java | 9 +++++++++ 2 files changed, 10 insertions(+) diff --git a/spring-data-commons-core/src/main/java/org/springframework/data/mapping/SimpleTypeHolder.java b/spring-data-commons-core/src/main/java/org/springframework/data/mapping/SimpleTypeHolder.java index 05089eb82..c431ff5a6 100644 --- a/spring-data-commons-core/src/main/java/org/springframework/data/mapping/SimpleTypeHolder.java +++ b/spring-data-commons-core/src/main/java/org/springframework/data/mapping/SimpleTypeHolder.java @@ -115,6 +115,7 @@ public class SimpleTypeHolder { * @return */ public boolean isSimpleType(Class type) { + Assert.notNull(type); 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 54605f225..f5356a118 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 @@ -39,6 +39,15 @@ public class SimpleTypeHolderUnitTests { public void rejectsNullOriginal() { new SimpleTypeHolder(new HashSet>(), null); } + + /** + * @see DATACMNS-31 + */ + @Test(expected = IllegalArgumentException.class) + public void rejectsNullTypeForIsSimpleTypeCall() { + SimpleTypeHolder holder = new SimpleTypeHolder(); + holder.isSimpleType(null); + } @Test public void addsDefaultTypes() {