From d06fbb7626ca5c9e4e7a91ac06a6f2ae186c0f27 Mon Sep 17 00:00:00 2001
From: aa51513 <aa51513@163.com>
Date: 星期六, 15 五月 2021 15:52:04 +0800
Subject: [PATCH] 解决warnings，统一处理finally中return的问题
---
java110-utils/src/main/java/com/java110/utils/util/BeanConvertUtil.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/java110-utils/src/main/java/com/java110/utils/util/BeanConvertUtil.java b/java110-utils/src/main/java/com/java110/utils/util/BeanConvertUtil.java
index b554b43..efc5af4 100644
--- a/java110-utils/src/main/java/com/java110/utils/util/BeanConvertUtil.java
+++ b/java110-utils/src/main/java/com/java110/utils/util/BeanConvertUtil.java
@@ -35,9 +35,9 @@
static {
ConvertUtils.register(new Converter() { //娉ㄥ唽涓�涓棩鏈熻浆鎹㈠櫒
- public Object convert(Class type, Object value) {
+ public <T> T convert(Class<T> type, Object value) {
Date date1 = null;
- if (value instanceof String) {
+ if (value instanceof String && type.getClass().equals(Date.class)) {
String date = (String) value;
SimpleDateFormat sdf = null;
if (date.contains(":")) {
@@ -50,10 +50,11 @@
} catch (ParseException e) {
e.printStackTrace();
}
- return date1;
+ return type.cast(date1);
}
- return value;
+ return null;
}
+
}, Date.class);
@@ -90,14 +91,14 @@
return dstBean;
}
- private static void objectFieldsPutMap(Object dstBean, BeanMap beanMap, Map orgMap) {
+ private static void objectFieldsPutMap(Object dstBean, BeanMap beanMap, Map<String,Object> orgMap) {
//Field[] fields = dstBean.getClass().getDeclaredFields();
Field[] fields = FieldUtils.getAllFields(dstBean.getClass());
for (Field field : fields) {
if (!orgMap.containsKey(field.getName())) {
continue;
}
- Class dstClass = field.getType();
+ Class<?> dstClass = field.getType();
//System.out.println("瀛楁绫诲瀷" + dstClass);
Object value = orgMap.get(field.getName());
--
Gitblit v1.8.0