From 0187e7e0bf78fb70b76a270bea1dc92baae3f9df Mon Sep 17 00:00:00 2001
From: loong0306 <loong0306@gmail.com>
Date: Thu, 3 Aug 2023 12:44:51 +0800
Subject: [PATCH] feat: optimize

---
 .../main/java/com/mybatisflex/core/field/FieldQueryManager.java | 2 ++
 .../src/main/java/com/mybatisflex/core/util/DateUtil.java       | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/mybatis-flex-core/src/main/java/com/mybatisflex/core/field/FieldQueryManager.java b/mybatis-flex-core/src/main/java/com/mybatisflex/core/field/FieldQueryManager.java
index 8a20665a..59f586d2 100644
--- a/mybatis-flex-core/src/main/java/com/mybatisflex/core/field/FieldQueryManager.java
+++ b/mybatis-flex-core/src/main/java/com/mybatisflex/core/field/FieldQueryManager.java
@@ -111,6 +111,8 @@ public class FieldQueryManager {
             } else if (fieldType == Set.class) {
                 return Collections.emptySet();
             }
+            // avoid NPE
+            return ClassUtil.newInstance(fieldType);
         }
 
         if (ClassUtil.canInstance(fieldType.getModifiers())) {
diff --git a/mybatis-flex-core/src/main/java/com/mybatisflex/core/util/DateUtil.java b/mybatis-flex-core/src/main/java/com/mybatisflex/core/util/DateUtil.java
index ded74b61..93eacd6d 100644
--- a/mybatis-flex-core/src/main/java/com/mybatisflex/core/util/DateUtil.java
+++ b/mybatis-flex-core/src/main/java/com/mybatisflex/core/util/DateUtil.java
@@ -41,7 +41,7 @@ public class DateUtil {
     public static final String dateMillisecondPattern = "yyyy-MM-dd HH:mm:ss SSS";
     public static final String dateCSTPattern = "EEE MMM dd HH:mm:ss zzz yyyy";
 
-    private static final ThreadLocal<HashMap<String, SimpleDateFormat>> TL = ThreadLocal.withInitial(() -> new HashMap<>());
+    private static final ThreadLocal<HashMap<String, SimpleDateFormat>> TL = ThreadLocal.withInitial(HashMap::new);
 
     private static final Map<String, DateTimeFormatter> dateTimeFormatters = new ConcurrentHashMap<>();