Support response in gzip.

MichalFoksa · s-gromov · commit 1c5f7a56da8f · 2016-02-05T17:25:31.000+03:00
diff --git a/changelog b/changelog
@@ -1,3 +1,6 @@
+[SNAPSHOT]
+ * Support response in gzip.
+
 [2.2.2]
  * make all APIs to be extentable (have protected constructors, useful for testing)
 
diff --git a/scribejava-core/src/main/java/com/github/scribejava/core/model/Response.java b/scribejava-core/src/main/java/com/github/scribejava/core/model/Response.java
@@ -38,7 +38,11 @@ public Response(int code, String message, Map<String, String> headers, String bo
     }
 
     private String parseBodyContents() {
-        body = StreamUtils.getStreamContents(getStream());
+        if ("gzip".equals(getHeader("Content-Encoding"))) {
+            body = StreamUtils.getGzipStreamContents(getStream());
+        } else {
+            body = StreamUtils.getStreamContents(getStream());
+        }
         return body;
     }
 
diff --git a/scribejava-core/src/main/java/com/github/scribejava/core/utils/StreamUtils.java b/scribejava-core/src/main/java/com/github/scribejava/core/utils/StreamUtils.java
@@ -4,6 +4,7 @@
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.Reader;
+import java.util.zip.GZIPInputStream;
 
 /**
  * Utils to deal with Streams.
@@ -37,4 +38,20 @@ public static String getStreamContents(InputStream is) {
             throw new IllegalStateException("Error while reading response body", ioe);
         }
     }
+
+    /**
+     * Return String content from a gzip stream
+     *
+     * @param is input stream
+     * @return string contents
+     */
+    public static String getGzipStreamContents(InputStream is) {
+        Preconditions.checkNotNull(is, "Cannot get String from a null object");
+        try {
+            final GZIPInputStream gis = new GZIPInputStream(is);
+            return getStreamContents(gis);
+        } catch (IOException ioe) {
+            throw new IllegalStateException("Error while reading response body", ioe);
+        }
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,11 @@ public Response(int code, String message, Map<String, String> headers, String bo`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`private String parseBodyContents() {`
`41`		`- body = StreamUtils.getStreamContents(getStream());`
	`41`	`+ if ("gzip".equals(getHeader("Content-Encoding"))) {`
	`42`	`+ body = StreamUtils.getGzipStreamContents(getStream());`
	`43`	`+ } else {`
	`44`	`+ body = StreamUtils.getStreamContents(getStream());`
	`45`	`+ }`
`42`	`46`	`return body;`
`43`	`47`	`}`
`44`	`48`