complete2

Alexey007gold · Feb 18, 2017 · fbbe2da · fbbe2da
1 parent 2c0b3ed
commit fbbe2da
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 deletions.
diff --git a/...oup/basis/common-datamapper/src/main/java/com/softgroup/common/datamapper/DataMapper.java b/...oup/basis/common-datamapper/src/main/java/com/softgroup/common/datamapper/DataMapper.java
@@ -14,9 +14,9 @@ public interface DataMapper {
 
 	Map convertToMap(Object value);
 
-	<T> T convert(Map map, Class<T> dataType);
+	<T> T convert(Map<String, Object> map, Class<T> dataType);
 
-	//<T> T convert(HashMap map, Class<T> dataType);
+	<T> T convert(Map<String, Object> map, TypeReference<T> dataType);
 
 	<T> T mapData(String data, Class<T> dataType);
 

diff --git a/...is/common-datamapper/src/main/java/com/softgroup/common/datamapper/JacksonDataMapper.java b/...is/common-datamapper/src/main/java/com/softgroup/common/datamapper/JacksonDataMapper.java
@@ -11,6 +11,7 @@
 import com.softgroup.common.exceptions.MapperException;
 
 import java.io.InputStream;
+import java.util.HashMap;
 import java.util.Map;
 
 /**
@@ -43,17 +44,17 @@ public Map convertToMap(final Object value) {
 		}
 	}
 
-//	@Override
-//	public convert(map, dataType) {
-//		try {
-//			return mapper.convertValue(map, dataType);
-//		} catch (Exception ex) {
-//			throw new MapperException("Can't convert map ", ex);
-//		}
-//	}
+	@Override
+	public <T> T convert(Map<String, Object> map, Class<T> dataType) {
+		try {
+			return mapper.convertValue(map, dataType);
+		} catch (Exception ex) {
+			throw new MapperException("Can't convert map ", ex);
+		}
+	}
 
 	@Override
-	public <T> T  convert(Map map, Class<T> dataType) {
+	public <T> T  convert(Map<String, Object> map, TypeReference<T> dataType) {
 		try {
 			return mapper.convertValue(map, dataType);
 		} catch (Exception ex) {