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

[noreply at shibboleth.net]

Author: scantor
Date: Thu Dec 13 21:07:18 2012
New Revision: 303

URL: http://svn.shibboleth.net/view/utilities?rev=303&view=rev
Log:
Update references to deprecated methods/classes.

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/httpclient/InMemoryCachingHttpClientBuilder.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=303&r1=302&r2=303&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 Thu Dec 13 21:07:18 2012
@@ -54,7 +54,7 @@
     private int maxCacheEntries;
 
     /** The maximum response body size, in bytes, that will be eligible for caching. Default: 10485760 (10 megabytes) */
-    private int maxCacheEntrySize;
+    private long maxCacheEntrySize;
 
     /**
      * Constructor.
@@ -122,7 +122,7 @@
      * 
      * @return maximum response body size that will be eligible for caching
      */
-    public int getMaxCacheEntrySize() {
+    public long getMaxCacheEntrySize() {
         return maxCacheEntrySize;
     }
 
@@ -131,7 +131,7 @@
      * 
      * @param size maximum response body size that will be eligible for caching, must be greater than zero
      */
-    public void setMaxCacheEntrySize(int size) {
+    public void setMaxCacheEntrySize(long size) {
         maxCacheEntrySize = (int) Constraint.isGreaterThan(0, size, "Maximum cache entry size must be greater than 0");
     }
 
@@ -162,7 +162,7 @@
 
         CacheConfig cacheConfig = new CacheConfig();
         cacheConfig.setMaxCacheEntries(maxCacheEntries);
-        cacheConfig.setMaxObjectSizeBytes(maxCacheEntrySize);
+        cacheConfig.setMaxObjectSize(maxCacheEntrySize);
         cacheConfig.setHeuristicCachingEnabled(false);
         cacheConfig.setSharedCache(false);
 

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=303&r1=302&r2=303&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 Thu Dec 13 21:07:18 2012
@@ -45,7 +45,7 @@
 import org.apache.http.conn.scheme.SchemeRegistry;
 import org.apache.http.conn.ssl.SSLSocketFactory;
 import org.apache.http.impl.client.DefaultHttpClient;
-import org.apache.http.impl.conn.tsccm.ThreadSafeClientConnManager;
+import org.apache.http.impl.conn.PoolingClientConnectionManager;
 import org.apache.http.params.HttpParams;
 
 //TODO retry attempts, keep alive strategy
@@ -474,15 +474,15 @@
     }
 
     /**
-     * Builds the connection manager used by the HTTP client. A {@link ThreadSafeClientConnManager} is used with
-     * {@link ThreadSafeClientConnManager#setDefaultMaxPerRoute(int)} set to {@link #connectionsMaxPerRoute} and
-     * {@link ThreadSafeClientConnManager#setMaxTotal(int)} set to {@link #connectionsMaxTotal}.
+     * Builds the connection manager used by the HTTP client. A {@link PoolingClientConnectionManager} is used with
+     * {@link PoolingClientConnectionManager#setDefaultMaxPerRoute(int)} set to {@link #connectionsMaxPerRoute} and
+     * {@link PoolingClientConnectionManager#setMaxTotal(int)} set to {@link #connectionsMaxTotal}.
      * 
      * @return the connection manager used by the HTTP client
      */
     private ClientConnectionManager buildConnectionManager() {
         final SchemeRegistry registry = buildSchemeRegistry();
-        final ThreadSafeClientConnManager manager = new ThreadSafeClientConnManager(registry);
+        final PoolingClientConnectionManager manager = new PoolingClientConnectionManager(registry);
         manager.setDefaultMaxPerRoute(connectionsMaxPerRoute);
         manager.setMaxTotal(connectionsMaxTotal);
         return manager;

Modified: java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/httpclient/InMemoryCachingHttpClientBuilder.java
URL: http://svn.shibboleth.net/view/utilities/java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/httpclient/InMemoryCachingHttpClientBuilder.java?rev=303&r1=302&r2=303&view=diff

[... 42 lines stripped ...]