From 7c8a1fdf5b0ced3b4866bab477fdf26ddfecd00e Mon Sep 17 00:00:00 2001 From: Oleg Kalnichevski Date: Mon, 2 Aug 2010 19:55:52 +0000 Subject: [PATCH] Renamed CacheEntryGenerator to MemCacheEntryFactory git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@981668 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/http/impl/client/cache/CacheEntryUpdater.java | 2 +- .../apache/http/impl/client/cache/CachingHttpClient.java | 8 ++++---- ...CacheEntryGenerator.java => MemCacheEntryFactory.java} | 2 +- .../http/impl/client/cache/AbstractProtocolTest.java | 2 +- .../impl/client/cache/DoNotTestProtocolRequirements.java | 2 +- .../org/apache/http/impl/client/cache/TestCacheEntry.java | 2 +- .../http/impl/client/cache/TestCacheEntryGenerator.java | 2 +- .../http/impl/client/cache/TestProtocolDeviations.java | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) rename httpclient-cache/src/main/java/org/apache/http/impl/client/cache/{CacheEntryGenerator.java => MemCacheEntryFactory.java} (98%) diff --git a/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CacheEntryUpdater.java b/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CacheEntryUpdater.java index a667de641..ab080dfe5 100644 --- a/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CacheEntryUpdater.java +++ b/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CacheEntryUpdater.java @@ -58,7 +58,7 @@ class CacheEntryUpdater { private final HttpCacheEntryFactory cacheEntryFactory; CacheEntryUpdater() { - this(new CacheEntryGenerator()); + this(new MemCacheEntryFactory()); } CacheEntryUpdater(final HttpCacheEntryFactory cacheEntryFactory) { diff --git a/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CachingHttpClient.java b/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CachingHttpClient.java index 33e777aac..6865764c4 100644 --- a/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CachingHttpClient.java +++ b/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CachingHttpClient.java @@ -138,28 +138,28 @@ public CachingHttpClient( 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); } diff --git a/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CacheEntryGenerator.java b/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/MemCacheEntryFactory.java similarity index 98% rename from httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CacheEntryGenerator.java rename to httpclient-cache/src/main/java/org/apache/http/impl/client/cache/MemCacheEntryFactory.java index 70667a2d9..85879831f 100644 --- a/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CacheEntryGenerator.java +++ b/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/MemCacheEntryFactory.java @@ -46,7 +46,7 @@ * @since 4.1 */ @Immutable -class CacheEntryGenerator implements HttpCacheEntryFactory { +class MemCacheEntryFactory implements HttpCacheEntryFactory { public HttpCacheEntry generateEntry( Date requestDate, diff --git a/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/AbstractProtocolTest.java b/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/AbstractProtocolTest.java index 62b4b0471..1835c4d37 100644 --- a/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/AbstractProtocolTest.java +++ b/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/AbstractProtocolTest.java @@ -52,7 +52,7 @@ public void setUp() { 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); diff --git a/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/DoNotTestProtocolRequirements.java b/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/DoNotTestProtocolRequirements.java index 47cfc4967..cab1da47f 100644 --- a/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/DoNotTestProtocolRequirements.java +++ b/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/DoNotTestProtocolRequirements.java @@ -82,7 +82,7 @@ public void setUp() { 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() { diff --git a/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestCacheEntry.java b/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestCacheEntry.java index 9a1d584de..7a20030cb 100644 --- a/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestCacheEntry.java +++ b/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestCacheEntry.java @@ -108,7 +108,7 @@ public void testCacheEntryCanStoreMultipleVariantUris() throws Exception { 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"); diff --git a/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestCacheEntryGenerator.java b/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestCacheEntryGenerator.java index d43081831..c9988af89 100644 --- a/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestCacheEntryGenerator.java +++ b/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestCacheEntryGenerator.java @@ -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"); diff --git a/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestProtocolDeviations.java b/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestProtocolDeviations.java index b8b3ddee2..214e47a1e 100644 --- a/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestProtocolDeviations.java +++ b/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestProtocolDeviations.java @@ -100,7 +100,7 @@ public void setUp() { 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() {