Use DateTimeFormatter in date adapters

Should guarantee thread safety without constantly re-creating formatters.

Author: antweb

libpretixsync/src/main/java/eu/pretix/libpretixsync/sqldelight/AndroidUtilDateAdapter.kt

@@ -1,26 +1,23 @@
 package eu.pretix.libpretixsync.sqldelight
 
 import app.cash.sqldelight.ColumnAdapter
-import java.text.SimpleDateFormat
+import java.time.Instant
+import java.time.OffsetDateTime
+import java.time.ZoneId
+import java.time.format.DateTimeFormatter
 import java.util.Date
-import java.util.TimeZone
 
 class AndroidUtilDateAdapter : ColumnAdapter<Date, String> {
+    private val df = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ssXXXXX")
+
     override fun decode(databaseValue: String): Date {
-        try {
-            val df = SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'").apply {
-                timeZone = TimeZone.getTimeZone("UTC")
-            }
-            return df.parse(databaseValue)
-        } catch (e: Throwable) {
-            throw e
-        }
+        // Use the default formatter (ISO_OFFSET_DATE_TIME) when decoding to be on the safe side
+        // in case we encounter valid ISO strings with a slightly different format (e.g. including
+        // milliseconds)
+        return Date(OffsetDateTime.parse(databaseValue).toInstant().toEpochMilli())
     }
 
     override fun encode(value: Date): String {
-        val df = SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'").apply {
-            timeZone = TimeZone.getTimeZone("UTC")
-        }
-        return df.format(value)
+        return df.format(Instant.ofEpochMilli(value.time).atZone(ZoneId.of("Z")))
     }
 }

libpretixsync/src/main/java/eu/pretix/libpretixsync/sqldelight/JavaUtilDateAdapter.kt

@@ -1,18 +1,21 @@
 package eu.pretix.libpretixsync.sqldelight
 
 import app.cash.sqldelight.ColumnAdapter
-import java.text.SimpleDateFormat
+import java.time.Instant
+import java.time.LocalDateTime
+import java.time.ZoneId
+import java.time.ZoneOffset
+import java.time.format.DateTimeFormatter
 import java.util.Date
 
 class JavaUtilDateAdapter : ColumnAdapter<Date, String> {
+    private val df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SSS")
 
     override fun decode(databaseValue: String): Date {
-        val df = SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS")
-        return df.parse(databaseValue)
+        return Date(LocalDateTime.parse(databaseValue, df).toInstant(ZoneOffset.UTC).toEpochMilli())
     }
 
     override fun encode(value: Date): String {
-        val df = SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS")
-        return df.format(value)
+        return df.format(Instant.ofEpochMilli(value.time).atZone(ZoneId.of("Z")))
     }
 }