JDBC 4.2 for LocalTime, LocalDate & LocalDateTime

The follows other recent commits for OffsetDateTime & ZonedDateTime to defer to the driver’s JDBC 4.2 support for JSR 310 objects.

Author: kdubb

src/main/java/org/apache/ibatis/type/LocalDateTimeTypeHandler.java

@@ -1,5 +1,5 @@
 /**
- *    Copyright 2009-2018 the original author or authors.
+ *    Copyright 2009-2019 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -19,7 +19,6 @@
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
-import java.sql.Timestamp;
 import java.time.LocalDateTime;
 
 /**
@@ -31,31 +30,21 @@ public class LocalDateTimeTypeHandler extends BaseTypeHandler<LocalDateTime> {
   @Override
   public void setNonNullParameter(PreparedStatement ps, int i, LocalDateTime parameter, JdbcType jdbcType)
           throws SQLException {
-    ps.setTimestamp(i, Timestamp.valueOf(parameter));
+    ps.setObject(i, parameter);
   }
 
   @Override
   public LocalDateTime getNullableResult(ResultSet rs, String columnName) throws SQLException {
-    Timestamp timestamp = rs.getTimestamp(columnName);
-    return getLocalDateTime(timestamp);
+    return rs.getObject(columnName, LocalDateTime.class);
   }
 
   @Override
   public LocalDateTime getNullableResult(ResultSet rs, int columnIndex) throws SQLException {
-    Timestamp timestamp = rs.getTimestamp(columnIndex);
-    return getLocalDateTime(timestamp);
+    return rs.getObject(columnIndex, LocalDateTime.class);
   }
 
   @Override
   public LocalDateTime getNullableResult(CallableStatement cs, int columnIndex) throws SQLException {
-    Timestamp timestamp = cs.getTimestamp(columnIndex);
-    return getLocalDateTime(timestamp);
-  }
-
-  private static LocalDateTime getLocalDateTime(Timestamp timestamp) {
-    if (timestamp != null) {
-      return timestamp.toLocalDateTime();
-    }
-    return null;
+    return cs.getObject(columnIndex, LocalDateTime.class);
   }
 }

src/main/java/org/apache/ibatis/type/LocalDateTypeHandler.java

@@ -1,5 +1,5 @@
 /**
- *    Copyright 2009-2018 the original author or authors.
+ *    Copyright 2009-2019 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -16,7 +16,6 @@
 package org.apache.ibatis.type;
 
 import java.sql.CallableStatement;
-import java.sql.Date;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -31,31 +30,21 @@ public class LocalDateTypeHandler extends BaseTypeHandler<LocalDate> {
   @Override
   public void setNonNullParameter(PreparedStatement ps, int i, LocalDate parameter, JdbcType jdbcType)
           throws SQLException {
-    ps.setDate(i, Date.valueOf(parameter));
+    ps.setObject(i, parameter);
   }
 
   @Override
   public LocalDate getNullableResult(ResultSet rs, String columnName) throws SQLException {
-    Date date = rs.getDate(columnName);
-    return getLocalDate(date);
+    return rs.getObject(columnName, LocalDate.class);
   }
 
   @Override
   public LocalDate getNullableResult(ResultSet rs, int columnIndex) throws SQLException {
-    Date date = rs.getDate(columnIndex);
-    return getLocalDate(date);
+    return rs.getObject(columnIndex, LocalDate.class);
   }
 
   @Override
   public LocalDate getNullableResult(CallableStatement cs, int columnIndex) throws SQLException {
-    Date date = cs.getDate(columnIndex);
-    return getLocalDate(date);
-  }
-
-  private static LocalDate getLocalDate(Date date) {
-    if (date != null) {
-      return date.toLocalDate();
-    }
-    return null;
+    return cs.getObject(columnIndex, LocalDate.class);
   }
 }

src/main/java/org/apache/ibatis/type/LocalTimeTypeHandler.java

@@ -1,5 +1,5 @@
 /**
- *    Copyright 2009-2018 the original author or authors.
+ *    Copyright 2009-2019 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -19,7 +19,6 @@
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
-import java.sql.Time;
 import java.time.LocalTime;
 
 /**
@@ -31,31 +30,21 @@ public class LocalTimeTypeHandler extends BaseTypeHandler<LocalTime> {
   @Override
   public void setNonNullParameter(PreparedStatement ps, int i, LocalTime parameter, JdbcType jdbcType)
           throws SQLException {
-    ps.setTime(i, Time.valueOf(parameter));
+    ps.setObject(i, parameter);
   }
 
   @Override
   public LocalTime getNullableResult(ResultSet rs, String columnName) throws SQLException {
-    Time time = rs.getTime(columnName);
-    return getLocalTime(time);
+    return rs.getObject(columnName, LocalTime.class);
   }
 
   @Override
   public LocalTime getNullableResult(ResultSet rs, int columnIndex) throws SQLException {
-    Time time = rs.getTime(columnIndex);
-    return getLocalTime(time);
+    return rs.getObject(columnIndex, LocalTime.class);
   }
 
   @Override
   public LocalTime getNullableResult(CallableStatement cs, int columnIndex) throws SQLException {
-    Time time = cs.getTime(columnIndex);
-    return getLocalTime(time);
-  }
-
-  private static LocalTime getLocalTime(Time time) {
-    if (time != null) {
-      return time.toLocalTime();
-    }
-    return null;
+    return cs.getObject(columnIndex, LocalTime.class);
   }
 }

src/test/java/org/apache/ibatis/type/LocalDateTimeTypeHandlerTest.java

@@ -18,7 +18,6 @@
 import static org.junit.jupiter.api.Assertions.*;
 import static org.mockito.Mockito.*;
 
-import java.sql.Timestamp;
 import java.time.LocalDateTime;
 
 import org.junit.jupiter.api.Test;
@@ -27,59 +26,58 @@ class LocalDateTimeTypeHandlerTest extends BaseTypeHandlerTest {
 
   private static final TypeHandler<LocalDateTime> TYPE_HANDLER = new LocalDateTimeTypeHandler();
   private static final LocalDateTime LOCAL_DATE_TIME = LocalDateTime.now();
-  private static final Timestamp TIMESTAMP = Timestamp.valueOf(LOCAL_DATE_TIME);
 
   @Override
   @Test
   public void shouldSetParameter() throws Exception {
     TYPE_HANDLER.setParameter(ps, 1, LOCAL_DATE_TIME, null);
-    verify(ps).setTimestamp(1, TIMESTAMP);
+    verify(ps).setObject(1, LOCAL_DATE_TIME);
   }
 
   @Override
   @Test
   public void shouldGetResultFromResultSetByName() throws Exception {
-    when(rs.getTimestamp("column")).thenReturn(TIMESTAMP);
+    when(rs.getObject("column", LocalDateTime.class)).thenReturn(LOCAL_DATE_TIME);
     assertEquals(LOCAL_DATE_TIME, TYPE_HANDLER.getResult(rs, "column"));
     verify(rs, never()).wasNull();
   }
 
   @Override
   @Test
   public void shouldGetResultNullFromResultSetByName() throws Exception {
-    when(rs.getTimestamp("column")).thenReturn(null);
+    when(rs.getObject("column", LocalDateTime.class)).thenReturn(null);
     assertNull(TYPE_HANDLER.getResult(rs, "column"));
     verify(rs, never()).wasNull();
   }
 
   @Override
   @Test
   public void shouldGetResultFromResultSetByPosition() throws Exception {
-    when(rs.getTimestamp(1)).thenReturn(TIMESTAMP);
+    when(rs.getObject(1, LocalDateTime.class)).thenReturn(LOCAL_DATE_TIME);
     assertEquals(LOCAL_DATE_TIME, TYPE_HANDLER.getResult(rs, 1));
     verify(rs, never()).wasNull();
   }
 
   @Override
   @Test
   public void shouldGetResultNullFromResultSetByPosition() throws Exception {
-    when(rs.getTimestamp(1)).thenReturn(null);
+    when(rs.getObject(1, LocalDateTime.class)).thenReturn(null);
     assertNull(TYPE_HANDLER.getResult(rs, 1));
     verify(rs, never()).wasNull();
   }
 
   @Override
   @Test
   public void shouldGetResultFromCallableStatement() throws Exception {
-    when(cs.getTimestamp(1)).thenReturn(TIMESTAMP);
+    when(cs.getObject(1, LocalDateTime.class)).thenReturn(LOCAL_DATE_TIME);
     assertEquals(LOCAL_DATE_TIME, TYPE_HANDLER.getResult(cs, 1));
     verify(cs, never()).wasNull();
   }
 
   @Override
   @Test
   public void shouldGetResultNullFromCallableStatement() throws Exception {
-    when(cs.getTimestamp(1)).thenReturn(null);
+    when(cs.getObject(1, LocalDateTime.class)).thenReturn(null);
     assertNull(TYPE_HANDLER.getResult(cs, 1));
     verify(cs, never()).wasNull();
   }

src/test/java/org/apache/ibatis/type/LocalDateTypeHandlerTest.java

@@ -18,7 +18,6 @@
 import static org.junit.jupiter.api.Assertions.*;
 import static org.mockito.Mockito.*;
 
-import java.sql.Date;
 import java.time.LocalDate;
 
 import org.junit.jupiter.api.Test;
@@ -27,59 +26,58 @@ class LocalDateTypeHandlerTest extends BaseTypeHandlerTest {
 
   private static final TypeHandler<LocalDate> TYPE_HANDLER = new LocalDateTypeHandler();
   private static final LocalDate LOCAL_DATE = LocalDate.now();
-  private static final Date DATE = Date.valueOf(LOCAL_DATE);
 
   @Override
   @Test
   public void shouldSetParameter() throws Exception {
     TYPE_HANDLER.setParameter(ps, 1, LOCAL_DATE, null);
-    verify(ps).setDate(1, DATE);
+    verify(ps).setObject(1, LOCAL_DATE);
   }
 
   @Override
   @Test
   public void shouldGetResultFromResultSetByName() throws Exception {
-    when(rs.getDate("column")).thenReturn(DATE);
+    when(rs.getObject("column", LocalDate.class)).thenReturn(LOCAL_DATE);
     assertEquals(LOCAL_DATE, TYPE_HANDLER.getResult(rs, "column"));
     verify(rs, never()).wasNull();
   }
 
   @Override
   @Test
   public void shouldGetResultNullFromResultSetByName() throws Exception {
-    when(rs.getDate("column")).thenReturn(null);
+    when(rs.getObject("column", LocalDate.class)).thenReturn(null);
     assertNull(TYPE_HANDLER.getResult(rs, "column"));
     verify(rs, never()).wasNull();
   }
 
   @Override
   @Test
   public void shouldGetResultFromResultSetByPosition() throws Exception {
-    when(rs.getDate(1)).thenReturn(DATE);
+    when(rs.getObject(1, LocalDate.class)).thenReturn(LOCAL_DATE);
     assertEquals(LOCAL_DATE, TYPE_HANDLER.getResult(rs, 1));
     verify(rs, never()).wasNull();
   }
 
   @Override
   @Test
   public void shouldGetResultNullFromResultSetByPosition() throws Exception {
-    when(rs.getDate(1)).thenReturn(null);
+    when(rs.getObject(1, LocalDate.class)).thenReturn(null);
     assertNull(TYPE_HANDLER.getResult(rs, 1));
     verify(rs, never()).wasNull();
   }
 
   @Override
   @Test
   public void shouldGetResultFromCallableStatement() throws Exception {
-    when(cs.getDate(1)).thenReturn(DATE);
+    when(cs.getObject(1, LocalDate.class)).thenReturn(LOCAL_DATE);
     assertEquals(LOCAL_DATE, TYPE_HANDLER.getResult(cs, 1));
     verify(cs, never()).wasNull();
   }
 
   @Override
   @Test
   public void shouldGetResultNullFromCallableStatement() throws Exception {
-    when(cs.getDate(1)).thenReturn(null);
+    when(cs.getObject(1, LocalDate.class)).thenReturn(null);
     assertNull(TYPE_HANDLER.getResult(cs, 1));
     verify(cs, never()).wasNull();
   }

src/test/java/org/apache/ibatis/type/LocalTimeTypeHandlerTest.java

@@ -18,69 +18,66 @@
 import static org.junit.jupiter.api.Assertions.*;
 import static org.mockito.Mockito.*;
 
-import java.sql.Time;
 import java.time.LocalTime;
 
 import org.junit.jupiter.api.Test;
 
 class LocalTimeTypeHandlerTest extends BaseTypeHandlerTest {
 
   private static final TypeHandler<LocalTime> TYPE_HANDLER = new LocalTimeTypeHandler();
-  // java.sql.Time doesn't contain millis, so set nano to 0
-  private static final LocalTime LOCAL_TIME = LocalTime.now().withNano(0);
-  private static final Time TIME = Time.valueOf(LOCAL_TIME);
+  private static final LocalTime LOCAL_TIME = LocalTime.now();
 
   @Override
   @Test
   public void shouldSetParameter() throws Exception {
     TYPE_HANDLER.setParameter(ps, 1, LOCAL_TIME, null);
-    verify(ps).setTime(1, TIME);
+    verify(ps).setObject(1, LOCAL_TIME);
   }
 
   @Override
   @Test
   public void shouldGetResultFromResultSetByName() throws Exception {
-    when(rs.getTime("column")).thenReturn(TIME);
+    when(rs.getObject("column", LocalTime.class)).thenReturn(LOCAL_TIME);
     assertEquals(LOCAL_TIME, TYPE_HANDLER.getResult(rs, "column"));
     verify(rs, never()).wasNull();
   }
 
   @Override
   @Test
   public void shouldGetResultNullFromResultSetByName() throws Exception {
-    when(rs.getTime("column")).thenReturn(null);
+    when(rs.getObject("column", LocalTime.class)).thenReturn(null);
     assertNull(TYPE_HANDLER.getResult(rs, "column"));
     verify(rs, never()).wasNull();
   }
 
   @Override
   @Test
   public void shouldGetResultFromResultSetByPosition() throws Exception {
-    when(rs.getTime(1)).thenReturn(TIME);
+    when(rs.getObject(1, LocalTime.class)).thenReturn(LOCAL_TIME);
     assertEquals(LOCAL_TIME, TYPE_HANDLER.getResult(rs, 1));
     verify(rs, never()).wasNull();
   }
 
   @Override
   @Test
   public void shouldGetResultNullFromResultSetByPosition() throws Exception {
-    when(rs.getTime(1)).thenReturn(null);
+    when(rs.getObject(1, LocalTime.class)).thenReturn(null);
     assertNull(TYPE_HANDLER.getResult(rs, 1));
     verify(rs, never()).wasNull();
   }
 
   @Override
   @Test
   public void shouldGetResultFromCallableStatement() throws Exception {
-    when(cs.getTime(1)).thenReturn(TIME);
+    when(cs.getObject(1, LocalTime.class)).thenReturn(LOCAL_TIME);
     assertEquals(LOCAL_TIME, TYPE_HANDLER.getResult(cs, 1));
     verify(cs, never()).wasNull();
   }
 
   @Override
   @Test
   public void shouldGetResultNullFromCallableStatement() throws Exception {
-    when(cs.getTime(1)).thenReturn(null);
+    when(cs.getObject(1, LocalTime.class)).thenReturn(null);
     assertNull(TYPE_HANDLER.getResult(cs, 1));
     verify(cs, never()).wasNull();
   }