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 [2/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/httpasyncclient/trunk/httpasyncclient-cache/src/main/java/org/apache/http/impl/client/cache/CachingHttpAsyncClient.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/trunk/httpasyncclient-cache/src/main/java/org/apache/http/impl/client/cache/CachingHttpAsyncClient.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpasyncclient/trunk/httpasyncclient-cache/src/main/java/org/apache/http/impl/client/cache/CachingHttpAsyncClient.java (original)
+++ httpcomponents/httpasyncclient/trunk/httpasyncclient-cache/src/main/java/org/apache/http/impl/client/cache/CachingHttpAsyncClient.java Tue Jan 15 18:29:58 2013
@@ -103,9 +103,9 @@ public class CachingHttpAsyncClient impl
private final Log log = LogFactory.getLog(getClass());
CachingHttpAsyncClient(
- HttpAsyncClient client,
- HttpCache cache,
- CacheConfig config) {
+ final HttpAsyncClient client,
+ final HttpCache cache,
+ final CacheConfig config) {
super();
if (client == null) {
throw new IllegalArgumentException("HttpClient may not be null");
@@ -139,54 +139,54 @@ public class CachingHttpAsyncClient impl
new CacheConfig());
}
- public CachingHttpAsyncClient(CacheConfig config) throws IOReactorException {
+ public CachingHttpAsyncClient(final CacheConfig config) throws IOReactorException {
this(new DefaultHttpAsyncClient(),
new BasicHttpCache(config),
config);
}
- public CachingHttpAsyncClient(HttpAsyncClient client) {
+ public CachingHttpAsyncClient(final HttpAsyncClient client) {
this(client,
new BasicHttpCache(),
new CacheConfig());
}
- public CachingHttpAsyncClient(HttpAsyncClient client, CacheConfig config) {
+ public CachingHttpAsyncClient(final HttpAsyncClient client, final CacheConfig config) {
this(client,
new BasicHttpCache(config),
config);
}
public CachingHttpAsyncClient(
- HttpAsyncClient client,
- ResourceFactory resourceFactory,
- HttpCacheStorage storage,
- CacheConfig config) {
+ final HttpAsyncClient client,
+ final ResourceFactory resourceFactory,
+ final HttpCacheStorage storage,
+ final CacheConfig config) {
this(client,
new BasicHttpCache(resourceFactory, storage, config),
config);
}
public CachingHttpAsyncClient(
- HttpAsyncClient client,
- HttpCacheStorage storage,
- CacheConfig config) {
+ final HttpAsyncClient client,
+ final HttpCacheStorage storage,
+ final CacheConfig config) {
this(client,
new BasicHttpCache(new HeapResourceFactory(), storage, config),
config);
}
CachingHttpAsyncClient(
- HttpAsyncClient backend,
- CacheValidityPolicy validityPolicy,
- ResponseCachingPolicy responseCachingPolicy,
- HttpCache responseCache,
- CachedHttpResponseGenerator responseGenerator,
- CacheableRequestPolicy cacheableRequestPolicy,
- CachedResponseSuitabilityChecker suitabilityChecker,
- ConditionalRequestBuilder conditionalRequestBuilder,
- ResponseProtocolCompliance responseCompliance,
- RequestProtocolCompliance requestCompliance) {
+ final HttpAsyncClient backend,
+ final CacheValidityPolicy validityPolicy,
+ final ResponseCachingPolicy responseCachingPolicy,
+ final HttpCache responseCache,
+ final CachedHttpResponseGenerator responseGenerator,
+ final CacheableRequestPolicy cacheableRequestPolicy,
+ final CachedResponseSuitabilityChecker suitabilityChecker,
+ final ConditionalRequestBuilder conditionalRequestBuilder,
+ final ResponseProtocolCompliance responseCompliance,
+ final RequestProtocolCompliance requestCompliance) {
CacheConfig config = new CacheConfig();
this.maxObjectSizeBytes = config.getMaxObjectSize();
this.sharedCache = config.isSharedCache();
@@ -204,7 +204,7 @@ public class CachingHttpAsyncClient impl
}
private AsynchronousAsyncValidator makeAsynchronousValidator(
- CacheConfig config) {
+ final CacheConfig config) {
if (config.getAsynchronousWorkersMax() > 0) {
return new AsynchronousAsyncValidator(this, config);
}
@@ -343,9 +343,9 @@ public class CachingHttpAsyncClient impl
}
}
- private Future<HttpResponse> handleCacheHit(HttpHost target, HttpRequest request,
- HttpContext context, HttpCacheEntry entry,
- FutureCallback<HttpResponse> futureCallback)
+ private Future<HttpResponse> handleCacheHit(final HttpHost target, final HttpRequest request,
+ final HttpContext context, final HttpCacheEntry entry,
+ final FutureCallback<HttpResponse> futureCallback)
throws ClientProtocolException, IOException {
recordCacheHit(target, request);
@@ -368,7 +368,7 @@ public class CachingHttpAsyncClient impl
return callBackend(target, request, context, futureCallback);
}
- private Future<HttpResponse> revalidateCacheEntry(HttpHost target,
+ private Future<HttpResponse> revalidateCacheEntry(final HttpHost target,
final HttpRequest request, final HttpContext context, final HttpCacheEntry entry,
final Date now, final FutureCallback<HttpResponse> futureCallback) throws ClientProtocolException {
this.log.debug("Revalidating the cache entry");
@@ -392,11 +392,11 @@ public class CachingHttpAsyncClient impl
futureCallback.cancelled();
}
- public void completed(HttpResponse httpResponse) {
+ public void completed(final HttpResponse httpResponse) {
futureCallback.completed(httpResponse);
}
- public void failed(Exception e) {
+ public void failed(final Exception e) {
if(e instanceof IOException) {
futureCallback.completed(handleRevalidationFailure(request, context, entry, now));
return;
@@ -409,8 +409,8 @@ public class CachingHttpAsyncClient impl
}
}
- private Future<HttpResponse> handleCacheMiss(HttpHost target, HttpRequest request,
- HttpContext context, FutureCallback<HttpResponse> futureCallback) {
+ private Future<HttpResponse> handleCacheMiss(final HttpHost target, final HttpRequest request,
+ final HttpContext context, final FutureCallback<HttpResponse> futureCallback) {
recordCacheMiss(target, request);
if (!mayCallBackend(request)) {
@@ -428,7 +428,7 @@ public class CachingHttpAsyncClient impl
return callBackend(target, request, context, futureCallback);
}
- private HttpCacheEntry satisfyFromCache(HttpHost target, HttpRequest request) {
+ private HttpCacheEntry satisfyFromCache(final HttpHost target, final HttpRequest request) {
HttpCacheEntry entry = null;
try {
entry = this.responseCache.getCacheEntry(target, request);
@@ -438,8 +438,8 @@ public class CachingHttpAsyncClient impl
return entry;
}
- private HttpResponse getFatallyNoncompliantResponse(HttpRequest request,
- HttpContext context) {
+ private HttpResponse getFatallyNoncompliantResponse(final HttpRequest request,
+ final HttpContext context) {
HttpResponse fatalErrorResponse = null;
List<RequestProtocolError> fatalError = this.requestCompliance.requestIsFatallyNonCompliant(request);
@@ -450,8 +450,8 @@ public class CachingHttpAsyncClient impl
return fatalErrorResponse;
}
- private Map<String, Variant> getExistingCacheVariants(HttpHost target,
- HttpRequest request) {
+ private Map<String, Variant> getExistingCacheVariants(final HttpHost target,
+ final HttpRequest request) {
Map<String,Variant> variants = null;
try {
variants = this.responseCache.getVariantCacheEntriesWithEtags(target, request);
@@ -461,7 +461,7 @@ public class CachingHttpAsyncClient impl
return variants;
}
- private void recordCacheMiss(HttpHost target, HttpRequest request) {
+ private void recordCacheMiss(final HttpHost target, final HttpRequest request) {
this.cacheMisses.getAndIncrement();
if (this.log.isDebugEnabled()) {
RequestLine rl = request.getRequestLine();
@@ -469,7 +469,7 @@ public class CachingHttpAsyncClient impl
}
}
- private void recordCacheHit(HttpHost target, HttpRequest request) {
+ private void recordCacheHit(final HttpHost target, final HttpRequest request) {
this.cacheHits.getAndIncrement();
if (this.log.isDebugEnabled()) {
RequestLine rl = request.getRequestLine();
@@ -477,13 +477,13 @@ public class CachingHttpAsyncClient impl
}
}
- private void recordCacheUpdate(HttpContext context) {
+ private void recordCacheUpdate(final HttpContext context) {
this.cacheUpdates.getAndIncrement();
setResponseStatus(context, CacheResponseStatus.VALIDATED);
}
- private void flushEntriesInvalidatedByRequest(HttpHost target,
- HttpRequest request) {
+ private void flushEntriesInvalidatedByRequest(final HttpHost target,
+ final HttpRequest request) {
try {
this.responseCache.flushInvalidatedCacheEntriesFor(target, request);
} catch (IOException ioe) {
@@ -491,8 +491,8 @@ public class CachingHttpAsyncClient impl
}
}
- private HttpResponse generateCachedResponse(HttpRequest request,
- HttpContext context, HttpCacheEntry entry, Date now) {
+ private HttpResponse generateCachedResponse(final HttpRequest request,
+ final HttpContext context, final HttpCacheEntry entry, final Date now) {
final HttpResponse cachedResponse;
if (request.containsHeader(HeaderConstants.IF_NONE_MATCH)
|| request.containsHeader(HeaderConstants.IF_MODIFIED_SINCE)) {
@@ -507,36 +507,36 @@ public class CachingHttpAsyncClient impl
return cachedResponse;
}
- private HttpResponse handleRevalidationFailure(HttpRequest request,
- HttpContext context, HttpCacheEntry entry, Date now) {
+ private HttpResponse handleRevalidationFailure(final HttpRequest request,
+ final HttpContext context, final HttpCacheEntry entry, final Date now) {
if (staleResponseNotAllowed(request, entry, now)) {
return generateGatewayTimeout(context);
}
return unvalidatedCacheHit(context, entry);
}
- private HttpResponse generateGatewayTimeout(HttpContext context) {
+ private HttpResponse generateGatewayTimeout(final HttpContext context) {
setResponseStatus(context, CacheResponseStatus.CACHE_MODULE_RESPONSE);
return new BasicHttpResponse(HttpVersion.HTTP_1_1,
HttpStatus.SC_GATEWAY_TIMEOUT, "Gateway Timeout");
}
- private HttpResponse unvalidatedCacheHit(HttpContext context,
- HttpCacheEntry entry) {
+ private HttpResponse unvalidatedCacheHit(final HttpContext context,
+ final HttpCacheEntry entry) {
final HttpResponse cachedResponse = this.responseGenerator.generateResponse(entry);
setResponseStatus(context, CacheResponseStatus.CACHE_HIT);
cachedResponse.addHeader(HeaderConstants.WARNING, "111 localhost \"Revalidation failed\"");
return cachedResponse;
}
- private boolean staleResponseNotAllowed(HttpRequest request,
- HttpCacheEntry entry, Date now) {
+ private boolean staleResponseNotAllowed(final HttpRequest request,
+ final HttpCacheEntry entry, final Date now) {
return this.validityPolicy.mustRevalidate(entry)
|| (isSharedCache() && this.validityPolicy.proxyRevalidate(entry))
|| explicitFreshnessRequest(request, entry, now);
}
- private boolean mayCallBackend(HttpRequest request) {
+ private boolean mayCallBackend(final HttpRequest request) {
for (Header h: request.getHeaders("Cache-Control")) {
for (HeaderElement elt : h.getElements()) {
if ("only-if-cached".equals(elt.getName())) {
@@ -547,7 +547,7 @@ public class CachingHttpAsyncClient impl
return true;
}
- private boolean explicitFreshnessRequest(HttpRequest request, HttpCacheEntry entry, Date now) {
+ private boolean explicitFreshnessRequest(final HttpRequest request, final HttpCacheEntry entry, final Date now) {
for(Header h : request.getHeaders("Cache-Control")) {
for(HeaderElement elt : h.getElements()) {
if ("max-stale".equals(elt.getName())) {
@@ -570,7 +570,7 @@ public class CachingHttpAsyncClient impl
return false;
}
- private String generateViaHeader(HttpMessage msg) {
+ private String generateViaHeader(final HttpMessage msg) {
final VersionInfo vi = VersionInfo.loadVersionInfo("org.apache.http.client", getClass().getClassLoader());
final String release = (vi != null) ? vi.getRelease() : VersionInfo.UNAVAILABLE;
final ProtocolVersion pv = msg.getProtocolVersion();
@@ -613,7 +613,7 @@ public class CachingHttpAsyncClient impl
return new Date();
}
- boolean clientRequestsOurOptions(HttpRequest request) {
+ boolean clientRequestsOurOptions(final HttpRequest request) {
RequestLine line = request.getRequestLine();
if (!HeaderConstants.OPTIONS_METHOD.equals(line.getMethod())) {
@@ -640,7 +640,7 @@ public class CachingHttpAsyncClient impl
futureCallback.cancelled();
}
- public void completed(HttpResponse httpResponse) {
+ public void completed(final HttpResponse httpResponse) {
httpResponse.addHeader("Via", generateViaHeader(httpResponse));
try {
HttpResponse backendResponse = handleBackendResponse(target, request, requestDate, getCurrentDate(), httpResponse);
@@ -652,15 +652,15 @@ public class CachingHttpAsyncClient impl
}
- public void failed(Exception e) {
+ public void failed(final Exception e) {
futureCallback.failed(e);
}
});
}
- private boolean revalidationResponseIsTooOld(HttpResponse backendResponse,
- HttpCacheEntry cacheEntry) {
+ private boolean revalidationResponseIsTooOld(final HttpResponse backendResponse,
+ final HttpCacheEntry cacheEntry) {
final Header entryDateHeader = cacheEntry.getFirstHeader("Date");
final Header responseDateHeader = backendResponse.getFirstHeader("Date");
if (entryDateHeader != null && responseDateHeader != null) {
@@ -694,7 +694,7 @@ public class CachingHttpAsyncClient impl
futureCallback.cancelled();
}
- public void completed(HttpResponse httpResponse) {
+ public void completed(final HttpResponse httpResponse) {
Date responseDate = getCurrentDate();
httpResponse.addHeader("Via", generateViaHeader(httpResponse));
@@ -719,11 +719,11 @@ public class CachingHttpAsyncClient impl
futureCallback.cancelled();
}
- public void completed(HttpResponse innerHttpResponse) {
+ public void completed(final HttpResponse innerHttpResponse) {
futureCallback.completed(innerHttpResponse);
}
- public void failed(Exception e) {
+ public void failed(final Exception e) {
futureCallback.failed(e);
}
@@ -741,11 +741,11 @@ public class CachingHttpAsyncClient impl
futureCallback.cancelled();
}
- public void completed(HttpResponse innerHttpResponse) {
+ public void completed(final HttpResponse innerHttpResponse) {
futureCallback.completed(innerHttpResponse);
}
- public void failed(Exception e) {
+ public void failed(final Exception e) {
futureCallback.failed(e);
}
@@ -780,24 +780,24 @@ public class CachingHttpAsyncClient impl
return;
}
- public void failed(Exception e) {
+ public void failed(final Exception e) {
futureCallback.failed(e);
}
});
}
- private void retryRequestUnconditionally(HttpHost target,
- HttpRequest request, HttpContext context,
- HttpCacheEntry matchedEntry, FutureCallback<HttpResponse> futureCallback) {
+ private void retryRequestUnconditionally(final HttpHost target,
+ final HttpRequest request, final HttpContext context,
+ final HttpCacheEntry matchedEntry, final FutureCallback<HttpResponse> futureCallback) {
HttpRequest unconditional = this.conditionalRequestBuilder
.buildUnconditionalRequest(request, matchedEntry);
callBackend(target, unconditional, context, futureCallback);
}
- private HttpCacheEntry getUpdatedVariantEntry(HttpHost target,
- HttpRequest conditionalRequest, Date requestDate,
- Date responseDate, HttpResponse backendResponse,
- Variant matchingVariant, HttpCacheEntry matchedEntry) {
+ private HttpCacheEntry getUpdatedVariantEntry(final HttpHost target,
+ final HttpRequest conditionalRequest, final Date requestDate,
+ final Date responseDate, final HttpResponse backendResponse,
+ final Variant matchingVariant, final HttpCacheEntry matchedEntry) {
HttpCacheEntry responseEntry = matchedEntry;
try {
responseEntry = this.responseCache.updateVariantCacheEntry(target, conditionalRequest,
@@ -808,8 +808,8 @@ public class CachingHttpAsyncClient impl
return responseEntry;
}
- private void tryToUpdateVariantMap(HttpHost target, HttpRequest request,
- Variant matchingVariant) {
+ private void tryToUpdateVariantMap(final HttpHost target, final HttpRequest request,
+ final Variant matchingVariant) {
try {
this.responseCache.reuseVariantEntryFor(target, request, matchingVariant);
} catch (IOException ioe) {
@@ -817,8 +817,8 @@ public class CachingHttpAsyncClient impl
}
}
- private boolean shouldSendNotModifiedResponse(HttpRequest request,
- HttpCacheEntry responseEntry) {
+ private boolean shouldSendNotModifiedResponse(final HttpRequest request,
+ final HttpCacheEntry responseEntry) {
return (this.suitabilityChecker.isConditional(request)
&& this.suitabilityChecker.allConditionalsMatch(request, responseEntry, new Date()));
}
@@ -838,7 +838,7 @@ public class CachingHttpAsyncClient impl
futureCallback.cancelled();
}
- public void completed(HttpResponse httpResponse) {
+ public void completed(final HttpResponse httpResponse) {
final Date responseDate = getCurrentDate();
if (revalidationResponseIsTooOld(httpResponse, cacheEntry)) {
@@ -850,7 +850,7 @@ public class CachingHttpAsyncClient impl
futureCallback.cancelled();
}
- public void completed(HttpResponse innerHttpResponse) {
+ public void completed(final HttpResponse innerHttpResponse) {
Date innerResponseDate = getCurrentDate();
revalidateCacheEntryCompleted(target, request,
context, cacheEntry, futureCallback,
@@ -858,7 +858,7 @@ public class CachingHttpAsyncClient impl
innerHttpResponse, innerResponseDate);
}
- public void failed(Exception e) {
+ public void failed(final Exception e) {
futureCallback.failed(e);
}
@@ -871,7 +871,7 @@ public class CachingHttpAsyncClient impl
httpResponse, responseDate);
}
- public void failed(Exception e) {
+ public void failed(final Exception e) {
futureCallback.failed(e);
}
@@ -886,8 +886,8 @@ public class CachingHttpAsyncClient impl
final FutureCallback<HttpResponse> futureCallback,
final HttpRequest conditionalRequest,
final Date requestDate,
- HttpResponse httpResponse,
- Date responseDate) {
+ final HttpResponse httpResponse,
+ final Date responseDate) {
httpResponse.addHeader("Via", generateViaHeader(httpResponse));
@@ -933,7 +933,7 @@ public class CachingHttpAsyncClient impl
}
}
- private boolean staleIfErrorAppliesTo(int statusCode) {
+ private boolean staleIfErrorAppliesTo(final int statusCode) {
return statusCode == HttpStatus.SC_INTERNAL_SERVER_ERROR
|| statusCode == HttpStatus.SC_BAD_GATEWAY
|| statusCode == HttpStatus.SC_SERVICE_UNAVAILABLE
@@ -941,11 +941,11 @@ public class CachingHttpAsyncClient impl
}
HttpResponse handleBackendResponse(
- HttpHost target,
- HttpRequest request,
- Date requestDate,
- Date responseDate,
- HttpResponse backendResponse) throws IOException {
+ final HttpHost target,
+ final HttpRequest request,
+ final Date requestDate,
+ final Date responseDate,
+ final HttpResponse backendResponse) throws IOException {
this.log.debug("Handling Backend response");
this.responseCompliance.ensureProtocolCompliance(request, backendResponse);
@@ -971,8 +971,8 @@ public class CachingHttpAsyncClient impl
return backendResponse;
}
- private boolean alreadyHaveNewerCacheEntry(HttpHost target, HttpRequest request,
- HttpResponse backendResponse) {
+ private boolean alreadyHaveNewerCacheEntry(final HttpHost target, final HttpRequest request,
+ final HttpResponse backendResponse) {
HttpCacheEntry existing = null;
try {
existing = this.responseCache.getCacheEntry(target, request);
Modified: httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/AbstractHttpAsyncClient.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/AbstractHttpAsyncClient.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/AbstractHttpAsyncClient.java (original)
+++ httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/AbstractHttpAsyncClient.java Tue Jan 15 18:29:58 2013
@@ -405,11 +405,11 @@ public abstract class AbstractHttpAsyncC
return getHttpProcessor().getResponseInterceptorCount();
}
- public synchronized HttpResponseInterceptor getResponseInterceptor(int index) {
+ public synchronized HttpResponseInterceptor getResponseInterceptor(final int index) {
return getHttpProcessor().getResponseInterceptor(index);
}
- public synchronized HttpRequestInterceptor getRequestInterceptor(int index) {
+ public synchronized HttpRequestInterceptor getRequestInterceptor(final int index) {
return getHttpProcessor().getRequestInterceptor(index);
}
@@ -422,7 +422,7 @@ public abstract class AbstractHttpAsyncC
this.protocolProcessor = null;
}
- public synchronized void addResponseInterceptor(final HttpResponseInterceptor itcp, int index) {
+ public synchronized void addResponseInterceptor(final HttpResponseInterceptor itcp, final int index) {
getHttpProcessor().addInterceptor(itcp, index);
this.protocolProcessor = null;
}
@@ -432,7 +432,7 @@ public abstract class AbstractHttpAsyncC
this.protocolProcessor = null;
}
- public synchronized void removeResponseInterceptorByClass(Class<? extends HttpResponseInterceptor> clazz) {
+ public synchronized void removeResponseInterceptorByClass(final Class<? extends HttpResponseInterceptor> clazz) {
getHttpProcessor().removeResponseInterceptorByClass(clazz);
this.protocolProcessor = null;
}
@@ -442,7 +442,7 @@ public abstract class AbstractHttpAsyncC
this.protocolProcessor = null;
}
- public synchronized void addRequestInterceptor(final HttpRequestInterceptor itcp, int index) {
+ public synchronized void addRequestInterceptor(final HttpRequestInterceptor itcp, final int index) {
getHttpProcessor().addInterceptor(itcp, index);
this.protocolProcessor = null;
}
@@ -452,7 +452,7 @@ public abstract class AbstractHttpAsyncC
this.protocolProcessor = null;
}
- public synchronized void removeRequestInterceptorByClass(Class<? extends HttpRequestInterceptor> clazz) {
+ public synchronized void removeRequestInterceptorByClass(final Class<? extends HttpRequestInterceptor> clazz) {
getHttpProcessor().removeRequestInterceptorByClass(clazz);
this.protocolProcessor = null;
}
Modified: httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/DefaultHttpAsyncClient.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/DefaultHttpAsyncClient.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/DefaultHttpAsyncClient.java (original)
+++ httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/DefaultHttpAsyncClient.java Tue Jan 15 18:29:58 2013
@@ -71,7 +71,7 @@ public class DefaultHttpAsyncClient exte
return params;
}
- public static void setDefaultHttpParams(HttpParams params) {
+ public static void setDefaultHttpParams(final HttpParams params) {
HttpProtocolParams.setVersion(params, HttpVersion.HTTP_1_1);
HttpProtocolParams.setContentCharset(params, HTTP.DEF_CONTENT_CHARSET.name());
HttpConnectionParams.setTcpNoDelay(params, true);
Modified: httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/DefaultClientAsyncConnection.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/DefaultClientAsyncConnection.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/DefaultClientAsyncConnection.java (original)
+++ httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/DefaultClientAsyncConnection.java Tue Jan 15 18:29:58 2013
@@ -82,7 +82,7 @@ public class DefaultClientAsyncConnectio
}
@Override
- protected void onResponseReceived(HttpResponse response) {
+ protected void onResponseReceived(final HttpResponse response) {
if (response != null && this.headerlog.isDebugEnabled()) {
this.headerlog.debug(this.id + " << " + response.getStatusLine().toString());
Header[] headers = response.getAllHeaders();
@@ -93,7 +93,7 @@ public class DefaultClientAsyncConnectio
}
@Override
- protected void onRequestSubmitted(HttpRequest request) {
+ protected void onRequestSubmitted(final HttpRequest request) {
if (request != null && this.headerlog.isDebugEnabled()) {
this.headerlog.debug(this.id + " >> " + request.getRequestLine().toString());
Header[] headers = request.getAllHeaders();
Modified: httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/HttpNIOConnPool.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/HttpNIOConnPool.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/HttpNIOConnPool.java (original)
+++ httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/HttpNIOConnPool.java Tue Jan 15 18:29:58 2013
@@ -53,7 +53,7 @@ class HttpNIOConnPool extends AbstractNI
final Log log,
final ConnectingIOReactor ioreactor,
final AsyncSchemeRegistry schemeRegistry,
- long connTimeToLive, final TimeUnit tunit) {
+ final long connTimeToLive, final TimeUnit tunit) {
super(ioreactor, new HttpNIOConnPoolFactory(), 2, 20);
this.log = log;
this.schemeRegistry = schemeRegistry;
Modified: httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/HttpPoolEntry.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/HttpPoolEntry.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/HttpPoolEntry.java (original)
+++ httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/HttpPoolEntry.java Tue Jan 15 18:29:58 2013
@@ -51,7 +51,7 @@ class HttpPoolEntry extends PoolEntry<Ht
}
@Override
- public boolean isExpired(long now) {
+ public boolean isExpired(final long now) {
boolean expired = super.isExpired(now);
if (expired && this.log.isDebugEnabled()) {
this.log.debug("Connection " + this + " expired @ " + new Date(getExpiry()));
Modified: httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/LoggingIOSession.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/LoggingIOSession.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/LoggingIOSession.java (original)
+++ httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/LoggingIOSession.java Tue Jan 15 18:29:58 2013
@@ -73,7 +73,7 @@ class LoggingIOSession implements IOSess
return this.session.getEventMask();
}
- private static String formatOps(int ops) {
+ private static String formatOps(final int ops) {
StringBuilder buffer = new StringBuilder(6);
buffer.append('[');
if ((ops & SelectionKey.OP_READ) > 0) {
@@ -92,21 +92,21 @@ class LoggingIOSession implements IOSess
return buffer.toString();
}
- public void setEventMask(int ops) {
+ public void setEventMask(final int ops) {
this.session.setEventMask(ops);
if (this.log.isDebugEnabled()) {
this.log.debug(this.id + " " + this.session + ": Event mask set " + formatOps(ops));
}
}
- public void setEvent(int op) {
+ public void setEvent(final int op) {
this.session.setEvent(op);
if (this.log.isDebugEnabled()) {
this.log.debug(this.id + " " + this.session + ": Event set " + formatOps(op));
}
}
- public void clearEvent(int op) {
+ public void clearEvent(final int op) {
this.session.clearEvent(op);
if (this.log.isDebugEnabled()) {
this.log.debug(this.id + " " + this.session + ": Event cleared " + formatOps(op));
@@ -139,7 +139,7 @@ class LoggingIOSession implements IOSess
return this.session.getSocketTimeout();
}
- public void setSocketTimeout(int timeout) {
+ public void setSocketTimeout(final int timeout) {
if (this.log.isDebugEnabled()) {
this.log.debug(this.id + " " + this.session + ": Set timeout " + timeout);
}
Modified: httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/ManagedClientAsyncConnectionImpl.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/ManagedClientAsyncConnectionImpl.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/ManagedClientAsyncConnectionImpl.java (original)
+++ httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/ManagedClientAsyncConnectionImpl.java Tue Jan 15 18:29:58 2013
@@ -141,7 +141,7 @@ class ManagedClientAsyncConnectionImpl i
return isOpen();
}
- public void setSocketTimeout(int timeout) {
+ public void setSocketTimeout(final int timeout) {
ClientAsyncConnection conn = ensureConnection();
conn.setSocketTimeout(timeout);
}
@@ -278,7 +278,7 @@ class ManagedClientAsyncConnectionImpl i
return this.reusable;
}
- public void setIdleDuration(long duration, TimeUnit unit) {
+ public void setIdleDuration(final long duration, final TimeUnit unit) {
if(duration > 0) {
this.duration = unit.toMillis(duration);
} else {
Modified: httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/PoolingClientAsyncConnectionManager.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/PoolingClientAsyncConnectionManager.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/PoolingClientAsyncConnectionManager.java (original)
+++ httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/PoolingClientAsyncConnectionManager.java Tue Jan 15 18:29:58 2013
@@ -112,7 +112,7 @@ public class PoolingClientAsyncConnectio
return this.ioreactor.getStatus();
}
- public void shutdown(long waitMs) throws IOException {
+ public void shutdown(final long waitMs) throws IOException {
this.log.debug("Connection manager is shutting down");
this.pool.shutdown(waitMs);
this.log.debug("Connection manager shut down");
@@ -246,15 +246,15 @@ public class PoolingClientAsyncConnectio
return this.pool.getStats(route);
}
- public void setMaxTotal(int max) {
+ public void setMaxTotal(final int max) {
this.pool.setMaxTotal(max);
}
- public void setDefaultMaxPerRoute(int max) {
+ public void setDefaultMaxPerRoute(final int max) {
this.pool.setDefaultMaxPerRoute(max);
}
- public void setMaxPerRoute(final HttpRoute route, int max) {
+ public void setMaxPerRoute(final HttpRoute route, final int max) {
this.pool.setMaxPerRoute(route, max);
}
@@ -270,7 +270,7 @@ public class PoolingClientAsyncConnectio
return this.pool.getMaxPerRoute(route);
}
- public void closeIdleConnections(long idleTimeout, final TimeUnit tunit) {
+ public void closeIdleConnections(final long idleTimeout, final TimeUnit tunit) {
if (log.isDebugEnabled()) {
log.debug("Closing connections idle longer than " + idleTimeout + " " + tunit);
}
Modified: httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/Wire.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/Wire.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/Wire.java (original)
+++ httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/Wire.java Tue Jan 15 18:29:58 2013
@@ -41,7 +41,7 @@ class Wire {
this.id = id;
}
- private void wire(final String header, final byte[] b, int pos, int off) {
+ private void wire(final String header, final byte[] b, final int pos, final int off) {
StringBuilder buffer = new StringBuilder();
for (int i = 0; i < off; i++) {
int ch = b[pos + i];
@@ -74,27 +74,27 @@ class Wire {
return this.log.isDebugEnabled();
}
- public void output(final byte[] b, int pos, int off) {
+ public void output(final byte[] b, final int pos, final int off) {
wire(">> ", b, pos, off);
}
- public void input(final byte[] b, int pos, int off) {
+ public void input(final byte[] b, final int pos, final int off) {
wire("<< ", b, pos, off);
}
- public void output(byte[] b) {
+ public void output(final byte[] b) {
output(b, 0, b.length);
}
- public void input(byte[] b) {
+ public void input(final byte[] b) {
input(b, 0, b.length);
}
- public void output(int b) {
+ public void output(final int b) {
output(new byte[] {(byte) b});
}
- public void input(int b) {
+ public void input(final int b) {
input(new byte[] {(byte) b});
}
Modified: httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/nio/client/methods/AsyncByteConsumer.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/nio/client/methods/AsyncByteConsumer.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/nio/client/methods/AsyncByteConsumer.java (original)
+++ httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/nio/client/methods/AsyncByteConsumer.java Tue Jan 15 18:29:58 2013
@@ -40,7 +40,7 @@ public abstract class AsyncByteConsumer<
private final int bufSize;
private ByteBuffer bbuf;
- public AsyncByteConsumer(int bufSize) {
+ public AsyncByteConsumer(final int bufSize) {
super();
this.bufSize = bufSize;
}
Modified: httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/nio/client/methods/AsyncCharConsumer.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/nio/client/methods/AsyncCharConsumer.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/nio/client/methods/AsyncCharConsumer.java (original)
+++ httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/nio/client/methods/AsyncCharConsumer.java Tue Jan 15 18:29:58 2013
@@ -48,7 +48,7 @@ public abstract class AsyncCharConsumer<
private ByteBuffer bbuf;
private CharBuffer cbuf;
- public AsyncCharConsumer(int bufSize) {
+ public AsyncCharConsumer(final int bufSize) {
super();
this.bufSize = bufSize;
}
Modified: httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/nio/conn/scheme/AsyncScheme.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/nio/conn/scheme/AsyncScheme.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/nio/conn/scheme/AsyncScheme.java (original)
+++ httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/nio/conn/scheme/AsyncScheme.java Tue Jan 15 18:29:58 2013
@@ -73,7 +73,7 @@ public final class AsyncScheme {
return name;
}
- public final int resolvePort(int port) {
+ public final int resolvePort(final int port) {
return port <= 0 ? defaultPort : port;
}
@@ -90,7 +90,7 @@ public final class AsyncScheme {
}
@Override
- public final boolean equals(Object obj) {
+ public final boolean equals(final Object obj) {
if (this == obj) {
return true;
}
Modified: httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/nio/conn/scheme/AsyncSchemeRegistry.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/nio/conn/scheme/AsyncSchemeRegistry.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/nio/conn/scheme/AsyncSchemeRegistry.java (original)
+++ httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/nio/conn/scheme/AsyncSchemeRegistry.java Tue Jan 15 18:29:58 2013
@@ -61,7 +61,7 @@ public final class AsyncSchemeRegistry {
* @throws IllegalStateException
* if the scheme with the given name is not registered
*/
- public final AsyncScheme getScheme(String name) {
+ public final AsyncScheme getScheme(final String name) {
AsyncScheme found = get(name);
if (found == null) {
throw new IllegalStateException
@@ -81,7 +81,7 @@ public final class AsyncSchemeRegistry {
* @throws IllegalStateException
* if a scheme with the respective name is not registered
*/
- public final AsyncScheme getScheme(HttpHost host) {
+ public final AsyncScheme getScheme(final HttpHost host) {
if (host == null) {
throw new IllegalArgumentException("Host must not be null.");
}
@@ -96,7 +96,7 @@ public final class AsyncSchemeRegistry {
* @return the scheme, or
* <code>null</code> if there is none by this name
*/
- public final AsyncScheme get(String name) {
+ public final AsyncScheme get(final String name) {
if (name == null) {
throw new IllegalArgumentException("Name must not be null.");
}
@@ -117,7 +117,7 @@ public final class AsyncSchemeRegistry {
* @return the scheme previously registered with that name, or
* <code>null</code> if none was registered
*/
- public final AsyncScheme register(AsyncScheme sch) {
+ public final AsyncScheme register(final AsyncScheme sch) {
if (sch == null) {
throw new IllegalArgumentException("Scheme must not be null.");
}
@@ -134,7 +134,7 @@ public final class AsyncSchemeRegistry {
* @return the unregistered scheme, or
* <code>null</code> if there was none
*/
- public final AsyncScheme unregister(String name) {
+ public final AsyncScheme unregister(final String name) {
if (name == null) {
throw new IllegalArgumentException("Name must not be null.");
}
Modified: httpcomponents/httpasyncclient/trunk/httpasyncclient/src/test/java/org/apache/http/localserver/HttpServerNio.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/trunk/httpasyncclient/src/test/java/org/apache/http/localserver/HttpServerNio.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpasyncclient/trunk/httpasyncclient/src/test/java/org/apache/http/localserver/HttpServerNio.java (original)
+++ httpcomponents/httpasyncclient/trunk/httpasyncclient/src/test/java/org/apache/http/localserver/HttpServerNio.java Tue Jan 15 18:29:58 2013
@@ -72,7 +72,7 @@ public class HttpServerNio {
return this.endpoint;
}
- public void setEndpoint(ListenerEndpoint endpoint) {
+ public void setEndpoint(final ListenerEndpoint endpoint) {
this.endpoint = endpoint;
}
@@ -94,7 +94,7 @@ public class HttpServerNio {
return this.ioReactor.getAuditLog();
}
- public void join(long timeout) throws InterruptedException {
+ public void join(final long timeout) throws InterruptedException {
if (this.thread != null) {
this.thread.join(timeout);
}
Modified: httpcomponents/httpasyncclient/trunk/httpasyncclient/src/test/java/org/apache/http/nio/client/integration/TestClientAuthentication.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/trunk/httpasyncclient/src/test/java/org/apache/http/nio/client/integration/TestClientAuthentication.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpasyncclient/trunk/httpasyncclient/src/test/java/org/apache/http/nio/client/integration/TestClientAuthentication.java (original)
+++ httpcomponents/httpasyncclient/trunk/httpasyncclient/src/test/java/org/apache/http/nio/client/integration/TestClientAuthentication.java Tue Jan 15 18:29:58 2013
@@ -157,7 +157,7 @@ public class TestClientAuthentication ex
private final boolean keepAlive;
- AuthHandler(boolean keepAlive) {
+ AuthHandler(final boolean keepAlive) {
super();
this.keepAlive = keepAlive;
}
@@ -256,12 +256,12 @@ public class TestClientAuthentication ex
public void clear() {
}
- public Credentials getCredentials(AuthScope authscope) {
+ public Credentials getCredentials(final AuthScope authscope) {
this.authscope = authscope;
return this.creds;
}
- public void setCredentials(AuthScope authscope, Credentials credentials) {
+ public void setCredentials(final AuthScope authscope, final Credentials credentials) {
}
public AuthScope getAuthScope() {
Modified: httpcomponents/httpasyncclient/trunk/httpasyncclient/src/test/java/org/apache/http/nio/client/integration/TestClientAuthenticationFallBack.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/trunk/httpasyncclient/src/test/java/org/apache/http/nio/client/integration/TestClientAuthenticationFallBack.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpasyncclient/trunk/httpasyncclient/src/test/java/org/apache/http/nio/client/integration/TestClientAuthenticationFallBack.java (original)
+++ httpcomponents/httpasyncclient/trunk/httpasyncclient/src/test/java/org/apache/http/nio/client/integration/TestClientAuthenticationFallBack.java Tue Jan 15 18:29:58 2013
@@ -182,12 +182,12 @@ public class TestClientAuthenticationFal
public void clear() {
}
- public Credentials getCredentials(AuthScope authscope) {
+ public Credentials getCredentials(final AuthScope authscope) {
this.authscope = authscope;
return this.creds;
}
- public void setCredentials(AuthScope authscope, Credentials credentials) {
+ public void setCredentials(final AuthScope authscope, final Credentials credentials) {
}
public AuthScope getAuthScope() {
Modified: httpcomponents/httpasyncclient/trunk/httpasyncclient/src/test/java/org/apache/http/nio/client/integration/TestClientReauthentication.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/trunk/httpasyncclient/src/test/java/org/apache/http/nio/client/integration/TestClientReauthentication.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpasyncclient/trunk/httpasyncclient/src/test/java/org/apache/http/nio/client/integration/TestClientReauthentication.java (original)
+++ httpcomponents/httpasyncclient/trunk/httpasyncclient/src/test/java/org/apache/http/nio/client/integration/TestClientReauthentication.java Tue Jan 15 18:29:58 2013
@@ -196,12 +196,12 @@ public class TestClientReauthentication
public void clear() {
}
- public Credentials getCredentials(AuthScope authscope) {
+ public Credentials getCredentials(final AuthScope authscope) {
this.authscope = authscope;
return this.creds;
}
- public void setCredentials(AuthScope authscope, Credentials credentials) {
+ public void setCredentials(final AuthScope authscope, final Credentials credentials) {
}
public AuthScope getAuthScope() {
@@ -222,7 +222,7 @@ public class TestClientReauthentication
BasicSchemeFactory myBasicAuthSchemeFactory = new BasicSchemeFactory() {
@Override
- public AuthScheme newInstance(HttpParams params) {
+ public AuthScheme newInstance(final HttpParams params) {
return new BasicScheme() {
@Override
Modified: httpcomponents/httpasyncclient/trunk/httpasyncclient/src/test/java/org/apache/http/nio/client/integration/TestRedirects.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/trunk/httpasyncclient/src/test/java/org/apache/http/nio/client/integration/TestRedirects.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpasyncclient/trunk/httpasyncclient/src/test/java/org/apache/http/nio/client/integration/TestRedirects.java (original)
+++ httpcomponents/httpasyncclient/trunk/httpasyncclient/src/test/java/org/apache/http/nio/client/integration/TestRedirects.java Tue Jan 15 18:29:58 2013
@@ -139,7 +139,7 @@ public class TestRedirects extends HttpA
private final String schemeName;
private final int statuscode;
- public BasicRedirectService(final String schemeName, int statuscode) {
+ public BasicRedirectService(final String schemeName, final int statuscode) {
super();
this.schemeName = schemeName;
this.statuscode = statuscode;
Modified: httpcomponents/httpasyncclient/trunk/httpasyncclient/src/test/java/org/apache/http/nio/client/integration/TestStatefulConnManagement.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/trunk/httpasyncclient/src/test/java/org/apache/http/nio/client/integration/TestStatefulConnManagement.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpasyncclient/trunk/httpasyncclient/src/test/java/org/apache/http/nio/client/integration/TestStatefulConnManagement.java (original)
+++ httpcomponents/httpasyncclient/trunk/httpasyncclient/src/test/java/org/apache/http/nio/client/integration/TestStatefulConnManagement.java Tue Jan 15 18:29:58 2013
@@ -204,7 +204,7 @@ public class TestStatefulConnManagement
public HttpWorker(
final HttpContext context,
- int requestCount,
+ final int requestCount,
final HttpHost target,
final HttpAsyncClient httpclient) {
super();
Modified: httpcomponents/httpasyncclient/trunk/httpasyncclient/src/test/java/org/apache/http/nio/client/methods/TestAsyncConsumers.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/trunk/httpasyncclient/src/test/java/org/apache/http/nio/client/methods/TestAsyncConsumers.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpasyncclient/trunk/httpasyncclient/src/test/java/org/apache/http/nio/client/methods/TestAsyncConsumers.java (original)
+++ httpcomponents/httpasyncclient/trunk/httpasyncclient/src/test/java/org/apache/http/nio/client/methods/TestAsyncConsumers.java Tue Jan 15 18:29:58 2013
@@ -124,7 +124,7 @@ public class TestAsyncConsumers extends
super();
}
- public ByteCountingConsumer(int bufSize) {
+ public ByteCountingConsumer(final int bufSize) {
super(bufSize);
}
@@ -176,7 +176,7 @@ public class TestAsyncConsumers extends
super();
}
- public BufferingCharConsumer(int bufSize) {
+ public BufferingCharConsumer(final int bufSize) {
super(bufSize);
}
Modified: httpcomponents/httpasyncclient/trunk/httpasyncclient/src/test/java/org/apache/http/nio/client/methods/TestZeroCopy.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/trunk/httpasyncclient/src/test/java/org/apache/http/nio/client/methods/TestZeroCopy.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpasyncclient/trunk/httpasyncclient/src/test/java/org/apache/http/nio/client/methods/TestZeroCopy.java (original)
+++ httpcomponents/httpasyncclient/trunk/httpasyncclient/src/test/java/org/apache/http/nio/client/methods/TestZeroCopy.java Tue Jan 15 18:29:58 2013
@@ -209,7 +209,7 @@ public class TestZeroCopy extends HttpAs
private final boolean forceChunking;
- TestHandler(boolean forceChunking) {
+ TestHandler(final boolean forceChunking) {
super();
this.forceChunking = forceChunking;
}
Modified: httpcomponents/httpclient/trunk/fluent-hc/src/main/java/org/apache/http/client/fluent/Request.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/fluent-hc/src/main/java/org/apache/http/client/fluent/Request.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/fluent-hc/src/main/java/org/apache/http/client/fluent/Request.java (original)
+++ httpcomponents/httpclient/trunk/fluent-hc/src/main/java/org/apache/http/client/fluent/Request.java Tue Jan 15 18:29:58 2013
@@ -179,7 +179,7 @@ public class Request {
return this;
}
- public Request setCacheControl(String cacheControl) {
+ public Request setCacheControl(final String cacheControl) {
this.request.setHeader(HttpHeader.CACHE_CONTROL, cacheControl);
return this;
}
@@ -247,15 +247,15 @@ public class Request {
//// HTTP connection parameter operations
- public Request socketTimeout(int timeout) {
+ public Request socketTimeout(final int timeout) {
return config(CoreConnectionPNames.SO_TIMEOUT, timeout);
}
- public Request connectTimeout(int timeout) {
+ public Request connectTimeout(final int timeout) {
return config(CoreConnectionPNames.CONNECTION_TIMEOUT, timeout);
}
- public Request staleConnectionCheck(boolean b) {
+ public Request staleConnectionCheck(final boolean b) {
return config(CoreConnectionPNames.STALE_CONNECTION_CHECK, b);
}
@@ -301,7 +301,7 @@ public class Request {
return body(new ByteArrayEntity(b));
}
- public Request bodyByteArray(final byte[] b, int off, int len) {
+ public Request bodyByteArray(final byte[] b, final int off, final int len) {
return body(new ByteArrayEntity(b, off, len));
}
Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/client/cache/HttpCacheEntry.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/client/cache/HttpCacheEntry.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/client/cache/HttpCacheEntry.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/client/cache/HttpCacheEntry.java Tue Jan 15 18:29:58 2013
@@ -117,8 +117,8 @@ public class HttpCacheEntry implements S
* Header[] from original HTTP Response
* @param resource representing origin response body
*/
- public HttpCacheEntry(Date requestDate, Date responseDate, StatusLine statusLine,
- Header[] responseHeaders, Resource resource) {
+ public HttpCacheEntry(final Date requestDate, final Date responseDate, final StatusLine statusLine,
+ final Header[] responseHeaders, final Resource resource) {
this(requestDate, responseDate, statusLine, responseHeaders, resource,
new HashMap<String,String>());
}
@@ -180,7 +180,7 @@ public class HttpCacheEntry implements S
* Returns the first header from the origin response with the given
* name.
*/
- public Header getFirstHeader(String name) {
+ public Header getFirstHeader(final String name) {
return responseHeaders.getFirstHeader(name);
}
@@ -188,7 +188,7 @@ public class HttpCacheEntry implements S
* Gets all the headers with the given name that were on the origin
* response.
*/
- public Header[] getHeaders(String name) {
+ public Header[] getHeaders(final String name) {
return responseHeaders.getHeaders(name);
}
Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/client/cache/HttpCacheUpdateException.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/client/cache/HttpCacheUpdateException.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/client/cache/HttpCacheUpdateException.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/client/cache/HttpCacheUpdateException.java Tue Jan 15 18:29:58 2013
@@ -36,11 +36,11 @@ public class HttpCacheUpdateException ex
private static final long serialVersionUID = 823573584868632876L;
- public HttpCacheUpdateException(String message) {
+ public HttpCacheUpdateException(final String message) {
super(message);
}
- public HttpCacheUpdateException(String message, Throwable cause) {
+ public HttpCacheUpdateException(final String message, final Throwable cause) {
super(message);
initCause(cause);
}
Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/client/cache/InputLimit.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/client/cache/InputLimit.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/client/cache/InputLimit.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/client/cache/InputLimit.java Tue Jan 15 18:29:58 2013
@@ -45,7 +45,7 @@ public class InputLimit {
* read.
* @param value maximum length in bytes
*/
- public InputLimit(long value) {
+ public InputLimit(final long value) {
super();
this.value = value;
this.reached = false;
Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/AsynchronousValidator.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/AsynchronousValidator.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/AsynchronousValidator.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/AsynchronousValidator.java Tue Jan 15 18:29:58 2013
@@ -67,8 +67,8 @@ class AsynchronousValidator {
* {@link CacheConfig#getAsynchronousWorkerIdleLifetimeSecs()},
* and {@link CacheConfig#getRevalidationQueueSize()}.
*/
- public AsynchronousValidator(CachingExec cachingExect,
- CacheConfig config) {
+ public AsynchronousValidator(final CachingExec cachingExect,
+ final CacheConfig config) {
this(cachingExect,
new ThreadPoolExecutor(config.getAsynchronousWorkersCore(),
config.getAsynchronousWorkersMax(),
@@ -85,7 +85,7 @@ class AsynchronousValidator {
* @param cachingExect used to execute asynchronous requests
* @param executor used to manage a thread pool of revalidation workers
*/
- AsynchronousValidator(CachingExec cachingExec, ExecutorService executor) {
+ AsynchronousValidator(final CachingExec cachingExec, final ExecutorService executor) {
this.cachingExec = cachingExec;
this.executor = executor;
this.queued = new HashSet<String>();
@@ -125,7 +125,7 @@ class AsynchronousValidator {
* complete, using the identifier passed in during constructions.
* @param identifier
*/
- synchronized void markComplete(String identifier) {
+ synchronized void markComplete(final String identifier) {
queued.remove(identifier);
}
Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/BasicHttpCache.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/BasicHttpCache.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/BasicHttpCache.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/BasicHttpCache.java Tue Jan 15 18:29:58 2013
@@ -63,7 +63,7 @@ class BasicHttpCache implements HttpCach
private final Log log = LogFactory.getLog(getClass());
- public BasicHttpCache(ResourceFactory resourceFactory, HttpCacheStorage storage, CacheConfig config) {
+ public BasicHttpCache(final ResourceFactory resourceFactory, final HttpCacheStorage storage, final CacheConfig config) {
this.resourceFactory = resourceFactory;
this.uriExtractor = new CacheKeyGenerator();
this.cacheEntryUpdater = new CacheEntryUpdater(resourceFactory);
@@ -73,7 +73,7 @@ class BasicHttpCache implements HttpCach
this.cacheInvalidator = new CacheInvalidator(this.uriExtractor, this.storage);
}
- public BasicHttpCache(CacheConfig config) {
+ public BasicHttpCache(final CacheConfig config) {
this(new HeapResourceFactory(), new BasicHttpCacheStorage(config), config);
}
@@ -81,18 +81,18 @@ class BasicHttpCache implements HttpCach
this(CacheConfig.DEFAULT);
}
- public void flushCacheEntriesFor(HttpHost host, HttpRequest request)
+ public void flushCacheEntriesFor(final HttpHost host, final HttpRequest request)
throws IOException {
String uri = uriExtractor.getURI(host, request);
storage.removeEntry(uri);
}
- public void flushInvalidatedCacheEntriesFor(HttpHost host, HttpRequest request, HttpResponse response) {
+ public void flushInvalidatedCacheEntriesFor(final HttpHost host, final HttpRequest request, final HttpResponse response) {
cacheInvalidator.flushInvalidatedCacheEntries(host, request, response);
}
void storeInCache(
- HttpHost target, HttpRequest request, HttpCacheEntry entry) throws IOException {
+ final HttpHost target, final HttpRequest request, final HttpCacheEntry entry) throws IOException {
if (entry.hasVariants()) {
storeVariantEntry(target, request, entry);
} else {
@@ -101,7 +101,7 @@ class BasicHttpCache implements HttpCach
}
void storeNonVariantEntry(
- HttpHost target, HttpRequest req, HttpCacheEntry entry) throws IOException {
+ final HttpHost target, final HttpRequest req, final HttpCacheEntry entry) throws IOException {
String uri = uriExtractor.getURI(target, req);
storage.putEntry(uri, entry);
}
@@ -116,7 +116,7 @@ class BasicHttpCache implements HttpCach
HttpCacheUpdateCallback callback = new HttpCacheUpdateCallback() {
- public HttpCacheEntry update(HttpCacheEntry existing) throws IOException {
+ public HttpCacheEntry update(final HttpCacheEntry existing) throws IOException {
return doGetUpdatedParentEntry(
req.getRequestLine().getUri(), existing, entry,
uriExtractor.getVariantKey(req, entry),
@@ -132,7 +132,7 @@ class BasicHttpCache implements HttpCach
}
}
- public void reuseVariantEntryFor(HttpHost target, final HttpRequest req,
+ public void reuseVariantEntryFor(final HttpHost target, final HttpRequest req,
final Variant variant) throws IOException {
final String parentCacheKey = uriExtractor.getURI(target, req);
final HttpCacheEntry entry = variant.getEntry();
@@ -140,7 +140,7 @@ class BasicHttpCache implements HttpCach
final String variantCacheKey = variant.getCacheKey();
HttpCacheUpdateCallback callback = new HttpCacheUpdateCallback() {
- public HttpCacheEntry update(HttpCacheEntry existing)
+ public HttpCacheEntry update(final HttpCacheEntry existing)
throws IOException {
return doGetUpdatedParentEntry(req.getRequestLine().getUri(),
existing, entry, variantKey, variantCacheKey);
@@ -154,7 +154,7 @@ class BasicHttpCache implements HttpCach
}
}
- boolean isIncompleteResponse(HttpResponse resp, Resource resource) {
+ boolean isIncompleteResponse(final HttpResponse resp, final Resource resource) {
int status = resp.getStatusLine().getStatusCode();
if (status != HttpStatus.SC_OK
&& status != HttpStatus.SC_PARTIAL_CONTENT) {
@@ -173,8 +173,8 @@ class BasicHttpCache implements HttpCach
return (resource.length() < contentLength);
}
- HttpResponse generateIncompleteResponseError(HttpResponse response,
- Resource resource) {
+ HttpResponse generateIncompleteResponseError(final HttpResponse response,
+ final Resource resource) {
int contentLength = Integer.parseInt(response.getFirstHeader(HTTP.CONTENT_LEN).getValue());
HttpResponse error =
new BasicHttpResponse(HttpVersion.HTTP_1_1, HttpStatus.SC_BAD_GATEWAY, "Bad Gateway");
@@ -216,9 +216,9 @@ class BasicHttpCache implements HttpCach
variantMap);
}
- public HttpCacheEntry updateCacheEntry(HttpHost target, HttpRequest request,
- HttpCacheEntry stale, HttpResponse originResponse,
- Date requestSent, Date responseReceived) throws IOException {
+ public HttpCacheEntry updateCacheEntry(final HttpHost target, final HttpRequest request,
+ final HttpCacheEntry stale, final HttpResponse originResponse,
+ final Date requestSent, final Date responseReceived) throws IOException {
HttpCacheEntry updatedEntry = cacheEntryUpdater.updateCacheEntry(
request.getRequestLine().getUri(),
stale,
@@ -229,9 +229,9 @@ class BasicHttpCache implements HttpCach
return updatedEntry;
}
- public HttpCacheEntry updateVariantCacheEntry(HttpHost target, HttpRequest request,
- HttpCacheEntry stale, HttpResponse originResponse,
- Date requestSent, Date responseReceived, String cacheKey) throws IOException {
+ public HttpCacheEntry updateVariantCacheEntry(final HttpHost target, final HttpRequest request,
+ final HttpCacheEntry stale, final HttpResponse originResponse,
+ final Date requestSent, final Date responseReceived, final String cacheKey) throws IOException {
HttpCacheEntry updatedEntry = cacheEntryUpdater.updateCacheEntry(
request.getRequestLine().getUri(),
stale,
@@ -242,8 +242,8 @@ class BasicHttpCache implements HttpCach
return updatedEntry;
}
- public HttpResponse cacheAndReturnResponse(HttpHost host, HttpRequest request,
- HttpResponse originResponse, Date requestSent, Date responseReceived)
+ public HttpResponse cacheAndReturnResponse(final HttpHost host, final HttpRequest request,
+ final HttpResponse originResponse, final Date requestSent, final Date responseReceived)
throws IOException {
SizeLimitedResponseReader responseReader = getResponseReader(request, originResponse);
@@ -276,12 +276,12 @@ class BasicHttpCache implements HttpCach
}
}
- SizeLimitedResponseReader getResponseReader(HttpRequest request, HttpResponse backEndResponse) {
+ SizeLimitedResponseReader getResponseReader(final HttpRequest request, final HttpResponse backEndResponse) {
return new SizeLimitedResponseReader(
resourceFactory, maxObjectSizeBytes, request, backEndResponse);
}
- public HttpCacheEntry getCacheEntry(HttpHost host, HttpRequest request) throws IOException {
+ public HttpCacheEntry getCacheEntry(final HttpHost host, final HttpRequest request) throws IOException {
HttpCacheEntry root = storage.getEntry(uriExtractor.getURI(host, request));
if (root == null) {
return null;
@@ -296,12 +296,12 @@ class BasicHttpCache implements HttpCach
return storage.getEntry(variantCacheKey);
}
- public void flushInvalidatedCacheEntriesFor(HttpHost host,
- HttpRequest request) throws IOException {
+ public void flushInvalidatedCacheEntriesFor(final HttpHost host,
+ final HttpRequest request) throws IOException {
cacheInvalidator.flushInvalidatedCacheEntries(host, request);
}
- public Map<String, Variant> getVariantCacheEntriesWithEtags(HttpHost host, HttpRequest request)
+ public Map<String, Variant> getVariantCacheEntriesWithEtags(final HttpHost host, final HttpRequest request)
throws IOException {
Map<String,Variant> variants = new HashMap<String,Variant>();
HttpCacheEntry root = storage.getEntry(uriExtractor.getURI(host, request));
@@ -316,8 +316,8 @@ class BasicHttpCache implements HttpCach
return variants;
}
- private void addVariantWithEtag(String variantKey,
- String variantCacheKey, Map<String, Variant> variants)
+ private void addVariantWithEtag(final String variantKey,
+ final String variantCacheKey, final Map<String, Variant> variants)
throws IOException {
HttpCacheEntry entry = storage.getEntry(variantCacheKey);
if (entry == null) {
Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/BasicHttpCacheStorage.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/BasicHttpCacheStorage.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/BasicHttpCacheStorage.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/BasicHttpCacheStorage.java Tue Jan 15 18:29:58 2013
@@ -49,7 +49,7 @@ public class BasicHttpCacheStorage imple
private final CacheMap entries;
- public BasicHttpCacheStorage(CacheConfig config) {
+ public BasicHttpCacheStorage(final CacheConfig config) {
super();
this.entries = new CacheMap(config.getMaxCacheEntries());
}
@@ -62,7 +62,7 @@ public class BasicHttpCacheStorage imple
* @param entry
* HttpCacheEntry to place in the cache
*/
- public synchronized void putEntry(String url, HttpCacheEntry entry) throws IOException {
+ public synchronized void putEntry(final String url, final HttpCacheEntry entry) throws IOException {
entries.put(url, entry);
}
@@ -73,7 +73,7 @@ public class BasicHttpCacheStorage imple
* Url that is the cache key
* @return HttpCacheEntry if one exists, or null for cache miss
*/
- public synchronized HttpCacheEntry getEntry(String url) throws IOException {
+ public synchronized HttpCacheEntry getEntry(final String url) throws IOException {
return entries.get(url);
}
@@ -83,13 +83,13 @@ public class BasicHttpCacheStorage imple
* @param url
* Url that is the cache key
*/
- public synchronized void removeEntry(String url) throws IOException {
+ public synchronized void removeEntry(final String url) throws IOException {
entries.remove(url);
}
public synchronized void updateEntry(
- String url,
- HttpCacheUpdateCallback callback) throws IOException {
+ final String url,
+ final HttpCacheUpdateCallback callback) throws IOException {
HttpCacheEntry existingEntry = entries.get(url);
entries.put(url, callback.update(existingEntry));
}
Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CacheConfig.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CacheConfig.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CacheConfig.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CacheConfig.java Tue Jan 15 18:29:58 2013
@@ -169,18 +169,18 @@ public class CacheConfig implements Clon
}
CacheConfig(
- long maxObjectSize,
- int maxCacheEntries,
- int maxUpdateRetries,
- boolean heuristicCachingEnabled,
- float heuristicCoefficient,
- long heuristicDefaultLifetime,
- boolean isSharedCache,
- int asynchronousWorkersMax,
- int asynchronousWorkersCore,
- int asynchronousWorkerIdleLifetimeSecs,
- int revalidationQueueSize,
- boolean neverCacheHTTP10ResponsesWithQuery) {
+ final long maxObjectSize,
+ final int maxCacheEntries,
+ final int maxUpdateRetries,
+ final boolean heuristicCachingEnabled,
+ final float heuristicCoefficient,
+ final long heuristicDefaultLifetime,
+ final boolean isSharedCache,
+ final int asynchronousWorkersMax,
+ final int asynchronousWorkersCore,
+ final int asynchronousWorkerIdleLifetimeSecs,
+ final int revalidationQueueSize,
+ final boolean neverCacheHTTP10ResponsesWithQuery) {
super();
this.maxObjectSize = maxObjectSize;
this.maxCacheEntries = maxCacheEntries;
@@ -213,7 +213,7 @@ public class CacheConfig implements Clon
* @deprecated (4.2) use {@link Builder}.
*/
@Deprecated
- public void setMaxObjectSizeBytes(int maxObjectSizeBytes) {
+ public void setMaxObjectSizeBytes(final int maxObjectSizeBytes) {
if (maxObjectSizeBytes > Integer.MAX_VALUE) {
this.maxObjectSize = Integer.MAX_VALUE;
} else {
@@ -240,7 +240,7 @@ public class CacheConfig implements Clon
* @deprecated (4.3) use {@link Builder}.
*/
@Deprecated
- public void setMaxObjectSize(long maxObjectSize) {
+ public void setMaxObjectSize(final long maxObjectSize) {
this.maxObjectSize = maxObjectSize;
}
@@ -266,7 +266,7 @@ public class CacheConfig implements Clon
* @deprecated (4.3) use {@link Builder}.
*/
@Deprecated
- public void setMaxCacheEntries(int maxCacheEntries) {
+ public void setMaxCacheEntries(final int maxCacheEntries) {
this.maxCacheEntries = maxCacheEntries;
}
@@ -283,7 +283,7 @@ public class CacheConfig implements Clon
* @deprecated (4.3) use {@link Builder}.
*/
@Deprecated
- public void setMaxUpdateRetries(int maxUpdateRetries){
+ public void setMaxUpdateRetries(final int maxUpdateRetries){
this.maxUpdateRetries = maxUpdateRetries;
}
@@ -303,7 +303,7 @@ public class CacheConfig implements Clon
* @deprecated (4.3) use {@link Builder}.
*/
@Deprecated
- public void setHeuristicCachingEnabled(boolean heuristicCachingEnabled) {
+ public void setHeuristicCachingEnabled(final boolean heuristicCachingEnabled) {
this.heuristicCachingEnabled = heuristicCachingEnabled;
}
@@ -325,7 +325,7 @@ public class CacheConfig implements Clon
* @deprecated (4.3) use {@link Builder}.
*/
@Deprecated
- public void setHeuristicCoefficient(float heuristicCoefficient) {
+ public void setHeuristicCoefficient(final float heuristicCoefficient) {
this.heuristicCoefficient = heuristicCoefficient;
}
@@ -351,7 +351,7 @@ public class CacheConfig implements Clon
* @deprecated (4.3) use {@link Builder}.
*/
@Deprecated
- public void setHeuristicDefaultLifetime(long heuristicDefaultLifetimeSecs) {
+ public void setHeuristicDefaultLifetime(final long heuristicDefaultLifetimeSecs) {
this.heuristicDefaultLifetime = heuristicDefaultLifetimeSecs;
}
@@ -373,7 +373,7 @@ public class CacheConfig implements Clon
* @deprecated (4.3) use {@link Builder}.
*/
@Deprecated
- public void setSharedCache(boolean isSharedCache) {
+ public void setSharedCache(final boolean isSharedCache) {
this.isSharedCache = isSharedCache;
}
@@ -395,7 +395,7 @@ public class CacheConfig implements Clon
* @deprecated (4.3) use {@link Builder}.
*/
@Deprecated
- public void setAsynchronousWorkersMax(int max) {
+ public void setAsynchronousWorkersMax(final int max) {
this.asynchronousWorkersMax = max;
}
@@ -416,7 +416,7 @@ public class CacheConfig implements Clon
* @deprecated (4.3) use {@link Builder}.
*/
@Deprecated
- public void setAsynchronousWorkersCore(int min) {
+ public void setAsynchronousWorkersCore(final int min) {
this.asynchronousWorkersCore = min;
}
@@ -440,7 +440,7 @@ public class CacheConfig implements Clon
* @deprecated (4.3) use {@link Builder}.
*/
@Deprecated
- public void setAsynchronousWorkerIdleLifetimeSecs(int secs) {
+ public void setAsynchronousWorkerIdleLifetimeSecs(final int secs) {
this.asynchronousWorkerIdleLifetimeSecs = secs;
}
@@ -457,7 +457,7 @@ public class CacheConfig implements Clon
* @deprecated (4.3) use {@link Builder}.
*/
@Deprecated
- public void setRevalidationQueueSize(int size) {
+ public void setRevalidationQueueSize(final int size) {
this.revalidationQueueSize = size;
}
@@ -521,7 +521,7 @@ public class CacheConfig implements Clon
* Specifies the maximum response body size that will be eligible for caching.
* @param maxObjectSize size in bytes
*/
- public Builder setMaxObjectSize(long maxObjectSize) {
+ public Builder setMaxObjectSize(final long maxObjectSize) {
this.maxObjectSize = maxObjectSize;
return this;
}
@@ -529,7 +529,7 @@ public class CacheConfig implements Clon
/**
* Sets the maximum number of cache entries the cache will retain.
*/
- public Builder setMaxCacheEntries(int maxCacheEntries) {
+ public Builder setMaxCacheEntries(final int maxCacheEntries) {
this.maxCacheEntries = maxCacheEntries;
return this;
}
@@ -537,7 +537,7 @@ public class CacheConfig implements Clon
/**
* Sets the number of times to retry a cache update on failure
*/
- public Builder setMaxUpdateRetries(int maxUpdateRetries) {
+ public Builder setMaxUpdateRetries(final int maxUpdateRetries) {
this.maxUpdateRetries = maxUpdateRetries;
return this;
}
@@ -547,7 +547,7 @@ public class CacheConfig implements Clon
* @param heuristicCachingEnabled should be {@code true} to
* permit heuristic caching, {@code false} to enable it.
*/
- public Builder setHeuristicCachingEnabled(boolean heuristicCachingEnabled) {
+ public Builder setHeuristicCachingEnabled(final boolean heuristicCachingEnabled) {
this.heuristicCachingEnabled = heuristicCachingEnabled;
return this;
}
@@ -560,7 +560,7 @@ public class CacheConfig implements Clon
* @param heuristicCoefficient should be between {@code 0.0} and
* {@code 1.0}.
*/
- public Builder setHeuristicCoefficient(float heuristicCoefficient) {
+ public Builder setHeuristicCoefficient(final float heuristicCoefficient) {
this.heuristicCoefficient = heuristicCoefficient;
return this;
}
@@ -576,7 +576,7 @@ public class CacheConfig implements Clon
* information. Set this to {@code 0} to disable this style of
* heuristic caching.
*/
- public Builder setHeuristicDefaultLifetime(long heuristicDefaultLifetime) {
+ public Builder setHeuristicDefaultLifetime(final long heuristicDefaultLifetime) {
this.heuristicDefaultLifetime = heuristicDefaultLifetime;
return this;
}
@@ -587,7 +587,7 @@ public class CacheConfig implements Clon
* behave as a non-shared (private) cache. To have the cache
* behave like a browser cache, you want to set this to {@code false}.
*/
- public Builder setSharedCache(boolean isSharedCache) {
+ public Builder setSharedCache(final boolean isSharedCache) {
this.isSharedCache = isSharedCache;
return this;
}
@@ -598,7 +598,7 @@ public class CacheConfig implements Clon
* @param max number of threads; a value of 0 disables background
* revalidations.
*/
- public Builder setAsynchronousWorkersMax(int asynchronousWorkersMax) {
+ public Builder setAsynchronousWorkersMax(final int asynchronousWorkersMax) {
this.asynchronousWorkersMax = asynchronousWorkersMax;
return this;
}
@@ -609,7 +609,7 @@ public class CacheConfig implements Clon
* @param min should be greater than zero and less than or equal
* to <code>getAsynchronousWorkersMax()</code>
*/
- public Builder setAsynchronousWorkersCore(int asynchronousWorkersCore) {
+ public Builder setAsynchronousWorkersCore(final int asynchronousWorkersCore) {
this.asynchronousWorkersCore = asynchronousWorkersCore;
return this;
}
@@ -621,7 +621,7 @@ public class CacheConfig implements Clon
* threads alive, the worker will be reclaimed.
* @param secs idle lifetime in seconds
*/
- public Builder setAsynchronousWorkerIdleLifetimeSecs(int asynchronousWorkerIdleLifetimeSecs) {
+ public Builder setAsynchronousWorkerIdleLifetimeSecs(final int asynchronousWorkerIdleLifetimeSecs) {
this.asynchronousWorkerIdleLifetimeSecs = asynchronousWorkerIdleLifetimeSecs;
return this;
}
@@ -629,7 +629,7 @@ public class CacheConfig implements Clon
/**
* Sets the current maximum queue size for background revalidations.
*/
- public Builder setRevalidationQueueSize(int revalidationQueueSize) {
+ public Builder setRevalidationQueueSize(final int revalidationQueueSize) {
this.revalidationQueueSize = revalidationQueueSize;
return this;
}
@@ -641,7 +641,7 @@ public class CacheConfig implements Clon
* to better emulate IE, which also never caches responses, regardless of what caching
* headers may be present.
*/
- public Builder setNeverCacheHTTP10ResponsesWithQueryString(boolean b) {
+ public Builder setNeverCacheHTTP10ResponsesWithQueryString(final boolean b) {
this.neverCacheHTTP10ResponsesWithQuery = b;
return this;
}