Merge branch 'dewos-master'

Author: Shashi Ranjan

README.md

@@ -123,15 +123,23 @@ For example, serializing Json from\to Object using the popular Jackson ObjectMap
 ```java
 // Only one time
 Unirest.setObjectMapper(new ObjectMapper() {
-    private com.fasterxml.jackson.databind.ObjectMapper objectMapper 
-        = new com.fasterxml.jackson.databind.ObjectMapper();
-
-    public Object readValue(String value) {
-        return objectMapper.readValue(value);
-    }
+    private com.fasterxml.jackson.databind.ObjectMapper jacksonObjectMapper
+                = new com.fasterxml.jackson.databind.ObjectMapper();
 
+    public <T> T readValue(String value, Class<T> valueType) {
+        try {
+            return jacksonObjectMapper.readValue(value, valueType);
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
     public String writeValue(Object value) {
-        return objectMapper.writeValueAsString(value);
+        try {
+            return jacksonObjectMapper.writeValueAsString(value);
+        } catch (JsonProcessingException e) {
+            throw new RuntimeException(e);
+        }
     }
 });
 

formatter/unirest-code-format.xml

@@ -43,6 +43,7 @@
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+		<jackson.version>2.6.0</jackson.version>
 	</properties>
 
 	<build>
@@ -132,5 +133,11 @@
 			<version>2.4</version>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-databind</artifactId>
+			<version>${jackson.version}</version>
+			<scope>test</scope>
+		</dependency>
 	</dependencies>
 </project>

pom.xml

@@ -8,7 +8,7 @@ public class Headers extends HashMap<String, List<String>> {
 	private static final long serialVersionUID = 71310341388734766L;
 
 	public String getFirst(Object key) {
-		Object lowerCasedKey = key instanceof String ? ((String)key).toLowerCase() : key;
+		Object lowerCasedKey = key instanceof String ? ((String) key).toLowerCase() : key;
 		List<String> list = get(lowerCasedKey);
 		if (list != null && list.size() > 0) {
 			return list.get(0);

src/main/java/com/mashape/unirest/http/Headers.java

@@ -68,8 +68,7 @@ public class HttpClientHelper {
 	private static final String USER_AGENT_HEADER = "user-agent";
 	private static final String USER_AGENT = "unirest-java/1.3.11";
 
-	private static <T> FutureCallback<org.apache.http.HttpResponse> prepareCallback(final Class<T> responseClass,
-			final Callback<T> callback) {
+	private static <T> FutureCallback<org.apache.http.HttpResponse> prepareCallback(final Class<T> responseClass, final Callback<T> callback) {
 		if (callback == null)
 			return null;
 
@@ -100,8 +99,7 @@ public static <T> Future<HttpResponse<T>> requestAsync(HttpRequest request, fina
 			asyncIdleConnectionMonitorThread.start();
 		}
 
-		final Future<org.apache.http.HttpResponse> future = asyncHttpClient.execute(requestObj,
-				prepareCallback(responseClass, callback));
+		final Future<org.apache.http.HttpResponse> future = asyncHttpClient.execute(requestObj, prepareCallback(responseClass, callback));
 
 		return new Future<HttpResponse<T>>() {
 
@@ -122,8 +120,7 @@ public HttpResponse<T> get() throws InterruptedException, ExecutionException {
 				return new HttpResponse<T>(httpResponse, responseClass);
 			}
 
-			public HttpResponse<T> get(long timeout, TimeUnit unit) throws InterruptedException, ExecutionException,
-					TimeoutException {
+			public HttpResponse<T> get(long timeout, TimeUnit unit) throws InterruptedException, ExecutionException, TimeoutException {
 				org.apache.http.HttpResponse httpResponse = future.get(timeout, unit);
 				return new HttpResponse<T>(httpResponse, responseClass);
 			}
@@ -135,7 +132,7 @@ public static <T> HttpResponse<T> request(HttpRequest request, Class<T> response
 		HttpClient client = ClientFactory.getHttpClient(); // The
 															// DefaultHttpClient
 															// is thread-safe
-		
+
 		org.apache.http.HttpResponse response;
 		try {
 			response = client.execute(requestObj);
@@ -185,7 +182,7 @@ private static HttpRequestBase prepareRequest(HttpRequest request, boolean async
 		} catch (Exception e) {
 			throw new RuntimeException(e);
 		}
-		
+
 		switch (request.getHttpMethod()) {
 		case GET:
 			reqObj = new HttpGet(urlToRequest);
@@ -209,12 +206,12 @@ private static HttpRequestBase prepareRequest(HttpRequest request, boolean async
 			reqObj = new HttpHead(urlToRequest);
 			break;
 		}
-		
+
 		Set<Entry<String, List<String>>> entrySet = request.getHeaders().entrySet();
-		for(Entry<String, List<String>> entry : entrySet) {
+		for (Entry<String, List<String>> entry : entrySet) {
 			List<String> values = entry.getValue();
 			if (values != null) {
-				for(String value : values) {
+				for (String value : values) {
 					reqObj.addHeader(entry.getKey(), value);
 				}
 			}

src/main/java/com/mashape/unirest/http/HttpClientHelper.java

@@ -21,7 +21,7 @@ a copy of this software and associated documentation files (the
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
+ */
 
 package com.mashape.unirest.http;
 
@@ -30,16 +30,23 @@ a copy of this software and associated documentation files (the
 import org.apache.http.client.methods.HttpEntityEnclosingRequestBase;
 
 class HttpDeleteWithBody extends HttpEntityEnclosingRequestBase {
-    public static final String METHOD_NAME = "DELETE";
-    public String getMethod() { return METHOD_NAME; }
-
-    public HttpDeleteWithBody(final String uri) {
-        super();
-        setURI(URI.create(uri));
-    }
-    public HttpDeleteWithBody(final URI uri) {
-        super();
-        setURI(uri);
-    }
-    public HttpDeleteWithBody() { super(); }
+	public static final String METHOD_NAME = "DELETE";
+
+	public String getMethod() {
+		return METHOD_NAME;
+	}
+
+	public HttpDeleteWithBody(final String uri) {
+		super();
+		setURI(URI.create(uri));
+	}
+
+	public HttpDeleteWithBody(final URI uri) {
+		super();
+		setURI(uri);
+	}
+
+	public HttpDeleteWithBody() {
+		super();
+	}
 }

src/main/java/com/mashape/unirest/http/HttpDeleteWithBody.java

@@ -21,7 +21,7 @@ a copy of this software and associated documentation files (the
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
+ */
 
 package com.mashape.unirest.http;
 

src/main/java/com/mashape/unirest/http/HttpMethod.java

@@ -21,7 +21,7 @@ a copy of this software and associated documentation files (the
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
+ */
 
 package com.mashape.unirest.http;
 
@@ -30,16 +30,23 @@ a copy of this software and associated documentation files (the
 import org.apache.http.client.methods.HttpEntityEnclosingRequestBase;
 
 class HttpPatchWithBody extends HttpEntityEnclosingRequestBase {
-    public static final String METHOD_NAME = "PATCH";
-    public String getMethod() { return METHOD_NAME; }
-
-    public HttpPatchWithBody(final String uri) {
-        super();
-        setURI(URI.create(uri));
-    }
-    public HttpPatchWithBody(final URI uri) {
-        super();
-        setURI(uri);
-    }
-    public HttpPatchWithBody() { super(); }
+	public static final String METHOD_NAME = "PATCH";
+
+	public String getMethod() {
+		return METHOD_NAME;
+	}
+
+	public HttpPatchWithBody(final String uri) {
+		super();
+		setURI(URI.create(uri));
+	}
+
+	public HttpPatchWithBody(final URI uri) {
+		super();
+		setURI(uri);
+	}
+
+	public HttpPatchWithBody() {
+		super();
+	}
 }

src/main/java/com/mashape/unirest/http/HttpPatchWithBody.java

@@ -21,7 +21,7 @@ a copy of this software and associated documentation files (the
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
+ */
 
 package com.mashape.unirest.http;
 
@@ -52,30 +52,31 @@ public class HttpResponse<T> {
 	public HttpResponse(org.apache.http.HttpResponse response, Class<T> responseClass) {
 		HttpEntity responseEntity = response.getEntity();
 		ObjectMapper objectMapper = (ObjectMapper) Options.getOption(Option.OBJECT_MAPPER);
-		
+
 		Header[] allHeaders = response.getAllHeaders();
-		for(Header header : allHeaders) {
+		for (Header header : allHeaders) {
 			String headerName = header.getName().toLowerCase();
 			List<String> list = headers.get(headerName);
-			if (list == null) list = new ArrayList<String>();
+			if (list == null)
+				list = new ArrayList<String>();
 			list.add(header.getValue());
 			headers.put(headerName, list);
 		}
 		StatusLine statusLine = response.getStatusLine();
 		this.statusCode = statusLine.getStatusCode();
 		this.statusText = statusLine.getReasonPhrase();
-		
+
 		if (responseEntity != null) {
 			String charset = "UTF-8";
-			
+
 			Header contentType = responseEntity.getContentType();
 			if (contentType != null) {
 				String responseCharset = ResponseUtils.getCharsetFromContentType(contentType.getValue());
 				if (responseCharset != null && !responseCharset.trim().equals("")) {
 					charset = responseCharset;
 				}
 			}
-		
+
 			try {
 				byte[] rawBody;
 				try {
@@ -97,15 +98,15 @@ public HttpResponse(org.apache.http.HttpResponse response, Class<T> responseClas
 				} else if (InputStream.class.equals(responseClass)) {
 					this.body = (T) this.rawBody;
 				} else if (objectMapper != null) {
-					this.body = (T) objectMapper.readValue(new String(rawBody, charset));
+					this.body = objectMapper.readValue(new String(rawBody, charset), responseClass);
 				} else {
 					throw new Exception("Only String, JsonNode and InputStream are supported, or an ObjectMapper implementation is required.");
 				}
 			} catch (Exception e) {
 				throw new RuntimeException(e);
 			}
 		}
-		
+
 		try {
 			EntityUtils.consume(responseEntity);
 		} catch (IOException e) {
@@ -116,7 +117,7 @@ public HttpResponse(org.apache.http.HttpResponse response, Class<T> responseClas
 	public int getStatus() {
 		return statusCode;
 	}
-	
+
 	public String getStatusText() {
 		return statusText;
 	}

src/main/java/com/mashape/unirest/http/HttpResponse.java

@@ -21,7 +21,7 @@ a copy of this software and associated documentation files (the
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
+ */
 
 package com.mashape.unirest.http;
 
@@ -30,10 +30,10 @@ a copy of this software and associated documentation files (the
 import org.json.JSONObject;
 
 public class JsonNode {
-	
+
 	private JSONObject jsonObject;
 	private JSONArray jsonArray;
-	
+
 	private boolean array;
 
 	public JsonNode(String json) {
@@ -53,11 +53,11 @@ public JsonNode(String json) {
 			}
 		}
 	}
-	
+
 	public JSONObject getObject() {
 		return this.jsonObject;
 	}
-	
+
 	public JSONArray getArray() {
 		JSONArray result = this.jsonArray;
 		if (array == false) {
@@ -66,18 +66,20 @@ public JSONArray getArray() {
 		}
 		return result;
 	}
-	
+
 	public boolean isArray() {
 		return this.array;
 	}
-	
+
 	@Override
 	public String toString() {
 		if (isArray()) {
-			if (jsonArray == null) return null;
+			if (jsonArray == null)
+				return null;
 			return jsonArray.toString();
 		}
-		if (jsonObject == null) return null;
+		if (jsonObject == null)
+			return null;
 		return jsonObject.toString();
 	}
 }