Minor changes (drop PushPublicKey)

bitfireAT · Dec 2, 2024 · 8dee2da · 8dee2da
1 parent d33be3d
commit 8dee2da
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 44 deletions.
diff --git a/src/main/kotlin/at/bitfire/dav4jvm/property/push/ClientPublicKey.kt b/src/main/kotlin/at/bitfire/dav4jvm/property/push/ClientPublicKey.kt
@@ -11,9 +11,9 @@ import org.xmlpull.v1.XmlPullParser
  * Experimental! See https://github.com/bitfireAT/webdav-push/
  */
 data class ClientPublicKey(
-    override val type: String? = null,
-    override val key: String? = null
-): PushPublicKey(type, key) {
+    val type: String? = null,
+    val key: String? = null
+): Property {
 
     companion object {
 
@@ -36,4 +36,4 @@ data class ClientPublicKey(
 
     }
 
-}
+}
diff --git a/src/main/kotlin/at/bitfire/dav4jvm/property/push/PushPublicKey.kt b/src/main/kotlin/at/bitfire/dav4jvm/property/push/PushPublicKey.kt
diff --git a/src/main/kotlin/at/bitfire/dav4jvm/property/push/PushResource.kt b/src/main/kotlin/at/bitfire/dav4jvm/property/push/PushResource.kt
@@ -9,9 +9,9 @@ package at.bitfire.dav4jvm.property.push
 import at.bitfire.dav4jvm.Property
 import at.bitfire.dav4jvm.PropertyFactory
 import at.bitfire.dav4jvm.XmlReader
+import org.xmlpull.v1.XmlPullParser
 import java.net.URI
 import java.net.URISyntaxException
-import org.xmlpull.v1.XmlPullParser
 
 /**
  * Represents a [NS_WEBDAV_PUSH]`:push-resource` property.
@@ -39,7 +39,7 @@ data class PushResource(
                 uri = XmlReader(parser).readText()?.let { uri ->
                     try {
                         URI(uri)
-                    } catch (e: URISyntaxException) {
+                    } catch (_: URISyntaxException) {
                         null
                     }
                 }

diff --git a/src/main/kotlin/at/bitfire/dav4jvm/property/push/ServerPublicKey.kt b/src/main/kotlin/at/bitfire/dav4jvm/property/push/ServerPublicKey.kt
@@ -11,9 +11,9 @@ import org.xmlpull.v1.XmlPullParser
  * Experimental! See https://github.com/bitfireAT/webdav-push/
  */
 data class ServerPublicKey(
-    override val type: String? = null,
-    override val key: String? = null
-): PushPublicKey(type, key) {
+    val type: String? = null,
+    val key: String? = null
+): Property {
 
     companion object {
 
@@ -36,4 +36,4 @@ data class ServerPublicKey(
 
     }
 
-}
+}