aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZach Smith <zach@driver.xyz>2017-05-01 16:57:34 -0700
committerZach Smith <zach@driver.xyz>2017-05-24 13:50:04 -0700
commit5a71d0074285f44bc7fa0adfb90efd469c20ff83 (patch)
tree44e51f6d64280506d8e2e14923aa8af0caab33cf
parent6427b9dc1a60b670c70aca05f419e3fc3313cf6a (diff)
downloaddriver-core-5a71d0074285f44bc7fa0adfb90efd469c20ff83.tar.gz
driver-core-5a71d0074285f44bc7fa0adfb90efd469c20ff83.tar.bz2
driver-core-5a71d0074285f44bc7fa0adfb90efd469c20ff83.zip
Change signature for GET query params to allow for duplicate query keys
-rw-r--r--src/main/scala/xyz/driver/core/rest.scala11
1 files changed, 4 insertions, 7 deletions
diff --git a/src/main/scala/xyz/driver/core/rest.scala b/src/main/scala/xyz/driver/core/rest.scala
index f1eab45..0bc9595 100644
--- a/src/main/scala/xyz/driver/core/rest.scala
+++ b/src/main/scala/xyz/driver/core/rest.scala
@@ -217,11 +217,8 @@ package rest {
protected def jsonEntity(json: JsValue): RequestEntity =
HttpEntity(ContentTypes.`application/json`, json.compactPrint)
- protected def get(baseUri: Uri, path: String) =
- HttpRequest(HttpMethods.GET, endpointUri(baseUri, path))
-
- protected def get(baseUri: Uri, path: String, query: Map[String, String]) =
- HttpRequest(HttpMethods.GET, endpointUri(baseUri, path, query))
+ protected def get(baseUri: Uri, path: String, query: (String, String)*) =
+ HttpRequest(HttpMethods.GET, endpointUri(baseUri, path, query: _*))
protected def post(baseUri: Uri, path: String, httpEntity: RequestEntity) =
HttpRequest(HttpMethods.POST, endpointUri(baseUri, path), entity = httpEntity)
@@ -235,8 +232,8 @@ package rest {
protected def endpointUri(baseUri: Uri, path: String) =
baseUri.withPath(Uri.Path(path))
- protected def endpointUri(baseUri: Uri, path: String, query: Map[String, String]) =
- baseUri.withPath(Uri.Path(path)).withQuery(Uri.Query(query))
+ protected def endpointUri(baseUri: Uri, path: String, query: (String, String)*) =
+ baseUri.withPath(Uri.Path(path)).withQuery(Uri.Query(query: _*))
}
trait ServiceTransport {