From 8ab42a266c21eb57c406abb5f2f521c8bdf780f4 Mon Sep 17 00:00:00 2001 From: Oliver Gierke Date: Wed, 16 Mar 2011 18:17:14 +0100 Subject: [PATCH] Some tweaks to handling collections and enums. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixed isAssignableFrom(…) usage in BasicPersistentProperty to correctly detect collections and maps. Let MappingBeanHelper treat enums as simple types as well. --- .../springframework/data/mapping/BasicPersistentProperty.java | 4 ++-- .../org/springframework/data/mapping/MappingBeanHelper.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/spring-data-commons-core/src/main/java/org/springframework/data/mapping/BasicPersistentProperty.java b/spring-data-commons-core/src/main/java/org/springframework/data/mapping/BasicPersistentProperty.java index 6ce822ae5..afc860d88 100644 --- a/spring-data-commons-core/src/main/java/org/springframework/data/mapping/BasicPersistentProperty.java +++ b/spring-data-commons-core/src/main/java/org/springframework/data/mapping/BasicPersistentProperty.java @@ -128,13 +128,13 @@ public class BasicPersistentProperty implements PersistentProperty { @Override public boolean isCollection() { - return getType().isAssignableFrom(Collection.class) || getType().isAssignableFrom(List.class) || isArray(); + return Collection.class.isAssignableFrom(getType()) || isArray(); } @Override public boolean isMap() { - return getType().isAssignableFrom(Map.class); + return Map.class.isAssignableFrom(getType()); } /* (non-Javadoc) diff --git a/spring-data-commons-core/src/main/java/org/springframework/data/mapping/MappingBeanHelper.java b/spring-data-commons-core/src/main/java/org/springframework/data/mapping/MappingBeanHelper.java index fcc77a3ec..b9d7609a1 100644 --- a/spring-data-commons-core/src/main/java/org/springframework/data/mapping/MappingBeanHelper.java +++ b/spring-data-commons-core/src/main/java/org/springframework/data/mapping/MappingBeanHelper.java @@ -84,7 +84,7 @@ public abstract class MappingBeanHelper { return true; } } - return false; + return type.isEnum(); } public static T constructInstance(PersistentEntity entity,