@@ -5,7 +5,6 @@ package org.onebusaway.core.http
5
5
import com.fasterxml.jackson.databind.JsonNode
6
6
import com.fasterxml.jackson.databind.json.JsonMapper
7
7
import com.fasterxml.jackson.databind.node.JsonNodeType
8
- import java.io.ByteArrayInputStream
9
8
import java.io.InputStream
10
9
import java.io.OutputStream
11
10
import org.apache.hc.client5.http.entity.mime.MultipartEntityBuilder
@@ -69,12 +68,12 @@ internal fun multipartFormData(
69
68
when (node.nodeType) {
70
69
JsonNodeType .MISSING ,
71
70
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 ())
74
73
JsonNodeType .BOOLEAN ->
75
- sequenceOf(name to node.booleanValue().toString().toInputStream ())
74
+ sequenceOf(name to node.booleanValue().toString().inputStream ())
76
75
JsonNodeType .NUMBER ->
77
- sequenceOf(name to node.numberValue().toString().toInputStream ())
76
+ sequenceOf(name to node.numberValue().toString().inputStream ())
78
77
JsonNodeType .ARRAY ->
79
78
node.elements().asSequence().flatMap { element -> serializePart(name, element) }
80
79
JsonNodeType .OBJECT ->
@@ -88,7 +87,7 @@ internal fun multipartFormData(
88
87
)
89
88
}
90
89
91
- private fun String.toInputStream (): InputStream = ByteArrayInputStream ( toByteArray())
90
+ private fun String.inputStream (): InputStream = toByteArray().inputStream( )
92
91
93
92
override fun writeTo (outputStream : OutputStream ) = entity.writeTo(outputStream)
94
93
0 commit comments