Make null the default encoding in various places
#206
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This usually cuases the implementation to auto-detect the encoding.
sschuberth
force-pushed
the
default-null-encoding
branch
from
1a6487a
to
f547a16
Compare
pdvrieze
added a commit
that referenced
this pull request
May 3, 2024
default parameters on overrides are not correct, and changing default values is a breaking API change.
pdvrieze
reviewed
May 3, 2024
There was a problem hiding this comment.
Thanks for the pull request. Due to the need to maintain API compatibility I have changed some ways in which this works (with a new interface method rather than having a default argument for newReader. There were also various bits of code that I should have deleted, but hadn't yet (they were no longer in the sourceset). As such it was easier to just do the changes directly.
| @@ -136,7 +136,7 @@ public actual object XmlStreaming : XmlStreamingJavaCommon(), IXmlStreaming { | |||
| public fun newGenericReader(input: String): XmlReader = | |||
| newGenericReader(StringReader(input)) | |||
|
|
|||
| public fun newGenericReader(inputStream: InputStream, encoding: String?): XmlReader = | |||
| public fun newGenericReader(inputStream: InputStream, encoding: String? = null): XmlReader = | |||
There was a problem hiding this comment.
This is no longer part of any sourceSet, and should have been removed.
| @@ -327,7 +327,7 @@ public class BetterXmlSerializer : XmlSerializer { | |||
| } | |||
|
|
|||
| @Throws(IOException::class) | |||
| override fun setOutput(os: OutputStream?, encoding: String?) { | |||
| override fun setOutput(os: OutputStream?, encoding: String? = null) { | |||
There was a problem hiding this comment.
This class is deprecated/unused. This function overrides a Java type, so shouldn't really have default parameter.
| @@ -29,7 +29,7 @@ import kotlin.jvm.JvmInline | |||
| @ExperimentalXmlUtilApi | |||
| public class KtXmlReader internal constructor( | |||
| private val reader: Reader, | |||
| encoding: String?, | |||
| encoding: String? = null, | |||
There was a problem hiding this comment.
This has been updated (but was internal anyway)
| @@ -188,7 +188,7 @@ public actual object XmlStreaming : XmlStreamingJavaCommon(), IXmlStreaming { | |||
| public fun newGenericReader(input: String): XmlReader = | |||
| newGenericReader(StringReader(input)) | |||
|
|
|||
| public fun newGenericReader(inputStream: InputStream, encoding: String?): XmlReader = | |||
| public fun newGenericReader(inputStream: InputStream, encoding: String? = null): XmlReader = | |||
There was a problem hiding this comment.
Not an override, so has been added.
| @@ -46,7 +46,7 @@ public class StAXReader(private val delegate: XMLStreamReader) : XmlReader { | |||
| public constructor(reader: Reader) : this(safeInputFactory().createXMLStreamReader(reader)) | |||
|
|
|||
| @Throws(XMLStreamException::class) | |||
| public constructor(inputStream: InputStream, encoding: String?) : this( | |||
| public constructor(inputStream: InputStream, encoding: String? = null) : this( | |||
| @@ -157,7 +157,7 @@ public actual object XmlStreaming : XmlStreamingJavaCommon(), IXmlStreaming { | |||
| public fun newGenericReader(input: String): XmlReader = | |||
| newGenericReader(StringReader(input)) | |||
|
|
|||
| public fun newGenericReader(inputStream: InputStream, encoding: String?): XmlReader = | |||
| public fun newGenericReader(inputStream: InputStream, encoding: String? = null): XmlReader = | |||
There was a problem hiding this comment.
This code is not actually in a sourceset (but forgot to delete it)
| @@ -336,7 +336,7 @@ public class BetterXmlSerializer : XmlSerializer { | |||
| } | |||
|
|
|||
| @Throws(IOException::class) | |||
| override fun setOutput(os: OutputStream?, encoding: String?) { | |||
| override fun setOutput(os: OutputStream?, encoding: String? = null) { | |||
| @@ -47,7 +47,7 @@ public class StAXReader(private val delegate: XMLStreamReader) : XmlReader { | |||
| public constructor(reader: Reader) : this(safeInputFactory().createXMLStreamReader(reader)) | |||
|
|
|||
| @Throws(XMLStreamException::class) | |||
| public constructor(inputStream: InputStream, encoding: String?) : this( | |||
| public constructor(inputStream: InputStream, encoding: String? = null) : this( | |||
| @@ -191,7 +191,7 @@ public actual object XmlStreaming : XmlStreamingJavaCommon(), IXmlStreaming { | |||
| public fun newGenericReader(input: String): XmlReader = | |||
| newGenericReader(StringReader(input)) | |||
|
|
|||
| public fun newGenericReader(inputStream: InputStream, encoding: String?): XmlReader = | |||
| public fun newGenericReader(inputStream: InputStream, encoding: String? = null): XmlReader = | |||
|
This has been implemented with an alternate implementation. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This usually cuases the implementation to auto-detect the encoding.