Also fix getTime and getDate

Author: aiguofer

flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/accessor/impl/calendar/ArrowFlightJdbcTimeStampVectorAccessor.java

@@ -160,7 +160,11 @@ public Date getDate(Calendar calendar) {
       return null;
     }
 
-    return new Date(Timestamp.valueOf(localDateTime).getTime());
+    if (calendar != null && !isZoned) {
+      return new Date(getTimstampWithOffset(calendar, localDateTime).getTime());
+    } else {
+      return new Date(Timestamp.valueOf(localDateTime).getTime());
+    }
   }
 
   @Override
@@ -170,7 +174,11 @@ public Time getTime(Calendar calendar) {
       return null;
     }
 
-    return new Time(Timestamp.valueOf(localDateTime).getTime());
+    if (calendar != null && !isZoned) {
+      return new Time(getTimstampWithOffset(calendar, localDateTime).getTime());
+    } else {
+      return new Time(Timestamp.valueOf(localDateTime).getTime());
+    }
   }
 
   @Override
@@ -179,21 +187,32 @@ public Timestamp getTimestamp(Calendar calendar) {
     if (localDateTime == null) {
       return null;
     }
-    // to prevent breaking changes for those using this, apply the offset that was previously
-    // applied in getLocalDateTime
-    if (calendar != null && !isZoned) {
-      TimeZone timeZone = calendar.getTimeZone();
-      long millis = Timestamp.valueOf(localDateTime).getTime();
-      localDateTime =
-          localDateTime.minus(
-              timeZone.getOffset(millis) - this.timeZone.getOffset(millis), ChronoUnit.MILLIS);
 
-      return Timestamp.valueOf(localDateTime);
+    if (calendar != null && !isZoned) {
+      return getTimstampWithOffset(calendar, localDateTime);
     } else {
       return Timestamp.valueOf(localDateTime);
     }
   }
 
+  /**
+   * To prevent breaking changes for those using the legacy JDBC classes, apply the offset that was
+   * previously applied in getLocalDateTime
+   *
+   * @param calendar
+   * @param localDateTime
+   * @return
+   */
+  private Timestamp getTimstampWithOffset(Calendar calendar, LocalDateTime localDateTime) {
+    TimeZone timeZone = calendar.getTimeZone();
+    long millis = Timestamp.valueOf(localDateTime).getTime();
+    localDateTime =
+        localDateTime.minus(
+            timeZone.getOffset(millis) - this.timeZone.getOffset(millis), ChronoUnit.MILLIS);
+
+    return Timestamp.valueOf(localDateTime);
+  }
+
   protected static TimeUnit getTimeUnitForVector(TimeStampVector vector) {
     ArrowType.Timestamp arrowType =
         (ArrowType.Timestamp) vector.getField().getFieldType().getType();