hc-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject svn commit: r981668 - in /httpcomponents/httpclient/trunk/httpclient-cache/src: main/java/org/apache/http/impl/client/cache/ test/java/org/apache/http/impl/client/cache/
Date Mon, 02 Aug 2010 19:55:52 GMT
Author: olegk
Date: Mon Aug  2 19:55:52 2010
New Revision: 981668

URL: http://svn.apache.org/viewvc?rev=981668&view=rev
Log:
Renamed CacheEntryGenerator to MemCacheEntryFactory

Added:
    httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/MemCacheEntryFactory.java
      - copied, changed from r981667, httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CacheEntryGenerator.java
Removed:
    httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CacheEntryGenerator.java
Modified:
    httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CacheEntryUpdater.java
    httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CachingHttpClient.java
    httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/AbstractProtocolTest.java
    httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/DoNotTestProtocolRequirements.java
    httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestCacheEntry.java
    httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestCacheEntryGenerator.java
    httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestProtocolDeviations.java

Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CacheEntryUpdater.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CacheEntryUpdater.java?rev=981668&r1=981667&r2=981668&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CacheEntryUpdater.java
(original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CacheEntryUpdater.java
Mon Aug  2 19:55:52 2010
@@ -58,7 +58,7 @@ class CacheEntryUpdater {
     private final HttpCacheEntryFactory cacheEntryFactory;
 
     CacheEntryUpdater() {
-        this(new CacheEntryGenerator());
+        this(new MemCacheEntryFactory());
     }
 
     CacheEntryUpdater(final HttpCacheEntryFactory cacheEntryFactory) {

Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CachingHttpClient.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CachingHttpClient.java?rev=981668&r1=981667&r2=981668&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CachingHttpClient.java
(original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CachingHttpClient.java
Mon Aug  2 19:55:52 2010
@@ -138,28 +138,28 @@ public class CachingHttpClient implement
     public CachingHttpClient() {
         this(new DefaultHttpClient(),
                 new BasicHttpCache(MAX_CACHE_ENTRIES),
-                new CacheEntryGenerator(),
+                new MemCacheEntryFactory(),
                 new CacheConfig());
     }
 
     public CachingHttpClient(CacheConfig config) {
         this(new DefaultHttpClient(),
                 new BasicHttpCache(MAX_CACHE_ENTRIES),
-                new CacheEntryGenerator(),
+                new MemCacheEntryFactory(),
                 config);
     }
 
     public CachingHttpClient(HttpClient client) {
         this(client,
                 new BasicHttpCache(MAX_CACHE_ENTRIES),
-                new CacheEntryGenerator(),
+                new MemCacheEntryFactory(),
                 new CacheConfig());
     }
 
     public CachingHttpClient(HttpClient client, CacheConfig config) {
         this(client,
                 new BasicHttpCache(MAX_CACHE_ENTRIES),
-                new CacheEntryGenerator(),
+                new MemCacheEntryFactory(),
                 config);
     }
 

Copied: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/MemCacheEntryFactory.java
(from r981667, httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CacheEntryGenerator.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/MemCacheEntryFactory.java?p2=httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/MemCacheEntryFactory.java&p1=httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CacheEntryGenerator.java&r1=981667&r2=981668&rev=981668&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CacheEntryGenerator.java
(original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/MemCacheEntryFactory.java
Mon Aug  2 19:55:52 2010
@@ -46,7 +46,7 @@ import org.apache.http.client.cache.Http
  * @since 4.1
  */
 @Immutable
-class CacheEntryGenerator implements HttpCacheEntryFactory {
+class MemCacheEntryFactory implements HttpCacheEntryFactory {
 
     public HttpCacheEntry generateEntry(
             Date requestDate,

Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/AbstractProtocolTest.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/AbstractProtocolTest.java?rev=981668&r1=981667&r2=981668&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/AbstractProtocolTest.java
(original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/AbstractProtocolTest.java
Mon Aug  2 19:55:52 2010
@@ -52,7 +52,7 @@ public abstract class AbstractProtocolTe
         originResponse = make200Response();
 
         cache = new BasicHttpCache(MAX_ENTRIES);
-        cacheEntryFactory = new CacheEntryGenerator();
+        cacheEntryFactory = new MemCacheEntryFactory();
         mockBackend = EasyMock.createMock(HttpClient.class);
         mockEntity = EasyMock.createMock(HttpEntity.class);
         mockCache = EasyMock.createMock(HttpCache.class);

Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/DoNotTestProtocolRequirements.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/DoNotTestProtocolRequirements.java?rev=981668&r1=981667&r2=981668&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/DoNotTestProtocolRequirements.java
(original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/DoNotTestProtocolRequirements.java
Mon Aug  2 19:55:52 2010
@@ -82,7 +82,7 @@ public class DoNotTestProtocolRequiremen
         mockCache = EasyMock.createMock(HttpCache.class);
         CacheConfig params = new CacheConfig();
         params.setMaxObjectSizeBytes(MAX_BYTES);
-        impl = new CachingHttpClient(mockBackend, cache, new CacheEntryGenerator(), params);
+        impl = new CachingHttpClient(mockBackend, cache, new MemCacheEntryFactory(), params);
     }
 
     private HttpResponse make200Response() {

Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestCacheEntry.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestCacheEntry.java?rev=981668&r1=981667&r2=981668&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestCacheEntry.java
(original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestCacheEntry.java
Mon Aug  2 19:55:52 2010
@@ -108,7 +108,7 @@ public class TestCacheEntry {
         Header[] headers = new Header[]{};
         CacheEntry entry = new CacheEntry(headers);
 
-        CacheEntryGenerator entryGenerator = new CacheEntryGenerator();
+        MemCacheEntryFactory entryGenerator = new MemCacheEntryFactory();
 
         HttpCacheEntry addedOne = entryGenerator.copyVariant(entry, "foo");
         HttpCacheEntry addedTwo = entryGenerator.copyVariant(addedOne, "bar");

Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestCacheEntryGenerator.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestCacheEntryGenerator.java?rev=981668&r1=981667&r2=981668&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestCacheEntryGenerator.java
(original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestCacheEntryGenerator.java
Mon Aug  2 19:55:52 2010
@@ -43,7 +43,7 @@ public class TestCacheEntryGenerator {
     @Test
     public void testEntryMatchesInputs() {
 
-        CacheEntryGenerator gen = new CacheEntryGenerator();
+        MemCacheEntryFactory gen = new MemCacheEntryFactory();
 
         HttpResponse response = new BasicHttpResponse(new ProtocolVersion("HTTP", 1, 1),
                 HttpStatus.SC_OK, "Success");

Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestProtocolDeviations.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestProtocolDeviations.java?rev=981668&r1=981667&r2=981668&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestProtocolDeviations.java
(original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestProtocolDeviations.java
Mon Aug  2 19:55:52 2010
@@ -100,7 +100,7 @@ public class TestProtocolDeviations {
 
         CacheConfig params = new CacheConfig();
         params.setMaxObjectSizeBytes(MAX_BYTES);
-        impl = new CachingHttpClient(mockBackend, cache, new CacheEntryGenerator(), params);
+        impl = new CachingHttpClient(mockBackend, cache, new MemCacheEntryFactory(), params);
     }
 
     private HttpResponse make200Response() {



Mime
View raw message