Remove ImageUrl in favor of a regular String

MGaetan89 · MGaetan89 · commit db14c86f73bb · 2025-03-04T12:10:34.000+01:00
diff --git a/data/src/main/java/ch/srg/dataProvider/integrationlayer/data/ImageUrl.kt b/data/src/main/java/ch/srg/dataProvider/integrationlayer/data/ImageUrl.kt
diff --git a/data/src/main/java/ch/srg/dataProvider/integrationlayer/data/remote/Channel.kt b/data/src/main/java/ch/srg/dataProvider/integrationlayer/data/remote/Channel.kt
@@ -1,6 +1,5 @@
 package ch.srg.dataProvider.integrationlayer.data.remote
 
-import ch.srg.dataProvider.integrationlayer.data.ImageUrl
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
@@ -17,12 +16,12 @@ data class Channel(
     override val title: String,
     override val lead: String? = null,
     override val description: String? = null,
-    override val imageUrl: ImageUrl,
+    override val imageUrl: String,
     override val imageFocalPoint: FocalPoint? = null,
     override val imageTitle: String? = null,
     override val imageCopyright: String? = null,
     override val transmission: Transmission,
     override val timeTableUrl: String? = null,
     @SerialName("imageUrlRaw")
-    override val rawImageUrl: ImageUrl? = null
+    override val rawImageUrl: String? = null
 ) : SRGChannelMetadata
diff --git a/data/src/main/java/ch/srg/dataProvider/integrationlayer/data/remote/Chapter.kt b/data/src/main/java/ch/srg/dataProvider/integrationlayer/data/remote/Chapter.kt
@@ -2,7 +2,6 @@
 
 package ch.srg.dataProvider.integrationlayer.data.remote
 
-import ch.srg.dataProvider.integrationlayer.data.ImageUrl
 import ch.srg.dataProvider.integrationlayer.data.serializer.DateSerializer
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
@@ -23,7 +22,7 @@ data class Chapter(
     override val title: String,
     override val lead: String? = null,
     override val description: String? = null,
-    override val imageUrl: ImageUrl,
+    override val imageUrl: String,
     override val imageTitle: String? = null,
     override val imageCopyright: String? = null,
     override val blockReason: BlockReason? = null,
diff --git a/data/src/main/java/ch/srg/dataProvider/integrationlayer/data/remote/Episode.kt b/data/src/main/java/ch/srg/dataProvider/integrationlayer/data/remote/Episode.kt
@@ -2,7 +2,6 @@
 
 package ch.srg.dataProvider.integrationlayer.data.remote
 
-import ch.srg.dataProvider.integrationlayer.data.ImageUrl
 import ch.srg.dataProvider.integrationlayer.data.serializer.DateSerializer
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.UseSerializers
@@ -17,7 +16,7 @@ import java.util.Date
 data class Episode(
     val id: String,
     override val title: String,
-    override val imageUrl: ImageUrl,
+    override val imageUrl: String,
     override val lead: String? = null,
     override val description: String? = null,
     override val imageTitle: String? = null,
diff --git a/data/src/main/java/ch/srg/dataProvider/integrationlayer/data/remote/Media.kt b/data/src/main/java/ch/srg/dataProvider/integrationlayer/data/remote/Media.kt
@@ -2,7 +2,6 @@
 
 package ch.srg.dataProvider.integrationlayer.data.remote
 
-import ch.srg.dataProvider.integrationlayer.data.ImageUrl
 import ch.srg.dataProvider.integrationlayer.data.serializer.DateSerializer
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
@@ -24,7 +23,7 @@ data class Media(
     override val type: Type,
     override val date: Date,
     override val duration: Long,
-    override val imageUrl: ImageUrl,
+    override val imageUrl: String,
     override val imageFocalPoint: FocalPoint? = null,
     override val lead: String? = null,
     override val description: String? = null,
diff --git a/data/src/main/java/ch/srg/dataProvider/integrationlayer/data/remote/NowAndNext.kt b/data/src/main/java/ch/srg/dataProvider/integrationlayer/data/remote/NowAndNext.kt
@@ -1,6 +1,5 @@
 package ch.srg.dataProvider.integrationlayer.data.remote
 
-import ch.srg.dataProvider.integrationlayer.data.ImageUrl
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
@@ -17,14 +16,14 @@ data class NowAndNext(
     override val title: String,
     override val lead: String? = null,
     override val description: String? = null,
-    override val imageUrl: ImageUrl,
+    override val imageUrl: String,
     override val imageFocalPoint: FocalPoint? = null,
     override val imageTitle: String? = null,
     override val imageCopyright: String? = null,
     override val transmission: Transmission,
     override val timeTableUrl: String? = null,
     @SerialName("imageUrlRaw")
-    override val rawImageUrl: ImageUrl? = null,
+    override val rawImageUrl: String? = null,
     val now: Program? = null,
     val next: Program? = null
 ) : SRGChannelMetadata
diff --git a/data/src/main/java/ch/srg/dataProvider/integrationlayer/data/remote/Program.kt b/data/src/main/java/ch/srg/dataProvider/integrationlayer/data/remote/Program.kt
@@ -2,7 +2,6 @@
 
 package ch.srg.dataProvider.integrationlayer.data.remote
 
-import ch.srg.dataProvider.integrationlayer.data.ImageUrl
 import ch.srg.dataProvider.integrationlayer.data.serializer.DateSerializer
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
@@ -21,7 +20,7 @@ data class Program(
     val endTime: Date,
     override val lead: String? = null,
     override val description: String? = null,
-    val imageUrl: ImageUrl? = null,
+    val imageUrl: String? = null,
     val imageFocalPoint: FocalPoint? = null,
     val imageTitle: String? = null,
     val imageCopyright: String? = null,
diff --git a/data/src/main/java/ch/srg/dataProvider/integrationlayer/data/remote/Representation.kt b/data/src/main/java/ch/srg/dataProvider/integrationlayer/data/remote/Representation.kt
@@ -1,6 +1,5 @@
 package ch.srg.dataProvider.integrationlayer.data.remote
 
-import ch.srg.dataProvider.integrationlayer.data.ImageUrl
 import kotlinx.serialization.Serializable
 
 /**
@@ -31,7 +30,7 @@ data class Representation(
     val pickRandomElement: Boolean
         get() = properties?.pickRandomElement == true
 
-    val imageUrl: ImageUrl?
+    val imageUrl: String?
         get() = properties?.imageUrl
 
     val imageFocalPoint: FocalPoint?
@@ -47,7 +46,7 @@ data class Representation(
         val label: String? = null,
         val hasDetailPage: Boolean? = null,
         val pickRandomElement: Boolean? = null,
-        val imageUrl: ImageUrl? = null,
+        val imageUrl: String? = null,
         val imageFocalPoint: FocalPoint? = null,
         val link: Link? = null,
     )
diff --git a/data/src/main/java/ch/srg/dataProvider/integrationlayer/data/remote/SRGObject.kt b/data/src/main/java/ch/srg/dataProvider/integrationlayer/data/remote/SRGObject.kt
@@ -1,7 +1,5 @@
 package ch.srg.dataProvider.integrationlayer.data.remote
 
-import ch.srg.dataProvider.integrationlayer.data.ImageUrl
-
 /**
  * Copyright (c) SRG SSR. All rights reserved.
  * <p>
@@ -23,7 +21,7 @@ interface SRGMetadata {
 }
 
 interface SRGImageMetadata {
-    val imageUrl: ImageUrl
+    val imageUrl: String
     val imageTitle: String?
     val imageCopyright: String?
     val imageFocalPoint: FocalPoint?
@@ -32,5 +30,5 @@ interface SRGImageMetadata {
 interface SRGChannelMetadata : SRGIdentifierMetadata, SRGMetadata, SRGImageMetadata {
     val transmission: Transmission
     val timeTableUrl: String?
-    val rawImageUrl: ImageUrl?
+    val rawImageUrl: String?
 }
diff --git a/data/src/main/java/ch/srg/dataProvider/integrationlayer/data/remote/Segment.kt b/data/src/main/java/ch/srg/dataProvider/integrationlayer/data/remote/Segment.kt
@@ -2,7 +2,6 @@
 
 package ch.srg.dataProvider.integrationlayer.data.remote
 
-import ch.srg.dataProvider.integrationlayer.data.ImageUrl
 import ch.srg.dataProvider.integrationlayer.data.serializer.DateSerializer
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
@@ -36,7 +35,7 @@ data class Segment @JvmOverloads constructor(
     override val playableAbroad: Boolean,
     override val lead: String? = null,
     override val description: String? = null,
-    override val imageUrl: ImageUrl,
+    override val imageUrl: String,
     override val imageFocalPoint: FocalPoint? = null,
     override val imageTitle: String? = null,
     override val imageCopyright: String? = null,
diff --git a/data/src/main/java/ch/srg/dataProvider/integrationlayer/data/remote/Show.kt b/data/src/main/java/ch/srg/dataProvider/integrationlayer/data/remote/Show.kt
@@ -1,6 +1,5 @@
 package ch.srg.dataProvider.integrationlayer.data.remote
 
-import ch.srg.dataProvider.integrationlayer.data.ImageUrl
 import kotlinx.serialization.Serializable
 
 /**
@@ -15,18 +14,18 @@ data class Show(
     val transmission: Transmission,
     override val urn: String,
     override val title: String,
-    override val imageUrl: ImageUrl,
+    override val imageUrl: String,
     override val lead: String? = null,
     override val description: String? = null,
     val primaryChannelUrn: String? = null,
     val primaryChannelId: String? = null,
     override val imageFocalPoint: FocalPoint? = null,
     override val imageTitle: String? = null,
     override val imageCopyright: String? = null,
-    val bannerImageUrl: ImageUrl? = null,
-    val posterImageUrl: ImageUrl? = null,
+    val bannerImageUrl: String? = null,
+    val posterImageUrl: String? = null,
     val posterImageIsFallbackUrl: Boolean = true,
-    val podcastImageUrl: ImageUrl? = null,
+    val podcastImageUrl: String? = null,
     val podcastImageIsFallbackUrl: Boolean = true,
     val podcastSubscriptionUrl: String? = null,
     val podcastFeedSdUrl: String? = null,
diff --git a/data/src/main/java/ch/srg/dataProvider/integrationlayer/data/remote/Song.kt b/data/src/main/java/ch/srg/dataProvider/integrationlayer/data/remote/Song.kt
@@ -2,7 +2,6 @@
 
 package ch.srg.dataProvider.integrationlayer.data.remote
 
-import ch.srg.dataProvider.integrationlayer.data.ImageUrl
 import ch.srg.dataProvider.integrationlayer.data.serializer.DateSerializer
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.UseSerializers
@@ -26,8 +25,8 @@ data class Song(
 @Serializable
 data class Cd(
     val name: String,
-    val coverUrlSmall: ImageUrl? = null,
-    val coverUrlLarge: ImageUrl? = null
+    val coverUrlSmall: String? = null,
+    val coverUrlLarge: String? = null
 )
 
 @Serializable
diff --git a/data/src/main/java/ch/srg/dataProvider/integrationlayer/data/remote/Topic.kt b/data/src/main/java/ch/srg/dataProvider/integrationlayer/data/remote/Topic.kt
@@ -1,6 +1,5 @@
 package ch.srg.dataProvider.integrationlayer.data.remote
 
-import ch.srg.dataProvider.integrationlayer.data.ImageUrl
 import kotlinx.serialization.Serializable
 
 /**
@@ -18,7 +17,7 @@ data class Topic(
     override val lead: String? = null,
     override val description: String? = null,
     val viewedMedias: Int? = null,
-    val imageUrl: ImageUrl? = null,
+    val imageUrl: String? = null,
     val imageTitle: String? = null,
     val imageFocalPoint: FocalPoint? = null,
     val imageCopyright: String? = null,
diff --git a/data/src/main/java/ch/srg/dataProvider/integrationlayer/data/serializer/ImageUrlSerializer.kt b/data/src/main/java/ch/srg/dataProvider/integrationlayer/data/serializer/ImageUrlSerializer.kt
diff --git a/data/src/test/java/ch/srg/dataProvider/integrationlayer/data/remote/ChapterTest.kt b/data/src/test/java/ch/srg/dataProvider/integrationlayer/data/remote/ChapterTest.kt
@@ -1,6 +1,5 @@
 package ch.srg.dataProvider.integrationlayer.data.remote
 
-import ch.srg.dataProvider.integrationlayer.data.ImageUrl
 import java.util.Date
 import kotlin.test.Test
 import kotlin.test.assertEquals
@@ -101,7 +100,7 @@ class ChapterTest {
                 vendor = Vendor.RTS,
                 urn = "urn:rts:video:123456",
                 title = "chapter-title",
-                imageUrl = ImageUrl("https://image.url"),
+                imageUrl = "https://image.url",
                 type = Type.EPISODE,
                 date = Date(),
                 duration = 90.minutes.inWholeMilliseconds,
@@ -127,7 +126,7 @@ class ChapterTest {
                 duration = 30.minutes.inWholeMilliseconds,
                 displayable = true,
                 playableAbroad = true,
-                imageUrl = ImageUrl("https://image.url"),
+                imageUrl = "https://image.url",
                 blockReason = BlockReason.LEGAL.takeIf { blocked },
             )
         }
diff --git a/data/src/test/java/ch/srg/dataProvider/integrationlayer/data/remote/MediaCompositionTest.kt b/data/src/test/java/ch/srg/dataProvider/integrationlayer/data/remote/MediaCompositionTest.kt
@@ -1,6 +1,5 @@
 package ch.srg.dataProvider.integrationlayer.data.remote
 
-import ch.srg.dataProvider.integrationlayer.data.ImageUrl
 import java.util.Date
 import kotlin.test.Test
 import kotlin.test.assertEquals
@@ -51,7 +50,7 @@ class MediaCompositionTest {
                 vendor = Vendor.RTS,
                 urn = urn,
                 title = "chapter-title",
-                imageUrl = ImageUrl("https://image.url"),
+                imageUrl = "https://image.url",
                 type = Type.EPISODE,
                 date = Date(),
                 duration = 90.minutes.inWholeMilliseconds,
diff --git a/data/src/test/java/ch/srg/dataProvider/integrationlayer/data/remote/ProgramGuideTest.kt b/data/src/test/java/ch/srg/dataProvider/integrationlayer/data/remote/ProgramGuideTest.kt
@@ -1,6 +1,5 @@
 package ch.srg.dataProvider.integrationlayer.data.remote
 
-import ch.srg.dataProvider.integrationlayer.data.ImageUrl
 import kotlin.test.Test
 import kotlin.test.assertEquals
 
@@ -29,7 +28,7 @@ class ProgramGuideTest {
                         vendor = Vendor.RTS,
                         urn = "urn:rts:video:$index",
                         title = "channel-title$index",
-                        imageUrl = ImageUrl("https://image.url/"),
+                        imageUrl = "https://image.url/",
                         transmission = Transmission.TV,
                     )
                 )
diff --git a/data/src/test/java/ch/srg/dataProvider/integrationlayer/data/remote/RepresentationTest.kt b/data/src/test/java/ch/srg/dataProvider/integrationlayer/data/remote/RepresentationTest.kt
@@ -1,6 +1,5 @@
 package ch.srg.dataProvider.integrationlayer.data.remote
 
-import ch.srg.dataProvider.integrationlayer.data.ImageUrl
 import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertFalse
@@ -49,7 +48,7 @@ class RepresentationTest {
             label = "label",
             hasDetailPage = true,
             pickRandomElement = true,
-            imageUrl = ImageUrl("https://image.url/image.jpg"),
+            imageUrl = "https://image.url/image.jpg",
             imageFocalPoint = FocalPoint(25, 75),
             link = Link(
                 targetType = "target-type",
diff --git a/data/src/test/java/ch/srg/dataProvider/integrationlayer/data/remote/SRGMediaMetadataTest.kt b/data/src/test/java/ch/srg/dataProvider/integrationlayer/data/remote/SRGMediaMetadataTest.kt
diff --git a/data/src/test/java/ch/srg/dataProvider/integrationlayer/data/remote/SegmentTest.kt b/data/src/test/java/ch/srg/dataProvider/integrationlayer/data/remote/SegmentTest.kt
diff --git a/data/src/test/java/ch/srg/dataProvider/integrationlayer/data/serializer/TestImageUrlSerializer.kt b/data/src/test/java/ch/srg/dataProvider/integrationlayer/data/serializer/TestImageUrlSerializer.kt
diff --git a/dataprovider-retrofit/src/main/java/ch/srg/dataProvider/integrationlayer/request/image/ImageUrlExtension.kt b/dataprovider-retrofit/src/main/java/ch/srg/dataProvider/integrationlayer/request/image/ImageUrlExtension.kt
diff --git a/dataprovider-retrofit/src/test/java/ch/srg/dataProvider/integrationlayer/TestDefaultImageUrlDecorator.kt b/dataprovider-retrofit/src/test/java/ch/srg/dataProvider/integrationlayer/TestDefaultImageUrlDecorator.kt
