Skip to content

Commit dade503

Browse files
docs: refine comments on multipart params (#295)
chore(internal): make multipart assertions more robust chore(internal): remove unnecessary `assertNotNull` calls
1 parent b45ee94 commit dade503

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

onebusaway-sdk-kotlin-core/src/main/kotlin/org/onebusaway/core/http/HttpRequestBodies.kt

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ package org.onebusaway.core.http
55
import com.fasterxml.jackson.databind.JsonNode
66
import com.fasterxml.jackson.databind.json.JsonMapper
77
import com.fasterxml.jackson.databind.node.JsonNodeType
8-
import java.io.ByteArrayInputStream
98
import java.io.InputStream
109
import java.io.OutputStream
1110
import org.apache.hc.client5.http.entity.mime.MultipartEntityBuilder
@@ -69,12 +68,12 @@ internal fun multipartFormData(
6968
when (node.nodeType) {
7069
JsonNodeType.MISSING,
7170
JsonNodeType.NULL -> emptySequence()
72-
JsonNodeType.BINARY -> sequenceOf(name to ByteArrayInputStream(node.binaryValue()))
73-
JsonNodeType.STRING -> sequenceOf(name to node.textValue().toInputStream())
71+
JsonNodeType.BINARY -> sequenceOf(name to node.binaryValue().inputStream())
72+
JsonNodeType.STRING -> sequenceOf(name to node.textValue().inputStream())
7473
JsonNodeType.BOOLEAN ->
75-
sequenceOf(name to node.booleanValue().toString().toInputStream())
74+
sequenceOf(name to node.booleanValue().toString().inputStream())
7675
JsonNodeType.NUMBER ->
77-
sequenceOf(name to node.numberValue().toString().toInputStream())
76+
sequenceOf(name to node.numberValue().toString().inputStream())
7877
JsonNodeType.ARRAY ->
7978
node.elements().asSequence().flatMap { element -> serializePart(name, element) }
8079
JsonNodeType.OBJECT ->
@@ -88,7 +87,7 @@ internal fun multipartFormData(
8887
)
8988
}
9089

91-
private fun String.toInputStream(): InputStream = ByteArrayInputStream(toByteArray())
90+
private fun String.inputStream(): InputStream = toByteArray().inputStream()
9291

9392
override fun writeTo(outputStream: OutputStream) = entity.writeTo(outputStream)
9493

0 commit comments

Comments
 (0)