[utilities COMMIT] in /java-support/trunk/src/main/java/net/shibboleth/utilities/java/support: httpclient/FileCaching...

[noreply at shibboleth.net]

Author: rdw
Date: Mon Nov 25 11:21:00 2013
New Revision: 478

URL: http://svn.shibboleth.net/view/utilities?rev=478&view=rev
Log:
CheckStyle

Modified:
    java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/httpclient/FileCachingHttpClientBuilder.java
    java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/httpclient/HttpClientBuilder.java
    java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/security/SecureRandomIdentifierGenerationStrategy.java
    java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/xml/BasicParserPool.java
    java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/xml/NamespaceSupport.java

Modified: java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/httpclient/FileCachingHttpClientBuilder.java
URL: http://svn.shibboleth.net/view/utilities/java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/httpclient/FileCachingHttpClientBuilder.java?rev=478&r1=477&r2=478&view=diff
==============================================================================
--- java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/httpclient/FileCachingHttpClientBuilder.java (original)
+++ java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/httpclient/FileCachingHttpClientBuilder.java Mon Nov 25 11:21:00 2013
@@ -26,14 +26,13 @@
 import net.shibboleth.utilities.java.support.logic.Constraint;
 import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
-import org.apache.http.client.HttpClient;
 import org.apache.http.impl.client.cache.CacheConfig;
 import org.apache.http.impl.client.cache.CachingHttpClientBuilder;
 import org.apache.http.impl.client.cache.FileResourceFactory;
 import org.apache.http.impl.client.cache.ManagedHttpCacheStorage;
 
 /**
- * An {@link HttpClient} builder that supports RFC 2616 caching.
+ * An {@link org.apache.http.client.HttpClient} builder that supports RFC 2616 caching.
  * <p>
  * Cached content is written to disk. Special care should be taken so that multiple clients do not share a single cache
  * directory unintentionally. This could result senstive data being available in ways it should not be.

Modified: java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/httpclient/HttpClientBuilder.java
URL: http://svn.shibboleth.net/view/utilities/java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/httpclient/HttpClientBuilder.java?rev=478&r1=477&r2=478&view=diff
==============================================================================
--- java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/httpclient/HttpClientBuilder.java (original)
+++ java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/httpclient/HttpClientBuilder.java Mon Nov 25 11:21:00 2013
@@ -21,7 +21,6 @@
 import java.net.UnknownHostException;
 
 import javax.annotation.Nonnull;
-import javax.net.ssl.SSLContext;
 
 import net.shibboleth.utilities.java.support.logic.Constraint;
 import net.shibboleth.utilities.java.support.primitive.StringSupport;
@@ -33,98 +32,92 @@
 import org.apache.http.client.HttpClient;
 import org.apache.http.client.config.RequestConfig;
 import org.apache.http.config.ConnectionConfig;
-import org.apache.http.config.SocketConfig;
-import org.apache.http.conn.HttpClientConnectionManager;
-import org.apache.http.conn.socket.LayeredConnectionSocketFactory;
-import org.apache.http.conn.ssl.X509HostnameVerifier;
 import org.apache.http.impl.client.BasicCredentialsProvider;
 import org.apache.http.util.CharsetUtils;
 
 //TODO retry attempts, keep alive strategy
 
-/** Builder used to construct {@link HttpClient} objects configured with particular settings. 
+/**
+ * Builder used to construct {@link HttpClient} objects configured with particular settings.
  * 
  * <p>
  * When using the single-arg constructor variant to wrap an existing instance of
- * {@link org.apache.http.impl.client.HttpClientBuilder}, there are several caveats
- * of which to be aware:
+ * {@link org.apache.http.impl.client.HttpClientBuilder}, there are several caveats of which to be aware:
  * 
  * <ul>
  * 
  * <li>
- * Instances of the following which are set as the default instance on the Apache builder will be
- * unconditionally overwritten by this builder when {@link #buildClient()} is called:
- * 
- *   <ul>
- *   <li>{@link RequestConfig}</li>
- *   <li>{@link ConnectionConfig}</li>
- *   </ul>
- *   
- *   <p>
- *   This is due to the unfortunate fact that the Apache builder does not currently provide accessor methods to
- *   obtain the default instances currently set on the builder.  Therefore, if you need to set any default request
- *   or connection config parameters which are not exposed by this builder, then you must use the Apache
- *   builder directly and may not use this builder.
- *   </p>
+ * Instances of the following which are set as the default instance on the Apache builder will be unconditionally
+ * overwritten by this builder when {@link #buildClient()} is called:
+ * 
+ * <ul>

[... 304 lines stripped ...]