Update DelegatingSerializer to require a different serialName

Author: pdvrieze

Changelog.md

@@ -8,6 +8,8 @@ Changes:
 - Tidy up the implementation of the constructors of the 
   `DefaultSerializationPolicy`. This might have slight consequences
   in binary compatibility for (experimental) inheritance.
+- Change `DelegatingSerializer` (in serialutil) to take the serial
+  name as parameter as using the delegate is not valid.
 
 Fixes:
 - Fix trimming of strings inside a mixed context where there is an

serialutil/api/serialutil.api

@@ -16,6 +16,7 @@ public abstract class nl/adaptivity/serialutil/DelegateSerializer : kotlinx/seri
 }
 
 public abstract class nl/adaptivity/serialutil/DelegatingSerializer : kotlinx/serialization/KSerializer {
+	public fun <init> (Ljava/lang/String;Lkotlinx/serialization/KSerializer;)V
 	public fun <init> (Lkotlinx/serialization/KSerializer;)V
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
 	public abstract fun fromDelegate (Ljava/lang/Object;)Ljava/lang/Object;

serialutil/api/serialutil.klib.api

@@ -7,6 +7,7 @@
 
 // Library unique name: <io.github.pdvrieze.xmlutil:serialutil>
 abstract class <#A: kotlin/Any?, #B: kotlin/Any?> nl.adaptivity.serialutil/DelegatingSerializer : kotlinx.serialization/KSerializer<#A> { // nl.adaptivity.serialutil/DelegatingSerializer|null[0]
+    constructor <init>(kotlin/String, kotlinx.serialization/KSerializer<#B>) // nl.adaptivity.serialutil/DelegatingSerializer.<init>|<init>(kotlin.String;kotlinx.serialization.KSerializer<1:1>){}[0]
     constructor <init>(kotlinx.serialization/KSerializer<#B>) // nl.adaptivity.serialutil/DelegatingSerializer.<init>|<init>(kotlinx.serialization.KSerializer<1:1>){}[0]
 
     final val delegateSerializer // nl.adaptivity.serialutil/DelegatingSerializer.delegateSerializer|{}delegateSerializer[0]

serialutil/src/commonMain/kotlin/nl/adaptivity/serialutil/DelegatingSerializer.kt

@@ -1,21 +1,21 @@
 /*
- * Copyright (c) 2021.
+ * Copyright (c) 2021-2025.
  *
  * This file is part of xmlutil.
  *
- * This file is licenced to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You should have received a copy of the license with the source distribution.
- * Alternatively, you may obtain a copy of the License at
+ * This file is licenced to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance
+ * with the License.  You should have  received a copy of the license
+ * with the source distribution. Alternatively, you may obtain a copy
+ * of the License at
  *
  *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ * implied.  See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
 package nl.adaptivity.serialutil
@@ -25,7 +25,16 @@ import kotlinx.serialization.descriptors.SerialDescriptor
 import kotlinx.serialization.encoding.Decoder
 import kotlinx.serialization.encoding.Encoder
 
-abstract class DelegatingSerializer<T, D>(val delegateSerializer: KSerializer<D>): KSerializer<T> {
+abstract class DelegatingSerializer<T, D>(
+    serialName: String,
+    val delegateSerializer: KSerializer<D>
+): KSerializer<T> {
+
+    @Deprecated("Use serializer that specifies the serial name")
+    constructor(delegateSerializer: KSerializer<D>) : this(
+        delegateSerializer.descriptor.serialName + "_delegate",
+        delegateSerializer
+    )
 
     abstract fun fromDelegate(delegate: D): T
 
@@ -35,7 +44,7 @@ abstract class DelegatingSerializer<T, D>(val delegateSerializer: KSerializer<D>
         return fromDelegate(delegateSerializer.deserialize(decoder))
     }
 
-    override val descriptor: SerialDescriptor get() = delegateSerializer.descriptor
+    override val descriptor: SerialDescriptor = SerialDescriptor(serialName, delegateSerializer.descriptor)
 
     override fun serialize(encoder: Encoder, value: T) {
         delegateSerializer.serialize(encoder, value.toDelegate())