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 2C441EE32 for ; Tue, 15 Jan 2013 18:31:39 +0000 (UTC) Received: (qmail 91613 invoked by uid 500); 15 Jan 2013 18:31:39 -0000 Delivered-To: apmail-hc-commits-archive@hc.apache.org Received: (qmail 91579 invoked by uid 500); 15 Jan 2013 18:31:38 -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 91571 invoked by uid 99); 15 Jan 2013 18:31:38 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 15 Jan 2013 18:31:38 +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; Tue, 15 Jan 2013 18:31:35 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 4A7EE2388ABA for ; Tue, 15 Jan 2013 18:30:52 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1433569 [6/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... Date: Tue, 15 Jan 2013 18:30:06 -0000 To: commits@hc.apache.org From: ggregory@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130115183052.4A7EE2388ABA@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/SchemeLayeredSocketFactoryAdaptor2.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/SchemeLayeredSocketFactoryAdaptor2.java?rev=1433569&r1=1433568&r2=1433569&view=diff ============================================================================== --- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/SchemeLayeredSocketFactoryAdaptor2.java (original) +++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/SchemeLayeredSocketFactoryAdaptor2.java Tue Jan 15 18:29:58 2013 @@ -60,13 +60,13 @@ class SchemeLayeredSocketFactoryAdaptor2 return this.factory.connectSocket(sock, remoteAddress, localAddress, params); } - public boolean isSecure(Socket sock) throws IllegalArgumentException { + public boolean isSecure(final Socket sock) throws IllegalArgumentException { return this.factory.isSecure(sock); } public Socket createLayeredSocket( final Socket socket, - final String target, int port, + final String target, final int port, final HttpParams params) throws IOException, UnknownHostException { return this.factory.createLayeredSocket(socket, target, port, true); } Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/SchemeRegistry.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/SchemeRegistry.java?rev=1433569&r1=1433568&r2=1433569&view=diff ============================================================================== --- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/SchemeRegistry.java (original) +++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/SchemeRegistry.java Tue Jan 15 18:29:58 2013 @@ -69,7 +69,7 @@ public final class SchemeRegistry { * @throws IllegalStateException * if the scheme with the given name is not registered */ - public final Scheme getScheme(String name) { + public final Scheme getScheme(final String name) { Scheme found = get(name); if (found == null) { throw new IllegalStateException @@ -89,7 +89,7 @@ public final class SchemeRegistry { * @throws IllegalStateException * if a scheme with the respective name is not registered */ - public final Scheme getScheme(HttpHost host) { + public final Scheme getScheme(final HttpHost host) { Args.notNull(host, "Host"); return getScheme(host.getSchemeName()); } @@ -102,7 +102,7 @@ public final class SchemeRegistry { * @return the scheme, or * null if there is none by this name */ - public final Scheme get(String name) { + public final Scheme get(final String name) { Args.notNull(name, "Scheme name"); // leave it to the caller to use the correct name - all lowercase //name = name.toLowerCase(); @@ -120,7 +120,7 @@ public final class SchemeRegistry { * @return the scheme previously registered with that name, or * null if none was registered */ - public final Scheme register(Scheme sch) { + public final Scheme register(final Scheme sch) { Args.notNull(sch, "Scheme"); Scheme old = registeredSchemes.put(sch.getName(), sch); return old; @@ -134,7 +134,7 @@ public final class SchemeRegistry { * @return the unregistered scheme, or * null if there was none */ - public final Scheme unregister(String name) { + public final Scheme unregister(final String name) { Args.notNull(name, "Scheme name"); // leave it to the caller to use the correct name - all lowercase //name = name.toLowerCase(); Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/SocketFactoryAdaptor.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/SocketFactoryAdaptor.java?rev=1433569&r1=1433568&r2=1433569&view=diff ============================================================================== --- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/SocketFactoryAdaptor.java (original) +++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/SocketFactoryAdaptor.java Tue Jan 15 18:29:58 2013 @@ -57,7 +57,7 @@ class SocketFactoryAdaptor implements So public Socket connectSocket( final Socket socket, - final String host, int port, + final String host, final int port, final InetAddress localAddress, int localPort, final HttpParams params) throws IOException, UnknownHostException, ConnectTimeoutException { InetSocketAddress local = null; Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/AbstractVerifier.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/AbstractVerifier.java?rev=1433569&r1=1433568&r2=1433569&view=diff ============================================================================== --- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/AbstractVerifier.java (original) +++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/AbstractVerifier.java Tue Jan 15 18:29:58 2013 @@ -79,7 +79,7 @@ public abstract class AbstractVerifier i super(); } - public final void verify(String host, SSLSocket ssl) + public final void verify(final String host, final SSLSocket ssl) throws IOException { if(host == null) { throw new NullPointerException("host to verify is null"); @@ -127,7 +127,7 @@ public abstract class AbstractVerifier i verify(host, x509); } - public final boolean verify(String host, SSLSession session) { + public final boolean verify(final String host, final SSLSession session) { try { Certificate[] certs = session.getPeerCertificates(); X509Certificate x509 = (X509Certificate) certs[0]; @@ -139,7 +139,7 @@ public abstract class AbstractVerifier i } } - public final void verify(String host, X509Certificate cert) + public final void verify(final String host, final X509Certificate cert) throws SSLException { String[] cns = getCNs(cert); String[] subjectAlts = getSubjectAlts(cert, host); @@ -227,7 +227,7 @@ public abstract class AbstractVerifier i } } - public static boolean acceptableCountryWildcard(String cn) { + public static boolean acceptableCountryWildcard(final String cn) { String parts[] = cn.split("\\."); if (parts.length != 3 || parts[2].length() != 2) { return true; // it's not an attempt to wildcard a 2TLD within a country code @@ -235,7 +235,7 @@ public abstract class AbstractVerifier i return Arrays.binarySearch(BAD_COUNTRY_2LDS, parts[1]) < 0; } - public static String[] getCNs(X509Certificate cert) { + public static String[] getCNs(final X509Certificate cert) { LinkedList cnList = new LinkedList(); /* Sebastian Hauer's original StrictSSLProtocolSocketFactory used @@ -336,7 +336,7 @@ public abstract class AbstractVerifier i * @param cert X509Certificate * @return Array of SubjectALT DNS names stored in the certificate. */ - public static String[] getDNSSubjectAlts(X509Certificate cert) { + public static String[] getDNSSubjectAlts(final X509Certificate cert) { return getSubjectAlts(cert, null); } Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/SSLSocketFactory.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/SSLSocketFactory.java?rev=1433569&r1=1433568&r2=1433569&view=diff ============================================================================== --- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/SSLSocketFactory.java (original) +++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/SSLSocketFactory.java Tue Jan 15 18:29:58 2013 @@ -393,7 +393,7 @@ public class SSLSocketFactory implements * @since 4.1 */ public SSLSocketFactory( - String algorithm, + final String algorithm, final KeyStore keystore, final String keystorePassword, final KeyStore truststore, @@ -409,7 +409,7 @@ public class SSLSocketFactory implements * @since 4.1 */ public SSLSocketFactory( - String algorithm, + final String algorithm, final KeyStore keystore, final String keystorePassword, final KeyStore truststore, @@ -600,7 +600,7 @@ public class SSLSocketFactory implements * @deprecated (4.1) use constructor. */ @Deprecated - public void setHostnameVerifier(X509HostnameVerifier hostnameVerifier) { + public void setHostnameVerifier(final X509HostnameVerifier hostnameVerifier) { Args.notNull(hostnameVerifier, "Hostname verifier"); this.hostnameVerifier = hostnameVerifier; } @@ -616,7 +616,7 @@ public class SSLSocketFactory implements @Deprecated public Socket connectSocket( final Socket socket, - final String host, int port, + final String host, final int port, final InetAddress local, int localPort, final HttpParams params) throws IOException, UnknownHostException, ConnectTimeoutException { InetAddress remote; @@ -644,8 +644,8 @@ public class SSLSocketFactory implements @Deprecated public Socket createSocket( final Socket socket, - final String host, int port, - boolean autoClose) throws IOException, UnknownHostException { + final String host, final int port, + final boolean autoClose) throws IOException, UnknownHostException { return createLayeredSocket(socket, host, port, autoClose); } @@ -707,7 +707,7 @@ public class SSLSocketFactory implements public Socket createLayeredSocket( final Socket socket, final String target, - int port, + final int port, final HttpContext context) throws IOException, UnknownHostException { SSLSocket sslSocket = (SSLSocket) this.socketfactory.createSocket( socket, Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/cookie/CookieOrigin.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/cookie/CookieOrigin.java?rev=1433569&r1=1433568&r2=1433569&view=diff ============================================================================== --- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/cookie/CookieOrigin.java (original) +++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/cookie/CookieOrigin.java Tue Jan 15 18:29:58 2013 @@ -45,7 +45,7 @@ public final class CookieOrigin { private final String path; private final boolean secure; - public CookieOrigin(final String host, int port, final String path, boolean secure) { + public CookieOrigin(final String host, final int port, final String path, final boolean secure) { super(); Args.notBlank(host, "Host"); Args.notNegative(port, "Port"); Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/cookie/CookieRestrictionViolationException.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/cookie/CookieRestrictionViolationException.java?rev=1433569&r1=1433568&r2=1433569&view=diff ============================================================================== --- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/cookie/CookieRestrictionViolationException.java (original) +++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/cookie/CookieRestrictionViolationException.java Tue Jan 15 18:29:58 2013 @@ -54,7 +54,7 @@ public class CookieRestrictionViolationE * * @param message The exception detail message */ - public CookieRestrictionViolationException(String message) { + public CookieRestrictionViolationException(final String message) { super(message); } Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/cookie/CookieSpecRegistry.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/cookie/CookieSpecRegistry.java?rev=1433569&r1=1433568&r2=1433569&view=diff ============================================================================== --- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/cookie/CookieSpecRegistry.java (original) +++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/cookie/CookieSpecRegistry.java Tue Jan 15 18:29:58 2013 @@ -156,7 +156,7 @@ public final class CookieSpecRegistry im public CookieSpecProvider lookup(final String name) { return new CookieSpecProvider() { - public CookieSpec create(HttpContext context) { + public CookieSpec create(final HttpContext context) { HttpRequest request = (HttpRequest) context.getAttribute( ExecutionContext.HTTP_REQUEST); return getCookieSpec(name, request.getParams()); Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/cookie/MalformedCookieException.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/cookie/MalformedCookieException.java?rev=1433569&r1=1433568&r2=1433569&view=diff ============================================================================== --- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/cookie/MalformedCookieException.java (original) +++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/cookie/MalformedCookieException.java Tue Jan 15 18:29:58 2013 @@ -54,7 +54,7 @@ public class MalformedCookieException ex * * @param message The exception detail message */ - public MalformedCookieException(String message) { + public MalformedCookieException(final String message) { super(message); } @@ -65,7 +65,7 @@ public class MalformedCookieException ex * @param cause the Throwable that caused this exception, or null * if the cause is unavailable, unknown, or not a Throwable */ - public MalformedCookieException(String message, Throwable cause) { + public MalformedCookieException(final String message, final Throwable cause) { super(message, cause); } } Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/BasicScheme.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/BasicScheme.java?rev=1433569&r1=1433568&r2=1433569&view=diff ============================================================================== --- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/BasicScheme.java (original) +++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/BasicScheme.java Tue Jan 15 18:29:58 2013 @@ -190,7 +190,7 @@ public class BasicScheme extends RFC2617 public static Header authenticate( final Credentials credentials, final String charset, - boolean proxy) { + final boolean proxy) { Args.notNull(credentials, "Credentials"); Args.notNull(charset, "charset"); Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/DigestScheme.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/DigestScheme.java?rev=1433569&r1=1433568&r2=1433569&view=diff ============================================================================== --- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/DigestScheme.java (original) +++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/DigestScheme.java Tue Jan 15 18:29:58 2013 @@ -448,7 +448,7 @@ public class DigestScheme extends RFC261 * @param binaryData array containing the digest * @return encoded MD5, or null if encoding failed */ - static String encode(byte[] binaryData) { + static String encode(final byte[] binaryData) { int n = binaryData.length; char[] buffer = new char[n * 2]; for (int i = 0; i < n; i++) { Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/GGSSchemeBase.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/GGSSchemeBase.java?rev=1433569&r1=1433568&r2=1433569&view=diff ============================================================================== --- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/GGSSchemeBase.java (original) +++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/GGSSchemeBase.java Tue Jan 15 18:29:58 2013 @@ -73,7 +73,7 @@ public abstract class GGSSchemeBase exte /** base64 decoded challenge **/ private byte[] token; - GGSSchemeBase(boolean stripPort) { + GGSSchemeBase(final boolean stripPort) { super(); this.base64codec = new Base64(); this.state = State.UNINITIATED; @@ -197,7 +197,7 @@ public abstract class GGSSchemeBase exte @Override protected void parseChallenge( final CharArrayBuffer buffer, - int beginIndex, int endIndex) throws MalformedChallengeException { + final int beginIndex, final int endIndex) throws MalformedChallengeException { String challenge = buffer.substringTrimmed(beginIndex, endIndex); if (log.isDebugEnabled()) { log.debug("Received challenge '" + challenge + "' from the auth server"); Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/HttpEntityDigester.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/HttpEntityDigester.java?rev=1433569&r1=1433568&r2=1433569&view=diff ============================================================================== --- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/HttpEntityDigester.java (original) +++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/HttpEntityDigester.java Tue Jan 15 18:29:58 2013 @@ -43,7 +43,7 @@ class HttpEntityDigester extends OutputS } @Override - public void write(int b) throws IOException { + public void write(final int b) throws IOException { if (this.closed) { throw new IOException("Stream has been already closed"); } @@ -51,7 +51,7 @@ class HttpEntityDigester extends OutputS } @Override - public void write(byte[] b, int off, int len) throws IOException { + public void write(final byte[] b, final int off, final int len) throws IOException { if (this.closed) { throw new IOException("Stream has been already closed"); } Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/KerberosScheme.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/KerberosScheme.java?rev=1433569&r1=1433568&r2=1433569&view=diff ============================================================================== --- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/KerberosScheme.java (original) +++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/KerberosScheme.java Tue Jan 15 18:29:58 2013 @@ -44,7 +44,7 @@ public class KerberosScheme extends GGSS private static final String KERBEROS_OID = "1.2.840.113554.1.2.2"; - public KerberosScheme(boolean stripPort) { + public KerberosScheme(final boolean stripPort) { super(stripPort); } @@ -87,7 +87,7 @@ public class KerberosScheme extends GGSS * * @return null */ - public String getParameter(String name) { + public String getParameter(final String name) { Args.notNull(name, "Parameter name"); return null; } Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/KerberosSchemeFactory.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/KerberosSchemeFactory.java?rev=1433569&r1=1433568&r2=1433569&view=diff ============================================================================== --- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/KerberosSchemeFactory.java (original) +++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/KerberosSchemeFactory.java Tue Jan 15 18:29:58 2013 @@ -45,7 +45,7 @@ public class KerberosSchemeFactory imple private final boolean stripPort; - public KerberosSchemeFactory(boolean stripPort) { + public KerberosSchemeFactory(final boolean stripPort) { super(); this.stripPort = stripPort; } Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/NTLMEngineException.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/NTLMEngineException.java?rev=1433569&r1=1433568&r2=1433569&view=diff ============================================================================== --- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/NTLMEngineException.java (original) +++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/NTLMEngineException.java Tue Jan 15 18:29:58 2013 @@ -49,7 +49,7 @@ public class NTLMEngineException extends * * @param message the exception detail message */ - public NTLMEngineException(String message) { + public NTLMEngineException(final String message) { super(message); } @@ -60,7 +60,7 @@ public class NTLMEngineException extends * @param cause the Throwable that caused this exception, or null * if the cause is unavailable, unknown, or not a Throwable */ - public NTLMEngineException(String message, Throwable cause) { + public NTLMEngineException(final String message, final Throwable cause) { super(message, cause); } Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/NTLMEngineImpl.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/NTLMEngineImpl.java?rev=1433569&r1=1433568&r2=1433569&view=diff ============================================================================== --- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/NTLMEngineImpl.java (original) +++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/NTLMEngineImpl.java Tue Jan 15 18:29:58 2013 @@ -111,8 +111,8 @@ final class NTLMEngineImpl implements NT * @throws HttpException * If the messages cannot be retrieved. */ - final String getResponseFor(String message, String username, String password, - String host, String domain) throws NTLMEngineException { + final String getResponseFor(final String message, final String username, final String password, + final String host, final String domain) throws NTLMEngineException { final String response; if (message == null || message.trim().equals("")) { @@ -136,7 +136,7 @@ final class NTLMEngineImpl implements NT * The domain to authenticate with. * @return String the message to add to the HTTP request header. */ - String getType1Message(String host, String domain) throws NTLMEngineException { + String getType1Message(final String host, final String domain) throws NTLMEngineException { return new Type1Message(domain, host).getResponse(); } @@ -160,8 +160,8 @@ final class NTLMEngineImpl implements NT * @throws NTLMEngineException * If {@encrypt(byte[],byte[])} fails. */ - String getType3Message(String user, String password, String host, String domain, - byte[] nonce, int type2Flags, String target, byte[] targetInformation) + String getType3Message(final String user, final String password, final String host, final String domain, + final byte[] nonce, final int type2Flags, final String target, final byte[] targetInformation) throws NTLMEngineException { return new Type3Message(domain, host, user, password, nonce, type2Flags, target, targetInformation).getResponse(); @@ -178,12 +178,12 @@ final class NTLMEngineImpl implements NT * @param credentialCharset * The credentialCharset to set. */ - void setCredentialCharset(String credentialCharset) { + void setCredentialCharset(final String credentialCharset) { this.credentialCharset = credentialCharset; } /** Strip dot suffix from a name */ - private static String stripDotSuffix(String value) { + private static String stripDotSuffix(final String value) { int index = value.indexOf("."); if (index != -1) { return value.substring(0, index); @@ -192,16 +192,16 @@ final class NTLMEngineImpl implements NT } /** Convert host to standard form */ - private static String convertHost(String host) { + private static String convertHost(final String host) { return stripDotSuffix(host); } /** Convert domain to standard form */ - private static String convertDomain(String domain) { + private static String convertDomain(final String domain) { return stripDotSuffix(domain); } - private static int readULong(byte[] src, int index) throws NTLMEngineException { + private static int readULong(final byte[] src, final int index) throws NTLMEngineException { if (src.length < index + 4) { throw new NTLMEngineException("NTLM authentication - buffer too small for DWORD"); } @@ -209,14 +209,14 @@ final class NTLMEngineImpl implements NT | ((src[index + 2] & 0xff) << 16) | ((src[index + 3] & 0xff) << 24); } - private static int readUShort(byte[] src, int index) throws NTLMEngineException { + private static int readUShort(final byte[] src, final int index) throws NTLMEngineException { if (src.length < index + 2) { throw new NTLMEngineException("NTLM authentication - buffer too small for WORD"); } return (src[index] & 0xff) | ((src[index + 1] & 0xff) << 8); } - private static byte[] readSecurityBuffer(byte[] src, int index) throws NTLMEngineException { + private static byte[] readSecurityBuffer(final byte[] src, final int index) throws NTLMEngineException { int length = readUShort(src, index); int offset = readULong(src, index + 4); if (src.length < offset + length) { @@ -282,9 +282,9 @@ final class NTLMEngineImpl implements NT protected byte[] ntlm2SessionResponseUserSessionKey = null; protected byte[] lanManagerSessionKey = null; - public CipherGen(String target, String user, String password, - byte[] challenge, byte[] targetInformation, - byte[] clientChallenge, byte[] secondaryKey, byte[] timestamp) { + public CipherGen(final String target, final String user, final String password, + final byte[] challenge, final byte[] targetInformation, + final byte[] clientChallenge, final byte[] secondaryKey, final byte[] timestamp) { this.target = target; this.user = user; this.password = password; @@ -295,8 +295,8 @@ final class NTLMEngineImpl implements NT this.timestamp = timestamp; } - public CipherGen(String target, String user, String password, - byte[] challenge, byte[] targetInformation) { + public CipherGen(final String target, final String user, final String password, + final byte[] challenge, final byte[] targetInformation) { this(target, user, password, challenge, targetInformation, null, null, null); } @@ -513,7 +513,7 @@ final class NTLMEngineImpl implements NT } /** Calculates HMAC-MD5 */ - static byte[] hmacMD5(byte[] value, byte[] key) + static byte[] hmacMD5(final byte[] value, final byte[] key) throws NTLMEngineException { HMACMD5 hmacMD5 = new HMACMD5(key); hmacMD5.update(value); @@ -521,7 +521,7 @@ final class NTLMEngineImpl implements NT } /** Calculates RC4 */ - static byte[] RC4(byte[] value, byte[] key) + static byte[] RC4(final byte[] value, final byte[] key) throws NTLMEngineException { try { Cipher rc4 = Cipher.getInstance("RC4"); @@ -547,8 +547,8 @@ final class NTLMEngineImpl implements NT * field of the Type 3 message; the LM response field contains the * client challenge, null-padded to 24 bytes. */ - static byte[] ntlm2SessionResponse(byte[] ntlmHash, byte[] challenge, - byte[] clientChallenge) throws NTLMEngineException { + static byte[] ntlm2SessionResponse(final byte[] ntlmHash, final byte[] challenge, + final byte[] clientChallenge) throws NTLMEngineException { try { // Look up MD5 algorithm (was necessary on jdk 1.4.2) // This used to be needed, but java 1.5.0_07 includes the MD5 @@ -588,7 +588,7 @@ final class NTLMEngineImpl implements NT * @return The LM Hash of the given password, used in the calculation of the * LM Response. */ - private static byte[] lmHash(String password) throws NTLMEngineException { + private static byte[] lmHash(final String password) throws NTLMEngineException { try { byte[] oemPassword = password.toUpperCase(Locale.US).getBytes("US-ASCII"); int length = Math.min(oemPassword.length, 14); @@ -620,7 +620,7 @@ final class NTLMEngineImpl implements NT * @return The NTLM Hash of the given password, used in the calculation of * the NTLM Response and the NTLMv2 and LMv2 Hashes. */ - private static byte[] ntlmHash(String password) throws NTLMEngineException { + private static byte[] ntlmHash(final String password) throws NTLMEngineException { try { byte[] unicodePassword = password.getBytes("UnicodeLittleUnmarked"); MD4 md4 = new MD4(); @@ -644,7 +644,7 @@ final class NTLMEngineImpl implements NT * @return The NTLMv2 Hash, used in the calculation of the NTLMv2 and LMv2 * Responses. */ - private static byte[] ntlmv2Hash(String target, String user, String password) + private static byte[] ntlmv2Hash(final String target, final String user, final String password) throws NTLMEngineException { try { byte[] ntlmHash = ntlmHash(password); @@ -668,7 +668,7 @@ final class NTLMEngineImpl implements NT * * @return The response (either LM or NTLM, depending on the provided hash). */ - private static byte[] lmResponse(byte[] hash, byte[] challenge) throws NTLMEngineException { + private static byte[] lmResponse(final byte[] hash, final byte[] challenge) throws NTLMEngineException { try { byte[] keyBytes = new byte[21]; System.arraycopy(hash, 0, keyBytes, 0, 16); @@ -706,7 +706,7 @@ final class NTLMEngineImpl implements NT * @return The response (either NTLMv2 or LMv2, depending on the client * data). */ - private static byte[] lmv2Response(byte[] hash, byte[] challenge, byte[] clientData) + private static byte[] lmv2Response(final byte[] hash, final byte[] challenge, final byte[] clientData) throws NTLMEngineException { HMACMD5 hmacMD5 = new HMACMD5(hash); hmacMD5.update(challenge); @@ -729,7 +729,7 @@ final class NTLMEngineImpl implements NT * * @return The blob, used in the calculation of the NTLMv2 Response. */ - private static byte[] createBlob(byte[] clientChallenge, byte[] targetInformation, byte[] timestamp) { + private static byte[] createBlob(final byte[] clientChallenge, final byte[] targetInformation, final byte[] timestamp) { byte[] blobSignature = new byte[] { (byte) 0x01, (byte) 0x01, (byte) 0x00, (byte) 0x00 }; byte[] reserved = new byte[] { (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00 }; byte[] unknown1 = new byte[] { (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00 }; @@ -766,7 +766,7 @@ final class NTLMEngineImpl implements NT * @return A DES encryption key created from the key material starting at * the specified offset in the given byte array. */ - private static Key createDESKey(byte[] bytes, int offset) { + private static Key createDESKey(final byte[] bytes, final int offset) { byte[] keyBytes = new byte[7]; System.arraycopy(bytes, offset, keyBytes, 0, 7); byte[] material = new byte[8]; @@ -788,7 +788,7 @@ final class NTLMEngineImpl implements NT * @param bytes * The data whose parity bits are to be adjusted for odd parity. */ - private static void oddParity(byte[] bytes) { + private static void oddParity(final byte[] bytes) { for (int i = 0; i < bytes.length; i++) { byte b = bytes[i]; boolean needsParity = (((b >>> 7) ^ (b >>> 6) ^ (b >>> 5) ^ (b >>> 4) ^ (b >>> 3) @@ -814,7 +814,7 @@ final class NTLMEngineImpl implements NT } /** Constructor to use when message contents are known */ - NTLMMessage(String messageBody, int expectedType) throws NTLMEngineException { + NTLMMessage(final String messageBody, final int expectedType) throws NTLMEngineException { messageContents = Base64.decodeBase64(EncodingUtils.getBytes(messageBody, DEFAULT_CHARSET)); // Look for NTLM message @@ -854,7 +854,7 @@ final class NTLMEngineImpl implements NT } /** Read a byte from a position within the message buffer */ - protected byte readByte(int position) throws NTLMEngineException { + protected byte readByte(final int position) throws NTLMEngineException { if (messageContents.length < position + 1) { throw new NTLMEngineException("NTLM: Message too short"); } @@ -862,7 +862,7 @@ final class NTLMEngineImpl implements NT } /** Read a bunch of bytes from a position in the message buffer */ - protected void readBytes(byte[] buffer, int position) throws NTLMEngineException { + protected void readBytes(final byte[] buffer, final int position) throws NTLMEngineException { if (messageContents.length < position + buffer.length) { throw new NTLMEngineException("NTLM: Message too short"); } @@ -870,17 +870,17 @@ final class NTLMEngineImpl implements NT } /** Read a ushort from a position within the message buffer */ - protected int readUShort(int position) throws NTLMEngineException { + protected int readUShort(final int position) throws NTLMEngineException { return NTLMEngineImpl.readUShort(messageContents, position); } /** Read a ulong from a position within the message buffer */ - protected int readULong(int position) throws NTLMEngineException { + protected int readULong(final int position) throws NTLMEngineException { return NTLMEngineImpl.readULong(messageContents, position); } /** Read a security buffer from a position within the message buffer */ - protected byte[] readSecurityBuffer(int position) throws NTLMEngineException { + protected byte[] readSecurityBuffer(final int position) throws NTLMEngineException { return NTLMEngineImpl.readSecurityBuffer(messageContents, position); } @@ -892,7 +892,7 @@ final class NTLMEngineImpl implements NT * including the type and the signature (which this method * adds). */ - protected void prepareResponse(int maxlength, int messageType) { + protected void prepareResponse(final int maxlength, final int messageType) { messageContents = new byte[maxlength]; currentOutputPosition = 0; addBytes(SIGNATURE); @@ -905,7 +905,7 @@ final class NTLMEngineImpl implements NT * @param b * the byte to add. */ - protected void addByte(byte b) { + protected void addByte(final byte b) { messageContents[currentOutputPosition] = b; currentOutputPosition++; } @@ -916,7 +916,7 @@ final class NTLMEngineImpl implements NT * @param bytes * the bytes to add. */ - protected void addBytes(byte[] bytes) { + protected void addBytes(final byte[] bytes) { for (byte b : bytes) { messageContents[currentOutputPosition] = b; currentOutputPosition++; @@ -924,13 +924,13 @@ final class NTLMEngineImpl implements NT } /** Adds a USHORT to the response */ - protected void addUShort(int value) { + protected void addUShort(final int value) { addByte((byte) (value & 0xff)); addByte((byte) (value >> 8 & 0xff)); } /** Adds a ULong to the response */ - protected void addULong(int value) { + protected void addULong(final int value) { addByte((byte) (value & 0xff)); addByte((byte) (value >> 8 & 0xff)); addByte((byte) (value >> 16 & 0xff)); @@ -1060,7 +1060,7 @@ final class NTLMEngineImpl implements NT protected byte[] targetInfo; protected int flags; - Type2Message(String message) throws NTLMEngineException { + Type2Message(final String message) throws NTLMEngineException { super(message, 2); // Type 2 message is laid out as follows: @@ -1153,8 +1153,8 @@ final class NTLMEngineImpl implements NT /** Constructor. Pass the arguments we will need */ - Type3Message(String domain, String host, String user, String password, byte[] nonce, - int type2Flags, String target, byte[] targetInformation) + Type3Message(String domain, String host, final String user, final String password, final byte[] nonce, + final int type2Flags, final String target, final byte[] targetInformation) throws NTLMEngineException { // Save the flags this.type2Flags = type2Flags; @@ -1356,26 +1356,26 @@ final class NTLMEngineImpl implements NT } } - static void writeULong(byte[] buffer, int value, int offset) { + static void writeULong(final byte[] buffer, final int value, final int offset) { buffer[offset] = (byte) (value & 0xff); buffer[offset + 1] = (byte) (value >> 8 & 0xff); buffer[offset + 2] = (byte) (value >> 16 & 0xff); buffer[offset + 3] = (byte) (value >> 24 & 0xff); } - static int F(int x, int y, int z) { + static int F(final int x, final int y, final int z) { return ((x & y) | (~x & z)); } - static int G(int x, int y, int z) { + static int G(final int x, final int y, final int z) { return ((x & y) | (x & z) | (y & z)); } - static int H(int x, int y, int z) { + static int H(final int x, final int y, final int z) { return (x ^ y ^ z); } - static int rotintlft(int val, int numbits) { + static int rotintlft(final int val, final int numbits) { return ((val << numbits) | (val >>> (32 - numbits))); } @@ -1397,7 +1397,7 @@ final class NTLMEngineImpl implements NT MD4() { } - void update(byte[] input) { + void update(final byte[] input) { // We always deal with 512 bits at a time. Correspondingly, there is // a buffer 64 bytes long that we write data into until it gets // full. @@ -1476,7 +1476,7 @@ final class NTLMEngineImpl implements NT } - protected void round1(int[] d) { + protected void round1(final int[] d) { A = rotintlft((A + F(B, C, D) + d[0]), 3); D = rotintlft((D + F(A, B, C) + d[1]), 7); C = rotintlft((C + F(D, A, B) + d[2]), 11); @@ -1498,7 +1498,7 @@ final class NTLMEngineImpl implements NT B = rotintlft((B + F(C, D, A) + d[15]), 19); } - protected void round2(int[] d) { + protected void round2(final int[] d) { A = rotintlft((A + G(B, C, D) + d[0] + 0x5a827999), 3); D = rotintlft((D + G(A, B, C) + d[4] + 0x5a827999), 5); C = rotintlft((C + G(D, A, B) + d[8] + 0x5a827999), 9); @@ -1521,7 +1521,7 @@ final class NTLMEngineImpl implements NT } - protected void round3(int[] d) { + protected void round3(final int[] d) { A = rotintlft((A + H(B, C, D) + d[0] + 0x6ed9eba1), 3); D = rotintlft((D + H(A, B, C) + d[8] + 0x6ed9eba1), 9); C = rotintlft((C + H(D, A, B) + d[4] + 0x6ed9eba1), 11); @@ -1602,12 +1602,12 @@ final class NTLMEngineImpl implements NT } /** Update by adding a complete array */ - void update(byte[] input) { + void update(final byte[] input) { md5.update(input); } /** Update the algorithm */ - void update(byte[] input, int offset, int length) { + void update(final byte[] input, final int offset, final int length) { md5.update(input, offset, length); } Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/NTLMScheme.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/NTLMScheme.java?rev=1433569&r1=1433568&r2=1433569&view=diff ============================================================================== --- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/NTLMScheme.java (original) +++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/NTLMScheme.java Tue Jan 15 18:29:58 2013 @@ -74,7 +74,7 @@ public class NTLMScheme extends AuthSche return "ntlm"; } - public String getParameter(String name) { + public String getParameter(final String name) { // String parameters not supported return null; } @@ -91,7 +91,7 @@ public class NTLMScheme extends AuthSche @Override protected void parseChallenge( final CharArrayBuffer buffer, - int beginIndex, int endIndex) throws MalformedChallengeException { + final int beginIndex, final int endIndex) throws MalformedChallengeException { String challenge = buffer.substringTrimmed(beginIndex, endIndex); if (challenge.length() == 0) { if (this.state == State.UNINITIATED) { Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/NegotiateScheme.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/NegotiateScheme.java?rev=1433569&r1=1433568&r2=1433569&view=diff ============================================================================== --- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/NegotiateScheme.java (original) +++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/NegotiateScheme.java Tue Jan 15 18:29:58 2013 @@ -61,7 +61,7 @@ public class NegotiateScheme extends GGS * Default constructor for the Negotiate authentication scheme. * */ - public NegotiateScheme(final SpnegoTokenGenerator spengoGenerator, boolean stripPort) { + public NegotiateScheme(final SpnegoTokenGenerator spengoGenerator, final boolean stripPort) { super(stripPort); this.spengoGenerator = spengoGenerator; } @@ -176,7 +176,7 @@ public class NegotiateScheme extends GGS * * @return the parameter with the given name */ - public String getParameter(String name) { + public String getParameter(final String name) { Args.notNull(name, "Parameter name"); return null; } Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/NegotiateSchemeFactory.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/NegotiateSchemeFactory.java?rev=1433569&r1=1433568&r2=1433569&view=diff ============================================================================== --- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/NegotiateSchemeFactory.java (original) +++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/NegotiateSchemeFactory.java Tue Jan 15 18:29:58 2013 @@ -44,7 +44,7 @@ public class NegotiateSchemeFactory impl private final SpnegoTokenGenerator spengoGenerator; private final boolean stripPort; - public NegotiateSchemeFactory(final SpnegoTokenGenerator spengoGenerator, boolean stripPort) { + public NegotiateSchemeFactory(final SpnegoTokenGenerator spengoGenerator, final boolean stripPort) { super(); this.spengoGenerator = spengoGenerator; this.stripPort = stripPort; Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/RFC2617Scheme.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/RFC2617Scheme.java?rev=1433569&r1=1433568&r2=1433569&view=diff ============================================================================== --- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/RFC2617Scheme.java (original) +++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/RFC2617Scheme.java Tue Jan 15 18:29:58 2013 @@ -103,7 +103,7 @@ public abstract class RFC2617Scheme exte @Override protected void parseChallenge( - final CharArrayBuffer buffer, int pos, int len) throws MalformedChallengeException { + final CharArrayBuffer buffer, final int pos, final int len) throws MalformedChallengeException { HeaderValueParser parser = BasicHeaderValueParser.INSTANCE; ParserCursor cursor = new ParserCursor(pos, buffer.length()); HeaderElement[] elements = parser.parseElements(buffer, cursor); Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/SPNegoScheme.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/SPNegoScheme.java?rev=1433569&r1=1433568&r2=1433569&view=diff ============================================================================== --- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/SPNegoScheme.java (original) +++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/SPNegoScheme.java Tue Jan 15 18:29:58 2013 @@ -45,7 +45,7 @@ public class SPNegoScheme extends GGSSch private static final String SPNEGO_OID = "1.3.6.1.5.5.2"; - public SPNegoScheme(boolean stripPort) { + public SPNegoScheme(final boolean stripPort) { super(stripPort); } @@ -88,7 +88,7 @@ public class SPNegoScheme extends GGSSch * * @return null */ - public String getParameter(String name) { + public String getParameter(final String name) { Args.notNull(name, "Parameter name"); return null; } Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/SPNegoSchemeFactory.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/SPNegoSchemeFactory.java?rev=1433569&r1=1433568&r2=1433569&view=diff ============================================================================== --- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/SPNegoSchemeFactory.java (original) +++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/SPNegoSchemeFactory.java Tue Jan 15 18:29:58 2013 @@ -45,7 +45,7 @@ public class SPNegoSchemeFactory impleme private final boolean stripPort; - public SPNegoSchemeFactory(boolean stripPort) { + public SPNegoSchemeFactory(final boolean stripPort) { super(); this.stripPort = stripPort; } Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/UnsupportedDigestAlgorithmException.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/UnsupportedDigestAlgorithmException.java?rev=1433569&r1=1433568&r2=1433569&view=diff ============================================================================== --- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/UnsupportedDigestAlgorithmException.java (original) +++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/UnsupportedDigestAlgorithmException.java Tue Jan 15 18:29:58 2013 @@ -52,7 +52,7 @@ public class UnsupportedDigestAlgorithmE * * @param message the exception detail message */ - public UnsupportedDigestAlgorithmException(String message) { + public UnsupportedDigestAlgorithmException(final String message) { super(message); } @@ -63,7 +63,7 @@ public class UnsupportedDigestAlgorithmE * @param cause the Throwable that caused this exception, or null * if the cause is unavailable, unknown, or not a Throwable */ - public UnsupportedDigestAlgorithmException(String message, Throwable cause) { + public UnsupportedDigestAlgorithmException(final String message, final Throwable cause) { super(message, cause); } } Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/AIMDBackoffManager.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/AIMDBackoffManager.java?rev=1433569&r1=1433568&r2=1433569&view=diff ============================================================================== --- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/AIMDBackoffManager.java (original) +++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/AIMDBackoffManager.java Tue Jan 15 18:29:58 2013 @@ -71,18 +71,18 @@ public class AIMDBackoffManager implemen * @param connPerRoute per-host routing maximums to * be managed */ - public AIMDBackoffManager(ConnPoolControl connPerRoute) { + public AIMDBackoffManager(final ConnPoolControl connPerRoute) { this(connPerRoute, new SystemClock()); } - AIMDBackoffManager(ConnPoolControl connPerRoute, Clock clock) { + AIMDBackoffManager(final ConnPoolControl connPerRoute, final Clock clock) { this.clock = clock; this.connPerRoute = connPerRoute; this.lastRouteProbes = new HashMap(); this.lastRouteBackoffs = new HashMap(); } - public void backOff(HttpRoute route) { + public void backOff(final HttpRoute route) { synchronized(connPerRoute) { int curr = connPerRoute.getMaxPerRoute(route); Long lastUpdate = getLastUpdate(lastRouteBackoffs, route); @@ -95,14 +95,14 @@ public class AIMDBackoffManager implemen } } - private int getBackedOffPoolSize(int curr) { + private int getBackedOffPoolSize(final int curr) { if (curr <= 1) { return 1; } return (int)(Math.floor(backoffFactor * curr)); } - public void probe(HttpRoute route) { + public void probe(final HttpRoute route) { synchronized(connPerRoute) { int curr = connPerRoute.getMaxPerRoute(route); int max = (curr >= cap) ? cap : curr + 1; @@ -117,7 +117,7 @@ public class AIMDBackoffManager implemen } } - private Long getLastUpdate(Map updates, HttpRoute route) { + private Long getLastUpdate(final Map updates, final HttpRoute route) { Long lastUpdate = updates.get(route); if (lastUpdate == null) { lastUpdate = Long.valueOf(0L); @@ -134,7 +134,7 @@ public class AIMDBackoffManager implemen * below 1, however. Defaults to 0.5. * @param d must be between 0.0 and 1.0, exclusive. */ - public void setBackoffFactor(double d) { + public void setBackoffFactor(final double d) { Args.check(d > 0.0 && d < 1.0, "Backoff factor must be 0.0 < f < 1.0"); backoffFactor = d; } @@ -146,7 +146,7 @@ public class AIMDBackoffManager implemen * to 5000L (5 seconds). * @param l must be positive */ - public void setCooldownMillis(long l) { + public void setCooldownMillis(final long l) { Args.positive(coolDown, "Cool down"); coolDown = l; } @@ -156,7 +156,7 @@ public class AIMDBackoffManager implemen * probe up to; defaults to 2 (the default per-host max). * @param cap must be >= 1 */ - public void setPerHostConnectionCap(int cap) { + public void setPerHostConnectionCap(final int cap) { Args.positive(cap, "Per host connection cap"); this.cap = cap; } Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/AbstractHttpClient.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/AbstractHttpClient.java?rev=1433569&r1=1433568&r2=1433569&view=diff ============================================================================== --- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/AbstractHttpClient.java (original) +++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/AbstractHttpClient.java Tue Jan 15 18:29:58 2013 @@ -454,7 +454,7 @@ public abstract class AbstractHttpClient * * @param params the new default parameters */ - public synchronized void setParams(HttpParams params) { + public synchronized void setParams(final HttpParams params) { defaultParams = params; } @@ -724,11 +724,11 @@ public abstract class AbstractHttpClient 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); } @@ -741,7 +741,7 @@ public abstract class AbstractHttpClient 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); protocolProcessor = null; } @@ -751,7 +751,7 @@ public abstract class AbstractHttpClient protocolProcessor = null; } - public synchronized void removeResponseInterceptorByClass(Class clazz) { + public synchronized void removeResponseInterceptorByClass(final Class clazz) { getHttpProcessor().removeResponseInterceptorByClass(clazz); protocolProcessor = null; } @@ -761,7 +761,7 @@ public abstract class AbstractHttpClient 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); protocolProcessor = null; } @@ -771,14 +771,14 @@ public abstract class AbstractHttpClient protocolProcessor = null; } - public synchronized void removeRequestInterceptorByClass(Class clazz) { + public synchronized void removeRequestInterceptorByClass(final Class clazz) { getHttpProcessor().removeRequestInterceptorByClass(clazz); protocolProcessor = null; } @Override - protected final CloseableHttpResponse doExecute(HttpHost target, HttpRequest request, - HttpContext context) + protected final CloseableHttpResponse doExecute(final HttpHost target, final HttpRequest request, + final HttpContext context) throws IOException, ClientProtocolException { Args.notNull(request, "HTTP request"); @@ -976,7 +976,7 @@ public abstract class AbstractHttpClient * * @return the parameters to use */ - protected HttpParams determineParams(HttpRequest req) { + protected HttpParams determineParams(final HttpRequest req) { return new ClientParamsStack (null, getParams(), req.getParams(), null); } Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/AuthenticationStrategyImpl.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/AuthenticationStrategyImpl.java?rev=1433569&r1=1433568&r2=1433569&view=diff ============================================================================== --- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/AuthenticationStrategyImpl.java (original) +++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/AuthenticationStrategyImpl.java Tue Jan 15 18:29:58 2013 @@ -79,7 +79,7 @@ abstract class AuthenticationStrategyImp private final int challengeCode; private final String headerName; - AuthenticationStrategyImpl(int challengeCode, final String headerName) { + AuthenticationStrategyImpl(final int challengeCode, final String headerName) { super(); this.challengeCode = challengeCode; this.headerName = headerName; Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/AutoRetryHttpClient.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/AutoRetryHttpClient.java?rev=1433569&r1=1433568&r2=1433569&view=diff ============================================================================== --- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/AutoRetryHttpClient.java (original) +++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/AutoRetryHttpClient.java Tue Jan 15 18:29:58 2013 @@ -91,7 +91,7 @@ public class AutoRetryHttpClient impleme * @param config * retry configuration module options */ - public AutoRetryHttpClient(ServiceUnavailableRetryStrategy config) { + public AutoRetryHttpClient(final ServiceUnavailableRetryStrategy config) { this(new DefaultHttpClient(), config); } @@ -103,34 +103,34 @@ public class AutoRetryHttpClient impleme * @param client * used to make origin requests */ - public AutoRetryHttpClient(HttpClient client) { + public AutoRetryHttpClient(final HttpClient client) { this(client, new DefaultServiceUnavailableRetryStrategy()); } - public HttpResponse execute(HttpHost target, HttpRequest request) + public HttpResponse execute(final HttpHost target, final HttpRequest request) throws IOException { HttpContext defaultContext = null; return execute(target, request, defaultContext); } - public T execute(HttpHost target, HttpRequest request, - ResponseHandler responseHandler) throws IOException { + public T execute(final HttpHost target, final HttpRequest request, + final ResponseHandler responseHandler) throws IOException { return execute(target, request, responseHandler, null); } - public T execute(HttpHost target, HttpRequest request, - ResponseHandler responseHandler, HttpContext context) + public T execute(final HttpHost target, final HttpRequest request, + final ResponseHandler responseHandler, final HttpContext context) throws IOException { HttpResponse resp = execute(target, request, context); return responseHandler.handleResponse(resp); } - public HttpResponse execute(HttpUriRequest request) throws IOException { + public HttpResponse execute(final HttpUriRequest request) throws IOException { HttpContext context = null; return execute(request, context); } - public HttpResponse execute(HttpUriRequest request, HttpContext context) + public HttpResponse execute(final HttpUriRequest request, final HttpContext context) throws IOException { URI uri = request.getURI(); HttpHost httpHost = new HttpHost(uri.getHost(), uri.getPort(), @@ -138,20 +138,20 @@ public class AutoRetryHttpClient impleme return execute(httpHost, request, context); } - public T execute(HttpUriRequest request, - ResponseHandler responseHandler) throws IOException { + public T execute(final HttpUriRequest request, + final ResponseHandler responseHandler) throws IOException { return execute(request, responseHandler, null); } - public T execute(HttpUriRequest request, - ResponseHandler responseHandler, HttpContext context) + public T execute(final HttpUriRequest request, + final ResponseHandler responseHandler, final HttpContext context) throws IOException { HttpResponse resp = execute(request, context); return responseHandler.handleResponse(resp); } - public HttpResponse execute(HttpHost target, HttpRequest request, - HttpContext context) throws IOException { + public HttpResponse execute(final HttpHost target, final HttpRequest request, + final HttpContext context) throws IOException { for (int c = 1;; c++) { HttpResponse response = backend.execute(target, request, context); try { Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/BasicCookieStore.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/BasicCookieStore.java?rev=1433569&r1=1433568&r2=1433569&view=diff ============================================================================== --- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/BasicCookieStore.java (original) +++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/BasicCookieStore.java Tue Jan 15 18:29:58 2013 @@ -68,7 +68,7 @@ public class BasicCookieStore implements * @see #addCookies(Cookie[]) * */ - public synchronized void addCookie(Cookie cookie) { + public synchronized void addCookie(final Cookie cookie) { if (cookie != null) { // first remove any old cookie that is equivalent cookies.remove(cookie); @@ -88,7 +88,7 @@ public class BasicCookieStore implements * @see #addCookie(Cookie) * */ - public synchronized void addCookies(Cookie[] cookies) { + public synchronized void addCookies(final Cookie[] cookies) { if (cookies != null) { for (Cookie cooky : cookies) { this.addCookie(cooky); Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/ClientParamsStack.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/ClientParamsStack.java?rev=1433569&r1=1433568&r2=1433569&view=diff ============================================================================== --- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/ClientParamsStack.java (original) +++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/ClientParamsStack.java Tue Jan 15 18:29:58 2013 @@ -96,8 +96,8 @@ public class ClientParamsStack extends A * @param rparams request parameters, or null * @param oparams override parameters, or null */ - public ClientParamsStack(HttpParams aparams, HttpParams cparams, - HttpParams rparams, HttpParams oparams) { + public ClientParamsStack(final HttpParams aparams, final HttpParams cparams, + final HttpParams rparams, final HttpParams oparams) { applicationParams = aparams; clientParams = cparams; requestParams = rparams; @@ -112,7 +112,7 @@ public class ClientParamsStack extends A * * @param stack the stack to copy */ - public ClientParamsStack(ClientParamsStack stack) { + public ClientParamsStack(final ClientParamsStack stack) { this(stack.getApplicationParams(), stack.getClientParams(), stack.getRequestParams(), @@ -133,9 +133,9 @@ public class ClientParamsStack extends A * @param rparams request parameters, or null * @param oparams override parameters, or null */ - public ClientParamsStack(ClientParamsStack stack, - HttpParams aparams, HttpParams cparams, - HttpParams rparams, HttpParams oparams) { + public ClientParamsStack(final ClientParamsStack stack, + final HttpParams aparams, final HttpParams cparams, + final HttpParams rparams, final HttpParams oparams) { this((aparams != null) ? aparams : stack.getApplicationParams(), (cparams != null) ? cparams : stack.getClientParams(), (rparams != null) ? rparams : stack.getRequestParams(), @@ -189,7 +189,7 @@ public class ClientParamsStack extends A * @return the highest-priority value for that parameter, or * null if it is not set anywhere in this stack */ - public Object getParameter(String name) { + public Object getParameter(final String name) { Args.notNull(name, "Parameter name"); Object result = null; @@ -222,7 +222,7 @@ public class ClientParamsStack extends A * * @throws UnsupportedOperationException always */ - public HttpParams setParameter(String name, Object value) + public HttpParams setParameter(final String name, final Object value) throws UnsupportedOperationException { throw new UnsupportedOperationException @@ -242,7 +242,7 @@ public class ClientParamsStack extends A * * @throws UnsupportedOperationException always */ - public boolean removeParameter(String name) { + public boolean removeParameter(final String name) { throw new UnsupportedOperationException ("Removing parameters in a stack is not supported."); } Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/CloseableHttpClient.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/CloseableHttpClient.java?rev=1433569&r1=1433568&r2=1433569&view=diff ============================================================================== --- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/CloseableHttpClient.java (original) +++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/CloseableHttpClient.java Tue Jan 15 18:29:58 2013 @@ -76,7 +76,7 @@ public abstract class CloseableHttpClien return doExecute(determineTarget(request), request, context); } - private static HttpHost determineTarget(HttpUriRequest request) throws ClientProtocolException { + private static HttpHost determineTarget(final HttpUriRequest request) throws ClientProtocolException { // A null target may be acceptable if there is a default target. // Otherwise, the null target is detected in the director. HttpHost target = null; Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/ContentEncodingHttpClient.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/ContentEncodingHttpClient.java?rev=1433569&r1=1433568&r2=1433569&view=diff ============================================================================== --- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/ContentEncodingHttpClient.java (original) +++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/ContentEncodingHttpClient.java Tue Jan 15 18:29:58 2013 @@ -60,14 +60,14 @@ public class ContentEncodingHttpClient e * @param params the parameters * @param conman the connection manager */ - public ContentEncodingHttpClient(ClientConnectionManager conman, HttpParams params) { + public ContentEncodingHttpClient(final ClientConnectionManager conman, final HttpParams params) { super(conman, params); } /** * @param params */ - public ContentEncodingHttpClient(HttpParams params) { + public ContentEncodingHttpClient(final HttpParams params) { this(null, params); } Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DecompressingHttpClient.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DecompressingHttpClient.java?rev=1433569&r1=1433568&r2=1433569&view=diff ============================================================================== --- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DecompressingHttpClient.java (original) +++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DecompressingHttpClient.java Tue Jan 15 18:29:58 2013 @@ -95,13 +95,13 @@ public class DecompressingHttpClient imp * @param backend the {@link HttpClient} to use for actually * issuing requests */ - public DecompressingHttpClient(HttpClient backend) { + public DecompressingHttpClient(final HttpClient backend) { this(backend, new RequestAcceptEncoding(), new ResponseContentEncoding()); } - DecompressingHttpClient(HttpClient backend, - HttpRequestInterceptor requestInterceptor, - HttpResponseInterceptor responseInterceptor) { + DecompressingHttpClient(final HttpClient backend, + final HttpRequestInterceptor requestInterceptor, + final HttpResponseInterceptor responseInterceptor) { this.backend = backend; this.acceptEncodingInterceptor = requestInterceptor; this.contentEncodingInterceptor = responseInterceptor; @@ -115,7 +115,7 @@ public class DecompressingHttpClient imp return backend.getConnectionManager(); } - public HttpResponse execute(HttpUriRequest request) throws IOException, + public HttpResponse execute(final HttpUriRequest request) throws IOException, ClientProtocolException { return execute(getHttpHost(request), request, (HttpContext)null); } @@ -129,22 +129,22 @@ public class DecompressingHttpClient imp return this.backend; } - HttpHost getHttpHost(HttpUriRequest request) { + HttpHost getHttpHost(final HttpUriRequest request) { URI uri = request.getURI(); return URIUtils.extractHost(uri); } - public HttpResponse execute(HttpUriRequest request, HttpContext context) + public HttpResponse execute(final HttpUriRequest request, final HttpContext context) throws IOException, ClientProtocolException { return execute(getHttpHost(request), request, context); } - public HttpResponse execute(HttpHost target, HttpRequest request) + public HttpResponse execute(final HttpHost target, final HttpRequest request) throws IOException, ClientProtocolException { return execute(target, request, (HttpContext)null); } - public HttpResponse execute(HttpHost target, HttpRequest request, + public HttpResponse execute(final HttpHost target, final HttpRequest request, HttpContext context) throws IOException, ClientProtocolException { try { if (context == null) { @@ -181,26 +181,26 @@ public class DecompressingHttpClient imp } } - public T execute(HttpUriRequest request, - ResponseHandler responseHandler) throws IOException, + public T execute(final HttpUriRequest request, + final ResponseHandler responseHandler) throws IOException, ClientProtocolException { return execute(getHttpHost(request), request, responseHandler); } - public T execute(HttpUriRequest request, - ResponseHandler responseHandler, HttpContext context) + public T execute(final HttpUriRequest request, + final ResponseHandler responseHandler, final HttpContext context) throws IOException, ClientProtocolException { return execute(getHttpHost(request), request, responseHandler, context); } - public T execute(HttpHost target, HttpRequest request, - ResponseHandler responseHandler) throws IOException, + public T execute(final HttpHost target, final HttpRequest request, + final ResponseHandler responseHandler) throws IOException, ClientProtocolException { return execute(target, request, responseHandler, null); } - public T execute(HttpHost target, HttpRequest request, - ResponseHandler responseHandler, HttpContext context) + public T execute(final HttpHost target, final HttpRequest request, + final ResponseHandler responseHandler, final HttpContext context) throws IOException, ClientProtocolException { HttpResponse response = execute(target, request, context); try { Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultBackoffStrategy.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultBackoffStrategy.java?rev=1433569&r1=1433568&r2=1433569&view=diff ============================================================================== --- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultBackoffStrategy.java (original) +++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultBackoffStrategy.java Tue Jan 15 18:29:58 2013 @@ -42,12 +42,12 @@ import org.apache.http.client.Connection */ public class DefaultBackoffStrategy implements ConnectionBackoffStrategy { - public boolean shouldBackoff(Throwable t) { + public boolean shouldBackoff(final Throwable t) { return (t instanceof SocketTimeoutException || t instanceof ConnectException); } - public boolean shouldBackoff(HttpResponse resp) { + public boolean shouldBackoff(final HttpResponse resp) { return (resp.getStatusLine().getStatusCode() == HttpStatus.SC_SERVICE_UNAVAILABLE); } Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultConnectionKeepAliveStrategy.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultConnectionKeepAliveStrategy.java?rev=1433569&r1=1433568&r2=1433569&view=diff ============================================================================== --- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultConnectionKeepAliveStrategy.java (original) +++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultConnectionKeepAliveStrategy.java Tue Jan 15 18:29:58 2013 @@ -50,7 +50,7 @@ public class DefaultConnectionKeepAliveS public static final DefaultConnectionKeepAliveStrategy INSTANCE = new DefaultConnectionKeepAliveStrategy(); - public long getKeepAliveDuration(HttpResponse response, HttpContext context) { + public long getKeepAliveDuration(final HttpResponse response, final HttpContext context) { Args.notNull(response, "HTTP response"); HeaderElementIterator it = new BasicHeaderElementIterator( response.headerIterator(HTTP.CONN_KEEP_ALIVE)); Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultHttpClient.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultHttpClient.java?rev=1433569&r1=1433568&r2=1433569&view=diff ============================================================================== --- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultHttpClient.java (original) +++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultHttpClient.java Tue Jan 15 18:29:58 2013 @@ -173,7 +173,7 @@ public class DefaultHttpClient extends A *
  • {@link CoreProtocolPNames#USER_AGENT}: Apache-HttpClient/ (java 1.5)
    • * */ - 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/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultHttpRequestRetryHandler.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultHttpRequestRetryHandler.java?rev=1433569&r1=1433568&r2=1433569&view=diff ============================================================================== --- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultHttpRequestRetryHandler.java (original) +++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultHttpRequestRetryHandler.java Tue Jan 15 18:29:58 2013 @@ -62,7 +62,7 @@ public class DefaultHttpRequestRetryHand /** * Default constructor */ - public DefaultHttpRequestRetryHandler(int retryCount, boolean requestSentRetryEnabled) { + public DefaultHttpRequestRetryHandler(final int retryCount, final boolean requestSentRetryEnabled) { super(); this.retryCount = retryCount; this.requestSentRetryEnabled = requestSentRetryEnabled; @@ -80,7 +80,7 @@ public class DefaultHttpRequestRetryHand */ public boolean retryRequest( final IOException exception, - int executionCount, + final int executionCount, final HttpContext context) { Args.notNull(exception, "Exception parameter"); Args.notNull(context, "HTTP context"); Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultRequestDirector.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultRequestDirector.java?rev=1433569&r1=1433568&r2=1433569&view=diff ============================================================================== --- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultRequestDirector.java (original) +++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultRequestDirector.java Tue Jan 15 18:29:58 2013 @@ -366,8 +366,8 @@ public class DefaultRequestDirector impl // non-javadoc, see interface ClientRequestDirector - public HttpResponse execute(HttpHost target, HttpRequest request, - HttpContext context) + public HttpResponse execute(HttpHost target, final HttpRequest request, + final HttpContext context) throws HttpException, IOException { context.setAttribute(ClientContext.TARGET_AUTH_STATE, targetAuthState); @@ -743,8 +743,8 @@ public class DefaultRequestDirector impl * @throws HttpException in case of a problem */ protected HttpRoute determineRoute(HttpHost target, - HttpRequest request, - HttpContext context) + final HttpRequest request, + final HttpContext context) throws HttpException { if (target == null) { @@ -765,7 +765,7 @@ public class DefaultRequestDirector impl * @throws HttpException in case of a problem * @throws IOException in case of an IO problem */ - protected void establishRoute(HttpRoute route, HttpContext context) + protected void establishRoute(final HttpRoute route, final HttpContext context) throws HttpException, IOException { HttpRouteDirector rowdy = new BasicRouteDirector(); @@ -839,8 +839,8 @@ public class DefaultRequestDirector impl * @throws HttpException in case of a problem * @throws IOException in case of an IO problem */ - protected boolean createTunnelToTarget(HttpRoute route, - HttpContext context) + protected boolean createTunnelToTarget(final HttpRoute route, + final HttpContext context) throws HttpException, IOException { HttpHost proxy = route.getProxyHost(); @@ -941,8 +941,8 @@ public class DefaultRequestDirector impl * @throws HttpException in case of a problem * @throws IOException in case of an IO problem */ - protected boolean createTunnelToProxy(HttpRoute route, int hop, - HttpContext context) + protected boolean createTunnelToProxy(final HttpRoute route, final int hop, + final HttpContext context) throws HttpException, IOException { // Have a look at createTunnelToTarget and replicate the parts @@ -968,8 +968,8 @@ public class DefaultRequestDirector impl * * @return the CONNECT request for tunnelling */ - protected HttpRequest createConnectRequest(HttpRoute route, - HttpContext context) { + protected HttpRequest createConnectRequest(final HttpRoute route, + final HttpContext context) { // see RFC 2817, section 5.2 and // INTERNET-DRAFT: Tunneling TCP based protocols through // Web proxy servers @@ -1011,9 +1011,9 @@ public class DefaultRequestDirector impl * @throws HttpException in case of a problem * @throws IOException in case of an IO problem */ - protected RoutedRequest handleResponse(RoutedRequest roureq, - HttpResponse response, - HttpContext context) + protected RoutedRequest handleResponse(final RoutedRequest roureq, + final HttpResponse response, + final HttpContext context) throws HttpException, IOException { HttpRoute route = roureq.getRoute(); Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultServiceUnavailableRetryStrategy.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultServiceUnavailableRetryStrategy.java?rev=1433569&r1=1433568&r2=1433569&view=diff ============================================================================== --- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultServiceUnavailableRetryStrategy.java (original) +++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultServiceUnavailableRetryStrategy.java Tue Jan 15 18:29:58 2013 @@ -56,7 +56,7 @@ public class DefaultServiceUnavailableRe */ private final long retryInterval; - public DefaultServiceUnavailableRetryStrategy(int maxRetries, int retryInterval) { + public DefaultServiceUnavailableRetryStrategy(final int maxRetries, final int retryInterval) { super(); Args.positive(maxRetries, "Max retries"); Args.positive(retryInterval, "Retry interval"); @@ -68,7 +68,7 @@ public class DefaultServiceUnavailableRe this(1, 1000); } - public boolean retryRequest(final HttpResponse response, int executionCount, final HttpContext context) { + public boolean retryRequest(final HttpResponse response, final int executionCount, final HttpContext context) { return executionCount <= maxRetries && response.getStatusLine().getStatusCode() == HttpStatus.SC_SERVICE_UNAVAILABLE; } Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/HttpClientBuilder.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/HttpClientBuilder.java?rev=1433569&r1=1433568&r2=1433569&view=diff ============================================================================== --- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/HttpClientBuilder.java (original) +++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/HttpClientBuilder.java Tue Jan 15 18:29:58 2013 @@ -216,12 +216,12 @@ public class HttpClientBuilder { return this; } - public final HttpClientBuilder setMaxConnTotal(int maxConnTotal) { + public final HttpClientBuilder setMaxConnTotal(final int maxConnTotal) { this.maxConnTotal = maxConnTotal; return this; } - public final HttpClientBuilder setMaxConnPerRoute(int maxConnPerRoute) { + public final HttpClientBuilder setMaxConnPerRoute(final int maxConnPerRoute) { this.maxConnPerRoute = maxConnPerRoute; return this; }