From 5a71d0074285f44bc7fa0adfb90efd469c20ff83 Mon Sep 17 00:00:00 2001 From: Zach Smith Date: Mon, 1 May 2017 16:57:34 -0700 Subject: Change signature for GET query params to allow for duplicate query keys --- src/main/scala/xyz/driver/core/rest.scala | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'src/main') 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 { -- cgit v1.2.3