From 7a9a897bdb66b2f81b1795212e9f17d365a4a6be Mon Sep 17 00:00:00 2001 From: win777 Date: Fri, 27 Nov 2015 02:03:42 +0000 Subject: [PATCH] =?UTF-8?q?Map=20=EC=B2=98=EB=A6=AC=EB=A5=BC=20=EC=9C=84?= =?UTF-8?q?=ED=95=B4=20canConvert=20=EB=A9=94=EC=86=8C=EB=93=9C=EC=97=90?= =?UTF-8?q?=EC=84=9C=20=EC=A1=B0=EA=B1=B4=EB=AC=B8=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nexacro/spring/data/support/DataSetToObjectConverter.java | 4 ++++ .../nexacro/spring/data/support/ObjectToDataSetConverter.java | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/src/main/java/com/nexacro/spring/data/support/DataSetToObjectConverter.java b/src/main/java/com/nexacro/spring/data/support/DataSetToObjectConverter.java index aa98267..eea6585 100644 --- a/src/main/java/com/nexacro/spring/data/support/DataSetToObjectConverter.java +++ b/src/main/java/com/nexacro/spring/data/support/DataSetToObjectConverter.java @@ -29,6 +29,10 @@ public class DataSetToObjectConverter extends AbstractDataSetConverter implement // support type if(DataSet.class.equals(source) && !List.class.equals(target) && NexacroConverterHelper.isSupportedBean(target)) { return true; + } + + if (DataSet.class.equals(source) && Map.class.isAssignableFrom(target)) { + return true; } return false; diff --git a/src/main/java/com/nexacro/spring/data/support/ObjectToDataSetConverter.java b/src/main/java/com/nexacro/spring/data/support/ObjectToDataSetConverter.java index 961b4e0..b8843ea 100644 --- a/src/main/java/com/nexacro/spring/data/support/ObjectToDataSetConverter.java +++ b/src/main/java/com/nexacro/spring/data/support/ObjectToDataSetConverter.java @@ -30,6 +30,10 @@ public class ObjectToDataSetConverter extends AbstractDataSetConverter implement return true; } + if (Map.class.isAssignableFrom(source) && DataSet.class.equals(target)) { + return true; + } + return false; }