You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by gg...@apache.org on 2013/01/15 19:30:06 UTC
svn commit: r1433569 [4/12] - in /httpcomponents:
benchmark/httpcore/trunk/src/main/java/org/apache/http/benchmark/
benchmark/httpcore/trunk/src/main/java/org/apache/http/benchmark/httpcore/
benchmark/httpcore/trunk/src/main/java/org/apache/http/benchm...
Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/ResponseProtocolCompliance.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/ResponseProtocolCompliance.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/ResponseProtocolCompliance.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/ResponseProtocolCompliance.java Tue Jan 15 18:29:58 2013
@@ -68,7 +68,7 @@ class ResponseProtocolCompliance {
* @param response The {@link HttpResponse} from the origin server
* @throws IOException Bad things happened
*/
- public void ensureProtocolCompliance(HttpRequestWrapper request, HttpResponse response)
+ public void ensureProtocolCompliance(final HttpRequestWrapper request, final HttpResponse response)
throws IOException {
if (backendResponseMustNotHaveBody(request, response)) {
consumeBody(response);
@@ -92,7 +92,7 @@ class ResponseProtocolCompliance {
warningsWithNonMatchingWarnDatesAreRemoved(response);
}
- private void consumeBody(HttpResponse response) throws IOException {
+ private void consumeBody(final HttpResponse response) throws IOException {
HttpEntity body = response.getEntity();
if (body != null) {
EntityUtils.consume(body);
@@ -100,7 +100,7 @@ class ResponseProtocolCompliance {
}
private void warningsWithNonMatchingWarnDatesAreRemoved(
- HttpResponse response) {
+ final HttpResponse response) {
Date responseDate = null;
try {
responseDate = DateUtils.parseDate(response.getFirstHeader(HTTP.DATE_HEADER).getValue());
@@ -138,7 +138,7 @@ class ResponseProtocolCompliance {
}
}
- private void identityIsNotUsedInContentEncoding(HttpResponse response) {
+ private void identityIsNotUsedInContentEncoding(final HttpResponse response) {
Header[] hdrs = response.getHeaders(HTTP.CONTENT_ENCODING);
if (hdrs == null || hdrs.length == 0) {
return;
@@ -173,15 +173,15 @@ class ResponseProtocolCompliance {
}
}
- private void ensure206ContainsDateHeader(HttpResponse response) {
+ private void ensure206ContainsDateHeader(final HttpResponse response) {
if (response.getFirstHeader(HTTP.DATE_HEADER) == null) {
response.addHeader(HTTP.DATE_HEADER, DateUtils.formatDate(new Date()));
}
}
- private void ensurePartialContentIsNotSentToAClientThatDidNotRequestIt(HttpRequest request,
- HttpResponse response) throws IOException {
+ private void ensurePartialContentIsNotSentToAClientThatDidNotRequestIt(final HttpRequest request,
+ final HttpResponse response) throws IOException {
if (request.getFirstHeader(HeaderConstants.RANGE) != null
|| response.getStatusLine().getStatusCode() != HttpStatus.SC_PARTIAL_CONTENT) {
return;
@@ -191,8 +191,8 @@ class ResponseProtocolCompliance {
throw new ClientProtocolException(UNEXPECTED_PARTIAL_CONTENT);
}
- private void ensure200ForOPTIONSRequestWithNoBodyHasContentLengthZero(HttpRequest request,
- HttpResponse response) {
+ private void ensure200ForOPTIONSRequestWithNoBodyHasContentLengthZero(final HttpRequest request,
+ final HttpResponse response) {
if (!request.getRequestLine().getMethod().equalsIgnoreCase(HeaderConstants.OPTIONS_METHOD)) {
return;
}
@@ -206,7 +206,7 @@ class ResponseProtocolCompliance {
}
}
- private void ensure304DoesNotContainExtraEntityHeaders(HttpResponse response) {
+ private void ensure304DoesNotContainExtraEntityHeaders(final HttpResponse response) {
String[] disallowedEntityHeaders = { HeaderConstants.ALLOW, HTTP.CONTENT_ENCODING,
"Content-Language", HTTP.CONTENT_LEN, "Content-MD5",
"Content-Range", HTTP.CONTENT_TYPE, HeaderConstants.LAST_MODIFIED
@@ -218,15 +218,15 @@ class ResponseProtocolCompliance {
}
}
- private boolean backendResponseMustNotHaveBody(HttpRequest request, HttpResponse backendResponse) {
+ private boolean backendResponseMustNotHaveBody(final HttpRequest request, final HttpResponse backendResponse) {
return HeaderConstants.HEAD_METHOD.equals(request.getRequestLine().getMethod())
|| backendResponse.getStatusLine().getStatusCode() == HttpStatus.SC_NO_CONTENT
|| backendResponse.getStatusLine().getStatusCode() == HttpStatus.SC_RESET_CONTENT
|| backendResponse.getStatusLine().getStatusCode() == HttpStatus.SC_NOT_MODIFIED;
}
- private void requestDidNotExpect100ContinueButResponseIsOne(HttpRequestWrapper request,
- HttpResponse response) throws IOException {
+ private void requestDidNotExpect100ContinueButResponseIsOne(final HttpRequestWrapper request,
+ final HttpResponse response) throws IOException {
if (response.getStatusLine().getStatusCode() != HttpStatus.SC_CONTINUE) {
return;
}
@@ -241,8 +241,8 @@ class ResponseProtocolCompliance {
throw new ClientProtocolException(UNEXPECTED_100_CONTINUE);
}
- private void transferEncodingIsNotReturnedTo1_0Client(HttpRequestWrapper request,
- HttpResponse response) {
+ private void transferEncodingIsNotReturnedTo1_0Client(final HttpRequestWrapper request,
+ final HttpResponse response) {
HttpRequest originalRequest = request.getOriginal();
if (originalRequest.getProtocolVersion().compareToVersion(HttpVersion.HTTP_1_1) >= 0) {
return;
@@ -251,7 +251,7 @@ class ResponseProtocolCompliance {
removeResponseTransferEncoding(response);
}
- private void removeResponseTransferEncoding(HttpResponse response) {
+ private void removeResponseTransferEncoding(final HttpResponse response) {
response.removeHeaders("TE");
response.removeHeaders(HTTP.TRANSFER_ENCODING);
}
Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/SizeLimitedResponseReader.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/SizeLimitedResponseReader.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/SizeLimitedResponseReader.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/SizeLimitedResponseReader.java Tue Jan 15 18:29:58 2013
@@ -59,10 +59,10 @@ class SizeLimitedResponseReader {
* the size of objects that will be stored in the cache.
*/
public SizeLimitedResponseReader(
- ResourceFactory resourceFactory,
- long maxResponseSizeBytes,
- HttpRequest request,
- HttpResponse response) {
+ final ResourceFactory resourceFactory,
+ final long maxResponseSizeBytes,
+ final HttpRequest request,
+ final HttpResponse response) {
super();
this.resourceFactory = resourceFactory;
this.maxResponseSizeBytes = maxResponseSizeBytes;
Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/Variant.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/Variant.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/Variant.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/Variant.java Tue Jan 15 18:29:58 2013
@@ -35,7 +35,7 @@ class Variant {
private final String cacheKey;
private final HttpCacheEntry entry;
- public Variant(String variantKey, String cacheKey, HttpCacheEntry entry) {
+ public Variant(final String variantKey, final String cacheKey, final HttpCacheEntry entry) {
this.variantKey = variantKey;
this.cacheKey = cacheKey;
this.entry = entry;
Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/WarningValue.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/WarningValue.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/WarningValue.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/WarningValue.java Tue Jan 15 18:29:58 2013
@@ -51,11 +51,11 @@ class WarningValue {
private String warnText;
private Date warnDate;
- WarningValue(String s) {
+ WarningValue(final String s) {
this(s, 0);
}
- WarningValue(String s, int offs) {
+ WarningValue(final String s, final int offs) {
this.offs = this.init_offs = offs;
this.src = s;
consumeWarnValue();
@@ -69,7 +69,7 @@ class WarningValue {
* @param h Warning {@link Header} to parse
* @return array of <code>WarnValue</code> objects
*/
- public static WarningValue[] getWarningValues(Header h) {
+ public static WarningValue[] getWarningValues(final Header h) {
List<WarningValue> out = new ArrayList<WarningValue>();
String src = h.getValue();
int offs = 0;
@@ -119,7 +119,7 @@ class WarningValue {
/*
* CHAR = <any US-ASCII character (octets 0 - 127)>
*/
- private boolean isChar(char c) {
+ private boolean isChar(final char c) {
int i = c;
return (i >= 0 && i <= 127);
}
@@ -128,7 +128,7 @@ class WarningValue {
* CTL = <any US-ASCII control character
(octets 0 - 31) and DEL (127)>
*/
- private boolean isControl(char c) {
+ private boolean isControl(final char c) {
int i = c;
return (i == 127 || (i >=0 && i <= 31));
}
@@ -139,7 +139,7 @@ class WarningValue {
* | "/" | "[" | "]" | "?" | "="
* | "{" | "}" | SP | HT
*/
- private boolean isSeparator(char c) {
+ private boolean isSeparator(final char c) {
return (c == '(' || c == ')' || c == '<' || c == '>'
|| c == '@' || c == ',' || c == ';' || c == ':'
|| c == '\\' || c == '\"' || c == '/'
@@ -162,7 +162,7 @@ class WarningValue {
}
}
- private boolean isTokenChar(char c) {
+ private boolean isTokenChar(final char c) {
return (isChar(c) && !isControl(c) && !isSeparator(c));
}
@@ -293,7 +293,7 @@ class WarningValue {
}
}
- protected void consumeCharacter(char c) {
+ protected void consumeCharacter(final char c) {
if (offs + 1 > src.length()
|| c != src.charAt(offs)) {
parseError();
Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/ehcache/EhcacheHttpCacheStorage.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/ehcache/EhcacheHttpCacheStorage.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/ehcache/EhcacheHttpCacheStorage.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/ehcache/EhcacheHttpCacheStorage.java Tue Jan 15 18:29:58 2013
@@ -69,7 +69,7 @@ public class EhcacheHttpCacheStorage imp
* with default configuration options.
* @param cache where to store cached origin responses
*/
- public EhcacheHttpCacheStorage(Ehcache cache) {
+ public EhcacheHttpCacheStorage(final Ehcache cache) {
this(cache, CacheConfig.DEFAULT, new DefaultHttpCacheEntrySerializer());
}
@@ -81,7 +81,7 @@ public class EhcacheHttpCacheStorage imp
* the setting for max object size <b>will be ignored</b> and
* should be configured in the Ehcache instead.
*/
- public EhcacheHttpCacheStorage(Ehcache cache, CacheConfig config){
+ public EhcacheHttpCacheStorage(final Ehcache cache, final CacheConfig config){
this(cache, config, new DefaultHttpCacheEntrySerializer());
}
@@ -95,19 +95,19 @@ public class EhcacheHttpCacheStorage imp
* should be configured in the Ehcache instead.
* @param serializer alternative serialization mechanism
*/
- public EhcacheHttpCacheStorage(Ehcache cache, CacheConfig config, HttpCacheEntrySerializer serializer){
+ public EhcacheHttpCacheStorage(final Ehcache cache, final CacheConfig config, final HttpCacheEntrySerializer serializer){
this.cache = cache;
this.maxUpdateRetries = config.getMaxUpdateRetries();
this.serializer = serializer;
}
- public synchronized void putEntry(String key, HttpCacheEntry entry) throws IOException {
+ public synchronized void putEntry(final String key, final HttpCacheEntry entry) throws IOException {
ByteArrayOutputStream bos = new ByteArrayOutputStream();
serializer.writeTo(entry, bos);
cache.put(new Element(key, bos.toByteArray()));
}
- public synchronized HttpCacheEntry getEntry(String key) throws IOException {
+ public synchronized HttpCacheEntry getEntry(final String key) throws IOException {
Element e = cache.get(key);
if(e == null){
return null;
@@ -117,11 +117,11 @@ public class EhcacheHttpCacheStorage imp
return serializer.readFrom(new ByteArrayInputStream(data));
}
- public synchronized void removeEntry(String key) {
+ public synchronized void removeEntry(final String key) {
cache.remove(key);
}
- public synchronized void updateEntry(String key, HttpCacheUpdateCallback callback)
+ public synchronized void updateEntry(final String key, final HttpCacheUpdateCallback callback)
throws IOException, HttpCacheUpdateException {
int numRetries = 0;
do{
Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/memcached/MemcachedCacheEntryFactoryImpl.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/memcached/MemcachedCacheEntryFactoryImpl.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/memcached/MemcachedCacheEntryFactoryImpl.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/memcached/MemcachedCacheEntryFactoryImpl.java Tue Jan 15 18:29:58 2013
@@ -33,7 +33,7 @@ import org.apache.http.client.cache.Http
*/
public class MemcachedCacheEntryFactoryImpl implements MemcachedCacheEntryFactory {
- public MemcachedCacheEntry getMemcachedCacheEntry(String key, HttpCacheEntry entry) {
+ public MemcachedCacheEntry getMemcachedCacheEntry(final String key, final HttpCacheEntry entry) {
return new MemcachedCacheEntryImpl(key, entry);
}
Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/memcached/MemcachedCacheEntryImpl.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/memcached/MemcachedCacheEntryImpl.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/memcached/MemcachedCacheEntryImpl.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/memcached/MemcachedCacheEntryImpl.java Tue Jan 15 18:29:58 2013
@@ -44,7 +44,7 @@ public class MemcachedCacheEntryImpl imp
private String key;
private HttpCacheEntry httpCacheEntry;
- public MemcachedCacheEntryImpl(String key, HttpCacheEntry httpCacheEntry) {
+ public MemcachedCacheEntryImpl(final String key, final HttpCacheEntry httpCacheEntry) {
this.key = key;
this.httpCacheEntry = httpCacheEntry;
}
@@ -86,7 +86,7 @@ public class MemcachedCacheEntryImpl imp
/* (non-Javadoc)
* @see org.apache.http.impl.client.cache.memcached.MemcachedCacheEntry#set(byte[])
*/
- synchronized public void set(byte[] bytes) {
+ synchronized public void set(final byte[] bytes) {
ByteArrayInputStream bis = new ByteArrayInputStream(bytes);
ObjectInputStream ois;
String s;
Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/memcached/MemcachedHttpCacheStorage.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/memcached/MemcachedHttpCacheStorage.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/memcached/MemcachedHttpCacheStorage.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/memcached/MemcachedHttpCacheStorage.java Tue Jan 15 18:29:58 2013
@@ -100,7 +100,7 @@ public class MemcachedHttpCacheStorage i
* @param address where the <i>memcached</i> daemon is running
* @throws IOException in case of an error
*/
- public MemcachedHttpCacheStorage(InetSocketAddress address) throws IOException {
+ public MemcachedHttpCacheStorage(final InetSocketAddress address) throws IOException {
this(new MemcachedClient(address));
}
@@ -109,7 +109,7 @@ public class MemcachedHttpCacheStorage i
* <i>memcached</i> client.
* @param cache client to use for communicating with <i>memcached</i>
*/
- public MemcachedHttpCacheStorage(MemcachedClientIF cache) {
+ public MemcachedHttpCacheStorage(final MemcachedClientIF cache) {
this(cache, CacheConfig.DEFAULT, new MemcachedCacheEntryFactoryImpl(),
new SHA256KeyHashingScheme());
}
@@ -132,8 +132,8 @@ public class MemcachedHttpCacheStorage i
* @deprecated (4.2) do not use
*/
@Deprecated
- public MemcachedHttpCacheStorage(MemcachedClientIF client, CacheConfig config,
- HttpCacheEntrySerializer serializer) {
+ public MemcachedHttpCacheStorage(final MemcachedClientIF client, final CacheConfig config,
+ final HttpCacheEntrySerializer serializer) {
this(client, config, new MemcachedCacheEntryFactoryImpl(),
new SHA256KeyHashingScheme());
}
@@ -149,16 +149,16 @@ public class MemcachedHttpCacheStorage i
* @param keyHashingScheme how to map higher-level logical "storage keys"
* onto "cache keys" suitable for use with memcached
*/
- public MemcachedHttpCacheStorage(MemcachedClientIF client, CacheConfig config,
- MemcachedCacheEntryFactory memcachedCacheEntryFactory,
- KeyHashingScheme keyHashingScheme) {
+ public MemcachedHttpCacheStorage(final MemcachedClientIF client, final CacheConfig config,
+ final MemcachedCacheEntryFactory memcachedCacheEntryFactory,
+ final KeyHashingScheme keyHashingScheme) {
this.client = client;
this.maxUpdateRetries = config.getMaxUpdateRetries();
this.memcachedCacheEntryFactory = memcachedCacheEntryFactory;
this.keyHashingScheme = keyHashingScheme;
}
- public void putEntry(String url, HttpCacheEntry entry) throws IOException {
+ public void putEntry(final String url, final HttpCacheEntry entry) throws IOException {
byte[] bytes = serializeEntry(url, entry);
String key = getCacheKey(url);
if (key == null) {
@@ -171,7 +171,7 @@ public class MemcachedHttpCacheStorage i
}
}
- private String getCacheKey(String url) {
+ private String getCacheKey(final String url) {
try {
return keyHashingScheme.hash(url);
} catch (MemcachedKeyHashingException mkhe) {
@@ -179,7 +179,7 @@ public class MemcachedHttpCacheStorage i
}
}
- private byte[] serializeEntry(String url, HttpCacheEntry hce) throws IOException {
+ private byte[] serializeEntry(final String url, final HttpCacheEntry hce) throws IOException {
MemcachedCacheEntry mce = memcachedCacheEntryFactory.getMemcachedCacheEntry(url, hce);
try {
return mce.toByteArray();
@@ -190,7 +190,7 @@ public class MemcachedHttpCacheStorage i
}
}
- private byte[] convertToByteArray(Object o) {
+ private byte[] convertToByteArray(final Object o) {
if (o == null) {
return null;
}
@@ -201,7 +201,7 @@ public class MemcachedHttpCacheStorage i
return (byte[])o;
}
- private MemcachedCacheEntry reconstituteEntry(Object o) throws IOException {
+ private MemcachedCacheEntry reconstituteEntry(final Object o) throws IOException {
byte[] bytes = convertToByteArray(o);
if (bytes == null) {
return null;
@@ -215,7 +215,7 @@ public class MemcachedHttpCacheStorage i
return mce;
}
- public HttpCacheEntry getEntry(String url) throws IOException {
+ public HttpCacheEntry getEntry(final String url) throws IOException {
String key = getCacheKey(url);
if (key == null) {
return null;
@@ -231,7 +231,7 @@ public class MemcachedHttpCacheStorage i
}
}
- public void removeEntry(String url) throws IOException {
+ public void removeEntry(final String url) throws IOException {
String key = getCacheKey(url);
if (key == null) {
return;
@@ -243,7 +243,7 @@ public class MemcachedHttpCacheStorage i
}
}
- public void updateEntry(String url, HttpCacheUpdateCallback callback)
+ public void updateEntry(final String url, final HttpCacheUpdateCallback callback)
throws HttpCacheUpdateException, IOException {
int numRetries = 0;
String key = getCacheKey(url);
Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/memcached/MemcachedKeyHashingException.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/memcached/MemcachedKeyHashingException.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/memcached/MemcachedKeyHashingException.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/memcached/MemcachedKeyHashingException.java Tue Jan 15 18:29:58 2013
@@ -35,7 +35,7 @@ public class MemcachedKeyHashingExceptio
private static final long serialVersionUID = -7553380015989141114L;
- public MemcachedKeyHashingException(Throwable cause) {
+ public MemcachedKeyHashingException(final Throwable cause) {
super(cause);
}
}
Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/memcached/MemcachedSerializationException.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/memcached/MemcachedSerializationException.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/memcached/MemcachedSerializationException.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/memcached/MemcachedSerializationException.java Tue Jan 15 18:29:58 2013
@@ -34,7 +34,7 @@ public class MemcachedSerializationExcep
private static final long serialVersionUID = 2201652990656412236L;
- public MemcachedSerializationException(Throwable cause) {
+ public MemcachedSerializationException(final Throwable cause) {
super(cause);
}
Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/memcached/PrefixKeyHashingScheme.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/memcached/PrefixKeyHashingScheme.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/memcached/PrefixKeyHashingScheme.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/memcached/PrefixKeyHashingScheme.java Tue Jan 15 18:29:58 2013
@@ -47,12 +47,12 @@ public class PrefixKeyHashingScheme impl
* @param prefix
* @param backingScheme
*/
- public PrefixKeyHashingScheme(String prefix, KeyHashingScheme backingScheme) {
+ public PrefixKeyHashingScheme(final String prefix, final KeyHashingScheme backingScheme) {
this.prefix = prefix;
this.backingScheme = backingScheme;
}
- public String hash(String storageKey) {
+ public String hash(final String storageKey) {
return prefix + backingScheme.hash(storageKey);
}
Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/memcached/SHA256KeyHashingScheme.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/memcached/SHA256KeyHashingScheme.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/memcached/SHA256KeyHashingScheme.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/memcached/SHA256KeyHashingScheme.java Tue Jan 15 18:29:58 2013
@@ -44,7 +44,7 @@ public class SHA256KeyHashingScheme impl
private static final Log log = LogFactory.getLog(SHA256KeyHashingScheme.class);
- public String hash(String key) {
+ public String hash(final String key) {
MessageDigest md = getDigest();
md.update(key.getBytes());
return Hex.encodeHexString(md.digest());
Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/client/cache/TestHttpCacheEntry.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/client/cache/TestHttpCacheEntry.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/client/cache/TestHttpCacheEntry.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/client/cache/TestHttpCacheEntry.java Tue Jan 15 18:29:58 2013
@@ -67,7 +67,7 @@ public class TestHttpCacheEntry {
mockResource = createNiceMock(Resource.class);
}
- private HttpCacheEntry makeEntry(Header[] headers) {
+ private HttpCacheEntry makeEntry(final Header[] headers) {
return new HttpCacheEntry(elevenSecondsAgo, nineSecondsAgo,
statusLine, headers, mockResource);
}
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=1433569&r1=1433568&r2=1433569&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 Tue Jan 15 18:29:58 2013
@@ -60,7 +60,7 @@ public abstract class AbstractProtocolTe
protected CachingExec impl;
protected HttpCache cache;
- public static HttpRequestWrapper eqRequest(HttpRequestWrapper in) {
+ public static HttpRequestWrapper eqRequest(final HttpRequestWrapper in) {
EasyMock.reportMatcher(new RequestEquivalent(in));
return null;
}
@@ -108,7 +108,7 @@ public abstract class AbstractProtocolTe
}
protected IExpectationSetters<CloseableHttpResponse> backendExpectsAnyRequestAndReturn(
- HttpResponse reponse) throws Exception {
+ final HttpResponse reponse) throws Exception {
CloseableHttpResponse resp = mockBackend.execute(
EasyMock.isA(HttpRoute.class),
EasyMock.isA(HttpRequestWrapper.class),
Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/ConsumableInputStream.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/ConsumableInputStream.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/ConsumableInputStream.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/ConsumableInputStream.java Tue Jan 15 18:29:58 2013
@@ -35,7 +35,7 @@ public class ConsumableInputStream exten
private final ByteArrayInputStream buf;
private boolean closed = false;
- public ConsumableInputStream(ByteArrayInputStream buf) {
+ public ConsumableInputStream(final ByteArrayInputStream buf) {
this.buf = buf;
}
Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/DummyBackend.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/DummyBackend.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/DummyBackend.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/DummyBackend.java Tue Jan 15 18:29:58 2013
@@ -47,7 +47,7 @@ public class DummyBackend implements Cli
private HttpResponse response = new BasicHttpResponse(new ProtocolVersion("HTTP",1,1), HttpStatus.SC_OK, "OK");
private int executions = 0;
- public void setResponse(HttpResponse resp) {
+ public void setResponse(final HttpResponse resp) {
response = resp;
}
Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/HttpTestUtils.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/HttpTestUtils.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/HttpTestUtils.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/HttpTestUtils.java Tue Jan 15 18:29:58 2013
@@ -94,7 +94,7 @@ public class HttpTestUtils {
*
* @see http://www.w3.org/Protocols/rfc2616/rfc2616-sec13.html#sec13.5.1
*/
- public static boolean isHopByHopHeader(String name) {
+ public static boolean isHopByHopHeader(final String name) {
for (String s : HOP_BY_HOP_HEADERS) {
if (s.equalsIgnoreCase(name)) {
return true;
@@ -106,7 +106,7 @@ public class HttpTestUtils {
/*
* Determines whether a given header name may appear multiple times.
*/
- public static boolean isMultiHeader(String name) {
+ public static boolean isMultiHeader(final String name) {
for (String s : MULTI_HEADERS) {
if (s.equalsIgnoreCase(name)) {
return true;
@@ -118,7 +118,7 @@ public class HttpTestUtils {
/*
* Determines whether a given header name may only appear once in a message.
*/
- public static boolean isSingleHeader(String name) {
+ public static boolean isSingleHeader(final String name) {
for (String s : SINGLE_HEADERS) {
if (s.equalsIgnoreCase(name)) {
return true;
@@ -129,7 +129,7 @@ public class HttpTestUtils {
/*
* Assert.asserts that two request or response bodies are byte-equivalent.
*/
- public static boolean equivalent(HttpEntity e1, HttpEntity e2) throws Exception {
+ public static boolean equivalent(final HttpEntity e1, final HttpEntity e2) throws Exception {
InputStream i1 = e1.getContent();
InputStream i2 = e2.getContent();
if (i1 == null && i2 == null) {
@@ -156,19 +156,19 @@ public class HttpTestUtils {
*
* @see http://www.ietf.org/rfc/rfc2145.txt
*/
- public static boolean semanticallyTransparent(StatusLine l1, StatusLine l2) {
+ public static boolean semanticallyTransparent(final StatusLine l1, final StatusLine l2) {
return (l1.getReasonPhrase().equals(l2.getReasonPhrase()) && l1.getStatusCode() == l2
.getStatusCode());
}
/* Assert.asserts that the components of two status lines match. */
- public static boolean equivalent(StatusLine l1, StatusLine l2) {
+ public static boolean equivalent(final StatusLine l1, final StatusLine l2) {
return (l1.getProtocolVersion().equals(l2.getProtocolVersion()) && semanticallyTransparent(
l1, l2));
}
/* Assert.asserts that the components of two request lines match. */
- public static boolean equivalent(RequestLine l1, RequestLine l2) {
+ public static boolean equivalent(final RequestLine l1, final RequestLine l2) {
return (l1.getMethod().equals(l2.getMethod())
&& l1.getProtocolVersion().equals(l2.getProtocolVersion()) && l1.getUri().equals(
l2.getUri()));
@@ -180,7 +180,7 @@ public class HttpTestUtils {
*
* @see http://www.w3.org/Protocols/rfc2616/rfc2616-sec4.html#sec4.2
*/
- public static String getCanonicalHeaderValue(HttpMessage r, String name) {
+ public static String getCanonicalHeaderValue(final HttpMessage r, final String name) {
if (isSingleHeader(name)) {
Header h = r.getFirstHeader(name);
return (h != null) ? h.getValue() : null;
@@ -201,7 +201,7 @@ public class HttpTestUtils {
* Assert.asserts that all the headers appearing in r1 also appear in r2
* with the same canonical header values.
*/
- public static boolean isEndToEndHeaderSubset(HttpMessage r1, HttpMessage r2) {
+ public static boolean isEndToEndHeaderSubset(final HttpMessage r1, final HttpMessage r2) {
for (Header h : r1.getAllHeaders()) {
if (!isHopByHopHeader(h.getName())) {
String r1val = getCanonicalHeaderValue(r1, h.getName());
@@ -223,7 +223,7 @@ public class HttpTestUtils {
*
* @see http://www.w3.org/Protocols/rfc2616/rfc2616-sec1.html#sec1.3
*/
- public static boolean semanticallyTransparent(HttpResponse r1, HttpResponse r2)
+ public static boolean semanticallyTransparent(final HttpResponse r1, final HttpResponse r2)
throws Exception {
final boolean entitiesEquivalent = equivalent(r1.getEntity(), r2.getEntity());
if (!entitiesEquivalent) {
@@ -239,12 +239,12 @@ public class HttpTestUtils {
}
/* Assert.asserts that two requests are morally equivalent. */
- public static boolean equivalent(HttpRequest r1, HttpRequest r2) {
+ public static boolean equivalent(final HttpRequest r1, final HttpRequest r2) {
return (equivalent(r1.getRequestLine(), r2.getRequestLine()) && isEndToEndHeaderSubset(r1,
r2));
}
- public static byte[] getRandomBytes(int nbytes) {
+ public static byte[] getRandomBytes(final int nbytes) {
byte[] bytes = new byte[nbytes];
(new Random()).nextBytes(bytes);
return bytes;
@@ -254,16 +254,16 @@ public class HttpTestUtils {
* @param nbytes length of the desired response body
* @return an {@link HttpEntity}
*/
- public static HttpEntity makeBody(int nbytes) {
+ public static HttpEntity makeBody(final int nbytes) {
return new ByteArrayEntity(getRandomBytes(nbytes));
}
- public static HttpCacheEntry makeCacheEntry(Date requestDate, Date responseDate) {
+ public static HttpCacheEntry makeCacheEntry(final Date requestDate, final Date responseDate) {
Date when = new Date((responseDate.getTime() + requestDate.getTime()) / 2);
return makeCacheEntry(requestDate, responseDate, getStockHeaders(when));
}
- public static Header[] getStockHeaders(Date when) {
+ public static Header[] getStockHeaders(final Date when) {
Header[] headers = {
new BasicHeader("Date", DateUtils.formatDate(when)),
new BasicHeader("Server", "MockServer/1.0")
@@ -271,42 +271,42 @@ public class HttpTestUtils {
return headers;
}
- public static HttpCacheEntry makeCacheEntry(Date requestDate,
- Date responseDate, Header[] headers) {
+ public static HttpCacheEntry makeCacheEntry(final Date requestDate,
+ final Date responseDate, final Header[] headers) {
byte[] bytes = getRandomBytes(128);
return makeCacheEntry(requestDate, responseDate, headers, bytes);
}
- public static HttpCacheEntry makeCacheEntry(Date requestDate,
- Date responseDate, Header[] headers, byte[] bytes) {
+ public static HttpCacheEntry makeCacheEntry(final Date requestDate,
+ final Date responseDate, final Header[] headers, final byte[] bytes) {
Map<String,String> variantMap = null;
return makeCacheEntry(requestDate, responseDate, headers, bytes,
variantMap);
}
- public static HttpCacheEntry makeCacheEntry(Map<String,String> variantMap) {
+ public static HttpCacheEntry makeCacheEntry(final Map<String,String> variantMap) {
Date now = new Date();
return makeCacheEntry(now, now, getStockHeaders(now),
getRandomBytes(128), variantMap);
}
- public static HttpCacheEntry makeCacheEntry(Date requestDate,
- Date responseDate, Header[] headers, byte[] bytes,
- Map<String,String> variantMap) {
+ public static HttpCacheEntry makeCacheEntry(final Date requestDate,
+ final Date responseDate, final Header[] headers, final byte[] bytes,
+ final Map<String,String> variantMap) {
StatusLine statusLine = new BasicStatusLine(HttpVersion.HTTP_1_1, HttpStatus.SC_OK, "OK");
return new HttpCacheEntry(requestDate, responseDate, statusLine, headers, new HeapResource(bytes), variantMap);
}
- public static HttpCacheEntry makeCacheEntry(Header[] headers, byte[] bytes) {
+ public static HttpCacheEntry makeCacheEntry(final Header[] headers, final byte[] bytes) {
Date now = new Date();
return makeCacheEntry(now, now, headers, bytes);
}
- public static HttpCacheEntry makeCacheEntry(byte[] bytes) {
+ public static HttpCacheEntry makeCacheEntry(final byte[] bytes) {
return makeCacheEntry(getStockHeaders(new Date()), bytes);
}
- public static HttpCacheEntry makeCacheEntry(Header[] headers) {
+ public static HttpCacheEntry makeCacheEntry(final Header[] headers) {
return makeCacheEntry(headers, getRandomBytes(128));
}
@@ -324,7 +324,7 @@ public class HttpTestUtils {
return out;
}
- public static final HttpResponse make200Response(Date date, String cacheControl) {
+ public static final HttpResponse make200Response(final Date date, final String cacheControl) {
HttpResponse response = HttpTestUtils.make200Response();
response.setHeader("Date", DateUtils.formatDate(date));
response.setHeader("Cache-Control",cacheControl);
@@ -332,7 +332,7 @@ public class HttpTestUtils {
return response;
}
- public static final void assert110WarningFound(HttpResponse response) {
+ public static final void assert110WarningFound(final HttpResponse response) {
boolean found110Warning = false;
for(Header h : response.getHeaders("Warning")) {
for(HeaderElement elt : h.getElements()) {
Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/RequestEquivalent.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/RequestEquivalent.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/RequestEquivalent.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/RequestEquivalent.java Tue Jan 15 18:29:58 2013
@@ -33,11 +33,11 @@ public class RequestEquivalent implement
private final HttpRequest expected;
- public RequestEquivalent(HttpRequest expected) {
+ public RequestEquivalent(final HttpRequest expected) {
this.expected = expected;
}
- public boolean matches(Object actual) {
+ public boolean matches(final Object actual) {
if (!(actual instanceof HttpRequest)) {
return false;
}
@@ -45,7 +45,7 @@ public class RequestEquivalent implement
return HttpTestUtils.equivalent(expected, other);
}
- public void appendTo(StringBuffer buf) {
+ public void appendTo(final StringBuffer buf) {
buf.append("eqRequest(");
buf.append(expected);
buf.append(")");
Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/Serializer.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/Serializer.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/Serializer.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/Serializer.java Tue Jan 15 18:29:58 2013
@@ -33,7 +33,7 @@ import java.io.ObjectOutputStream;
public class Serializer<T> {
- public byte[] serialize(T object) throws Exception {
+ public byte[] serialize(final T object) throws Exception {
ByteArrayOutputStream byteStream = new ByteArrayOutputStream();
ObjectOutputStream objectStream = new ObjectOutputStream(byteStream);
objectStream.writeObject(object);
@@ -41,7 +41,7 @@ public class Serializer<T> {
}
@SuppressWarnings("unchecked")
- public T deserialize(byte[] serialized) throws Exception {
+ public T deserialize(final byte[] serialized) throws Exception {
ByteArrayInputStream byteStream = new ByteArrayInputStream(serialized);
ObjectInputStream objectStream = new ObjectInputStream(byteStream);
T object = (T) objectStream.readObject();
Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/SimpleHttpCacheStorage.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/SimpleHttpCacheStorage.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/SimpleHttpCacheStorage.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/SimpleHttpCacheStorage.java Tue Jan 15 18:29:58 2013
@@ -42,19 +42,19 @@ class SimpleHttpCacheStorage implements
map = new HashMap<String,HttpCacheEntry>();
}
- public void putEntry(String key, HttpCacheEntry entry) throws IOException {
+ public void putEntry(final String key, final HttpCacheEntry entry) throws IOException {
map.put(key, entry);
}
- public HttpCacheEntry getEntry(String key) throws IOException {
+ public HttpCacheEntry getEntry(final String key) throws IOException {
return map.get(key);
}
- public void removeEntry(String key) throws IOException {
+ public void removeEntry(final String key) throws IOException {
map.remove(key);
}
- public void updateEntry(String key, HttpCacheUpdateCallback callback)
+ public void updateEntry(final String key, final HttpCacheUpdateCallback callback)
throws IOException {
HttpCacheEntry v1 = map.get(key);
HttpCacheEntry v2 = callback.update(v1);
Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestCacheEntryUpdater.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestCacheEntryUpdater.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestCacheEntryUpdater.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestCacheEntryUpdater.java Tue Jan 15 18:29:58 2013
@@ -241,7 +241,7 @@ public class TestCacheEntryUpdater {
}
}
- private void headersContain(Header[] headers, String name, String value) {
+ private void headersContain(final Header[] headers, final String name, final String value) {
for (Header header : headers) {
if (header.getName().equals(name)) {
if (header.getValue().equals(value)) {
Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestCacheInvalidator.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestCacheInvalidator.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestCacheInvalidator.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestCacheInvalidator.java Tue Jan 15 18:29:58 2013
@@ -561,20 +561,20 @@ public class TestCacheInvalidator {
// Expectations
- private void cacheEntryHasVariantMap(Map<String,String> variantMap) {
+ private void cacheEntryHasVariantMap(final Map<String,String> variantMap) {
expect(mockEntry.getVariantMap()).andReturn(variantMap);
}
- private void cacheReturnsEntryForUri(String theUri) throws IOException {
+ private void cacheReturnsEntryForUri(final String theUri) throws IOException {
expect(mockStorage.getEntry(theUri)).andReturn(mockEntry);
}
- private void cacheReturnsExceptionForUri(String theUri) throws IOException {
+ private void cacheReturnsExceptionForUri(final String theUri) throws IOException {
expect(mockStorage.getEntry(theUri)).andThrow(
new IOException("TOTAL FAIL"));
}
- private void entryIsRemoved(String theUri) throws IOException {
+ private void entryIsRemoved(final String theUri) throws IOException {
mockStorage.removeEntry(theUri);
}
Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestCacheKeyGenerator.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestCacheKeyGenerator.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestCacheKeyGenerator.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestCacheKeyGenerator.java Tue Jan 15 18:29:58 2013
@@ -126,7 +126,7 @@ public class TestCacheKeyGenerator {
org.easymock.EasyMock.expect(mockEntry.hasVariants()).andReturn(false);
extractor = new CacheKeyGenerator() {
@Override
- public String getURI(HttpHost h, HttpRequest req) {
+ public String getURI(final HttpHost h, final HttpRequest req) {
Assert.assertSame(host, h);
Assert.assertSame(mockRequest, req);
return theURI;
@@ -147,7 +147,7 @@ public class TestCacheKeyGenerator {
extractor = new CacheKeyGenerator() {
@Override
- public String getURI(HttpHost h, HttpRequest req) {
+ public String getURI(final HttpHost h, final HttpRequest req) {
Assert.assertSame(host, h);
Assert.assertSame(mockRequest, req);
return theURI;
@@ -172,7 +172,7 @@ public class TestCacheKeyGenerator {
Header[] varyHeaders = { new BasicHeader("Vary", "Accept-Encoding") };
extractor = new CacheKeyGenerator() {
@Override
- public String getURI(HttpHost h, HttpRequest req) {
+ public String getURI(final HttpHost h, final HttpRequest req) {
Assert.assertSame(host, h);
Assert.assertSame(mockRequest, req);
return theURI;
@@ -198,7 +198,7 @@ public class TestCacheKeyGenerator {
Header[] uaHeaders = { new BasicHeader("User-Agent", "browser") };
extractor = new CacheKeyGenerator() {
@Override
- public String getURI(HttpHost h, HttpRequest req) {
+ public String getURI(final HttpHost h, final HttpRequest req) {
Assert.assertSame(host, h);
Assert.assertSame(mockRequest, req);
return theURI;
@@ -226,7 +226,7 @@ public class TestCacheKeyGenerator {
Header[] uaHeaders = { new BasicHeader("User-Agent", "browser") };
extractor = new CacheKeyGenerator() {
@Override
- public String getURI(HttpHost h, HttpRequest req) {
+ public String getURI(final HttpHost h, final HttpRequest req) {
Assert.assertSame(host, h);
Assert.assertSame(mockRequest, req);
return theURI;
@@ -253,7 +253,7 @@ public class TestCacheKeyGenerator {
Header[] uaHeaders = { new BasicHeader("User-Agent", "browser") };
extractor = new CacheKeyGenerator() {
@Override
- public String getURI(HttpHost h, HttpRequest req) {
+ public String getURI(final HttpHost h, final HttpRequest req) {
Assert.assertSame(host, h);
Assert.assertSame(mockRequest, req);
return theURI;
Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestCacheValidityPolicy.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestCacheValidityPolicy.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestCacheValidityPolicy.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestCacheValidityPolicy.java Tue Jan 15 18:29:58 2013
@@ -96,7 +96,7 @@ public class TestCacheValidityPolicy {
HttpCacheEntry entry = HttpTestUtils.makeCacheEntry(headers);
impl = new CacheValidityPolicy() {
@Override
- protected long getApparentAgeSecs(HttpCacheEntry entry) {
+ protected long getApparentAgeSecs(final HttpCacheEntry entry) {
return 6;
}
};
@@ -109,7 +109,7 @@ public class TestCacheValidityPolicy {
HttpCacheEntry entry = HttpTestUtils.makeCacheEntry(headers);
impl = new CacheValidityPolicy() {
@Override
- protected long getApparentAgeSecs(HttpCacheEntry entry) {
+ protected long getApparentAgeSecs(final HttpCacheEntry entry) {
return 10;
}
};
@@ -127,12 +127,12 @@ public class TestCacheValidityPolicy {
HttpCacheEntry entry = HttpTestUtils.makeCacheEntry();
impl = new CacheValidityPolicy() {
@Override
- protected long getCorrectedReceivedAgeSecs(HttpCacheEntry entry) {
+ protected long getCorrectedReceivedAgeSecs(final HttpCacheEntry entry) {
return 7;
}
@Override
- protected long getResponseDelaySecs(HttpCacheEntry entry) {
+ protected long getResponseDelaySecs(final HttpCacheEntry entry) {
return 13;
}
};
@@ -151,11 +151,11 @@ public class TestCacheValidityPolicy {
HttpCacheEntry entry = HttpTestUtils.makeCacheEntry();
impl = new CacheValidityPolicy() {
@Override
- protected long getCorrectedInitialAgeSecs(HttpCacheEntry entry) {
+ protected long getCorrectedInitialAgeSecs(final HttpCacheEntry entry) {
return 11;
}
@Override
- protected long getResidentTimeSecs(HttpCacheEntry entry, Date d) {
+ protected long getResidentTimeSecs(final HttpCacheEntry entry, final Date d) {
return 17;
}
};
@@ -252,13 +252,13 @@ public class TestCacheValidityPolicy {
final HttpCacheEntry entry = HttpTestUtils.makeCacheEntry();
impl = new CacheValidityPolicy() {
@Override
- public long getCurrentAgeSecs(HttpCacheEntry e, Date d) {
+ public long getCurrentAgeSecs(final HttpCacheEntry e, final Date d) {
assertSame(entry, e);
assertEquals(now, d);
return 6;
}
@Override
- public long getFreshnessLifetimeSecs(HttpCacheEntry e) {
+ public long getFreshnessLifetimeSecs(final HttpCacheEntry e) {
assertSame(entry, e);
return 10;
}
@@ -271,13 +271,13 @@ public class TestCacheValidityPolicy {
final HttpCacheEntry entry = HttpTestUtils.makeCacheEntry();
impl = new CacheValidityPolicy() {
@Override
- public long getCurrentAgeSecs(HttpCacheEntry e, Date d) {
+ public long getCurrentAgeSecs(final HttpCacheEntry e, final Date d) {
assertEquals(now, d);
assertSame(entry, e);
return 6;
}
@Override
- public long getFreshnessLifetimeSecs(HttpCacheEntry e) {
+ public long getFreshnessLifetimeSecs(final HttpCacheEntry e) {
assertSame(entry, e);
return 6;
}
@@ -290,13 +290,13 @@ public class TestCacheValidityPolicy {
final HttpCacheEntry entry = HttpTestUtils.makeCacheEntry();
impl = new CacheValidityPolicy() {
@Override
- public long getCurrentAgeSecs(HttpCacheEntry e, Date d) {
+ public long getCurrentAgeSecs(final HttpCacheEntry e, final Date d) {
assertEquals(now, d);
assertSame(entry, e);
return 10;
}
@Override
- public long getFreshnessLifetimeSecs(HttpCacheEntry e) {
+ public long getFreshnessLifetimeSecs(final HttpCacheEntry e) {
assertSame(entry, e);
return 6;
}
Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestCachedHttpResponseGenerator.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestCachedHttpResponseGenerator.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestCachedHttpResponseGenerator.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestCachedHttpResponseGenerator.java Tue Jan 15 18:29:58 2013
@@ -146,7 +146,7 @@ public class TestCachedHttpResponseGener
Assert.assertEquals(CacheValidityPolicy.MAX_AGE, Long.parseLong(ageHdr.getValue()));
}
- private void currentAge(long sec) {
+ private void currentAge(final long sec) {
EasyMock.expect(
mockValidityPolicy.getCurrentAgeSecs(EasyMock.same(entry),
EasyMock.isA(Date.class))).andReturn(sec);
Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestCachedResponseSuitabilityChecker.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestCachedResponseSuitabilityChecker.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestCachedResponseSuitabilityChecker.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestCachedResponseSuitabilityChecker.java Tue Jan 15 18:29:58 2013
@@ -69,7 +69,7 @@ public class TestCachedResponseSuitabili
impl = new CachedResponseSuitabilityChecker(CacheConfig.DEFAULT);
}
- private HttpCacheEntry getEntry(Header[] headers) {
+ private HttpCacheEntry getEntry(final Header[] headers) {
return HttpTestUtils.makeCacheEntry(elevenSecondsAgo, nineSecondsAgo, headers);
}
Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestCachingExec.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestCachingExec.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestCachingExec.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestCachingExec.java Tue Jan 15 18:29:58 2013
@@ -325,7 +325,7 @@ public class TestCachingExec {
Assert.assertSame(mockBackendResponse, result);
}
- private void requestIsFatallyNonCompliant(RequestProtocolError error) {
+ private void requestIsFatallyNonCompliant(final RequestProtocolError error) {
List<RequestProtocolError> errors = new ArrayList<RequestProtocolError>();
if (error != null) {
errors.add(error);
@@ -1760,7 +1760,7 @@ public class TestCachingExec {
}
private IExpectationSetters<CloseableHttpResponse> backendExpectsAnyRequestAndReturn(
- HttpResponse response) throws Exception {
+ final HttpResponse response) throws Exception {
CloseableHttpResponse resp = mockBackend.execute(
EasyMock.isA(HttpRoute.class),
EasyMock.isA(HttpRequestWrapper.class),
@@ -1770,7 +1770,7 @@ public class TestCachingExec {
}
private IExpectationSetters<CloseableHttpResponse> implExpectsAnyRequestAndReturn(
- CloseableHttpResponse response) throws Exception {
+ final CloseableHttpResponse response) throws Exception {
CloseableHttpResponse resp = impl.callBackend(
EasyMock.isA(HttpRoute.class),
EasyMock.isA(HttpRequestWrapper.class),
@@ -1780,7 +1780,7 @@ public class TestCachingExec {
}
private IExpectationSetters<CloseableHttpResponse> backendExpectsRequestAndReturn(
- HttpRequestWrapper request, HttpResponse response) throws Exception {
+ final HttpRequestWrapper request, final HttpResponse response) throws Exception {
CloseableHttpResponse resp = mockBackend.execute(
EasyMock.isA(HttpRoute.class),
EasyMock.eq(request),
@@ -1790,7 +1790,7 @@ public class TestCachingExec {
}
private IExpectationSetters<CloseableHttpResponse> backendExpectsRequestAndReturn(
- HttpRequestWrapper request, CloseableHttpResponse response) throws Exception {
+ final HttpRequestWrapper request, final CloseableHttpResponse response) throws Exception {
CloseableHttpResponse resp = mockBackend.execute(
EasyMock.isA(HttpRoute.class),
EasyMock.eq(request),
@@ -1800,7 +1800,7 @@ public class TestCachingExec {
}
private IExpectationSetters<CloseableHttpResponse> backendExpectsAnyRequestAndThrows(
- Throwable throwable) throws Exception {
+ final Throwable throwable) throws Exception {
CloseableHttpResponse resp = mockBackend.execute(
EasyMock.isA(HttpRoute.class),
EasyMock.isA(HttpRequestWrapper.class),
@@ -1810,7 +1810,7 @@ public class TestCachingExec {
}
private IExpectationSetters<CloseableHttpResponse> backendCaptureRequestAndReturn(
- Capture<HttpRequestWrapper> cap, HttpResponse response) throws Exception {
+ final Capture<HttpRequestWrapper> cap, final HttpResponse response) throws Exception {
CloseableHttpResponse resp = mockBackend.execute(
EasyMock.isA(HttpRoute.class),
EasyMock.capture(cap),
@@ -1819,11 +1819,11 @@ public class TestCachingExec {
return EasyMock.expect(resp).andReturn(Proxies.enhanceResponse(response));
}
- private void getCacheEntryReturns(HttpCacheEntry result) throws IOException {
+ private void getCacheEntryReturns(final HttpCacheEntry result) throws IOException {
expect(mockCache.getCacheEntry(host, request)).andReturn(result);
}
- private void getVariantCacheEntriesReturns(Map<String,Variant> result) throws IOException {
+ private void getVariantCacheEntriesReturns(final Map<String,Variant> result) throws IOException {
expect(mockCache.getVariantCacheEntriesWithEtags(host, request)).andReturn(result);
}
@@ -1833,42 +1833,42 @@ public class TestCachingExec {
(HttpRequest)anyObject());
}
- private void cacheEntryValidatable(boolean b) {
+ private void cacheEntryValidatable(final boolean b) {
expect(mockValidityPolicy.isRevalidatable(
(HttpCacheEntry)anyObject())).andReturn(b);
}
- private void cacheEntryMustRevalidate(boolean b) {
+ private void cacheEntryMustRevalidate(final boolean b) {
expect(mockValidityPolicy.mustRevalidate(mockCacheEntry))
.andReturn(b);
}
- private void cacheEntryProxyRevalidate(boolean b) {
+ private void cacheEntryProxyRevalidate(final boolean b) {
expect(mockValidityPolicy.proxyRevalidate(mockCacheEntry))
.andReturn(b);
}
- private void mayReturnStaleWhileRevalidating(boolean b) {
+ private void mayReturnStaleWhileRevalidating(final boolean b) {
expect(mockValidityPolicy.mayReturnStaleWhileRevalidating(
(HttpCacheEntry)anyObject(), (Date)anyObject())).andReturn(b);
}
- private void conditionalRequestBuilderReturns(HttpRequestWrapper validate)
+ private void conditionalRequestBuilderReturns(final HttpRequestWrapper validate)
throws Exception {
expect(mockConditionalRequestBuilder.buildConditionalRequest(
request, entry)).andReturn(validate);
}
- private void getCurrentDateReturns(Date date) {
+ private void getCurrentDateReturns(final Date date) {
expect(impl.getCurrentDate()).andReturn(date);
}
- private void requestPolicyAllowsCaching(boolean allow) {
+ private void requestPolicyAllowsCaching(final boolean allow) {
expect(mockRequestPolicy.isServableFromCache(
(HttpRequest)anyObject())).andReturn(allow);
}
- private void cacheEntrySuitable(boolean suitable) {
+ private void cacheEntrySuitable(final boolean suitable) {
expect(
mockSuitabilityChecker.canCachedResponseBeUsed(
(HttpHost)anyObject(),
@@ -1877,7 +1877,7 @@ public class TestCachingExec {
(Date)anyObject())).andReturn(suitable);
}
- private void entryHasStaleness(long staleness) {
+ private void entryHasStaleness(final long staleness) {
expect(mockValidityPolicy.getStalenessSecs(
(HttpCacheEntry)anyObject(),
(Date)anyObject()
@@ -1889,7 +1889,7 @@ public class TestCachingExec {
(HttpCacheEntry)anyObject())).andReturn(mockCachedResponse);
}
- private void handleBackendResponseReturnsResponse(HttpRequestWrapper request, HttpResponse response)
+ private void handleBackendResponseReturnsResponse(final HttpRequestWrapper request, final HttpResponse response)
throws IOException {
expect(
impl.handleBackendResponse(
@@ -1903,7 +1903,7 @@ public class TestCachingExec {
Proxies.enhanceResponse(response));
}
- private void mockImplMethods(String... methods) {
+ private void mockImplMethods(final String... methods) {
mockedImpl = true;
impl = createMockBuilder(CachingExec.class).withConstructor(
mockBackend,
Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestHttpCacheEntrySerializers.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestHttpCacheEntrySerializers.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestHttpCacheEntrySerializers.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestHttpCacheEntrySerializers.java Tue Jan 15 18:29:58 2013
@@ -67,7 +67,7 @@ public class TestHttpCacheEntrySerialize
readWriteVerify(makeCacheEntryWithVariantMap());
}
- public void readWriteVerify(HttpCacheEntry writeEntry) throws IOException {
+ public void readWriteVerify(final HttpCacheEntry writeEntry) throws IOException {
// write the entry
ByteArrayOutputStream out = new ByteArrayOutputStream();
impl.writeTo(writeEntry, out);
@@ -99,7 +99,7 @@ public class TestHttpCacheEntrySerialize
return cacheEntry;
}
- private boolean areEqual(HttpCacheEntry one, HttpCacheEntry two) throws IOException {
+ private boolean areEqual(final HttpCacheEntry one, final HttpCacheEntry two) throws IOException {
// dates are only stored with second precision, so scrub milliseconds
if (!((one.getRequestDate().getTime() / 1000) == (two.getRequestDate()
.getTime() / 1000))) {
@@ -137,7 +137,7 @@ public class TestHttpCacheEntrySerialize
return true;
}
- private byte[] resourceToBytes(Resource res) throws IOException {
+ private byte[] resourceToBytes(final Resource res) throws IOException {
InputStream inputStream = res.getInputStream();
ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
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=1433569&r1=1433568&r2=1433569&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 Tue Jan 15 18:29:58 2013
@@ -133,13 +133,13 @@ public class TestProtocolDeviations {
EasyMock.verify(mockEntity);
}
- private HttpEntity makeBody(int nbytes) {
+ private HttpEntity makeBody(final int nbytes) {
byte[] bytes = new byte[nbytes];
(new Random()).nextBytes(bytes);
return new ByteArrayEntity(bytes);
}
- public static HttpRequest eqRequest(HttpRequest in) {
+ public static HttpRequest eqRequest(final HttpRequest in) {
org.easymock.EasyMock.reportMatcher(new RequestEquivalent(in));
return null;
}
Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestProtocolRecommendations.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestProtocolRecommendations.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestProtocolRecommendations.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestProtocolRecommendations.java Tue Jan 15 18:29:58 2013
@@ -112,8 +112,8 @@ public class TestProtocolRecommendations
* http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html#sec10.3.5
*/
private void cacheGenerated304ForValidatorShouldNotContainEntityHeader(
- String headerName, String headerValue, String validatorHeader,
- String validator, String conditionalHeader) throws Exception,
+ final String headerName, final String headerValue, final String validatorHeader,
+ final String validator, final String conditionalHeader) throws Exception,
IOException {
HttpRequestWrapper req1 = HttpRequestWrapper.wrap(HttpTestUtils.makeDefaultRequest());
HttpResponse resp1 = HttpTestUtils.make200Response();
@@ -137,14 +137,14 @@ public class TestProtocolRecommendations
}
private void cacheGenerated304ForStrongETagValidatorShouldNotContainEntityHeader(
- String headerName, String headerValue) throws Exception,
+ final String headerName, final String headerValue) throws Exception,
IOException {
cacheGenerated304ForValidatorShouldNotContainEntityHeader(headerName,
headerValue, "ETag", "\"etag\"", "If-None-Match");
}
private void cacheGenerated304ForStrongDateValidatorShouldNotContainEntityHeader(
- String headerName, String headerValue) throws Exception,
+ final String headerName, final String headerValue) throws Exception,
IOException {
cacheGenerated304ForValidatorShouldNotContainEntityHeader(headerName,
headerValue, "Last-Modified", formatDate(twoMinutesAgo),
@@ -222,7 +222,7 @@ public class TestProtocolRecommendations
}
private void cacheGenerated304ForStrongValidatorShouldNotContainContentRange(
- String validatorHeader, String validator, String conditionalHeader)
+ final String validatorHeader, final String validator, final String conditionalHeader)
throws Exception, IOException, ClientProtocolException {
HttpRequestWrapper req1 = HttpRequestWrapper.wrap(HttpTestUtils.makeDefaultRequest());
req1.setHeader("Range","bytes=0-127");
@@ -308,7 +308,7 @@ public class TestProtocolRecommendations
}
private void shouldStripEntityHeaderFromOrigin304ResponseToStrongValidation(
- String entityHeader, String entityHeaderValue) throws Exception,
+ final String entityHeader, final String entityHeaderValue) throws Exception,
IOException {
HttpRequestWrapper req = HttpRequestWrapper.wrap(HttpTestUtils.makeDefaultRequest());
req.setHeader("If-None-Match", "\"etag\"");
@@ -416,7 +416,7 @@ public class TestProtocolRecommendations
return req1;
}
- private void testDoesNotReturnStaleResponseOnError(HttpRequestWrapper req2)
+ private void testDoesNotReturnStaleResponseOnError(final HttpRequestWrapper req2)
throws Exception, IOException {
HttpRequestWrapper req1 = requestToPopulateStaleCacheEntry();