fix #185: improve the accuracy of datetime to milliseconds (v1.1.5) #186

 from CorvusYe/master

fix #185: improve the accuracy of datetime to milliseconds (v1.1.5)

CHANGELOG.md

@@ -23,6 +23,7 @@ This source code is licensed under Apache 2.0 License.
 ## Dependencies upgrade
 - [ ] Springboot 3.x support.
 
+# 1.1.5
 ## Bugfix
 - fix: [#176](https://github.com/nebula-contrib/ngbatis/issues/176) use double quote instead of the original single quote in valuaFmt function
 - fix: [#181](https://github.com/nebula-contrib/ngbatis/issues/181) when node has multi tag, can not update by subclass
@@ -31,6 +32,7 @@ This source code is licensed under Apache 2.0 License.
   - updateByIdBatchSelective
   - updateByIdBatchSelective
   - upsertByIdSelective
+- fix: [#185](https://github.com/nebula-contrib/ngbatis/issues/185) improve the accuracy of datetime to milliseconds
 
 # 1.1.4
 ## Develop behavior change.

README-CN.md

@@ -34,12 +34,12 @@ This source code is licensed under Apache 2.0 License.
         <dependency>
           <groupId>org.nebula-contrib</groupId>
           <artifactId>ngbatis</artifactId>
-          <version>1.1.4</version>
+          <version>1.1.5</version>
         </dependency>
     ```
   - Gradle
     ```groovy
-    implementation 'org.nebula-contrib:ngbatis:1.1.4'
+    implementation 'org.nebula-contrib:ngbatis:1.1.5'
     ```
 ### 参考 [【ngbatis-demo】](./ngbatis-demo)，与springboot无缝集成。在该项目的 test 中还有api的样例。在开发过程中每增加一个特性也都会同步更新ngbatis-demo的用例。
 

README.md

@@ -38,12 +38,12 @@ See [EXECUTION-PROCESS.md](./EXECUTION-PROCESS.md)
         <dependency>
           <groupId>org.nebula-contrib</groupId>
           <artifactId>ngbatis</artifactId>
-          <version>1.1.4</version>
+          <version>1.1.5</version>
         </dependency>
     ```
   - Gradle
     ```groovy
-    implementation 'org.nebula-contrib:ngbatis:1.1.4'
+    implementation 'org.nebula-contrib:ngbatis:1.1.5'
     ```
 
 - Referring to [ngbatis-demo](./ngbatis-demo), which was smoothly integrated with spring-boot. The API examples could be found under the test of it for all features of ngbatis.

ngbatis-demo/src/test/java/ye/weicheng/ngbatis/demo/repository/TimeTestDaoTest.java

@@ -65,7 +65,7 @@ public void selectById() {
     );
 
     Assert.isTrue(
-      Objects.equals(timeTest.getDatetime().toString(), datetime.toString()),
+      Objects.equals(timeTest.getDatetime().getTime(), datetime.getTime()),
       "Datetime must be equal to the value before insertion"
     );
 

pom.xml

@@ -13,7 +13,7 @@
     <name>ngbatis</name>
     <groupId>org.nebula-contrib</groupId>
     <artifactId>ngbatis</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.1.5</version>
 
     <developers>
         <developer>

src/main/java/org/nebula/contrib/ngbatis/binding/DateDeserializer.java

@@ -12,6 +12,7 @@
  * @since 2022-08-29 8:06
  *     Now is history!
  */
+@Deprecated
 public class DateDeserializer implements ObjectSerializer {
 
   @Override

src/main/java/org/nebula/contrib/ngbatis/binding/beetl/functions/ValueFmtFn.java

@@ -20,6 +20,10 @@
  */
 public class ValueFmtFn extends AbstractFunction<Object, Boolean, Boolean, Void, Void, Void> {
 
+  private static final String DATE_FMT = "yyyy-MM-dd";
+  private static final String TIME_FMT = "HH:mm:ss.SSS";
+  private static final String DATETIME_FMT = String.format("%s'T'%s", DATE_FMT, TIME_FMT);
+
   private static boolean escape = true;
 
   private static String parameterQuote = "\"";
@@ -64,10 +68,10 @@ public Object call(Object value, Boolean ifStringLike, Boolean escape) {
         return String.format("%s(%d)", "timestamp", (((Timestamp) value).getTime() / 1000));
       }
 
-      String timePattern = objClass == java.util.Date.class ? "yyyy-MM-dd'T'HH:mm:ss.sss"
-        : objClass == java.sql.Date.class ? "yyyy-MM-dd"
-          : objClass == java.sql.Time.class ? "HH:mm:ss.sss"
-            : "yyyy-MM-dd'T'HH:mm:ss.sss";
+      String timePattern = objClass == java.util.Date.class ? DATETIME_FMT
+        : objClass == java.sql.Date.class ? DATE_FMT
+          : objClass == java.sql.Time.class ? TIME_FMT
+            : DATETIME_FMT;
       SimpleDateFormat sdf = new SimpleDateFormat(timePattern);
 
       String fn = "datetime";

src/main/java/org/nebula/contrib/ngbatis/utils/ResultSetUtil.java

@@ -19,6 +19,7 @@
 import com.vesoft.nebula.client.graph.data.TimeWrapper;
 import com.vesoft.nebula.client.graph.data.ValueWrapper;
 import java.io.UnsupportedEncodingException;
+import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.GregorianCalendar;
@@ -66,7 +67,19 @@ public class ResultSetUtil {
   public static String type_vertex_value = "vertex";
 
   public static String type_edge_value = "edge";
-
+
+  private static final Constructor<GregorianCalendar> CALENDAR_CONSTRUCTOR;
+
+  static {
+    try {
+      CALENDAR_CONSTRUCTOR = GregorianCalendar.class.getDeclaredConstructor(
+        int.class, int.class, int.class, int.class, int.class, int.class, int.class
+      );
+    } catch (NoSuchMethodException e) {
+      throw new RuntimeException(e);
+    }
+  }
+
   /**
    * <p>根据nebula graph本身的类型说明，获取对应的 java对象值。</p>
    * @param value nebula graph 类型数据，（结果集的元素）
@@ -112,16 +125,30 @@ public static <T> T getValue(ValueWrapper valueWrapper, Class<T> resultType) {
     return value;
   }
 
-
   private static Object transformDateTime(DateTimeWrapper dateTime) {
-    return new GregorianCalendar(
-      dateTime.getYear(),
-      dateTime.getMonth() - 1,
-      dateTime.getDay(),
-      dateTime.getHour(),
-      dateTime.getMinute(),
-      dateTime.getSecond()
-    ).getTime();
+    try {
+      CALENDAR_CONSTRUCTOR.setAccessible(true);
+      GregorianCalendar calendar = CALENDAR_CONSTRUCTOR.newInstance(
+        dateTime.getYear(),
+        dateTime.getMonth() - 1,
+        dateTime.getDay(),
+        dateTime.getHour(),
+        dateTime.getMinute(),
+        dateTime.getSecond(),
+        Math.floorDiv(dateTime.getMicrosec(), 1000)
+      );
+      CALENDAR_CONSTRUCTOR.setAccessible(false);
+      return calendar.getTime();
+    } catch (Exception e) {
+      return new GregorianCalendar(
+        dateTime.getYear(),
+        dateTime.getMonth() - 1,
+        dateTime.getDay(),
+        dateTime.getHour(),
+        dateTime.getMinute(),
+        dateTime.getSecond()
+        ).getTime();
+    }
   }
 
   private static Object transformDate(DateWrapper date) {

src/test/java/org/nebula/contrib/ngbatis/binding/DateDeserializerTest.java

@@ -16,6 +16,7 @@
  * @since 2022-06-22 4:44
  * <br>Now is history!
  */
+@Deprecated
 class DateDeserializerTest {
 
   @Test