Rename String.toIso8601Date to String.iso8601ToDate

readium · Feb 12, 2020 · 946e6bf · 946e6bf
1 parent 045fcae
commit 946e6bf
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 19 deletions.
diff --git a/r2-shared/src/main/java/org/readium/r2/shared/extensions/String.kt b/r2-shared/src/main/java/org/readium/r2/shared/extensions/String.kt
@@ -13,10 +13,9 @@ import org.joda.time.DateTime
 import org.joda.time.DateTimeZone
 import java.util.*
 
-fun String.toIso8601Date(): Date? {
+fun String.iso8601ToDate(): Date? =
     try {
-        return DateTime(this, DateTimeZone.UTC).toDate()
+        DateTime(this).toDate()
     } catch (e: Exception) {
-        return null
+        null
     }
-}
diff --git a/r2-shared/src/main/java/org/readium/r2/shared/opds/Availability.kt b/r2-shared/src/main/java/org/readium/r2/shared/opds/Availability.kt
@@ -15,7 +15,7 @@ import org.json.JSONObject
 import org.readium.r2.shared.JSONable
 import org.readium.r2.shared.util.logging.WarningLogger
 import org.readium.r2.shared.extensions.optNullableString
-import org.readium.r2.shared.extensions.toIso8601Date
+import org.readium.r2.shared.extensions.iso8601ToDate
 import org.readium.r2.shared.extensions.toIso8601String
 import org.readium.r2.shared.util.KeyMapper
 import org.readium.r2.shared.util.logging.JsonWarning
@@ -71,8 +71,8 @@ data class Availability(
 
             return Availability(
                 state = state,
-                since = json?.optNullableString("since")?.toIso8601Date(),
-                until = json?.optNullableString("until")?.toIso8601Date()
+                since = json?.optNullableString("since")?.iso8601ToDate(),
+                until = json?.optNullableString("until")?.iso8601ToDate()
             )
         }
 

diff --git a/r2-shared/src/main/java/org/readium/r2/shared/publication/Metadata.kt b/r2-shared/src/main/java/org/readium/r2/shared/publication/Metadata.kt
@@ -134,8 +134,8 @@ data class Metadata(
             val identifier = json.remove("identifier") as? String
             val type = json.remove("@type") as? String
             val localizedSubtitle = LocalizedString.fromJSON(json.remove("subtitle"), warnings)
-            val modified = (json.remove("modified") as? String)?.toIso8601Date()
-            val published = (json.remove("published") as? String)?.toIso8601Date()
+            val modified = (json.remove("modified") as? String)?.iso8601ToDate()
+            val published = (json.remove("published") as? String)?.iso8601ToDate()
             val languages = json.optStringsFromArrayOrSingle("language", remove = true)
             val sortAs = json.remove("sortAs") as? String
             val subjects = Subject.fromJSONArray(json.remove("subject"), normalizeHref, warnings)

diff --git a/r2-shared/src/test/java/org/readium/r2/shared/opds/AvailabilityTest.kt b/r2-shared/src/test/java/org/readium/r2/shared/opds/AvailabilityTest.kt
@@ -4,7 +4,7 @@ import org.json.JSONObject
 import org.junit.Assert.*
 import org.junit.Test
 import org.readium.r2.shared.assertJSONEquals
-import org.readium.r2.shared.extensions.toIso8601Date
+import org.readium.r2.shared.extensions.iso8601ToDate
 
 class AvailabilityTest {
 
@@ -35,8 +35,8 @@ class AvailabilityTest {
         assertEquals(
             Availability(
                 state = Availability.State.AVAILABLE,
-                since = "2001-01-01T12:36:27.000Z".toIso8601Date(),
-                until = "2001-02-01T12:36:27.000Z".toIso8601Date()
+                since = "2001-01-01T12:36:27.000Z".iso8601ToDate(),
+                until = "2001-02-01T12:36:27.000Z".iso8601ToDate()
             ),
             Availability.fromJSON(JSONObject("""{
                 'state': 'available',
@@ -70,8 +70,8 @@ class AvailabilityTest {
             }"""),
             Availability(
                 state = Availability.State.AVAILABLE,
-                since = "2001-01-01T12:36:27.000Z".toIso8601Date(),
-                until = "2001-02-01T12:36:27.000Z".toIso8601Date()
+                since = "2001-01-01T12:36:27.000Z".iso8601ToDate(),
+                until = "2001-02-01T12:36:27.000Z".iso8601ToDate()
             ).toJSON()
         )
     }

diff --git a/r2-shared/src/test/java/org/readium/r2/shared/publication/MetadataTest.kt b/r2-shared/src/test/java/org/readium/r2/shared/publication/MetadataTest.kt
@@ -13,7 +13,7 @@ import org.json.JSONObject
 import org.junit.Assert.*
 import org.junit.Test
 import org.readium.r2.shared.assertJSONEquals
-import org.readium.r2.shared.extensions.toIso8601Date
+import org.readium.r2.shared.extensions.iso8601ToDate
 
 class MetadataTest {
 
@@ -37,8 +37,8 @@ class MetadataTest {
                     "en" to "Subtitle",
                     "fr" to "Sous-titre"
                 )),
-                modified = "2001-01-01T12:36:27.000Z".toIso8601Date(),
-                published = "2001-01-02T12:36:27.000Z".toIso8601Date(),
+                modified = "2001-01-01T12:36:27.000Z".iso8601ToDate(),
+                published = "2001-01-02T12:36:27.000Z".iso8601ToDate(),
                 languages = listOf("en", "fr"),
                 sortAs = "sort key",
                 subjects = listOf(Subject(name = "Science Fiction"), Subject(name = "Fantasy")),
@@ -198,8 +198,8 @@ class MetadataTest {
                     "en" to "Subtitle",
                     "fr" to "Sous-titre"
                 )),
-                modified = "2001-01-01T12:36:27.000Z".toIso8601Date(),
-                published = "2001-01-02T12:36:27.000Z".toIso8601Date(),
+                modified = "2001-01-01T12:36:27.000Z".iso8601ToDate(),
+                published = "2001-01-02T12:36:27.000Z".iso8601ToDate(),
                 languages = listOf("en", "fr"),
                 sortAs = "sort key",
                 subjects = listOf(Subject(name = "Science Fiction"), Subject(name = "Fantasy")),