Renamed CacheEntryGenerator to MemCacheEntryFactory
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@981668 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
911350a0c2
commit
7c8a1fdf5b
|
@ -58,7 +58,7 @@ class CacheEntryUpdater {
|
|||
private final HttpCacheEntryFactory cacheEntryFactory;
|
||||
|
||||
CacheEntryUpdater() {
|
||||
this(new CacheEntryGenerator());
|
||||
this(new MemCacheEntryFactory());
|
||||
}
|
||||
|
||||
CacheEntryUpdater(final HttpCacheEntryFactory cacheEntryFactory) {
|
||||
|
|
|
@ -138,28 +138,28 @@ public class CachingHttpClient implements HttpClient {
|
|||
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);
|
||||
}
|
||||
|
||||
|
|
|
@ -46,7 +46,7 @@ import org.apache.http.client.cache.HttpCacheEntryFactory;
|
|||
* @since 4.1
|
||||
*/
|
||||
@Immutable
|
||||
class CacheEntryGenerator implements HttpCacheEntryFactory {
|
||||
class MemCacheEntryFactory implements HttpCacheEntryFactory {
|
||||
|
||||
public HttpCacheEntry generateEntry(
|
||||
Date requestDate,
|
|
@ -52,7 +52,7 @@ public abstract class AbstractProtocolTest {
|
|||
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);
|
||||
|
|
|
@ -82,7 +82,7 @@ public class DoNotTestProtocolRequirements {
|
|||
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() {
|
||||
|
|
|
@ -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");
|
||||
|
|
|
@ -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");
|
||||
|
|
|
@ -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() {
|
||||
|
|
Loading…
Reference in New Issue