Fixed bug in null-handling for java.time converters

aaberg · Jan 17, 2025 · 69bc00c · 69bc00c
1 parent 537d73e
commit 69bc00c
Show file tree

Hide file tree

Showing 10 changed files with 73 additions and 2 deletions.
diff --git a/core/src/main/java/org/sql2o/converters/InstantConverter.java b/core/src/main/java/org/sql2o/converters/InstantConverter.java
@@ -7,6 +7,9 @@
 public class InstantConverter extends ConverterBase<Instant> {
     @Override
     public Instant convert(Object val) throws ConverterException {
+        if (val == null) {
+            return null;
+        }
         if (val instanceof Timestamp) {
             return ((Timestamp)val).toInstant();
         }

diff --git a/core/src/main/java/org/sql2o/converters/LocalDateConverter.java b/core/src/main/java/org/sql2o/converters/LocalDateConverter.java
@@ -7,6 +7,9 @@
 public class LocalDateConverter extends ConverterBase<LocalDate> {
     @Override
     public LocalDate convert(Object val) throws ConverterException {
+        if (val == null) {
+            return null;
+        }
         if (val instanceof java.sql.Date) {
             return ((java.sql.Date) val).toLocalDate();
         }

diff --git a/core/src/main/java/org/sql2o/converters/LocalDateTimeConverter.java b/core/src/main/java/org/sql2o/converters/LocalDateTimeConverter.java
@@ -7,6 +7,9 @@
 public class LocalDateTimeConverter extends ConverterBase<LocalDateTime> {
     @Override
     public LocalDateTime convert(Object val) throws ConverterException {
+        if (val == null) {
+            return null;
+        }
         if (val instanceof java.sql.Timestamp) {
             return ((java.sql.Timestamp) val).toLocalDateTime();
         }

diff --git a/core/src/main/java/org/sql2o/converters/LocalTimeConverter.java b/core/src/main/java/org/sql2o/converters/LocalTimeConverter.java
@@ -6,6 +6,9 @@ public class LocalTimeConverter extends ConverterBase<LocalTime> {
 
     @Override
     public LocalTime convert(Object val) throws ConverterException {
+        if (val == null) {
+            return null;
+        }
         if (val instanceof java.sql.Time) {
             return ((java.sql.Time) val).toLocalTime();
         }

diff --git a/core/src/main/java/org/sql2o/converters/OffsetDateTimeConverter.java b/core/src/main/java/org/sql2o/converters/OffsetDateTimeConverter.java
@@ -7,6 +7,9 @@
 public class OffsetDateTimeConverter extends ConverterBase<OffsetDateTime>{
     @Override
     public OffsetDateTime convert(Object val) throws ConverterException {
+        if (val == null) {
+            return null;
+        }
         if (val instanceof OffsetDateTime) {
             return (OffsetDateTime) val;
         }

diff --git a/core/src/test/java/org/sql2o/converters/InstantConverterTest.java b/core/src/test/java/org/sql2o/converters/InstantConverterTest.java
@@ -11,8 +11,7 @@
 import java.time.ZoneOffset;
 import java.time.ZonedDateTime;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.*;
 
 public class InstantConverterTest {
 
@@ -107,4 +106,16 @@ void insertAndFetch_usingInstantType_isSuccessfull(String dbName, String url, St
         // Assert
         assertEquals(instantToInsert, result);
     }
+
+    @Test
+    void convert_null_returnsNull() throws ConverterException {
+        // Arrange
+        InstantConverter converter = new InstantConverter();
+
+        // Act
+        Instant result = converter.convert(null);
+
+        // Assert
+        assertNull(result);
+    }
 }
diff --git a/core/src/test/java/org/sql2o/converters/LocalDateConverterTest.java b/core/src/test/java/org/sql2o/converters/LocalDateConverterTest.java
@@ -92,6 +92,15 @@ public void insertAndFetch_usingLocalDateType_isSuccessfull(String dbName, Strin
         assertEquals(dateToInsert, pojo.getDate());
     }
 
+    @Test
+    public void convert_null_returns_null() throws ConverterException {
+        // setup
+        final var converter = new LocalDateConverter();
+
+        // test
+        final var convertedDate = converter.convert(null);
+        assertNull(convertedDate);
+    }
 
     private Sql2o setupDatabase(String url, String user, String pass) {
 

diff --git a/core/src/test/java/org/sql2o/converters/LocalDateTimeConverterTest.java b/core/src/test/java/org/sql2o/converters/LocalDateTimeConverterTest.java
@@ -68,6 +68,18 @@ void convert_invalidTimeString_throwsException() {
         assertThrows(ConverterException.class, () -> converter.convert("invalid"));
     }
 
+    @Test
+    void convert_null_returns_null() throws ConverterException {
+        // setup
+        final var converter = new LocalDateTimeConverter();
+
+        // test
+        final var convertedTime = converter.convert(null);
+
+        // assert
+        assertNull(convertedTime);
+    }
+
     @ParameterizedTest(name = "{0}")
     @ArgumentsSource(TestDatabasesArgumentSourceProvider.class)
     void insertAndFetch_usingLocalDateTimeType_isSuccessfull(String dbName, String url, String user, String pass) {

diff --git a/core/src/test/java/org/sql2o/converters/LocalTimeConverterTest.java b/core/src/test/java/org/sql2o/converters/LocalTimeConverterTest.java
@@ -109,6 +109,18 @@ void insertAndFetch_usingLocalTimeConverter_isSuccessfull(String dbName, String
         assertEquals(targetTime, pojo.getTime());
     }
 
+    @Test
+    void convert_null_returns_null() throws ConverterException {
+        // setup
+        final var converter = new LocalTimeConverter();
+
+        // test
+        final var convertedTime = converter.convert(null);
+
+        // assert
+        assertNull(convertedTime);
+    }
+
     static class LocalTimePojo {
         private int id;
         private LocalTime time;

diff --git a/core/src/test/java/org/sql2o/converters/OffsetDateTimeConverterTest.java b/core/src/test/java/org/sql2o/converters/OffsetDateTimeConverterTest.java
@@ -145,4 +145,16 @@ void insertAndFetch_usingOffsetDateTimeWithGivenTimeZone_isSuccessfull(String db
         // Assert
         assertEquals(targetTime.toInstant(), resultTime.toInstant());
     }
+
+    @Test
+    void convert_null_returnsNull() throws ConverterException {
+        // Arrange
+        final var converter = new OffsetDateTimeConverter();
+
+        // Act
+        final var convertedTime = converter.convert(null);
+
+        // Assert
+        assertNull(convertedTime);
+    }
 }