Update the policy constructors.

Author: pdvrieze

Changelog.md

@@ -1,5 +1,14 @@
 # 0.91.2-SNAPSHOT
 
+Features:
+- Make `defaultPrimitiveOutputKind` and `defaultObjectOutputKind`
+  configurable attributes rather than (overridable) properties (#285).
+
+Changes:
+- Tidy up the implementation of the constructors of the 
+  `DefaultSerializationPolicy`. This might have slight consequences
+  in binary compatibility for (experimental) inheritance.
+
 Fixes:
 - Fix trimming of strings inside a mixed context where there is an
   `@XmlIgnoreSpace(true)` annotation.

serialization/api/serialization.api

@@ -43,7 +43,7 @@ public final class nl/adaptivity/xmlutil/serialization/DefaultPlatformModuleKt {
 
 public class nl/adaptivity/xmlutil/serialization/DefaultXmlSerializationPolicy : nl/adaptivity/xmlutil/serialization/XmlSerializationPolicy {
 	public fun <init> (Lkotlin/jvm/functions/Function1;)V
-	protected fun <init> (Lnl/adaptivity/xmlutil/serialization/DefaultXmlSerializationPolicy$Builder;)V
+	public fun <init> (Lnl/adaptivity/xmlutil/serialization/DefaultXmlSerializationPolicy$Builder;)V
 	public fun <init> (Lnl/adaptivity/xmlutil/serialization/FormatCache;Lkotlin/jvm/functions/Function1;)V
 	protected fun <init> (Lnl/adaptivity/xmlutil/serialization/FormatCache;Lnl/adaptivity/xmlutil/serialization/DefaultXmlSerializationPolicy$Builder;)V
 	public fun <init> (Lnl/adaptivity/xmlutil/serialization/XmlSerializationPolicy;)V
@@ -68,12 +68,15 @@ public class nl/adaptivity/xmlutil/serialization/DefaultXmlSerializationPolicy :
 	public fun effectiveOutputKind (Lnl/adaptivity/xmlutil/serialization/structure/SafeParentInfo;Lnl/adaptivity/xmlutil/serialization/structure/SafeParentInfo;Z)Lnl/adaptivity/xmlutil/serialization/OutputKind;
 	public fun elementNamespaceDecls (Lnl/adaptivity/xmlutil/serialization/structure/SafeParentInfo;)Ljava/util/List;
 	public fun equals (Ljava/lang/Object;)Z
-	public final fun getAutoPolymorphic ()Z
-	public final fun getEncodeDefault ()Lnl/adaptivity/xmlutil/serialization/XmlSerializationPolicy$XmlEncodeDefault;
-	public final fun getPedantic ()Z
-	public final fun getThrowOnRepeatedElement ()Z
-	public final fun getTypeDiscriminatorName ()Ljavax/xml/namespace/QName;
-	public final fun getUnknownChildHandler ()Lnl/adaptivity/xmlutil/serialization/UnknownChildHandler;
+	public fun getAutoPolymorphic ()Z
+	public fun getDefaultObjectOutputKind ()Lnl/adaptivity/xmlutil/serialization/OutputKind;
+	public fun getDefaultPrimitiveOutputKind ()Lnl/adaptivity/xmlutil/serialization/OutputKind;
+	public fun getEncodeDefault ()Lnl/adaptivity/xmlutil/serialization/XmlSerializationPolicy$XmlEncodeDefault;
+	public final fun getFormatCache ()Lnl/adaptivity/xmlutil/serialization/FormatCache;
+	public fun getPedantic ()Z
+	public fun getThrowOnRepeatedElement ()Z
+	public fun getTypeDiscriminatorName ()Ljavax/xml/namespace/QName;
+	public fun getUnknownChildHandler ()Lnl/adaptivity/xmlutil/serialization/UnknownChildHandler;
 	public fun getVerifyElementOrder ()Z
 	public fun handleUnknownContent (Lnl/adaptivity/xmlutil/XmlReader;Lnl/adaptivity/xmlutil/serialization/InputKind;Ljavax/xml/namespace/QName;Ljava/util/Collection;)V
 	public fun handleUnknownContentRecovering (Lnl/adaptivity/xmlutil/XmlReader;Lnl/adaptivity/xmlutil/serialization/InputKind;Lnl/adaptivity/xmlutil/serialization/structure/XmlDescriptor;Ljavax/xml/namespace/QName;Ljava/util/Collection;)Ljava/util/List;
@@ -102,9 +105,12 @@ public class nl/adaptivity/xmlutil/serialization/DefaultXmlSerializationPolicy :
 public class nl/adaptivity/xmlutil/serialization/DefaultXmlSerializationPolicy$Builder {
 	public fun <init> ()V
 	public fun <init> (Lnl/adaptivity/xmlutil/serialization/DefaultXmlSerializationPolicy;)V
+	public fun <init> (Lnl/adaptivity/xmlutil/serialization/XmlSerializationPolicy;)V
 	public final fun build ()Lnl/adaptivity/xmlutil/serialization/DefaultXmlSerializationPolicy;
 	public final synthetic fun build ()Lnl/adaptivity/xmlutil/serialization/XmlSerializationPolicy;
 	public final fun getAutoPolymorphic ()Z
+	public final fun getDefaultObjectOutputKind ()Lnl/adaptivity/xmlutil/serialization/OutputKind;
+	public final fun getDefaultPrimitiveOutputKind ()Lnl/adaptivity/xmlutil/serialization/OutputKind;
 	public final fun getEncodeDefault ()Lnl/adaptivity/xmlutil/serialization/XmlSerializationPolicy$XmlEncodeDefault;
 	public final fun getFormatCache ()Lnl/adaptivity/xmlutil/serialization/FormatCache;
 	public final fun getPedantic ()Z
@@ -119,6 +125,8 @@ public class nl/adaptivity/xmlutil/serialization/DefaultXmlSerializationPolicy$B
 	public final fun isStrictOtherAttributes ()Z
 	public final fun isXmlFloat ()Z
 	public final fun setAutoPolymorphic (Z)V
+	public final fun setDefaultObjectOutputKind (Lnl/adaptivity/xmlutil/serialization/OutputKind;)V
+	public final fun setDefaultPrimitiveOutputKind (Lnl/adaptivity/xmlutil/serialization/OutputKind;)V
 	public final fun setDefaults_0_91_0 ()V
 	public final fun setEncodeDefault (Lnl/adaptivity/xmlutil/serialization/XmlSerializationPolicy$XmlEncodeDefault;)V
 	public final fun setFormatCache (Lnl/adaptivity/xmlutil/serialization/FormatCache;)V

serialization/api/serialization.klib.api

@@ -947,18 +947,16 @@ open class nl.adaptivity.xmlutil.serialization/DefaultXmlSerializationPolicy : n
     constructor <init>(nl.adaptivity.xmlutil.serialization/FormatCache, nl.adaptivity.xmlutil.serialization/DefaultXmlSerializationPolicy.Builder) // nl.adaptivity.xmlutil.serialization/DefaultXmlSerializationPolicy.<init>|<init>(nl.adaptivity.xmlutil.serialization.FormatCache;nl.adaptivity.xmlutil.serialization.DefaultXmlSerializationPolicy.Builder){}[0]
     constructor <init>(nl.adaptivity.xmlutil.serialization/XmlSerializationPolicy?) // nl.adaptivity.xmlutil.serialization/DefaultXmlSerializationPolicy.<init>|<init>(nl.adaptivity.xmlutil.serialization.XmlSerializationPolicy?){}[0]
 
-    final val autoPolymorphic // nl.adaptivity.xmlutil.serialization/DefaultXmlSerializationPolicy.autoPolymorphic|{}autoPolymorphic[0]
-        final fun <get-autoPolymorphic>(): kotlin/Boolean // nl.adaptivity.xmlutil.serialization/DefaultXmlSerializationPolicy.autoPolymorphic.<get-autoPolymorphic>|<get-autoPolymorphic>(){}[0]
-    final val encodeDefault // nl.adaptivity.xmlutil.serialization/DefaultXmlSerializationPolicy.encodeDefault|{}encodeDefault[0]
-        final fun <get-encodeDefault>(): nl.adaptivity.xmlutil.serialization/XmlSerializationPolicy.XmlEncodeDefault // nl.adaptivity.xmlutil.serialization/DefaultXmlSerializationPolicy.encodeDefault.<get-encodeDefault>|<get-encodeDefault>(){}[0]
-    final val pedantic // nl.adaptivity.xmlutil.serialization/DefaultXmlSerializationPolicy.pedantic|{}pedantic[0]
-        final fun <get-pedantic>(): kotlin/Boolean // nl.adaptivity.xmlutil.serialization/DefaultXmlSerializationPolicy.pedantic.<get-pedantic>|<get-pedantic>(){}[0]
-    final val throwOnRepeatedElement // nl.adaptivity.xmlutil.serialization/DefaultXmlSerializationPolicy.throwOnRepeatedElement|{}throwOnRepeatedElement[0]
-        final fun <get-throwOnRepeatedElement>(): kotlin/Boolean // nl.adaptivity.xmlutil.serialization/DefaultXmlSerializationPolicy.throwOnRepeatedElement.<get-throwOnRepeatedElement>|<get-throwOnRepeatedElement>(){}[0]
-    final val typeDiscriminatorName // nl.adaptivity.xmlutil.serialization/DefaultXmlSerializationPolicy.typeDiscriminatorName|{}typeDiscriminatorName[0]
-        final fun <get-typeDiscriminatorName>(): nl.adaptivity.xmlutil/QName? // nl.adaptivity.xmlutil.serialization/DefaultXmlSerializationPolicy.typeDiscriminatorName.<get-typeDiscriminatorName>|<get-typeDiscriminatorName>(){}[0]
-    final val unknownChildHandler // nl.adaptivity.xmlutil.serialization/DefaultXmlSerializationPolicy.unknownChildHandler|{}unknownChildHandler[0]
-        final fun <get-unknownChildHandler>(): nl.adaptivity.xmlutil.serialization/UnknownChildHandler // nl.adaptivity.xmlutil.serialization/DefaultXmlSerializationPolicy.unknownChildHandler.<get-unknownChildHandler>|<get-unknownChildHandler>(){}[0]
+    final val formatCache // nl.adaptivity.xmlutil.serialization/DefaultXmlSerializationPolicy.formatCache|{}formatCache[0]
+        final fun <get-formatCache>(): nl.adaptivity.xmlutil.serialization/FormatCache // nl.adaptivity.xmlutil.serialization/DefaultXmlSerializationPolicy.formatCache.<get-formatCache>|<get-formatCache>(){}[0]
+    open val autoPolymorphic // nl.adaptivity.xmlutil.serialization/DefaultXmlSerializationPolicy.autoPolymorphic|{}autoPolymorphic[0]
+        open fun <get-autoPolymorphic>(): kotlin/Boolean // nl.adaptivity.xmlutil.serialization/DefaultXmlSerializationPolicy.autoPolymorphic.<get-autoPolymorphic>|<get-autoPolymorphic>(){}[0]
+    open val defaultObjectOutputKind // nl.adaptivity.xmlutil.serialization/DefaultXmlSerializationPolicy.defaultObjectOutputKind|{}defaultObjectOutputKind[0]
+        open fun <get-defaultObjectOutputKind>(): nl.adaptivity.xmlutil.serialization/OutputKind // nl.adaptivity.xmlutil.serialization/DefaultXmlSerializationPolicy.defaultObjectOutputKind.<get-defaultObjectOutputKind>|<get-defaultObjectOutputKind>(){}[0]
+    open val defaultPrimitiveOutputKind // nl.adaptivity.xmlutil.serialization/DefaultXmlSerializationPolicy.defaultPrimitiveOutputKind|{}defaultPrimitiveOutputKind[0]
+        open fun <get-defaultPrimitiveOutputKind>(): nl.adaptivity.xmlutil.serialization/OutputKind // nl.adaptivity.xmlutil.serialization/DefaultXmlSerializationPolicy.defaultPrimitiveOutputKind.<get-defaultPrimitiveOutputKind>|<get-defaultPrimitiveOutputKind>(){}[0]
+    open val encodeDefault // nl.adaptivity.xmlutil.serialization/DefaultXmlSerializationPolicy.encodeDefault|{}encodeDefault[0]
+        open fun <get-encodeDefault>(): nl.adaptivity.xmlutil.serialization/XmlSerializationPolicy.XmlEncodeDefault // nl.adaptivity.xmlutil.serialization/DefaultXmlSerializationPolicy.encodeDefault.<get-encodeDefault>|<get-encodeDefault>(){}[0]
     open val isStrictAttributeNames // nl.adaptivity.xmlutil.serialization/DefaultXmlSerializationPolicy.isStrictAttributeNames|{}isStrictAttributeNames[0]
         open fun <get-isStrictAttributeNames>(): kotlin/Boolean // nl.adaptivity.xmlutil.serialization/DefaultXmlSerializationPolicy.isStrictAttributeNames.<get-isStrictAttributeNames>|<get-isStrictAttributeNames>(){}[0]
     open val isStrictBoolean // nl.adaptivity.xmlutil.serialization/DefaultXmlSerializationPolicy.isStrictBoolean|{}isStrictBoolean[0]
@@ -969,6 +967,14 @@ open class nl.adaptivity.xmlutil.serialization/DefaultXmlSerializationPolicy : n
         open fun <get-isStrictOtherAttributes>(): kotlin/Boolean // nl.adaptivity.xmlutil.serialization/DefaultXmlSerializationPolicy.isStrictOtherAttributes.<get-isStrictOtherAttributes>|<get-isStrictOtherAttributes>(){}[0]
     open val isXmlFloat // nl.adaptivity.xmlutil.serialization/DefaultXmlSerializationPolicy.isXmlFloat|{}isXmlFloat[0]
         open fun <get-isXmlFloat>(): kotlin/Boolean // nl.adaptivity.xmlutil.serialization/DefaultXmlSerializationPolicy.isXmlFloat.<get-isXmlFloat>|<get-isXmlFloat>(){}[0]
+    open val pedantic // nl.adaptivity.xmlutil.serialization/DefaultXmlSerializationPolicy.pedantic|{}pedantic[0]
+        open fun <get-pedantic>(): kotlin/Boolean // nl.adaptivity.xmlutil.serialization/DefaultXmlSerializationPolicy.pedantic.<get-pedantic>|<get-pedantic>(){}[0]
+    open val throwOnRepeatedElement // nl.adaptivity.xmlutil.serialization/DefaultXmlSerializationPolicy.throwOnRepeatedElement|{}throwOnRepeatedElement[0]
+        open fun <get-throwOnRepeatedElement>(): kotlin/Boolean // nl.adaptivity.xmlutil.serialization/DefaultXmlSerializationPolicy.throwOnRepeatedElement.<get-throwOnRepeatedElement>|<get-throwOnRepeatedElement>(){}[0]
+    open val typeDiscriminatorName // nl.adaptivity.xmlutil.serialization/DefaultXmlSerializationPolicy.typeDiscriminatorName|{}typeDiscriminatorName[0]
+        open fun <get-typeDiscriminatorName>(): nl.adaptivity.xmlutil/QName? // nl.adaptivity.xmlutil.serialization/DefaultXmlSerializationPolicy.typeDiscriminatorName.<get-typeDiscriminatorName>|<get-typeDiscriminatorName>(){}[0]
+    open val unknownChildHandler // nl.adaptivity.xmlutil.serialization/DefaultXmlSerializationPolicy.unknownChildHandler|{}unknownChildHandler[0]
+        open fun <get-unknownChildHandler>(): nl.adaptivity.xmlutil.serialization/UnknownChildHandler // nl.adaptivity.xmlutil.serialization/DefaultXmlSerializationPolicy.unknownChildHandler.<get-unknownChildHandler>|<get-unknownChildHandler>(){}[0]
     open val verifyElementOrder // nl.adaptivity.xmlutil.serialization/DefaultXmlSerializationPolicy.verifyElementOrder|{}verifyElementOrder[0]
         open fun <get-verifyElementOrder>(): kotlin/Boolean // nl.adaptivity.xmlutil.serialization/DefaultXmlSerializationPolicy.verifyElementOrder.<get-verifyElementOrder>|<get-verifyElementOrder>(){}[0]
 
@@ -1002,10 +1008,17 @@ open class nl.adaptivity.xmlutil.serialization/DefaultXmlSerializationPolicy : n
     open class Builder { // nl.adaptivity.xmlutil.serialization/DefaultXmlSerializationPolicy.Builder|null[0]
         constructor <init>() // nl.adaptivity.xmlutil.serialization/DefaultXmlSerializationPolicy.Builder.<init>|<init>(){}[0]
         constructor <init>(nl.adaptivity.xmlutil.serialization/DefaultXmlSerializationPolicy) // nl.adaptivity.xmlutil.serialization/DefaultXmlSerializationPolicy.Builder.<init>|<init>(nl.adaptivity.xmlutil.serialization.DefaultXmlSerializationPolicy){}[0]
+        constructor <init>(nl.adaptivity.xmlutil.serialization/XmlSerializationPolicy) // nl.adaptivity.xmlutil.serialization/DefaultXmlSerializationPolicy.Builder.<init>|<init>(nl.adaptivity.xmlutil.serialization.XmlSerializationPolicy){}[0]
 
         final var autoPolymorphic // nl.adaptivity.xmlutil.serialization/DefaultXmlSerializationPolicy.Builder.autoPolymorphic|{}autoPolymorphic[0]
             final fun <get-autoPolymorphic>(): kotlin/Boolean // nl.adaptivity.xmlutil.serialization/DefaultXmlSerializationPolicy.Builder.autoPolymorphic.<get-autoPolymorphic>|<get-autoPolymorphic>(){}[0]
             final fun <set-autoPolymorphic>(kotlin/Boolean) // nl.adaptivity.xmlutil.serialization/DefaultXmlSerializationPolicy.Builder.autoPolymorphic.<set-autoPolymorphic>|<set-autoPolymorphic>(kotlin.Boolean){}[0]
+        final var defaultObjectOutputKind // nl.adaptivity.xmlutil.serialization/DefaultXmlSerializationPolicy.Builder.defaultObjectOutputKind|{}defaultObjectOutputKind[0]
+            final fun <get-defaultObjectOutputKind>(): nl.adaptivity.xmlutil.serialization/OutputKind // nl.adaptivity.xmlutil.serialization/DefaultXmlSerializationPolicy.Builder.defaultObjectOutputKind.<get-defaultObjectOutputKind>|<get-defaultObjectOutputKind>(){}[0]
+            final fun <set-defaultObjectOutputKind>(nl.adaptivity.xmlutil.serialization/OutputKind) // nl.adaptivity.xmlutil.serialization/DefaultXmlSerializationPolicy.Builder.defaultObjectOutputKind.<set-defaultObjectOutputKind>|<set-defaultObjectOutputKind>(nl.adaptivity.xmlutil.serialization.OutputKind){}[0]
+        final var defaultPrimitiveOutputKind // nl.adaptivity.xmlutil.serialization/DefaultXmlSerializationPolicy.Builder.defaultPrimitiveOutputKind|{}defaultPrimitiveOutputKind[0]
+            final fun <get-defaultPrimitiveOutputKind>(): nl.adaptivity.xmlutil.serialization/OutputKind // nl.adaptivity.xmlutil.serialization/DefaultXmlSerializationPolicy.Builder.defaultPrimitiveOutputKind.<get-defaultPrimitiveOutputKind>|<get-defaultPrimitiveOutputKind>(){}[0]
+            final fun <set-defaultPrimitiveOutputKind>(nl.adaptivity.xmlutil.serialization/OutputKind) // nl.adaptivity.xmlutil.serialization/DefaultXmlSerializationPolicy.Builder.defaultPrimitiveOutputKind.<set-defaultPrimitiveOutputKind>|<set-defaultPrimitiveOutputKind>(nl.adaptivity.xmlutil.serialization.OutputKind){}[0]
         final var encodeDefault // nl.adaptivity.xmlutil.serialization/DefaultXmlSerializationPolicy.Builder.encodeDefault|{}encodeDefault[0]
             final fun <get-encodeDefault>(): nl.adaptivity.xmlutil.serialization/XmlSerializationPolicy.XmlEncodeDefault // nl.adaptivity.xmlutil.serialization/DefaultXmlSerializationPolicy.Builder.encodeDefault.<get-encodeDefault>|<get-encodeDefault>(){}[0]
             final fun <set-encodeDefault>(nl.adaptivity.xmlutil.serialization/XmlSerializationPolicy.XmlEncodeDefault) // nl.adaptivity.xmlutil.serialization/DefaultXmlSerializationPolicy.Builder.encodeDefault.<set-encodeDefault>|<set-encodeDefault>(nl.adaptivity.xmlutil.serialization.XmlSerializationPolicy.XmlEncodeDefault){}[0]