From bafdaa304d959989322e95f16c46f6220f0e474e Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Wed, 6 Dec 2023 18:09:42 +0100
Subject: [PATCH] joda -> java.time

---
 .../constraints/versionChecker/AllowedVersions.kt     |  7 +++++--
 .../constraints/versionChecker/AllowedVersionsTest.kt | 11 ++++++-----
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/versionChecker/AllowedVersions.kt b/plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/versionChecker/AllowedVersions.kt
index de331c6bd5..69dc86b752 100644
--- a/plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/versionChecker/AllowedVersions.kt
+++ b/plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/versionChecker/AllowedVersions.kt
@@ -1,9 +1,11 @@
 package app.aaps.plugins.constraints.versionChecker
 
-import org.joda.time.LocalDate
 import org.json.JSONArray
 import org.json.JSONException
 import org.json.JSONObject
+import java.time.LocalDate
+import java.time.LocalTime
+import java.time.ZoneId
 
 class AllowedVersions {
 
@@ -38,7 +40,8 @@ class AllowedVersions {
     fun endDateToMilliseconds(endDate: String): Long? {
         try {
             val dateTime = LocalDate.parse(endDate)
-            return dateTime.toDate().time
+            val instant = dateTime.atTime(LocalTime.MIDNIGHT).atZone(ZoneId.systemDefault()).toInstant()
+            return instant.toEpochMilli()
         } catch (ignored: Exception) {
         }
         return null
diff --git a/plugins/constraints/src/test/kotlin/app/aaps/plugins/constraints/versionChecker/AllowedVersionsTest.kt b/plugins/constraints/src/test/kotlin/app/aaps/plugins/constraints/versionChecker/AllowedVersionsTest.kt
index 0d8f29b5ad..5e18206329 100644
--- a/plugins/constraints/src/test/kotlin/app/aaps/plugins/constraints/versionChecker/AllowedVersionsTest.kt
+++ b/plugins/constraints/src/test/kotlin/app/aaps/plugins/constraints/versionChecker/AllowedVersionsTest.kt
@@ -1,11 +1,12 @@
 package app.aaps.plugins.constraints.versionChecker
 
 import com.google.common.truth.Truth.assertThat
-import app.aaps.plugins.constraints.versionChecker.AllowedVersions
-import org.joda.time.LocalDate
 import org.json.JSONArray
 import org.json.JSONObject
 import org.junit.jupiter.api.Test
+import java.time.Instant
+import java.time.LocalDate
+import java.time.ZoneId
 
 class AllowedVersionsTest {
 
@@ -71,10 +72,10 @@ class AllowedVersionsTest {
     @Test
     fun endDateToMilliseconds() {
         val definition = generateSupportedVersions()
-        val endDate = AllowedVersions().endDateToMilliseconds(AllowedVersions().findByVersion(definition, "2.9.0-beta1")?.getString("endDate") ?: "1000/01/01")
-        val dateTime = LocalDate(endDate)
+        val endDate = AllowedVersions().endDateToMilliseconds(AllowedVersions().findByVersion(definition, "2.9.0-beta1")?.getString("endDate") ?: "1000/01/01") ?: 0L
+        val dateTime = LocalDate.ofInstant(Instant.ofEpochMilli(endDate), ZoneId.systemDefault())
         assertThat(dateTime.year).isEqualTo(2021)
-        assertThat(dateTime.monthOfYear).isEqualTo(11)
+        assertThat(dateTime.monthValue).isEqualTo(11)
         assertThat(dateTime.dayOfMonth).isEqualTo(7)
 
         assertThat(AllowedVersions().endDateToMilliseconds("abdef")).isNull()