Return-Path: X-Original-To: apmail-hc-commits-archive@www.apache.org Delivered-To: apmail-hc-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 3723610A0C for ; Sat, 14 Sep 2013 12:53:53 +0000 (UTC) Received: (qmail 61283 invoked by uid 500); 14 Sep 2013 12:53:51 -0000 Delivered-To: apmail-hc-commits-archive@hc.apache.org Received: (qmail 61253 invoked by uid 500); 14 Sep 2013 12:53:46 -0000 Mailing-List: contact commits-help@hc.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "HttpComponents Project" Delivered-To: mailing list commits@hc.apache.org Received: (qmail 61240 invoked by uid 99); 14 Sep 2013 12:53:41 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 14 Sep 2013 12:53:41 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 14 Sep 2013 12:53:35 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 45F52238890B for ; Sat, 14 Sep 2013 12:53:12 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1523228 - in /httpcomponents/httpasyncclient/trunk: httpasyncclient-cache/src/main/java/org/apache/http/impl/client/cache/ httpasyncclient/src/main/java/org/apache/http/impl/nio/client/ httpasyncclient/src/main/java/org/apache/http/impl/ni... Date: Sat, 14 Sep 2013 12:53:11 -0000 To: commits@hc.apache.org From: olegk@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20130914125312.45F52238890B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: olegk Date: Sat Sep 14 12:53:10 2013 New Revision: 1523228 URL: http://svn.apache.org/r1523228 Log: Code cleanups Modified: httpcomponents/httpasyncclient/trunk/httpasyncclient-cache/src/main/java/org/apache/http/impl/client/cache/AsynchronousAsyncValidator.java httpcomponents/httpasyncclient/trunk/httpasyncclient-cache/src/main/java/org/apache/http/impl/client/cache/CachingHttpAsyncClient.java httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/CloseableHttpAsyncClient.java httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/MinimalClientExchangeHandlerImpl.java httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/ManagedNHttpClientConnectionFactory.java httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/nio/client/methods/BaseZeroCopyRequestProducer.java httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/nio/client/methods/ZeroCopyConsumer.java httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/nio/client/util/HttpAsyncClientUtils.java httpcomponents/httpasyncclient/trunk/httpasyncclient/src/test/java/org/apache/http/HttpAsyncTestBase.java httpcomponents/httpasyncclient/trunk/httpasyncclient/src/test/java/org/apache/http/localserver/EchoHandler.java httpcomponents/httpasyncclient/trunk/httpasyncclient/src/test/java/org/apache/http/nio/client/integration/TestClientAuthentication.java httpcomponents/httpasyncclient/trunk/httpasyncclient/src/test/java/org/apache/http/nio/client/integration/TestClientAuthenticationFallBack.java httpcomponents/httpasyncclient/trunk/httpasyncclient/src/test/java/org/apache/http/nio/client/integration/TestClientReauthentication.java httpcomponents/httpasyncclient/trunk/httpasyncclient/src/test/java/org/apache/http/nio/client/integration/TestHttpAsync.java httpcomponents/httpasyncclient/trunk/httpasyncclient/src/test/java/org/apache/http/nio/client/integration/TestHttpAsyncClientUtils.java httpcomponents/httpasyncclient/trunk/httpasyncclient/src/test/java/org/apache/http/nio/client/integration/TestHttpAsyncMinimal.java httpcomponents/httpasyncclient/trunk/httpasyncclient/src/test/java/org/apache/http/nio/client/integration/TestHttpAsyncPrematureTermination.java httpcomponents/httpasyncclient/trunk/httpasyncclient/src/test/java/org/apache/http/nio/client/integration/TestRedirects.java httpcomponents/httpasyncclient/trunk/httpasyncclient/src/test/java/org/apache/http/nio/client/integration/TestStatefulConnManagement.java httpcomponents/httpasyncclient/trunk/httpasyncclient/src/test/java/org/apache/http/nio/client/methods/TestAsyncConsumers.java httpcomponents/httpasyncclient/trunk/httpasyncclient/src/test/java/org/apache/http/nio/client/methods/TestZeroCopy.java Modified: httpcomponents/httpasyncclient/trunk/httpasyncclient-cache/src/main/java/org/apache/http/impl/client/cache/AsynchronousAsyncValidator.java URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/trunk/httpasyncclient-cache/src/main/java/org/apache/http/impl/client/cache/AsynchronousAsyncValidator.java?rev=1523228&r1=1523227&r2=1523228&view=diff ============================================================================== --- httpcomponents/httpasyncclient/trunk/httpasyncclient-cache/src/main/java/org/apache/http/impl/client/cache/AsynchronousAsyncValidator.java (original) +++ httpcomponents/httpasyncclient/trunk/httpasyncclient-cache/src/main/java/org/apache/http/impl/client/cache/AsynchronousAsyncValidator.java Sat Sep 14 12:53:10 2013 @@ -56,7 +56,7 @@ class AsynchronousAsyncValidator { /** * Create AsynchronousValidator which will make revalidation requests using - * the supplied {@link CachingHttpClient}, and a {@link ThreadPoolExecutor} + * the supplied {@link CachingHttpAsyncClient}, and a {@link ThreadPoolExecutor} * generated according to the thread pool settings provided in the given * {@link CacheConfig}. * @@ -78,7 +78,7 @@ class AsynchronousAsyncValidator { /** * Create AsynchronousValidator which will make revalidation requests using - * the supplied {@link CachingHttpClient} and {@link ExecutorService}. + * the supplied {@link CachingHttpAsyncClient} and {@link ExecutorService}. * * @param cachingClient * used to execute asynchronous requests @@ -94,11 +94,6 @@ class AsynchronousAsyncValidator { /** * Schedules an asynchronous revalidation - * - * @param target - * @param request - * @param context - * @param entry */ public synchronized void revalidateCacheEntry(final HttpHost target, final HttpRequestWrapper request, final HttpContext context, final HttpCacheEntry entry) { @@ -123,8 +118,6 @@ class AsynchronousAsyncValidator { * progress. This is meant to be called by * {@link AsynchronousValidationRequest#run()} once the revalidation is * complete, using the identifier passed in during constructions. - * - * @param identifier */ synchronized void markComplete(final String identifier) { this.queued.remove(identifier); 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=1523228&r1=1523227&r2=1523228&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 Sat Sep 14 12:53:10 2013 @@ -340,7 +340,7 @@ public class CachingHttpAsyncClient impl final FutureCallback futureCallback) throws ClientProtocolException, IOException { recordCacheHit(target, request); - HttpResponse out = null; + final HttpResponse out; final Date now = getCurrentDate(); if (this.suitabilityChecker.canCachedResponseBeUsed(target, request, entry, now)) { log.debug("Cache hit"); @@ -574,7 +574,7 @@ public class CachingHttpAsyncClient impl final VersionInfo vi = VersionInfo.loadVersionInfo("org.apache.http.client", getClass().getClassLoader()); final String release = (vi != null) ? vi.getRelease() : VersionInfo.UNAVAILABLE; - String value; + final String value; if ("http".equalsIgnoreCase(pv.getProtocol())) { value = String.format("%d.%d localhost (Apache-HttpClient/%s (cache))", pv.getMajor(), pv.getMinor(), release); @@ -628,12 +628,7 @@ public class CachingHttpAsyncClient impl if (!"*".equals(line.getUri())) { return false; } - - if (!"0".equals(request.getFirstHeader(HeaderConstants.MAX_FORWARDS).getValue())) { - return false; - } - - return true; + return "0".equals(request.getFirstHeader(HeaderConstants.MAX_FORWARDS).getValue()); } Future callBackend( @@ -679,7 +674,7 @@ public class CachingHttpAsyncClient impl final Date requestDate = getCurrentDate(); final FutureHttpResponse future = new FutureHttpResponse(futureCallback); - Future backendFuture = this.backend.execute(target, conditionalRequest, context, new FutureCallback () { + final Future backendFuture = this.backend.execute(target, conditionalRequest, context, new FutureCallback () { public void cancelled() { future.cancelled(); @@ -737,7 +732,6 @@ public class CachingHttpAsyncClient impl } future.completed(resp); - return; } public void failed(final Exception ex) { @@ -861,7 +855,7 @@ public class CachingHttpAsyncClient impl } if (statusCode == HttpStatus.SC_NOT_MODIFIED) { - HttpCacheEntry updatedEntry = null; + final HttpCacheEntry updatedEntry; try { updatedEntry = CachingHttpAsyncClient.this.responseCache.updateCacheEntry(target, request, cacheEntry, httpResponse, requestDate, responseDate); @@ -893,7 +887,6 @@ public class CachingHttpAsyncClient impl futureCallback.completed(backendResponse); } catch (final IOException e) { futureCallback.failed(e); - return; } } Modified: httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/CloseableHttpAsyncClient.java URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/CloseableHttpAsyncClient.java?rev=1523228&r1=1523227&r2=1523228&view=diff ============================================================================== --- httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/CloseableHttpAsyncClient.java (original) +++ httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/CloseableHttpAsyncClient.java Sat Sep 14 12:53:10 2013 @@ -84,7 +84,7 @@ public abstract class CloseableHttpAsync final HttpUriRequest request, final HttpContext context, final FutureCallback callback) { - HttpHost target; + final HttpHost target; try { target = determineTarget(request); } catch (final ClientProtocolException ex) { Modified: httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/MinimalClientExchangeHandlerImpl.java URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/MinimalClientExchangeHandlerImpl.java?rev=1523228&r1=1523227&r2=1523228&view=diff ============================================================================== --- httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/MinimalClientExchangeHandlerImpl.java (original) +++ httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/MinimalClientExchangeHandlerImpl.java Sat Sep 14 12:53:10 2013 @@ -215,7 +215,7 @@ public class MinimalClientExchangeHandle this.validDuration = this.keepaliveStrategy.getKeepAliveDuration(this.response, this.localContext); if (this.log.isDebugEnabled()) { - String s; + final String s; if (this.validDuration > 0) { s = "for " + this.validDuration + " " + TimeUnit.MILLISECONDS; } else { Modified: httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/ManagedNHttpClientConnectionFactory.java URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/ManagedNHttpClientConnectionFactory.java?rev=1523228&r1=1523227&r2=1523228&view=diff ============================================================================== --- httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/ManagedNHttpClientConnectionFactory.java (original) +++ httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/ManagedNHttpClientConnectionFactory.java Sat Sep 14 12:53:10 2013 @@ -54,7 +54,7 @@ public class ManagedNHttpClientConnectio private final Log wirelog = LogFactory.getLog("org.apache.http.wire"); private final Log log = LogFactory.getLog(ManagedNHttpClientConnectionImpl.class); - private static AtomicLong COUNTER = new AtomicLong(); + private static final AtomicLong COUNTER = new AtomicLong(); public static final ManagedNHttpClientConnectionFactory INSTANCE = new ManagedNHttpClientConnectionFactory(); Modified: httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/nio/client/methods/BaseZeroCopyRequestProducer.java URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/nio/client/methods/BaseZeroCopyRequestProducer.java?rev=1523228&r1=1523227&r2=1523228&view=diff ============================================================================== --- httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/nio/client/methods/BaseZeroCopyRequestProducer.java (original) +++ httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/nio/client/methods/BaseZeroCopyRequestProducer.java Sat Sep 14 12:53:10 2013 @@ -100,7 +100,7 @@ abstract class BaseZeroCopyRequestProduc this.fileChannel = this.accessfile.getChannel(); this.idx = 0; } - long transferred; + final long transferred; if (encoder instanceof FileContentEncoder) { transferred = ((FileContentEncoder)encoder).transfer( this.fileChannel, this.idx, Integer.MAX_VALUE); Modified: httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/nio/client/methods/ZeroCopyConsumer.java URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/nio/client/methods/ZeroCopyConsumer.java?rev=1523228&r1=1523227&r2=1523228&view=diff ============================================================================== --- httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/nio/client/methods/ZeroCopyConsumer.java (original) +++ httpcomponents/httpasyncclient/trunk/httpasyncclient/src/main/java/org/apache/http/nio/client/methods/ZeroCopyConsumer.java Sat Sep 14 12:53:10 2013 @@ -81,7 +81,7 @@ public abstract class ZeroCopyConsumer