Made HrefListProperty static

Signed-off-by: Arnau Mora Gras <[email protected]>
bitfireAT · Dec 5, 2024 · d7c2051 · d7c2051
1 parent b05fd76
commit d7c2051
Show file tree

Hide file tree

Showing 9 changed files with 29 additions and 25 deletions.
diff --git a/src/main/kotlin/at/bitfire/dav4jvm/property/caldav/CalendarHomeSet.kt b/src/main/kotlin/at/bitfire/dav4jvm/property/caldav/CalendarHomeSet.kt
@@ -8,11 +8,10 @@ package at.bitfire.dav4jvm.property.caldav
 
 import at.bitfire.dav4jvm.Property
 import at.bitfire.dav4jvm.property.webdav.HrefListProperty
-import java.util.LinkedList
 import org.xmlpull.v1.XmlPullParser
 
 data class CalendarHomeSet(
-    override val hrefs: LinkedList<String> = LinkedList<String>()
+    override val hrefs: List<String> = emptyList()
 ): HrefListProperty(hrefs) {
 
     companion object {
@@ -27,7 +26,7 @@ data class CalendarHomeSet(
 
         override fun getName() = NAME
 
-        override fun create(parser: XmlPullParser) = create(parser, CalendarHomeSet())
+        override fun create(parser: XmlPullParser) = create(parser, ::CalendarHomeSet)
 
     }
 

diff --git a/src/main/kotlin/at/bitfire/dav4jvm/property/caldav/CalendarProxyReadFor.kt b/src/main/kotlin/at/bitfire/dav4jvm/property/caldav/CalendarProxyReadFor.kt
@@ -8,11 +8,10 @@ package at.bitfire.dav4jvm.property.caldav
 
 import at.bitfire.dav4jvm.Property
 import at.bitfire.dav4jvm.property.webdav.HrefListProperty
-import java.util.LinkedList
 import org.xmlpull.v1.XmlPullParser
 
 data class CalendarProxyReadFor(
-    override val hrefs: LinkedList<String> = LinkedList<String>()
+    override val hrefs: List<String> = emptyList()
 ): HrefListProperty(hrefs) {
 
     companion object {
@@ -25,7 +24,7 @@ data class CalendarProxyReadFor(
 
         override fun getName() = NAME
 
-        override fun create(parser: XmlPullParser) = create(parser, CalendarProxyReadFor())
+        override fun create(parser: XmlPullParser) = create(parser, ::CalendarProxyReadFor)
 
     }
 

diff --git a/src/main/kotlin/at/bitfire/dav4jvm/property/caldav/CalendarProxyWriteFor.kt b/src/main/kotlin/at/bitfire/dav4jvm/property/caldav/CalendarProxyWriteFor.kt
@@ -8,11 +8,10 @@ package at.bitfire.dav4jvm.property.caldav
 
 import at.bitfire.dav4jvm.Property
 import at.bitfire.dav4jvm.property.webdav.HrefListProperty
-import java.util.LinkedList
 import org.xmlpull.v1.XmlPullParser
 
 data class CalendarProxyWriteFor(
-    override val hrefs: LinkedList<String> = LinkedList<String>()
+    override val hrefs: List<String> = emptyList()
 ): HrefListProperty(hrefs) {
 
     companion object {
@@ -25,7 +24,7 @@ data class CalendarProxyWriteFor(
 
         override fun getName() = NAME
 
-        override fun create(parser: XmlPullParser) = create(parser, CalendarProxyWriteFor())
+        override fun create(parser: XmlPullParser) = create(parser, ::CalendarProxyWriteFor)
 
     }
 

diff --git a/src/main/kotlin/at/bitfire/dav4jvm/property/caldav/CalendarUserAddressSet.kt b/src/main/kotlin/at/bitfire/dav4jvm/property/caldav/CalendarUserAddressSet.kt
@@ -8,11 +8,10 @@ package at.bitfire.dav4jvm.property.caldav
 
 import at.bitfire.dav4jvm.Property
 import at.bitfire.dav4jvm.property.webdav.HrefListProperty
-import java.util.LinkedList
 import org.xmlpull.v1.XmlPullParser
 
 data class CalendarUserAddressSet(
-    override val hrefs: LinkedList<String> = LinkedList<String>()
+    override val hrefs: List<String> = emptyList()
 ): HrefListProperty(hrefs) {
 
     companion object {
@@ -25,7 +24,7 @@ data class CalendarUserAddressSet(
 
         override fun getName() = NAME
 
-        override fun create(parser: XmlPullParser) = create(parser, CalendarUserAddressSet())
+        override fun create(parser: XmlPullParser) = create(parser, ::CalendarUserAddressSet)
 
     }
 

diff --git a/src/main/kotlin/at/bitfire/dav4jvm/property/caldav/Source.kt b/src/main/kotlin/at/bitfire/dav4jvm/property/caldav/Source.kt
@@ -8,11 +8,10 @@ package at.bitfire.dav4jvm.property.caldav
 
 import at.bitfire.dav4jvm.Property
 import at.bitfire.dav4jvm.property.webdav.HrefListProperty
-import java.util.LinkedList
 import org.xmlpull.v1.XmlPullParser
 
 class Source(
-    override val hrefs: LinkedList<String> = LinkedList<String>()
+    override val hrefs: List<String> = emptyList()
 ): HrefListProperty(hrefs) {
 
     companion object {
@@ -27,7 +26,7 @@ class Source(
 
         override fun getName() = NAME
 
-        override fun create(parser: XmlPullParser) = create(parser, Source())
+        override fun create(parser: XmlPullParser) = create(parser, ::Source)
 
     }
 

diff --git a/src/main/kotlin/at/bitfire/dav4jvm/property/carddav/AddressbookHomeSet.kt b/src/main/kotlin/at/bitfire/dav4jvm/property/carddav/AddressbookHomeSet.kt
@@ -8,11 +8,10 @@ package at.bitfire.dav4jvm.property.carddav
 
 import at.bitfire.dav4jvm.Property
 import at.bitfire.dav4jvm.property.webdav.HrefListProperty
-import java.util.LinkedList
 import org.xmlpull.v1.XmlPullParser
 
 class AddressbookHomeSet(
-    override val hrefs: LinkedList<String> = LinkedList<String>()
+    override val hrefs: List<String> = emptyList()
 ): HrefListProperty(hrefs) {
 
     companion object {
@@ -27,7 +26,7 @@ class AddressbookHomeSet(
 
         override fun getName() = NAME
 
-        override fun create(parser: XmlPullParser) = create(parser, AddressbookHomeSet())
+        override fun create(parser: XmlPullParser) = create(parser, ::AddressbookHomeSet)
 
     }
 

diff --git a/src/main/kotlin/at/bitfire/dav4jvm/property/webdav/GroupMembership.kt b/src/main/kotlin/at/bitfire/dav4jvm/property/webdav/GroupMembership.kt
@@ -9,7 +9,7 @@ package at.bitfire.dav4jvm.property.webdav
 import at.bitfire.dav4jvm.Property
 import org.xmlpull.v1.XmlPullParser
 
-class GroupMembership: HrefListProperty() {
+class GroupMembership: HrefListProperty(emptyList()) {
 
     companion object {
 
@@ -23,7 +23,7 @@ class GroupMembership: HrefListProperty() {
 
         override fun getName() = NAME
 
-        override fun create(parser: XmlPullParser) = create(parser, GroupMembership())
+        override fun create(parser: XmlPullParser) = create(parser) { GroupMembership() }
 
     }
 

diff --git a/src/main/kotlin/at/bitfire/dav4jvm/property/webdav/HrefListProperty.kt b/src/main/kotlin/at/bitfire/dav4jvm/property/webdav/HrefListProperty.kt
@@ -10,7 +10,6 @@ import at.bitfire.dav4jvm.DavResource
 import at.bitfire.dav4jvm.Property
 import at.bitfire.dav4jvm.PropertyFactory
 import at.bitfire.dav4jvm.XmlReader
-import java.util.LinkedList
 import org.xmlpull.v1.XmlPullParser
 
 /**
@@ -19,19 +18,30 @@ import org.xmlpull.v1.XmlPullParser
  * Every [HrefListProperty] must be a data class.
  */
 abstract class HrefListProperty(
-    open val hrefs: LinkedList<String> = LinkedList<String>()
+    open val hrefs: List<String>
 ): Property {
 
     val href get() = hrefs.firstOrNull()
 
 
     abstract class Factory : PropertyFactory {
 
+        @Deprecated("hrefs is no longer mutable.", level = DeprecationLevel.ERROR)
         fun create(parser: XmlPullParser, list: HrefListProperty): HrefListProperty {
-            XmlReader(parser).readTextPropertyList(DavResource.HREF, list.hrefs)
+            val hrefs = list.hrefs.toMutableList()
+            XmlReader(parser).readTextPropertyList(DavResource.HREF, hrefs)
             return list
         }
 
+        fun <PropertyType> create(
+            parser: XmlPullParser,
+            constructor: (hrefs: List<String>
+                ) -> PropertyType): PropertyType {
+            val hrefs = mutableListOf<String>()
+            XmlReader(parser).readTextPropertyList(DavResource.HREF, hrefs)
+            return constructor(hrefs)
+        }
+
     }
 
 }
diff --git a/src/main/kotlin/at/bitfire/dav4jvm/property/webdav/Owner.kt b/src/main/kotlin/at/bitfire/dav4jvm/property/webdav/Owner.kt
@@ -9,7 +9,7 @@ package at.bitfire.dav4jvm.property.webdav
 import at.bitfire.dav4jvm.Property
 import org.xmlpull.v1.XmlPullParser
 
-class Owner: HrefListProperty() {
+class Owner: HrefListProperty(emptyList()) {
 
     companion object {
 
@@ -23,7 +23,7 @@ class Owner: HrefListProperty() {
 
         override fun getName() = NAME
 
-        override fun create(parser: XmlPullParser) = create(parser, Owner())
+        override fun create(parser: XmlPullParser) = create(parser) { Owner() }
 
     }