You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by gg...@apache.org on 2013/01/15 19:30:06 UTC
svn commit: r1433569 [7/12] - in /httpcomponents:
benchmark/httpcore/trunk/src/main/java/org/apache/http/benchmark/
benchmark/httpcore/trunk/src/main/java/org/apache/http/benchmark/httpcore/
benchmark/httpcore/trunk/src/main/java/org/apache/http/benchm...
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/InternalHttpClient.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/InternalHttpClient.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/InternalHttpClient.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/InternalHttpClient.java Tue Jan 15 18:29:58 2013
@@ -214,13 +214,13 @@ class InternalHttpClient extends Closeab
}
public ClientConnectionRequest requestConnection(
- HttpRoute route, Object state) {
+ final HttpRoute route, final Object state) {
throw new UnsupportedOperationException();
}
public void releaseConnection(
- ManagedClientConnection conn,
- long validDuration, TimeUnit timeUnit) {
+ final ManagedClientConnection conn,
+ final long validDuration, final TimeUnit timeUnit) {
throw new UnsupportedOperationException();
}
@@ -228,7 +228,7 @@ class InternalHttpClient extends Closeab
throw new UnsupportedOperationException();
}
- public void closeIdleConnections(long idletime, TimeUnit tunit) {
+ public void closeIdleConnections(final long idletime, final TimeUnit tunit) {
connManager.closeIdleConnections(idletime, tunit);
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/LaxRedirectStrategy.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/LaxRedirectStrategy.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/LaxRedirectStrategy.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/LaxRedirectStrategy.java Tue Jan 15 18:29:58 2013
@@ -53,7 +53,7 @@ public class LaxRedirectStrategy extends
};
@Override
- protected boolean isRedirectable(String method) {
+ protected boolean isRedirectable(final String method) {
for (String m: REDIRECT_METHODS) {
if (m.equalsIgnoreCase(method)) {
return true;
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/MinimalHttpClient.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/MinimalHttpClient.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/MinimalHttpClient.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/MinimalHttpClient.java Tue Jan 15 18:29:58 2013
@@ -125,13 +125,13 @@ class MinimalHttpClient extends Closeabl
}
public ClientConnectionRequest requestConnection(
- HttpRoute route, Object state) {
+ final HttpRoute route, final Object state) {
throw new UnsupportedOperationException();
}
public void releaseConnection(
- ManagedClientConnection conn,
- long validDuration, TimeUnit timeUnit) {
+ final ManagedClientConnection conn,
+ final long validDuration, final TimeUnit timeUnit) {
throw new UnsupportedOperationException();
}
@@ -139,7 +139,7 @@ class MinimalHttpClient extends Closeabl
throw new UnsupportedOperationException();
}
- public void closeIdleConnections(long idletime, TimeUnit tunit) {
+ public void closeIdleConnections(final long idletime, final TimeUnit tunit) {
connManager.closeIdleConnections(idletime, tunit);
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/NullBackoffStrategy.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/NullBackoffStrategy.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/NullBackoffStrategy.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/NullBackoffStrategy.java Tue Jan 15 18:29:58 2013
@@ -37,11 +37,11 @@ import org.apache.http.client.Connection
*/
public class NullBackoffStrategy implements ConnectionBackoffStrategy {
- public boolean shouldBackoff(Throwable t) {
+ public boolean shouldBackoff(final Throwable t) {
return false;
}
- public boolean shouldBackoff(HttpResponse resp) {
+ public boolean shouldBackoff(final HttpResponse resp) {
return false;
}
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/StandardHttpRequestRetryHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/StandardHttpRequestRetryHandler.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/StandardHttpRequestRetryHandler.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/StandardHttpRequestRetryHandler.java Tue Jan 15 18:29:58 2013
@@ -53,7 +53,7 @@ public class StandardHttpRequestRetryHan
/**
* Default constructor
*/
- public StandardHttpRequestRetryHandler(int retryCount, boolean requestSentRetryEnabled) {
+ public StandardHttpRequestRetryHandler(final int retryCount, final boolean requestSentRetryEnabled) {
super(retryCount, requestSentRetryEnabled);
this.idempotentMethods = new ConcurrentHashMap<String, Boolean>();
this.idempotentMethods.put("GET", Boolean.TRUE);
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/AbstractClientConnAdapter.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/AbstractClientConnAdapter.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/AbstractClientConnAdapter.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/AbstractClientConnAdapter.java Tue Jan 15 18:29:58 2013
@@ -98,8 +98,8 @@ public abstract class AbstractClientConn
* @param mgr the connection manager, or <code>null</code>
* @param conn the connection to wrap, or <code>null</code>
*/
- protected AbstractClientConnAdapter(ClientConnectionManager mgr,
- OperatedClientConnection conn) {
+ protected AbstractClientConnAdapter(final ClientConnectionManager mgr,
+ final OperatedClientConnection conn) {
super();
connManager = mgr;
wrappedConnection = conn;
@@ -177,7 +177,7 @@ public abstract class AbstractClientConn
return conn.isStale();
}
- public void setSocketTimeout(int timeout) {
+ public void setSocketTimeout(final int timeout) {
OperatedClientConnection conn = getWrappedConnection();
assertValid(conn);
conn.setSocketTimeout(timeout);
@@ -201,13 +201,13 @@ public abstract class AbstractClientConn
conn.flush();
}
- public boolean isResponseAvailable(int timeout) throws IOException {
+ public boolean isResponseAvailable(final int timeout) throws IOException {
OperatedClientConnection conn = getWrappedConnection();
assertValid(conn);
return conn.isResponseAvailable(timeout);
}
- public void receiveResponseEntity(HttpResponse response)
+ public void receiveResponseEntity(final HttpResponse response)
throws HttpException, IOException {
OperatedClientConnection conn = getWrappedConnection();
assertValid(conn);
@@ -223,7 +223,7 @@ public abstract class AbstractClientConn
return conn.receiveResponseHeader();
}
- public void sendRequestEntity(HttpEntityEnclosingRequest request)
+ public void sendRequestEntity(final HttpEntityEnclosingRequest request)
throws HttpException, IOException {
OperatedClientConnection conn = getWrappedConnection();
assertValid(conn);
@@ -231,7 +231,7 @@ public abstract class AbstractClientConn
conn.sendRequestEntity(request);
}
- public void sendRequestHeader(HttpRequest request)
+ public void sendRequestHeader(final HttpRequest request)
throws HttpException, IOException {
OperatedClientConnection conn = getWrappedConnection();
assertValid(conn);
@@ -269,7 +269,7 @@ public abstract class AbstractClientConn
return conn.isSecure();
}
- public void bind(Socket socket) throws IOException {
+ public void bind(final Socket socket) throws IOException {
throw new UnsupportedOperationException();
}
@@ -309,7 +309,7 @@ public abstract class AbstractClientConn
return markedReusable;
}
- public void setIdleDuration(long duration, TimeUnit unit) {
+ public void setIdleDuration(final long duration, final TimeUnit unit) {
if(duration > 0) {
this.duration = unit.toMillis(duration);
} else {
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/AbstractPoolEntry.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/AbstractPoolEntry.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/AbstractPoolEntry.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/AbstractPoolEntry.java Tue Jan 15 18:29:58 2013
@@ -86,8 +86,8 @@ public abstract class AbstractPoolEntry
* @param route the planned route for the connection,
* or <code>null</code>
*/
- protected AbstractPoolEntry(ClientConnectionOperator connOperator,
- HttpRoute route) {
+ protected AbstractPoolEntry(final ClientConnectionOperator connOperator,
+ final HttpRoute route) {
super();
Args.notNull(connOperator, "Connection operator");
this.connOperator = connOperator;
@@ -123,8 +123,8 @@ public abstract class AbstractPoolEntry
*
* @throws IOException in case of a problem
*/
- public void open(HttpRoute route,
- HttpContext context, HttpParams params)
+ public void open(final HttpRoute route,
+ final HttpContext context, final HttpParams params)
throws IOException {
Args.notNull(route, "Route");
@@ -173,7 +173,7 @@ public abstract class AbstractPoolEntry
*
* @throws IOException in case of a problem
*/
- public void tunnelTarget(boolean secure, HttpParams params)
+ public void tunnelTarget(final boolean secure, final HttpParams params)
throws IOException {
Args.notNull(params, "HTTP parameters");
@@ -201,7 +201,7 @@ public abstract class AbstractPoolEntry
*
* @throws IOException in case of a problem
*/
- public void tunnelProxy(HttpHost next, boolean secure, HttpParams params)
+ public void tunnelProxy(final HttpHost next, final boolean secure, final HttpParams params)
throws IOException {
Args.notNull(next, "Next proxy");
@@ -222,7 +222,7 @@ public abstract class AbstractPoolEntry
*
* @throws IOException in case of a problem
*/
- public void layerProtocol(HttpContext context, HttpParams params)
+ public void layerProtocol(final HttpContext context, final HttpParams params)
throws IOException {
//@@@ is context allowed to be null? depends on operator?
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/AbstractPooledConnAdapter.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/AbstractPooledConnAdapter.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/AbstractPooledConnAdapter.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/AbstractPooledConnAdapter.java Tue Jan 15 18:29:58 2013
@@ -61,8 +61,8 @@ public abstract class AbstractPooledConn
* @param manager the connection manager
* @param entry the pool entry for the connection being wrapped
*/
- protected AbstractPooledConnAdapter(ClientConnectionManager manager,
- AbstractPoolEntry entry) {
+ protected AbstractPooledConnAdapter(final ClientConnectionManager manager,
+ final AbstractPoolEntry entry) {
super(manager, entry.connection);
this.poolEntry = entry;
}
@@ -119,29 +119,29 @@ public abstract class AbstractPooledConn
return (entry.tracker == null) ? null : entry.tracker.toRoute();
}
- public void open(HttpRoute route,
- HttpContext context, HttpParams params)
+ public void open(final HttpRoute route,
+ final HttpContext context, final HttpParams params)
throws IOException {
AbstractPoolEntry entry = getPoolEntry();
assertValid(entry);
entry.open(route, context, params);
}
- public void tunnelTarget(boolean secure, HttpParams params)
+ public void tunnelTarget(final boolean secure, final HttpParams params)
throws IOException {
AbstractPoolEntry entry = getPoolEntry();
assertValid(entry);
entry.tunnelTarget(secure, params);
}
- public void tunnelProxy(HttpHost next, boolean secure, HttpParams params)
+ public void tunnelProxy(final HttpHost next, final boolean secure, final HttpParams params)
throws IOException {
AbstractPoolEntry entry = getPoolEntry();
assertValid(entry);
entry.tunnelProxy(next, secure, params);
}
- public void layerProtocol(HttpContext context, HttpParams params)
+ public void layerProtocol(final HttpContext context, final HttpParams params)
throws IOException {
AbstractPoolEntry entry = getPoolEntry();
assertValid(entry);
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/BasicClientConnectionManager.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/BasicClientConnectionManager.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/BasicClientConnectionManager.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/BasicClientConnectionManager.java Tue Jan 15 18:29:58 2013
@@ -138,7 +138,7 @@ public class BasicClientConnectionManage
}
public ManagedClientConnection getConnection(
- long timeout, TimeUnit tunit) {
+ final long timeout, final TimeUnit tunit) {
return BasicClientConnectionManager.this.getConnection(
route, state);
}
@@ -187,7 +187,7 @@ public class BasicClientConnectionManage
}
}
- public void releaseConnection(final ManagedClientConnection conn, long keepalive, TimeUnit tunit) {
+ public void releaseConnection(final ManagedClientConnection conn, final long keepalive, final TimeUnit tunit) {
Args.check(conn instanceof ManagedClientConnectionImpl, "Connection class mismatch, " +
"connection not obtained from this manager");
ManagedClientConnectionImpl managedConn = (ManagedClientConnectionImpl) conn;
@@ -241,7 +241,7 @@ public class BasicClientConnectionManage
}
}
- public void closeIdleConnections(long idletime, TimeUnit tunit) {
+ public void closeIdleConnections(final long idletime, final TimeUnit tunit) {
Args.notNull(tunit, "Time unit");
synchronized (this) {
assertNotShutdown();
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/BasicHttpClientConnectionManager.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/BasicHttpClientConnectionManager.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/BasicHttpClientConnectionManager.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/BasicHttpClientConnectionManager.java Tue Jan 15 18:29:58 2013
@@ -195,7 +195,7 @@ public class BasicHttpClientConnectionMa
return false;
}
- public HttpClientConnection get(long timeout, TimeUnit tunit) {
+ public HttpClientConnection get(final long timeout, final TimeUnit tunit) {
return BasicHttpClientConnectionManager.this.getConnection(
route, state);
}
@@ -262,7 +262,7 @@ public class BasicHttpClientConnectionMa
public synchronized void releaseConnection(
final HttpClientConnection conn,
final Object state,
- long keepalive, final TimeUnit tunit) {
+ final long keepalive, final TimeUnit tunit) {
Args.notNull(conn, "Connection");
Asserts.check(conn == this.conn, "Connection not obtained from this manager");
if (this.log.isDebugEnabled()) {
@@ -334,7 +334,7 @@ public class BasicHttpClientConnectionMa
}
}
- public synchronized void closeIdleConnections(long idletime, TimeUnit tunit) {
+ public synchronized void closeIdleConnections(final long idletime, final TimeUnit tunit) {
Args.notNull(tunit, "Time unit");
if (this.shutdown) {
return;
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/CPoolEntry.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/CPoolEntry.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/CPoolEntry.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/CPoolEntry.java Tue Jan 15 18:29:58 2013
@@ -56,7 +56,7 @@ class CPoolEntry extends PoolEntry<HttpR
}
@Override
- public boolean isExpired(long now) {
+ public boolean isExpired(final long now) {
boolean expired = super.isExpired(now);
if (expired && this.log.isDebugEnabled()) {
this.log.debug("Connection " + this + " expired @ " + new Date(getExpiry()));
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/DefaultClientConnection.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/DefaultClientConnection.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/DefaultClientConnection.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/DefaultClientConnection.java Tue Jan 15 18:29:58 2013
@@ -114,7 +114,7 @@ public class DefaultClientConnection ext
}
}
- public void opening(Socket sock, HttpHost target) throws IOException {
+ public void opening(final Socket sock, final HttpHost target) throws IOException {
assertNotOpen();
this.socket = sock;
this.targetHost = target;
@@ -127,7 +127,7 @@ public class DefaultClientConnection ext
}
}
- public void openCompleted(boolean secure, HttpParams params) throws IOException {
+ public void openCompleted(final boolean secure, final HttpParams params) throws IOException {
Args.notNull(params, "Parameters");
assertNotOpen();
this.connSecure = secure;
@@ -228,12 +228,12 @@ public class DefaultClientConnection ext
(buffer, null, responseFactory, params);
}
- public void bind(Socket socket) throws IOException {
+ public void bind(final Socket socket) throws IOException {
bind(socket, new BasicHttpParams());
}
- public void update(Socket sock, HttpHost target,
- boolean secure, HttpParams params)
+ public void update(final Socket sock, final HttpHost target,
+ final boolean secure, final HttpParams params)
throws IOException {
assertOpen();
@@ -265,7 +265,7 @@ public class DefaultClientConnection ext
}
@Override
- public void sendRequestHeader(HttpRequest request) throws HttpException, IOException {
+ public void sendRequestHeader(final HttpRequest request) throws HttpException, IOException {
if (log.isDebugEnabled()) {
log.debug("Sending request: " + request.getRequestLine());
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/DefaultClientConnectionFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/DefaultClientConnectionFactory.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/DefaultClientConnectionFactory.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/DefaultClientConnectionFactory.java Tue Jan 15 18:29:58 2013
@@ -58,7 +58,7 @@ public class DefaultClientConnectionFact
private final HttpMessageParserFactory<HttpResponse> responseParserFactory;
public DefaultClientConnectionFactory(
- int bufferSize,
+ final int bufferSize,
final HttpMessageWriterFactory<HttpRequest> requestWriterFactory,
final HttpMessageParserFactory<HttpResponse> responseParserFactory) {
super();
@@ -80,7 +80,7 @@ public class DefaultClientConnectionFact
this(null, responseParserFactory);
}
- public DefaultClientConnectionFactory(int bufferSize) {
+ public DefaultClientConnectionFactory(final int bufferSize) {
this(bufferSize, null, null);
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/DefaultHttpResponseParser.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/DefaultHttpResponseParser.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/DefaultHttpResponseParser.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/DefaultHttpResponseParser.java Tue Jan 15 18:29:58 2013
@@ -162,7 +162,7 @@ public class DefaultHttpResponseParser e
return this.responseFactory.newHttpResponse(statusline, null);
}
- protected boolean reject(CharArrayBuffer line, int count) {
+ protected boolean reject(final CharArrayBuffer line, final int count) {
return false;
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/DefaultHttpRoutePlanner.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/DefaultHttpRoutePlanner.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/DefaultHttpRoutePlanner.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/DefaultHttpRoutePlanner.java Tue Jan 15 18:29:58 2013
@@ -73,14 +73,14 @@ public class DefaultHttpRoutePlanner imp
*
* @param schreg the scheme registry
*/
- public DefaultHttpRoutePlanner(SchemeRegistry schreg) {
+ public DefaultHttpRoutePlanner(final SchemeRegistry schreg) {
Args.notNull(schreg, "Scheme registry");
schemeRegistry = schreg;
}
- public HttpRoute determineRoute(HttpHost target,
- HttpRequest request,
- HttpContext context)
+ public HttpRoute determineRoute(final HttpHost target,
+ final HttpRequest request,
+ final HttpContext context)
throws HttpException {
Args.notNull(request, "HTTP request");
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/HttpPoolEntry.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/HttpPoolEntry.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/HttpPoolEntry.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/HttpPoolEntry.java Tue Jan 15 18:29:58 2013
@@ -59,7 +59,7 @@ class HttpPoolEntry extends PoolEntry<Ht
}
@Override
- public boolean isExpired(long now) {
+ public boolean isExpired(final long now) {
boolean expired = super.isExpired(now);
if (expired && this.log.isDebugEnabled()) {
this.log.debug("Connection " + this + " expired @ " + new Date(getExpiry()));
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/IdleConnectionHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/IdleConnectionHandler.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/IdleConnectionHandler.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/IdleConnectionHandler.java Tue Jan 15 18:29:58 2013
@@ -70,7 +70,7 @@ public class IdleConnectionHandler {
*
* @see #remove
*/
- public void add(HttpConnection connection, long validDuration, TimeUnit unit) {
+ public void add(final HttpConnection connection, final long validDuration, final TimeUnit unit) {
long timeAdded = System.currentTimeMillis();
@@ -89,7 +89,7 @@ public class IdleConnectionHandler {
* @param connection
* @return True if the connection is still valid.
*/
- public boolean remove(HttpConnection connection) {
+ public boolean remove(final HttpConnection connection) {
TimeValues times = connectionToTimes.remove(connection);
if(times == null) {
log.warn("Removing a connection that never existed!");
@@ -111,7 +111,7 @@ public class IdleConnectionHandler {
*
* @param idleTime the minimum idle time, in milliseconds, for connections to be closed
*/
- public void closeIdleConnections(long idleTime) {
+ public void closeIdleConnections(final long idleTime) {
// the latest time for which connections will be closed
long idleTimeout = System.currentTimeMillis() - idleTime;
@@ -169,7 +169,7 @@ public class IdleConnectionHandler {
* @param validDuration The duration this connection is valid for
* @param validUnit The unit of time the duration is specified in.
*/
- TimeValues(long now, long validDuration, TimeUnit validUnit) {
+ TimeValues(final long now, final long validDuration, final TimeUnit validUnit) {
this.timeAdded = now;
if(validDuration > 0) {
this.timeExpires = now + validUnit.toMillis(validDuration);
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/InMemoryDnsResolver.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/InMemoryDnsResolver.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/InMemoryDnsResolver.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/InMemoryDnsResolver.java Tue Jan 15 18:29:58 2013
@@ -80,7 +80,7 @@ public class InMemoryDnsResolver impleme
/**
* {@inheritDoc}
*/
- public InetAddress[] resolve(String host) throws UnknownHostException {
+ public InetAddress[] resolve(final String host) throws UnknownHostException {
InetAddress[] resolvedAddresses = dnsMap.get(host);
if (log.isInfoEnabled()) {
log.info("Resolving " + host + " to " + Arrays.deepToString(resolvedAddresses));
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/LoggingInputStream.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/LoggingInputStream.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/LoggingInputStream.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/LoggingInputStream.java Tue Jan 15 18:29:58 2013
@@ -54,7 +54,7 @@ public class LoggingInputStream extends
}
@Override
- public int read(byte[] b) throws IOException {
+ public int read(final byte[] b) throws IOException {
int bytesRead = in.read(b);
if (bytesRead != -1) {
wire.input(b, 0, bytesRead);
@@ -63,7 +63,7 @@ public class LoggingInputStream extends
}
@Override
- public int read(byte[] b, int off, int len) throws IOException {
+ public int read(final byte[] b, final int off, final int len) throws IOException {
int bytesRead = in.read(b, off, len);
if (bytesRead != -1) {
wire.input(b, off, bytesRead);
@@ -72,7 +72,7 @@ public class LoggingInputStream extends
}
@Override
- public long skip(long n) throws IOException {
+ public long skip(final long n) throws IOException {
return super.skip(n);
}
@@ -82,7 +82,7 @@ public class LoggingInputStream extends
}
@Override
- public synchronized void mark(int readlimit) {
+ public synchronized void mark(final int readlimit) {
super.mark(readlimit);
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/LoggingOutputStream.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/LoggingOutputStream.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/LoggingOutputStream.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/LoggingOutputStream.java Tue Jan 15 18:29:58 2013
@@ -45,18 +45,18 @@ public class LoggingOutputStream extends
}
@Override
- public void write(int b) throws IOException {
+ public void write(final int b) throws IOException {
wire.output(b);
}
@Override
- public void write(byte[] b) throws IOException {
+ public void write(final byte[] b) throws IOException {
wire.output(b);
out.write(b);
}
@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 {
wire.output(b, off, len);
out.write(b, off, len);
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/LoggingSessionInputBuffer.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/LoggingSessionInputBuffer.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/LoggingSessionInputBuffer.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/LoggingSessionInputBuffer.java Tue Jan 15 18:29:58 2013
@@ -75,11 +75,11 @@ public class LoggingSessionInputBuffer i
this(in, wire, null);
}
- public boolean isDataAvailable(int timeout) throws IOException {
+ public boolean isDataAvailable(final int timeout) throws IOException {
return this.in.isDataAvailable(timeout);
}
- public int read(byte[] b, int off, int len) throws IOException {
+ public int read(final byte[] b, final int off, final int len) throws IOException {
int l = this.in.read(b, off, len);
if (this.wire.enabled() && l > 0) {
this.wire.input(b, off, l);
@@ -95,7 +95,7 @@ public class LoggingSessionInputBuffer i
return l;
}
- public int read(byte[] b) throws IOException {
+ public int read(final byte[] b) throws IOException {
int l = this.in.read(b);
if (this.wire.enabled() && l > 0) {
this.wire.input(b, 0, l);
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/LoggingSessionOutputBuffer.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/LoggingSessionOutputBuffer.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/LoggingSessionOutputBuffer.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/LoggingSessionOutputBuffer.java Tue Jan 15 18:29:58 2013
@@ -69,21 +69,21 @@ public class LoggingSessionOutputBuffer
this(out, wire, null);
}
- 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 {
this.out.write(b, off, len);
if (this.wire.enabled()) {
this.wire.output(b, off, len);
}
}
- public void write(int b) throws IOException {
+ public void write(final int b) throws IOException {
this.out.write(b);
if (this.wire.enabled()) {
this.wire.output(b);
}
}
- public void write(byte[] b) throws IOException {
+ public void write(final byte[] b) throws IOException {
this.out.write(b);
if (this.wire.enabled()) {
this.wire.output(b);
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/ManagedClientConnectionImpl.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/ManagedClientConnectionImpl.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/ManagedClientConnectionImpl.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/ManagedClientConnectionImpl.java Tue Jan 15 18:29:58 2013
@@ -157,7 +157,7 @@ class ManagedClientConnectionImpl implem
}
}
- public void setSocketTimeout(int timeout) {
+ public void setSocketTimeout(final int timeout) {
OperatedClientConnection conn = ensureConnection();
conn.setSocketTimeout(timeout);
}
@@ -177,7 +177,7 @@ class ManagedClientConnectionImpl implem
conn.flush();
}
- public boolean isResponseAvailable(int timeout) throws IOException {
+ public boolean isResponseAvailable(final int timeout) throws IOException {
OperatedClientConnection conn = ensureConnection();
return conn.isResponseAvailable(timeout);
}
@@ -230,7 +230,7 @@ class ManagedClientConnectionImpl implem
return conn.isSecure();
}
- public void bind(Socket socket) throws IOException {
+ public void bind(final Socket socket) throws IOException {
throw new UnsupportedOperationException();
}
@@ -317,7 +317,7 @@ class ManagedClientConnectionImpl implem
}
public void tunnelTarget(
- boolean secure, final HttpParams params) throws IOException {
+ final boolean secure, final HttpParams params) throws IOException {
Args.notNull(params, "HTTP parameters");
HttpHost target;
OperatedClientConnection conn;
@@ -345,7 +345,7 @@ class ManagedClientConnectionImpl implem
}
public void tunnelProxy(
- final HttpHost next, boolean secure, final HttpParams params) throws IOException {
+ final HttpHost next, final boolean secure, final HttpParams params) throws IOException {
Args.notNull(next, "Next proxy");
Args.notNull(params, "HTTP parameters");
OperatedClientConnection conn;
@@ -420,7 +420,7 @@ class ManagedClientConnectionImpl implem
return this.reusable;
}
- public void setIdleDuration(long duration, TimeUnit unit) {
+ public void setIdleDuration(final long duration, final TimeUnit unit) {
if(duration > 0) {
this.duration = unit.toMillis(duration);
} else {
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/PoolingClientConnectionManager.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/PoolingClientConnectionManager.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/PoolingClientConnectionManager.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/PoolingClientConnectionManager.java Tue Jan 15 18:29:58 2013
@@ -135,7 +135,7 @@ public class PoolingClientConnectionMana
*
* @return the connection operator to use
*/
- protected ClientConnectionOperator createConnectionOperator(SchemeRegistry schreg) {
+ protected ClientConnectionOperator createConnectionOperator(final SchemeRegistry schreg) {
return new DefaultClientConnectionOperator(schreg, this.dnsResolver);
}
@@ -282,7 +282,7 @@ public class PoolingClientConnectionMana
this.log.debug("Connection manager shut down");
}
- public void closeIdleConnections(long idleTimeout, TimeUnit tunit) {
+ public void closeIdleConnections(final long idleTimeout, final TimeUnit tunit) {
if (this.log.isDebugEnabled()) {
this.log.debug("Closing connections idle longer than " + idleTimeout + " " + tunit);
}
@@ -298,7 +298,7 @@ public class PoolingClientConnectionMana
return this.pool.getMaxTotal();
}
- public void setMaxTotal(int max) {
+ public void setMaxTotal(final int max) {
this.pool.setMaxTotal(max);
}
@@ -306,7 +306,7 @@ public class PoolingClientConnectionMana
return this.pool.getDefaultMaxPerRoute();
}
- public void setDefaultMaxPerRoute(int max) {
+ public void setDefaultMaxPerRoute(final int max) {
this.pool.setDefaultMaxPerRoute(max);
}
@@ -314,7 +314,7 @@ public class PoolingClientConnectionMana
return this.pool.getMaxPerRoute(route);
}
- public void setMaxPerRoute(final HttpRoute route, int max) {
+ public void setMaxPerRoute(final HttpRoute route, final int max) {
this.pool.setMaxPerRoute(route, max);
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/PoolingHttpClientConnectionManager.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/PoolingHttpClientConnectionManager.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/PoolingHttpClientConnectionManager.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/PoolingHttpClientConnectionManager.java Tue Jan 15 18:29:58 2013
@@ -341,7 +341,7 @@ public class PoolingHttpClientConnection
this.log.debug("Connection manager shut down");
}
- public void closeIdleConnections(long idleTimeout, TimeUnit tunit) {
+ public void closeIdleConnections(final long idleTimeout, final TimeUnit tunit) {
if (this.log.isDebugEnabled()) {
this.log.debug("Closing connections idle longer than " + idleTimeout + " " + tunit);
}
@@ -357,7 +357,7 @@ public class PoolingHttpClientConnection
return this.pool.getMaxTotal();
}
- public void setMaxTotal(int max) {
+ public void setMaxTotal(final int max) {
this.pool.setMaxTotal(max);
}
@@ -365,7 +365,7 @@ public class PoolingHttpClientConnection
return this.pool.getDefaultMaxPerRoute();
}
- public void setDefaultMaxPerRoute(int max) {
+ public void setDefaultMaxPerRoute(final int max) {
this.pool.setDefaultMaxPerRoute(max);
}
@@ -373,7 +373,7 @@ public class PoolingHttpClientConnection
return this.pool.getMaxPerRoute(route);
}
- public void setMaxPerRoute(final HttpRoute route, int max) {
+ public void setMaxPerRoute(final HttpRoute route, final int max) {
this.pool.setMaxPerRoute(route, max);
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/ProxySelectorRoutePlanner.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/ProxySelectorRoutePlanner.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/ProxySelectorRoutePlanner.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/ProxySelectorRoutePlanner.java Tue Jan 15 18:29:58 2013
@@ -88,8 +88,8 @@ public class ProxySelectorRoutePlanner i
* @param prosel the proxy selector, or
* <code>null</code> for the system default
*/
- public ProxySelectorRoutePlanner(SchemeRegistry schreg,
- ProxySelector prosel) {
+ public ProxySelectorRoutePlanner(final SchemeRegistry schreg,
+ final ProxySelector prosel) {
Args.notNull(schreg, "SchemeRegistry");
schemeRegistry = schreg;
proxySelector = prosel;
@@ -110,13 +110,13 @@ public class ProxySelectorRoutePlanner i
* @param prosel the proxy selector, or
* <code>null</code> to use the system default
*/
- public void setProxySelector(ProxySelector prosel) {
+ public void setProxySelector(final ProxySelector prosel) {
this.proxySelector = prosel;
}
- public HttpRoute determineRoute(HttpHost target,
- HttpRequest request,
- HttpContext context)
+ public HttpRoute determineRoute(final HttpHost target,
+ final HttpRequest request,
+ final HttpContext context)
throws HttpException {
Args.notNull(request, "HTTP request");
@@ -163,9 +163,9 @@ public class ProxySelectorRoutePlanner i
* @throws HttpException
* in case of system proxy settings that cannot be handled
*/
- protected HttpHost determineProxy(HttpHost target,
- HttpRequest request,
- HttpContext context)
+ protected HttpHost determineProxy(final HttpHost target,
+ final HttpRequest request,
+ final HttpContext context)
throws HttpException {
// the proxy selector can be 'unset', so we better deal with null here
@@ -213,7 +213,7 @@ public class ProxySelectorRoutePlanner i
* <br/>
* (TODO: determine format for IPv6 addresses, with or without [brackets])
*/
- protected String getHost(InetSocketAddress isa) {
+ protected String getHost(final InetSocketAddress isa) {
//@@@ Will this work with literal IPv6 addresses, or do we
//@@@ need to wrap these in [] for the string representation?
@@ -239,10 +239,10 @@ public class ProxySelectorRoutePlanner i
*
* @return a proxy type
*/
- protected Proxy chooseProxy(List<Proxy> proxies,
- HttpHost target,
- HttpRequest request,
- HttpContext context) {
+ protected Proxy chooseProxy(final List<Proxy> proxies,
+ final HttpHost target,
+ final HttpRequest request,
+ final HttpContext context) {
Args.notEmpty(proxies, "List of proxies");
Proxy result = null;
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/SingleClientConnManager.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/SingleClientConnManager.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/SingleClientConnManager.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/SingleClientConnManager.java Tue Jan 15 18:29:58 2013
@@ -109,8 +109,8 @@ public class SingleClientConnManager imp
* @deprecated (4.1) use {@link SingleClientConnManager#SingleClientConnManager(SchemeRegistry)}
*/
@Deprecated
- public SingleClientConnManager(HttpParams params,
- SchemeRegistry schreg) {
+ public SingleClientConnManager(final HttpParams params,
+ final SchemeRegistry schreg) {
this(schreg);
}
/**
@@ -162,7 +162,7 @@ public class SingleClientConnManager imp
* @return the connection operator to use
*/
protected ClientConnectionOperator
- createConnectionOperator(SchemeRegistry schreg) {
+ createConnectionOperator(final SchemeRegistry schreg) {
return new DefaultClientConnectionOperator(schreg);
}
@@ -186,7 +186,7 @@ public class SingleClientConnManager imp
}
public ManagedClientConnection getConnection(
- long timeout, TimeUnit tunit) {
+ final long timeout, final TimeUnit tunit) {
return SingleClientConnManager.this.getConnection(
route, state);
}
@@ -202,7 +202,7 @@ public class SingleClientConnManager imp
* @return a connection that can be used to communicate
* along the given route
*/
- public ManagedClientConnection getConnection(HttpRoute route, Object state) {
+ public ManagedClientConnection getConnection(final HttpRoute route, final Object state) {
Args.notNull(route, "Route");
assertStillUp();
@@ -254,8 +254,8 @@ public class SingleClientConnManager imp
}
public void releaseConnection(
- ManagedClientConnection conn,
- long validDuration, TimeUnit timeUnit) {
+ final ManagedClientConnection conn,
+ final long validDuration, final TimeUnit timeUnit) {
Args.check(conn instanceof ConnAdapter, "Connection class mismatch, " +
"connection not obtained from this manager");
assertStillUp();
@@ -314,7 +314,7 @@ public class SingleClientConnManager imp
}
}
- public void closeIdleConnections(long idletime, TimeUnit tunit) {
+ public void closeIdleConnections(final long idletime, final TimeUnit tunit) {
assertStillUp();
// idletime can be 0 or negative, no problem there
@@ -416,7 +416,7 @@ public class SingleClientConnManager imp
* @param entry the pool entry for the connection being wrapped
* @param route the planned route for this connection
*/
- protected ConnAdapter(PoolEntry entry, HttpRoute route) {
+ protected ConnAdapter(final PoolEntry entry, final HttpRoute route) {
super(SingleClientConnManager.this, entry);
markReusable();
entry.route = route;
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/SocketClientConnectionImpl.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/SocketClientConnectionImpl.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/SocketClientConnectionImpl.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/SocketClientConnectionImpl.java Tue Jan 15 18:29:58 2013
@@ -68,7 +68,7 @@ class SocketClientConnectionImpl extends
private volatile boolean shutdown;
public SocketClientConnectionImpl(
- int buffersize,
+ final int buffersize,
final CharsetDecoder chardecoder,
final CharsetEncoder charencoder,
final MessageConstraints constraints,
@@ -86,7 +86,7 @@ class SocketClientConnectionImpl extends
this.attributes = new ConcurrentHashMap<String, Object>();
}
- public SocketClientConnectionImpl(int buffersize) {
+ public SocketClientConnectionImpl(final int buffersize) {
this(buffersize, null, null, null, null, null, null, null);
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/SystemDefaultDnsResolver.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/SystemDefaultDnsResolver.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/SystemDefaultDnsResolver.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/SystemDefaultDnsResolver.java Tue Jan 15 18:29:58 2013
@@ -43,7 +43,7 @@ public class SystemDefaultDnsResolver im
/**
* {@inheritDoc}
*/
- public InetAddress[] resolve(String host) throws UnknownHostException {
+ public InetAddress[] resolve(final String host) throws UnknownHostException {
return InetAddress.getAllByName(host);
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/SystemDefaultRoutePlanner.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/SystemDefaultRoutePlanner.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/SystemDefaultRoutePlanner.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/SystemDefaultRoutePlanner.java Tue Jan 15 18:29:58 2013
@@ -92,7 +92,7 @@ public class SystemDefaultRoutePlanner e
return result;
}
- private String getHost(InetSocketAddress isa) {
+ private String getHost(final InetSocketAddress isa) {
//@@@ Will this work with literal IPv6 addresses, or do we
//@@@ need to wrap these in [] for the string representation?
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/Wire.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/Wire.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/Wire.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/Wire.java Tue Jan 15 18:29:58 2013
@@ -49,16 +49,16 @@ public class Wire {
/**
* @since 4.3
*/
- public Wire(Log log, String id) {
+ public Wire(final Log log, final String id) {
this.log = log;
this.id = id;
}
- public Wire(Log log) {
+ public Wire(final Log log) {
this(log, "");
}
- private void wire(String header, InputStream instream)
+ private void wire(final String header, final InputStream instream)
throws IOException {
StringBuilder buffer = new StringBuilder();
int ch;
@@ -92,48 +92,48 @@ public class Wire {
return log.isDebugEnabled();
}
- public void output(InputStream outstream)
+ public void output(final InputStream outstream)
throws IOException {
Args.notNull(outstream, "Output");
wire(">> ", outstream);
}
- public void input(InputStream instream)
+ public void input(final InputStream instream)
throws IOException {
Args.notNull(instream, "Input");
wire("<< ", instream);
}
- public void output(byte[] b, int off, int len)
+ public void output(final byte[] b, final int off, final int len)
throws IOException {
Args.notNull(b, "Output");
wire(">> ", new ByteArrayInputStream(b, off, len));
}
- public void input(byte[] b, int off, int len)
+ public void input(final byte[] b, final int off, final int len)
throws IOException {
Args.notNull(b, "Input");
wire("<< ", new ByteArrayInputStream(b, off, len));
}
- public void output(byte[] b)
+ public void output(final byte[] b)
throws IOException {
Args.notNull(b, "Output");
wire(">> ", new ByteArrayInputStream(b));
}
- public void input(byte[] b)
+ public void input(final byte[] b)
throws IOException {
Args.notNull(b, "Input");
wire("<< ", new ByteArrayInputStream(b));
}
- public void output(int b)
+ public void output(final int b)
throws IOException {
output(new byte[] {(byte) b});
}
- public void input(int b)
+ public void input(final int b)
throws IOException {
input(new byte[] {(byte) b});
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/AbstractConnPool.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/AbstractConnPool.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/AbstractConnPool.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/AbstractConnPool.java Tue Jan 15 18:29:58 2013
@@ -115,10 +115,10 @@ public abstract class AbstractConnPool {
*/
public final
BasicPoolEntry getEntry(
- HttpRoute route,
- Object state,
- long timeout,
- TimeUnit tunit)
+ final HttpRoute route,
+ final Object state,
+ final long timeout,
+ final TimeUnit tunit)
throws ConnectionPoolTimeoutException, InterruptedException {
return requestPoolEntry(route, state).getPoolEntry(timeout, tunit);
}
@@ -145,7 +145,7 @@ public abstract class AbstractConnPool {
public abstract void freeEntry(BasicPoolEntry entry, boolean reusable, long validDuration, TimeUnit timeUnit)
;
- public void handleReference(Reference<?> ref) {
+ public void handleReference(final Reference<?> ref) {
}
protected abstract void handleLostEntry(HttpRoute route);
@@ -157,7 +157,7 @@ public abstract class AbstractConnPool {
* in order to be closed now
* @param tunit the unit for the <code>idletime</code>
*/
- public void closeIdleConnections(long idletime, TimeUnit tunit) {
+ public void closeIdleConnections(final long idletime, final TimeUnit tunit) {
// idletime can be 0 or negative, no problem there
Args.notNull(tunit, "Time unit");
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/BasicPoolEntry.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/BasicPoolEntry.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/BasicPoolEntry.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/BasicPoolEntry.java Tue Jan 15 18:29:58 2013
@@ -51,9 +51,9 @@ public class BasicPoolEntry extends Abst
private long validUntil;
private long expiry;
- public BasicPoolEntry(ClientConnectionOperator op,
- HttpRoute route,
- ReferenceQueue<Object> queue) {
+ public BasicPoolEntry(final ClientConnectionOperator op,
+ final HttpRoute route,
+ final ReferenceQueue<Object> queue) {
super(op, route);
Args.notNull(route, "HTTP route");
this.created = System.currentTimeMillis();
@@ -67,8 +67,8 @@ public class BasicPoolEntry extends Abst
* @param op the connection operator
* @param route the planned route for the connection
*/
- public BasicPoolEntry(ClientConnectionOperator op,
- HttpRoute route) {
+ public BasicPoolEntry(final ClientConnectionOperator op,
+ final HttpRoute route) {
this(op, route, -1, TimeUnit.MILLISECONDS);
}
@@ -82,8 +82,8 @@ public class BasicPoolEntry extends Abst
*
* @since 4.1
*/
- public BasicPoolEntry(ClientConnectionOperator op,
- HttpRoute route, long connTTL, TimeUnit timeunit) {
+ public BasicPoolEntry(final ClientConnectionOperator op,
+ final HttpRoute route, final long connTTL, final TimeUnit timeunit) {
super(op, route);
Args.notNull(route, "HTTP route");
this.created = System.currentTimeMillis();
@@ -140,7 +140,7 @@ public class BasicPoolEntry extends Abst
/**
* @since 4.1
*/
- public void updateExpiry(long time, TimeUnit timeunit) {
+ public void updateExpiry(final long time, final TimeUnit timeunit) {
this.updated = System.currentTimeMillis();
long newExpiry;
if (time > 0) {
@@ -154,7 +154,7 @@ public class BasicPoolEntry extends Abst
/**
* @since 4.1
*/
- public boolean isExpired(long now) {
+ public boolean isExpired(final long now) {
return now >= this.expiry;
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/BasicPoolEntryRef.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/BasicPoolEntryRef.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/BasicPoolEntryRef.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/BasicPoolEntryRef.java Tue Jan 15 18:29:58 2013
@@ -54,8 +54,8 @@ public class BasicPoolEntryRef extends W
* @param entry the pool entry, must not be <code>null</code>
* @param queue the reference queue, or <code>null</code>
*/
- public BasicPoolEntryRef(BasicPoolEntry entry,
- ReferenceQueue<Object> queue) {
+ public BasicPoolEntryRef(final BasicPoolEntry entry,
+ final ReferenceQueue<Object> queue) {
super(entry, queue);
Args.notNull(entry, "Pool entry");
route = entry.getPlannedRoute();
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/BasicPooledConnAdapter.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/BasicPooledConnAdapter.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/BasicPooledConnAdapter.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/BasicPooledConnAdapter.java Tue Jan 15 18:29:58 2013
@@ -48,8 +48,8 @@ public class BasicPooledConnAdapter exte
* @param tsccm the connection manager
* @param entry the pool entry for the connection being wrapped
*/
- protected BasicPooledConnAdapter(ThreadSafeClientConnManager tsccm,
- AbstractPoolEntry entry) {
+ protected BasicPooledConnAdapter(final ThreadSafeClientConnManager tsccm,
+ final AbstractPoolEntry entry) {
super(tsccm, entry);
markReusable();
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/ConnPoolByRoute.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/ConnPoolByRoute.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/ConnPoolByRoute.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/ConnPoolByRoute.java Tue Jan 15 18:29:58 2013
@@ -110,7 +110,7 @@ public class ConnPoolByRoute extends Abs
public ConnPoolByRoute(
final ClientConnectionOperator operator,
final ConnPerRoute connPerRoute,
- int maxTotalConnections) {
+ final int maxTotalConnections) {
this(operator, connPerRoute, maxTotalConnections, -1, TimeUnit.MILLISECONDS);
}
@@ -120,8 +120,8 @@ public class ConnPoolByRoute extends Abs
public ConnPoolByRoute(
final ClientConnectionOperator operator,
final ConnPerRoute connPerRoute,
- int maxTotalConnections,
- long connTTL,
+ final int maxTotalConnections,
+ final long connTTL,
final TimeUnit connTTLTimeUnit) {
super();
Args.notNull(operator, "Connection operator");
@@ -193,7 +193,7 @@ public class ConnPoolByRoute extends Abs
*
* @return the new pool
*/
- protected RouteSpecificPool newRouteSpecificPool(HttpRoute route) {
+ protected RouteSpecificPool newRouteSpecificPool(final HttpRoute route) {
return new RouteSpecificPool(route, this.connPerRoute);
}
@@ -207,8 +207,8 @@ public class ConnPoolByRoute extends Abs
*
* @return a waiting thread representation
*/
- protected WaitingThread newWaitingThread(Condition cond,
- RouteSpecificPool rospl) {
+ protected WaitingThread newWaitingThread(final Condition cond,
+ final RouteSpecificPool rospl) {
return new WaitingThread(cond, rospl);
}
@@ -232,8 +232,8 @@ public class ConnPoolByRoute extends Abs
* @return the pool for the argument route,
* never <code>null</code> if <code>create</code> is <code>true</code>
*/
- protected RouteSpecificPool getRoutePool(HttpRoute route,
- boolean create) {
+ protected RouteSpecificPool getRoutePool(final HttpRoute route,
+ final boolean create) {
RouteSpecificPool rospl = null;
poolLock.lock();
try {
@@ -252,7 +252,7 @@ public class ConnPoolByRoute extends Abs
return rospl;
}
- public int getConnectionsInPool(HttpRoute route) {
+ public int getConnectionsInPool(final HttpRoute route) {
poolLock.lock();
try {
// don't allow a pool to be created here!
@@ -292,8 +292,8 @@ public class ConnPoolByRoute extends Abs
}
public BasicPoolEntry getPoolEntry(
- long timeout,
- TimeUnit tunit)
+ final long timeout,
+ final TimeUnit tunit)
throws InterruptedException, ConnectionPoolTimeoutException {
return getEntryBlocking(route, state, timeout, tunit, aborter);
}
@@ -320,9 +320,9 @@ public class ConnPoolByRoute extends Abs
* if the calling thread was interrupted
*/
protected BasicPoolEntry getEntryBlocking(
- HttpRoute route, Object state,
- long timeout, TimeUnit tunit,
- WaitingThreadAborter aborter)
+ final HttpRoute route, final Object state,
+ final long timeout, final TimeUnit tunit,
+ final WaitingThreadAborter aborter)
throws ConnectionPoolTimeoutException, InterruptedException {
Date deadline = null;
@@ -422,7 +422,7 @@ public class ConnPoolByRoute extends Abs
}
@Override
- public void freeEntry(BasicPoolEntry entry, boolean reusable, long validDuration, TimeUnit timeUnit) {
+ public void freeEntry(final BasicPoolEntry entry, final boolean reusable, final long validDuration, final TimeUnit timeUnit) {
HttpRoute route = entry.getPlannedRoute();
if (log.isDebugEnabled()) {
@@ -479,7 +479,7 @@ public class ConnPoolByRoute extends Abs
* @return an available pool entry for the given route, or
* <code>null</code> if none is available
*/
- protected BasicPoolEntry getFreeEntry(RouteSpecificPool rospl, Object state) {
+ protected BasicPoolEntry getFreeEntry(final RouteSpecificPool rospl, final Object state) {
BasicPoolEntry entry = null;
poolLock.lock();
@@ -539,8 +539,8 @@ public class ConnPoolByRoute extends Abs
*
* @return the new pool entry for a new connection
*/
- protected BasicPoolEntry createEntry(RouteSpecificPool rospl,
- ClientConnectionOperator op) {
+ protected BasicPoolEntry createEntry(final RouteSpecificPool rospl,
+ final ClientConnectionOperator op) {
if (log.isDebugEnabled()) {
log.debug("Creating new connection [" + rospl.getRoute() + "]");
@@ -573,7 +573,7 @@ public class ConnPoolByRoute extends Abs
*
* @param entry the pool entry for the connection to delete
*/
- protected void deleteEntry(BasicPoolEntry entry) {
+ protected void deleteEntry(final BasicPoolEntry entry) {
HttpRoute route = entry.getPlannedRoute();
@@ -622,7 +622,7 @@ public class ConnPoolByRoute extends Abs
}
@Override
- protected void handleLostEntry(HttpRoute route) {
+ protected void handleLostEntry(final HttpRoute route) {
poolLock.lock();
try {
@@ -649,7 +649,7 @@ public class ConnPoolByRoute extends Abs
*
* @param rospl the pool in which to notify, or <code>null</code>
*/
- protected void notifyWaitingThread(RouteSpecificPool rospl) {
+ protected void notifyWaitingThread(final RouteSpecificPool rospl) {
//@@@ while this strategy provides for best connection re-use,
//@@@ is it fair? only do this if the connection is open?
@@ -711,7 +711,7 @@ public class ConnPoolByRoute extends Abs
* @param tunit the unit for the <code>idletime</code>
*/
@Override
- public void closeIdleConnections(long idletime, TimeUnit tunit) {
+ public void closeIdleConnections(long idletime, final TimeUnit tunit) {
Args.notNull(tunit, "Time unit");
if (idletime < 0) {
idletime = 0;
@@ -810,7 +810,7 @@ public class ConnPoolByRoute extends Abs
/**
* since 4.1
*/
- public void setMaxTotalConnections(int max) {
+ public void setMaxTotalConnections(final int max) {
poolLock.lock();
try {
maxTotalConnections = max;
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/RouteSpecificPool.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/RouteSpecificPool.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/RouteSpecificPool.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/RouteSpecificPool.java Tue Jan 15 18:29:58 2013
@@ -80,11 +80,11 @@ public class RouteSpecificPool {
* @deprecated (4.1) use {@link RouteSpecificPool#RouteSpecificPool(HttpRoute, ConnPerRoute)}
*/
@Deprecated
- public RouteSpecificPool(HttpRoute route, int maxEntries) {
+ public RouteSpecificPool(final HttpRoute route, final int maxEntries) {
this.route = route;
this.maxEntries = maxEntries;
this.connPerRoute = new ConnPerRoute() {
- public int getMaxForRoute(HttpRoute route) {
+ public int getMaxForRoute(final HttpRoute route) {
return RouteSpecificPool.this.maxEntries;
}
};
@@ -100,7 +100,7 @@ public class RouteSpecificPool {
* @param route the route for which to pool
* @param connPerRoute the connections per route configuration
*/
- public RouteSpecificPool(HttpRoute route, ConnPerRoute connPerRoute) {
+ public RouteSpecificPool(final HttpRoute route, final ConnPerRoute connPerRoute) {
this.route = route;
this.connPerRoute = connPerRoute;
this.maxEntries = connPerRoute.getMaxForRoute(route);
@@ -202,7 +202,7 @@ public class RouteSpecificPool {
* @param entry the entry obtained from {@link #allocEntry allocEntry}
* or presented to {@link #createdEntry createdEntry}
*/
- public void freeEntry(BasicPoolEntry entry) {
+ public void freeEntry(final BasicPoolEntry entry) {
if (numEntries < 1) {
throw new IllegalStateException
("No entry created for this pool. " + route);
@@ -223,7 +223,7 @@ public class RouteSpecificPool {
*
* @param entry the entry that was created for this pool
*/
- public void createdEntry(BasicPoolEntry entry) {
+ public void createdEntry(final BasicPoolEntry entry) {
Args.check(route.equals(entry.getPlannedRoute()), "Entry not planned for this pool");
numEntries++;
}
@@ -239,7 +239,7 @@ public class RouteSpecificPool {
* @return <code>true</code> if the entry was found and deleted, or
* <code>false</code> if the entry was not found
*/
- public boolean deleteEntry(BasicPoolEntry entry) {
+ public boolean deleteEntry(final BasicPoolEntry entry) {
final boolean found = freeEntries.remove(entry);
if (found) {
@@ -269,7 +269,7 @@ public class RouteSpecificPool {
*
* @param wt the waiting thread
*/
- public void queueThread(WaitingThread wt) {
+ public void queueThread(final WaitingThread wt) {
Args.notNull(wt, "Waiting thread");
this.waitingThreads.add(wt);
}
@@ -301,7 +301,7 @@ public class RouteSpecificPool {
*
* @param wt the waiting thread
*/
- public void removeThread(WaitingThread wt) {
+ public void removeThread(final WaitingThread wt) {
if (wt == null) {
return;
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/ThreadSafeClientConnManager.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/ThreadSafeClientConnManager.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/ThreadSafeClientConnManager.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/ThreadSafeClientConnManager.java Tue Jan 15 18:29:58 2013
@@ -113,7 +113,7 @@ public class ThreadSafeClientConnManager
* @since 4.1
*/
public ThreadSafeClientConnManager(final SchemeRegistry schreg,
- long connTTL, TimeUnit connTTLTimeUnit) {
+ final long connTTL, final TimeUnit connTTLTimeUnit) {
this(schreg, connTTL, connTTLTimeUnit, new ConnPerRouteBean());
}
@@ -130,7 +130,7 @@ public class ThreadSafeClientConnManager
* @since 4.2
*/
public ThreadSafeClientConnManager(final SchemeRegistry schreg,
- long connTTL, TimeUnit connTTLTimeUnit, ConnPerRouteBean connPerRoute) {
+ final long connTTL, final TimeUnit connTTLTimeUnit, final ConnPerRouteBean connPerRoute) {
super();
Args.notNull(schreg, "Scheme registry");
this.log = LogFactory.getLog(getClass());
@@ -150,8 +150,8 @@ public class ThreadSafeClientConnManager
* @deprecated (4.1) use {@link ThreadSafeClientConnManager#ThreadSafeClientConnManager(SchemeRegistry)}
*/
@Deprecated
- public ThreadSafeClientConnManager(HttpParams params,
- SchemeRegistry schreg) {
+ public ThreadSafeClientConnManager(final HttpParams params,
+ final SchemeRegistry schreg) {
Args.notNull(schreg, "Scheme registry");
this.log = LogFactory.getLog(getClass());
this.schemeRegistry = schreg;
@@ -189,7 +189,7 @@ public class ThreadSafeClientConnManager
*
* @since 4.1
*/
- protected ConnPoolByRoute createConnectionPool(long connTTL, TimeUnit connTTLTimeUnit) {
+ protected ConnPoolByRoute createConnectionPool(final long connTTL, final TimeUnit connTTLTimeUnit) {
return new ConnPoolByRoute(connOperator, connPerRoute, 20, connTTL, connTTLTimeUnit);
}
@@ -206,7 +206,7 @@ public class ThreadSafeClientConnManager
* @return the connection operator to use
*/
protected ClientConnectionOperator
- createConnectionOperator(SchemeRegistry schreg) {
+ createConnectionOperator(final SchemeRegistry schreg) {
return new DefaultClientConnectionOperator(schreg);// @ThreadSafe
}
@@ -229,7 +229,7 @@ public class ThreadSafeClientConnManager
}
public ManagedClientConnection getConnection(
- long timeout, TimeUnit tunit) throws InterruptedException,
+ final long timeout, final TimeUnit tunit) throws InterruptedException,
ConnectionPoolTimeoutException {
Args.notNull(route, "Route");
@@ -245,7 +245,7 @@ public class ThreadSafeClientConnManager
}
- public void releaseConnection(ManagedClientConnection conn, long validDuration, TimeUnit timeUnit) {
+ public void releaseConnection(final ManagedClientConnection conn, final long validDuration, final TimeUnit timeUnit) {
Args.check(conn instanceof BasicPooledConnAdapter, "Connection class mismatch, " +
"connection not obtained from this manager");
BasicPooledConnAdapter hca = (BasicPooledConnAdapter) conn;
@@ -320,7 +320,7 @@ public class ThreadSafeClientConnManager
return pool.getConnectionsInPool();
}
- public void closeIdleConnections(long idleTimeout, TimeUnit tunit) {
+ public void closeIdleConnections(final long idleTimeout, final TimeUnit tunit) {
if (log.isDebugEnabled()) {
log.debug("Closing connections idle longer than " + idleTimeout + " " + tunit);
}
@@ -342,7 +342,7 @@ public class ThreadSafeClientConnManager
/**
* since 4.1
*/
- public void setMaxTotal(int max) {
+ public void setMaxTotal(final int max) {
pool.setMaxTotalConnections(max);
}
@@ -356,7 +356,7 @@ public class ThreadSafeClientConnManager
/**
* @since 4.1
*/
- public void setDefaultMaxPerRoute(int max) {
+ public void setDefaultMaxPerRoute(final int max) {
connPerRoute.setDefaultMaxPerRoute(max);
}
@@ -370,7 +370,7 @@ public class ThreadSafeClientConnManager
/**
* @since 4.1
*/
- public void setMaxForRoute(final HttpRoute route, int max) {
+ public void setMaxForRoute(final HttpRoute route, final int max) {
connPerRoute.setMaxForRoute(route, max);
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/WaitingThread.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/WaitingThread.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/WaitingThread.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/WaitingThread.java Tue Jan 15 18:29:58 2013
@@ -71,7 +71,7 @@ public class WaitingThread {
* @param pool the pool on which the thread will be waiting,
* or <code>null</code>
*/
- public WaitingThread(Condition cond, RouteSpecificPool pool) {
+ public WaitingThread(final Condition cond, final RouteSpecificPool pool) {
Args.notNull(cond, "Condition");
@@ -133,7 +133,7 @@ public class WaitingThread {
*
* @see #wakeup
*/
- public boolean await(Date deadline)
+ public boolean await(final Date deadline)
throws InterruptedException {
// This is only a sanity check. We cannot synchronize here,
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/WaitingThreadAborter.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/WaitingThreadAborter.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/WaitingThreadAborter.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/WaitingThreadAborter.java Tue Jan 15 18:29:58 2013
@@ -59,7 +59,7 @@ public class WaitingThreadAborter {
*
* @param waitingThread The thread to interrupt when aborting.
*/
- public void setWaitingThread(WaitingThread waitingThread) {
+ public void setWaitingThread(final WaitingThread waitingThread) {
this.waitingThread = waitingThread;
if (aborted) {
waitingThread.interrupt();
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BasicClientCookie.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BasicClientCookie.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BasicClientCookie.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BasicClientCookie.java Tue Jan 15 18:29:58 2013
@@ -109,7 +109,7 @@ public class BasicClientCookie implement
*
* @see #getComment()
*/
- public void setComment(String comment) {
+ public void setComment(final String comment) {
cookieComment = comment;
}
@@ -148,7 +148,7 @@ public class BasicClientCookie implement
* @see #getExpiryDate
*
*/
- public void setExpiryDate (Date expiryDate) {
+ public void setExpiryDate (final Date expiryDate) {
cookieExpiryDate = expiryDate;
}
@@ -183,7 +183,7 @@ public class BasicClientCookie implement
*
* @see #getDomain
*/
- public void setDomain(String domain) {
+ public void setDomain(final String domain) {
if (domain != null) {
cookieDomain = domain.toLowerCase(Locale.ENGLISH);
} else {
@@ -211,7 +211,7 @@ public class BasicClientCookie implement
* @see #getPath
*
*/
- public void setPath(String path) {
+ public void setPath(final String path) {
cookiePath = path;
}
@@ -235,7 +235,7 @@ public class BasicClientCookie implement
*
* @see #isSecure()
*/
- public void setSecure (boolean secure) {
+ public void setSecure (final boolean secure) {
isSecure = secure;
}
@@ -269,7 +269,7 @@ public class BasicClientCookie implement
*
* @see #getVersion
*/
- public void setVersion(int version) {
+ public void setVersion(final int version) {
cookieVersion = version;
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BasicClientCookie2.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BasicClientCookie2.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BasicClientCookie2.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BasicClientCookie2.java Tue Jan 15 18:29:58 2013
@@ -75,7 +75,7 @@ public class BasicClientCookie2 extends
this.commentURL = commentURL;
}
- public void setDiscard(boolean discard) {
+ public void setDiscard(final boolean discard) {
this.discard = discard;
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BestMatchSpec.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BestMatchSpec.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BestMatchSpec.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BestMatchSpec.java Tue Jan 15 18:29:58 2013
@@ -60,7 +60,7 @@ public class BestMatchSpec implements Co
private RFC2109Spec obsoleteStrict; // @NotThreadSafe
private BrowserCompatSpec compat; // @NotThreadSafe
- public BestMatchSpec(final String[] datepatterns, boolean oneHeader) {
+ public BestMatchSpec(final String[] datepatterns, final boolean oneHeader) {
super();
this.datepatterns = datepatterns == null ? null : datepatterns.clone();
this.oneHeader = oneHeader;
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/DateParseException.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/DateParseException.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/DateParseException.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/DateParseException.java Tue Jan 15 18:29:58 2013
@@ -52,7 +52,7 @@ public class DateParseException extends
/**
* @param message the exception message
*/
- public DateParseException(String message) {
+ public DateParseException(final String message) {
super(message);
}