[java-opensaml COMMIT] /trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/HTTPMetadataR...

[noreply at shibboleth.net]

Author: putmanb
Date: Fri Oct 11 16:35:00 2013
New Revision: 3471

URL: http://svn.shibboleth.net/view/java-opensaml?rev=3471&view=rev
Log:
Let HttpClient 4.x instance itself handle compression-related request headers and response processing. 

Modified:
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/HTTPMetadataResolver.java

Modified: trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/HTTPMetadataResolver.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/HTTPMetadataResolver.java?rev=3471&r1=3470&r2=3471&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/HTTPMetadataResolver.java (original)
+++ trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/HTTPMetadataResolver.java Fri Oct 11 16:35:00 2013
@@ -22,8 +22,6 @@
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.Timer;
-import java.util.zip.GZIPInputStream;
-import java.util.zip.InflaterInputStream;
 
 import net.shibboleth.utilities.java.support.component.ComponentSupport;
 import net.shibboleth.utilities.java.support.resolver.ResolverException;
@@ -222,9 +220,6 @@
         
         // TODO Connection header is already unconditionally added by our HttpClientBuilder config, keep here?
         getMethod.addHeader("Connection", "close");
-        // TODO Accept-Encoding could be handled by a request interceptor or decorator client impl. 
-        // Maybe remove depending on what do below re: response handling.
-        getMethod.setHeader("Accept-Encoding", "gzip,deflate");
         if (cachedMetadataETag != null) {
             getMethod.setHeader("If-None-Match", cachedMetadataETag);
         }
@@ -281,26 +276,6 @@
         log.debug("Attempting to extract metadata from response to request for metadata from '{}'", getMetadataURI());
         try {
             InputStream ins = response.getEntity().getContent();
-            
-            // TODO HttpClient v4 supports auto-decompressing via an interceptor and/or decorator client impl.
-            // Figure out how to detect automatic support, if possible, and support along with explicit
-            // decompression below (or not). Maybe just make it wholly the responsibility of the HttpClient
-            // instance which is passed in.
-
-            Header httpHeader = response.getFirstHeader("Content-Encoding");
-            if (httpHeader != null) {
-                String contentEncoding = httpHeader.getValue();
-                if ("deflate".equalsIgnoreCase(contentEncoding)) {
-                    log.debug("Metadata document from '{}' was deflate compressed, decompressing it", metadataURI);
-                    ins = new InflaterInputStream(ins);
-                }
-
-                if ("gzip".equalsIgnoreCase(contentEncoding)) {
-                    log.debug("Metadata document from '{}' was GZip compressed, decompressing it", metadataURI);
-                    ins = new GZIPInputStream(ins);
-                }
-            }
-
             return inputstreamToByteArray(ins);
         } catch (IOException e) {
             log.error("Unable to read response", e);