feat: enhance UUID deserialization to handle both standard and alternative formats

twisti-dev · twisti-dev · commit 97a9321e4a4b · 2025-10-27T12:36:37.000+01:00
diff --git a/gradle.properties b/gradle.properties
@@ -7,6 +7,6 @@ org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled
 javaVersion=21
 mcVersion=1.21.10
 group=dev.slne.surf
-version=1.21.10-2.42.0
+version=1.21.10-2.42.1
 relocationPrefix=dev.slne.surf.surfapi.libs
 snapshot=false
diff --git a/surf-api-core/surf-api-core-api/src/main/kotlin/dev/slne/surf/surfapi/core/api/serializer/java/uuid/JavaUUIDStringSerializer.kt b/surf-api-core/surf-api-core-api/src/main/kotlin/dev/slne/surf/surfapi/core/api/serializer/java/uuid/JavaUUIDStringSerializer.kt
@@ -18,7 +18,12 @@ object JavaUUIDStringSerializer : KSerializer<UUID> {
     }
 
     override fun deserialize(decoder: Decoder): UUID {
-        return fromString(decoder.decodeString())
+        val input = decoder.decodeString()
+        if (input.length == 36) {
+            return UUID.fromString(input)
+        }
+
+        return fromString(input)
     }
 
     fun fromUUID(value: UUID): String {

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,12 @@ object JavaUUIDStringSerializer : KSerializer<UUID> {`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`override fun deserialize(decoder: Decoder): UUID {`
`21`		`- return fromString(decoder.decodeString())`
	`21`	`+ val input = decoder.decodeString()`
	`22`	`+ if (input.length == 36) {`
	`23`	`+ return UUID.fromString(input)`
	`24`	`+ }`
	`25`	`+`
	`26`	`+ return fromString(input)`
`22`	`27`	`}`
`23`	`28`
`24`	`29`	`fun fromUUID(value: UUID): String {`