You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by ol...@apache.org on 2014/12/07 13:38:26 UTC

svn commit: r1643670 - /httpcomponents/httpclient/trunk/fluent-hc/src/main/java/org/apache/http/client/fluent/ContentResponseHandler.java

Author: olegk
Date: Sun Dec  7 12:38:25 2014
New Revision: 1643670

URL: http://svn.apache.org/r1643670
Log:
ContentResponseHandler to extend AbstractResponseHandler

Modified:
    httpcomponents/httpclient/trunk/fluent-hc/src/main/java/org/apache/http/client/fluent/ContentResponseHandler.java

Modified: httpcomponents/httpclient/trunk/fluent-hc/src/main/java/org/apache/http/client/fluent/ContentResponseHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/fluent-hc/src/main/java/org/apache/http/client/fluent/ContentResponseHandler.java?rev=1643670&r1=1643669&r2=1643670&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/fluent-hc/src/main/java/org/apache/http/client/fluent/ContentResponseHandler.java (original)
+++ httpcomponents/httpclient/trunk/fluent-hc/src/main/java/org/apache/http/client/fluent/ContentResponseHandler.java Sun Dec  7 12:38:25 2014
@@ -29,12 +29,8 @@ package org.apache.http.client.fluent;
 import java.io.IOException;
 
 import org.apache.http.HttpEntity;
-import org.apache.http.HttpResponse;
-import org.apache.http.StatusLine;
-import org.apache.http.client.ClientProtocolException;
-import org.apache.http.client.HttpResponseException;
-import org.apache.http.client.ResponseHandler;
 import org.apache.http.entity.ContentType;
+import org.apache.http.impl.client.AbstractResponseHandler;
 import org.apache.http.util.EntityUtils;
 
 /**
@@ -46,23 +42,13 @@ import org.apache.http.util.EntityUtils;
  *
  * @since 4.4
  */
-public class ContentResponseHandler implements ResponseHandler<Content> {
+public class ContentResponseHandler extends AbstractResponseHandler<Content> {
 
     @Override
-    public Content handleResponse(
-            final HttpResponse response) throws ClientProtocolException, IOException {
-        final StatusLine statusLine = response.getStatusLine();
-        final HttpEntity entity = response.getEntity();
-        if (statusLine.getStatusCode() >= 300) {
-            throw new HttpResponseException(statusLine.getStatusCode(),
-                    statusLine.getReasonPhrase());
-        }
-        if (entity != null) {
-            return new Content(
-                    EntityUtils.toByteArray(entity),
-                    ContentType.getOrDefault(entity));
-        }
-        return Content.NO_CONTENT;
+    public Content handleEntity(final HttpEntity entity) throws IOException {
+        return entity != null ?
+                new Content(EntityUtils.toByteArray(entity), ContentType.getOrDefault(entity)) :
+                Content.NO_CONTENT;
     }
 
 }