Skip to content
This repository was archived by the owner on Aug 24, 2018. It is now read-only.

Commit 895c509

Browse files
committed
port query params fix to 2.9
1 parent 0ac3aea commit 895c509

File tree

3 files changed

+8
-4
lines changed

3 files changed

+8
-4
lines changed

src/main/scala_2.10/com/wordnik/swagger/client/RestClient.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@ class RestClient(config: SwaggerConfig) extends TransportClient with Logging {
284284

285285

286286
private[this] def addBody(method: String, body: String)(req: AsyncHttpClient#BoundRequestBuilder) = {
287-
if (allowsBody.contains(method.toUpperCase(Locale.ENGLISH))) req.setBody(if (body.nonBlank) body else "")
287+
if (allowsBody.contains(method.toUpperCase(Locale.ENGLISH)) && body.nonBlank) req.setBody(body)
288288
req
289289
}
290290

src/main/scala_2.9/com/wordnik/swagger/client/RestClient.scala

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,11 @@ import akka.util.duration._
1717
import org.json4s._
1818
import org.json4s.jackson.JsonMethods
1919
import java.text.SimpleDateFormat
20+
import com.wordnik.swagger.client.async.BuildInfo
2021

2122

2223
object RestClient {
23-
val DefaultUserAgent = "SwaggerClient/1.0"
24+
val DefaultUserAgent = "Reverb SwaggerClient / " + BuildInfo.version
2425

2526
private implicit def stringWithExt(s: String) = new {
2627
def isBlank = s == null || s.trim.isEmpty
@@ -229,7 +230,10 @@ class RestClient(config: SwaggerConfig) extends TransportClient with Logging {
229230
case `GET` | `DELETE` | `HEAD` | `OPTIONS` params foreach { case (k, v) req addQueryParameter (k, v) }
230231
case `PUT` | `POST` | `PATCH` {
231232
if (!isMultipart)
232-
params foreach { case (k, v) req addParameter (k, v) }
233+
if (req.build().getHeaders.getFirstValue("Content-Type").startsWith("application/x-www-form-urlencoded"))
234+
params foreach { case (k, v) req addParameter (k, v) }
235+
else
236+
params foreach { case (k, v) => req addQueryParameter(k, v) }
233237
else {
234238
params foreach { case (k, v) => req addBodyPart new StringPart(k, v, charset.name)}
235239
}

version.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
version in ThisBuild := "0.1.6-SNAPSHOT"
1+
version in ThisBuild := "0.1.6"

0 commit comments

Comments
 (0)