use toLocalXXX for java.sql date/time/timestamp objects

Author: jenspapenhagen

src/main/java/dev/toonformat/jtoon/normalizer/JsonNormalizer.java

@@ -17,7 +17,6 @@
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
-import java.text.SimpleDateFormat;
 import java.time.Instant;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
@@ -55,8 +54,6 @@ public final class JsonNormalizer {
         JsonNormalizer::tryNormalizeCollection,
         JsonNormalizer::tryNormalizePojo);
 
-    private static final SimpleDateFormat DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZ");
-
     private JsonNormalizer() {
         throw new UnsupportedOperationException("Utility class cannot be instantiated");
     }
@@ -227,12 +224,12 @@ private static JsonNode tryNormalizeTemporal(Object value) {
             return StringNode.valueOf(calendar.toInstant().toString());
         } else if (value instanceof Instant instant) {
             return StringNode.valueOf(instant.toString());
+        } else if (value instanceof java.sql.Timestamp timestamp) {
+            return formatTemporal(timestamp.toLocalDateTime(), DateTimeFormatter.ISO_LOCAL_DATE_TIME);
         } else if (value instanceof java.sql.Date date) {
-            return StringNode.valueOf(DATE_FORMAT.format(date));
+            return formatTemporal(date.toLocalDate(), DateTimeFormatter.ISO_LOCAL_DATE);
         } else if (value instanceof java.sql.Time time) {
-            return StringNode.valueOf(DATE_FORMAT.format(time));
-        } else if (value instanceof java.sql.Timestamp timestamp) {
-            return StringNode.valueOf(DATE_FORMAT.format(timestamp));
+            return formatTemporal(time.toLocalTime(), DateTimeFormatter.ISO_LOCAL_TIME);
         } else if (value instanceof Date date) {
             return StringNode.valueOf(LocalDate.ofInstant(date.toInstant(), ZoneId.systemDefault()).toString());
         } else {

src/test/java/dev/toonformat/jtoon/normalizer/JsonNormalizerTest.java

@@ -336,7 +336,7 @@ void testSQLDate() {
             java.sql.Date dateTime = new java.sql.Date(1766419274);
             JsonNode result = JsonNormalizer.normalize(dateTime);
             assertTrue(result.isString());
-            assertEquals("1970-01-21T11:40:19+0100", result.asString());
+            assertEquals("1970-01-21", result.asString());
         }
 
         @Test
@@ -345,7 +345,7 @@ void testSQLTime() {
             java.sql.Time time = new java.sql.Time(1766419274);
             JsonNode result = JsonNormalizer.normalize(time);
             assertTrue(result.isString());
-            assertEquals("1970-01-21T11:40:19+0100", result.asString());
+            assertEquals("11:40:19", result.asString());
         }
 
         @Test
@@ -354,7 +354,7 @@ void testSQLTimeStamp() {
             java.sql.Timestamp dateTime = new java.sql.Timestamp(1766419274);
             JsonNode result = JsonNormalizer.normalize(dateTime);
             assertTrue(result.isString());
-            assertEquals("1970-01-21T11:40:19+0100", result.asString());
+            assertEquals("1970-01-21T11:40:19.274", result.asString());
         }