From 40bb52537441c4e51dc9c40a4486ba5bc1bb33c5 Mon Sep 17 00:00:00 2001 From: Pablo Fernandez Date: Mon, 10 Jan 2011 15:04:26 -0300 Subject: [PATCH] Added url params before making the connection Renamed method to keep consistency --- src/main/java/org/scribe/model/Request.java | 5 +++-- src/main/java/org/scribe/oauth/OAuth20ServiceImpl.java | 2 +- src/test/java/org/scribe/model/RequestTest.java | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/scribe/model/Request.java b/src/main/java/org/scribe/model/Request.java index 7557bb8..1d6b677 100644 --- a/src/main/java/org/scribe/model/Request.java +++ b/src/main/java/org/scribe/model/Request.java @@ -61,9 +61,10 @@ class Request private void createConnection() throws IOException { + String effectiveUrl = URLUtils.appendParametersToQueryString(url, querystringParams); if (connection == null) { - connection = (HttpURLConnection) new URL(url).openConnection(); + connection = (HttpURLConnection) new URL(effectiveUrl).openConnection(); } } @@ -119,7 +120,7 @@ class Request * @param key the parameter name * @param value the parameter value */ - public void addQuerystringParam(String key, String value) + public void addQuerystringParameter(String key, String value) { this.querystringParams.put(key, value); } diff --git a/src/main/java/org/scribe/oauth/OAuth20ServiceImpl.java b/src/main/java/org/scribe/oauth/OAuth20ServiceImpl.java index f957257..a81dc88 100644 --- a/src/main/java/org/scribe/oauth/OAuth20ServiceImpl.java +++ b/src/main/java/org/scribe/oauth/OAuth20ServiceImpl.java @@ -59,7 +59,7 @@ public class OAuth20ServiceImpl implements OAuthService */ public void signRequest(Token accessToken, OAuthRequest request) { - request.addQuerystringParam(OAuthConstants.ACCESS_TOKEN, accessToken.getToken()); + request.addQuerystringParameter(OAuthConstants.ACCESS_TOKEN, accessToken.getToken()); } /** diff --git a/src/test/java/org/scribe/model/RequestTest.java b/src/test/java/org/scribe/model/RequestTest.java index 601e9bd..750f004 100644 --- a/src/test/java/org/scribe/model/RequestTest.java +++ b/src/test/java/org/scribe/model/RequestTest.java @@ -69,8 +69,8 @@ public class RequestTest public void shouldAllowAddingQuerystringParametersAfterCreation() { Request request = new Request(Verb.GET, "http://example.com?one=val"); - request.addQuerystringParam("two", "other val"); - request.addQuerystringParam("more", "params"); + request.addQuerystringParameter("two", "other val"); + request.addQuerystringParameter("more", "params"); assertEquals(3, request.getQueryStringParams().size()); }