From 3094cf32ea81e49542665c92e5fc07496b841d1a Mon Sep 17 00:00:00 2001 From: Pablo Fernandez Date: Sun, 28 Mar 2010 16:44:50 -0300 Subject: [PATCH] Removed Request repetitive code --- src/main/java/org/scribe/http/Request.java | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/src/main/java/org/scribe/http/Request.java b/src/main/java/org/scribe/http/Request.java index 020d380..5336b4d 100644 --- a/src/main/java/org/scribe/http/Request.java +++ b/src/main/java/org/scribe/http/Request.java @@ -63,12 +63,11 @@ Response doSend() throws IOException{ addHeaders(connection); if(verb.equals(Verb.PUT) || verb.equals(Verb.POST)){ if(payload != null){ - addPayload(connection); + addBody(connection, payload); }else{ - addBody(connection); + addBody(connection, queryString(bodyParams)); } } - return new Response(connection); } @@ -77,17 +76,10 @@ void addHeaders (HttpURLConnection conn){ conn.setRequestProperty(key, headers.get(key)); } - void addBody(HttpURLConnection conn) throws IOException{ - String body = queryString(bodyParams); - conn.setRequestProperty(CONTENT_LENGTH, String.valueOf(body.getBytes().length)); + void addBody(HttpURLConnection conn, String content) throws IOException{ + conn.setRequestProperty(CONTENT_LENGTH, String.valueOf(content.getBytes().length)); conn.setDoOutput(true); - conn.getOutputStream().write(body.getBytes()); - } - - void addPayload(HttpURLConnection conn) throws IOException { - conn.setRequestProperty(CONTENT_LENGTH, String.valueOf(payload.getBytes().length)); - conn.setDoOutput(true); - conn.getOutputStream().write(payload.getBytes()); + conn.getOutputStream().write(content.getBytes()); } /** @@ -130,6 +122,8 @@ public void addPayload(String payload){ * @return a map containing the query string parameters */ public Set> getQueryStringParams(){ + //TODO move this into org.scribe.encoders.URL + //TODO change name of org.scribe.encoders to org.scribe.utils try{ Map params = new HashMap(); String query = new URL(url).getQuery();