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 2018/08/14 14:58:57 UTC
[3/3] httpcomponents-core git commit: - Always use blocks - Add
missing serial version ID (default 1L) - Camel-case names. - Don't nest in
else clause unnecessarily. - Remove declared exceptions that are not thrown
(but don't break BC.)
- Always use blocks
- Add missing serial version ID (default 1L)
- Camel-case names.
- Don't nest in else clause unnecessarily.
- Remove declared exceptions that are not thrown (but don't break BC.)
Project: http://git-wip-us.apache.org/repos/asf/httpcomponents-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/httpcomponents-core/commit/d956f67e
Tree: http://git-wip-us.apache.org/repos/asf/httpcomponents-core/tree/d956f67e
Diff: http://git-wip-us.apache.org/repos/asf/httpcomponents-core/diff/d956f67e
Branch: refs/heads/4.4.x
Commit: d956f67e68d0fa60b68343b11f80d64ff1ed95de
Parents: 14e3a19
Author: Gary Gregory <ga...@gmail.com>
Authored: Tue Aug 14 08:58:48 2018 -0600
Committer: Gary Gregory <ga...@gmail.com>
Committed: Tue Aug 14 08:58:48 2018 -0600
----------------------------------------------------------------------
.../apache/http/benchmark/BenchmarkWorker.java | 6 +-
.../http/examples/nio/NHttpReverseProxy.java | 4 +-
.../nio/reactor/SSLIOSessionHandlerAdaptor.java | 4 +-
.../http/impl/nio/reactor/SSLSetupHandler.java | 4 +-
.../nio/reactor/SSLSetupHandlerAdaptor.java | 4 +-
.../impl/nio/ssl/SSLClientIOEventDispatch.java | 14 +-
.../impl/nio/ssl/SSLServerIOEventDispatch.java | 14 +-
.../impl/nio/DefaultNHttpClientConnection.java | 16 +-
.../impl/nio/DefaultNHttpServerConnection.java | 16 +-
.../http/impl/nio/NHttpConnectionBase.java | 22 +-
.../nio/SSLNHttpClientConnectionFactory.java | 14 +-
.../nio/SSLNHttpServerConnectionFactory.java | 14 +-
.../http/impl/nio/SessionHttpContext.java | 16 +-
.../http/impl/nio/pool/BasicNIOConnPool.java | 24 +-
.../impl/nio/reactor/AbstractIODispatch.java | 50 +--
.../http/nio/pool/AbstractNIOConnPool.java | 40 +--
.../http/nio/reactor/ssl/SSLIOSession.java | 4 +-
.../impl/nio/pool/TestBasicNIOConnPool.java | 8 +-
.../reactor/TestDefaultListeningIOReactor.java | 50 +--
.../http/nio/integration/TestCustomSSL.java | 4 +-
.../apache/http/nio/pool/TestNIOConnPool.java | 302 +++++++++----------
.../nio/testserver/ClientConnectionFactory.java | 12 +-
.../http/nio/testserver/LoggingIOSession.java | 14 +-
.../LoggingNHttpClientConnection.java | 24 +-
.../LoggingNHttpServerConnection.java | 24 +-
.../nio/testserver/ServerConnectionFactory.java | 12 +-
.../http/impl/SocketHttpServerConnection.java | 6 +-
.../src/main/java/org/apache/http/HttpHost.java | 6 +-
.../org/apache/http/concurrent/BasicFuture.java | 9 +-
.../apache/http/entity/BufferedHttpEntity.java | 12 +-
.../org/apache/http/entity/ContentType.java | 3 +-
.../apache/http/impl/BHttpConnectionBase.java | 18 +-
.../java/org/apache/http/impl/ConnSupport.java | 6 +-
.../http/impl/DefaultBHttpClientConnection.java | 16 +-
.../http/impl/DefaultBHttpServerConnection.java | 16 +-
.../http/impl/HttpConnectionMetricsImpl.java | 28 +-
.../apache/http/impl/bootstrap/HttpServer.java | 12 +-
.../impl/entity/LaxContentLengthStrategy.java | 10 +-
.../apache/http/impl/io/ChunkedInputStream.java | 3 +-
.../http/impl/io/ContentLengthInputStream.java | 3 +-
.../http/impl/io/SessionOutputBufferImpl.java | 6 +-
.../apache/http/message/BasicHeaderElement.java | 3 +-
.../message/BasicHeaderElementIterator.java | 15 +-
.../org/apache/http/message/TokenParser.java | 13 +-
.../org/apache/http/params/BasicHttpParams.java | 3 +-
.../org/apache/http/pool/AbstractConnPool.java | 25 +-
.../java/org/apache/http/pool/PoolEntry.java | 14 +-
.../org/apache/http/pool/RouteSpecificPool.java | 6 +-
.../apache/http/protocol/HttpCoreContext.java | 8 +-
.../apache/http/protocol/UriPatternMatcher.java | 7 +-
.../java/org/apache/http/util/LangUtils.java | 16 +-
.../http/impl/SessionOutputBufferMock.java | 6 +-
.../impl/io/TimeoutByteArrayInputStream.java | 8 +-
.../java/org/apache/http/pool/TestConnPool.java | 8 +-
.../org/apache/http/pool/TestPoolEntry.java | 8 +-
.../apache/http/ssl/TestSSLContextBuilder.java | 6 +-
.../org/apache/http/testserver/HttpServer.java | 8 +-
.../LoggingBHttpClientConnection.java | 22 +-
.../LoggingBHttpServerConnection.java | 22 +-
59 files changed, 496 insertions(+), 572 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/d956f67e/httpcore-ab/src/main/java/org/apache/http/benchmark/BenchmarkWorker.java
----------------------------------------------------------------------
diff --git a/httpcore-ab/src/main/java/org/apache/http/benchmark/BenchmarkWorker.java b/httpcore-ab/src/main/java/org/apache/http/benchmark/BenchmarkWorker.java
index d864c8e..7a07d7f 100644
--- a/httpcore-ab/src/main/java/org/apache/http/benchmark/BenchmarkWorker.java
+++ b/httpcore-ab/src/main/java/org/apache/http/benchmark/BenchmarkWorker.java
@@ -170,18 +170,18 @@ class BenchmarkWorker implements Runnable {
if (charset == null) {
charset = HTTP.DEF_CONTENT_CHARSET;
}
- long contentlen = 0;
+ long contentLen = 0;
final InputStream inStream = entity.getContent();
int l;
while ((l = inStream.read(this.buffer)) != -1) {
- contentlen += l;
+ contentLen += l;
if (config.getVerbosity() >= 4) {
final String s = new String(this.buffer, 0, l, charset);
System.out.print(s);
}
}
inStream.close();
- stats.setContentLength(contentlen);
+ stats.setContentLength(contentLen);
}
if (config.getVerbosity() >= 4) {
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/d956f67e/httpcore-nio/src/examples/org/apache/http/examples/nio/NHttpReverseProxy.java
----------------------------------------------------------------------
diff --git a/httpcore-nio/src/examples/org/apache/http/examples/nio/NHttpReverseProxy.java b/httpcore-nio/src/examples/org/apache/http/examples/nio/NHttpReverseProxy.java
index 4a2469c..663875c 100644
--- a/httpcore-nio/src/examples/org/apache/http/examples/nio/NHttpReverseProxy.java
+++ b/httpcore-nio/src/examples/org/apache/http/examples/nio/NHttpReverseProxy.java
@@ -871,10 +871,10 @@ public class NHttpReverseProxy {
static class ProxyConnPool extends BasicNIOConnPool {
public ProxyConnPool(
- final ConnectingIOReactor ioreactor,
+ final ConnectingIOReactor ioReactor,
final NIOConnFactory<HttpHost, NHttpClientConnection> connFactory,
final int connectTimeout) {
- super(ioreactor, connFactory, connectTimeout);
+ super(ioReactor, connFactory, connectTimeout);
}
@Override
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/d956f67e/httpcore-nio/src/main/java-deprecated/org/apache/http/impl/nio/reactor/SSLIOSessionHandlerAdaptor.java
----------------------------------------------------------------------
diff --git a/httpcore-nio/src/main/java-deprecated/org/apache/http/impl/nio/reactor/SSLIOSessionHandlerAdaptor.java b/httpcore-nio/src/main/java-deprecated/org/apache/http/impl/nio/reactor/SSLIOSessionHandlerAdaptor.java
index 3b355a2..5019400 100644
--- a/httpcore-nio/src/main/java-deprecated/org/apache/http/impl/nio/reactor/SSLIOSessionHandlerAdaptor.java
+++ b/httpcore-nio/src/main/java-deprecated/org/apache/http/impl/nio/reactor/SSLIOSessionHandlerAdaptor.java
@@ -56,8 +56,8 @@ class SSLIOSessionHandlerAdaptor implements org.apache.http.nio.reactor.ssl.SSLS
}
@Override
- public void verify(final IOSession iosession, final SSLSession sslsession) throws SSLException {
- this.handler.verify(iosession.getRemoteAddress(), sslsession);
+ public void verify(final IOSession ioSession, final SSLSession sslsession) throws SSLException {
+ this.handler.verify(ioSession.getRemoteAddress(), sslsession);
}
public void setParams(final HttpParams params) {
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/d956f67e/httpcore-nio/src/main/java-deprecated/org/apache/http/impl/nio/reactor/SSLSetupHandler.java
----------------------------------------------------------------------
diff --git a/httpcore-nio/src/main/java-deprecated/org/apache/http/impl/nio/reactor/SSLSetupHandler.java b/httpcore-nio/src/main/java-deprecated/org/apache/http/impl/nio/reactor/SSLSetupHandler.java
index fc867a7..351cb3b 100644
--- a/httpcore-nio/src/main/java-deprecated/org/apache/http/impl/nio/reactor/SSLSetupHandler.java
+++ b/httpcore-nio/src/main/java-deprecated/org/apache/http/impl/nio/reactor/SSLSetupHandler.java
@@ -64,11 +64,11 @@ public interface SSLSetupHandler {
* For instance this would be the right place to enforce SSL cipher
* strength, validate certificate chain and do hostname checks.
*
- * @param iosession the underlying IOSession for the SSL connection.
+ * @param ioSession the underlying IOSession for the SSL connection.
* @param sslsession newly created SSL session.
* @throws SSLException if case of SSL protocol error.
*/
- void verify(IOSession iosession, SSLSession sslsession)
+ void verify(IOSession ioSession, SSLSession sslsession)
throws SSLException;
}
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/d956f67e/httpcore-nio/src/main/java-deprecated/org/apache/http/impl/nio/reactor/SSLSetupHandlerAdaptor.java
----------------------------------------------------------------------
diff --git a/httpcore-nio/src/main/java-deprecated/org/apache/http/impl/nio/reactor/SSLSetupHandlerAdaptor.java b/httpcore-nio/src/main/java-deprecated/org/apache/http/impl/nio/reactor/SSLSetupHandlerAdaptor.java
index d49bb8d..480f438 100644
--- a/httpcore-nio/src/main/java-deprecated/org/apache/http/impl/nio/reactor/SSLSetupHandlerAdaptor.java
+++ b/httpcore-nio/src/main/java-deprecated/org/apache/http/impl/nio/reactor/SSLSetupHandlerAdaptor.java
@@ -56,8 +56,8 @@ class SSLSetupHandlerAdaptor implements org.apache.http.nio.reactor.ssl.SSLSetup
}
@Override
- public void verify(final IOSession iosession, final SSLSession sslsession) throws SSLException {
- this.handler.verify(iosession, sslsession);
+ public void verify(final IOSession ioSession, final SSLSession sslsession) throws SSLException {
+ this.handler.verify(ioSession, sslsession);
}
public void setParams(final HttpParams params) {
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/d956f67e/httpcore-nio/src/main/java-deprecated/org/apache/http/impl/nio/ssl/SSLClientIOEventDispatch.java
----------------------------------------------------------------------
diff --git a/httpcore-nio/src/main/java-deprecated/org/apache/http/impl/nio/ssl/SSLClientIOEventDispatch.java b/httpcore-nio/src/main/java-deprecated/org/apache/http/impl/nio/ssl/SSLClientIOEventDispatch.java
index d7d87ab..b404a69 100644
--- a/httpcore-nio/src/main/java-deprecated/org/apache/http/impl/nio/ssl/SSLClientIOEventDispatch.java
+++ b/httpcore-nio/src/main/java-deprecated/org/apache/http/impl/nio/ssl/SSLClientIOEventDispatch.java
@@ -113,20 +113,20 @@ public class SSLClientIOEventDispatch extends DefaultClientIOEventDispatch {
return new SSLIOSession(session, sslContext, sslHandler);
}
- protected NHttpClientIOTarget createSSLConnection(final SSLIOSession ssliosession) {
- return super.createConnection(ssliosession);
+ protected NHttpClientIOTarget createSSLConnection(final SSLIOSession sslioSession) {
+ return super.createConnection(sslioSession);
}
@Override
protected NHttpClientIOTarget createConnection(final IOSession session) {
- final SSLIOSession ssliosession = createSSLIOSession(session, this.sslContext, this.sslHandler);
- session.setAttribute(SSLIOSession.SESSION_KEY, ssliosession);
- final NHttpClientIOTarget conn = createSSLConnection(ssliosession);
+ final SSLIOSession sslioSession = createSSLIOSession(session, this.sslContext, this.sslHandler);
+ session.setAttribute(SSLIOSession.SESSION_KEY, sslioSession);
+ final NHttpClientIOTarget conn = createSSLConnection(sslioSession);
try {
- ssliosession.initialize();
+ sslioSession.initialize();
} catch (final SSLException ex) {
this.handler.exception(conn, ex);
- ssliosession.shutdown();
+ sslioSession.shutdown();
}
return conn;
}
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/d956f67e/httpcore-nio/src/main/java-deprecated/org/apache/http/impl/nio/ssl/SSLServerIOEventDispatch.java
----------------------------------------------------------------------
diff --git a/httpcore-nio/src/main/java-deprecated/org/apache/http/impl/nio/ssl/SSLServerIOEventDispatch.java b/httpcore-nio/src/main/java-deprecated/org/apache/http/impl/nio/ssl/SSLServerIOEventDispatch.java
index cf1d413..fa6f004 100644
--- a/httpcore-nio/src/main/java-deprecated/org/apache/http/impl/nio/ssl/SSLServerIOEventDispatch.java
+++ b/httpcore-nio/src/main/java-deprecated/org/apache/http/impl/nio/ssl/SSLServerIOEventDispatch.java
@@ -113,20 +113,20 @@ public class SSLServerIOEventDispatch extends DefaultServerIOEventDispatch {
return new SSLIOSession(session, sslContext, sslHandler);
}
- protected NHttpServerIOTarget createSSLConnection(final SSLIOSession ssliosession) {
- return super.createConnection(ssliosession);
+ protected NHttpServerIOTarget createSSLConnection(final SSLIOSession sslioSession) {
+ return super.createConnection(sslioSession);
}
@Override
protected NHttpServerIOTarget createConnection(final IOSession session) {
- final SSLIOSession ssliosession = createSSLIOSession(session, this.sslContext, this.sslHandler);
- session.setAttribute(SSLIOSession.SESSION_KEY, ssliosession);
- final NHttpServerIOTarget conn = createSSLConnection(ssliosession);
+ final SSLIOSession sslioSession = createSSLIOSession(session, this.sslContext, this.sslHandler);
+ session.setAttribute(SSLIOSession.SESSION_KEY, sslioSession);
+ final NHttpServerIOTarget conn = createSSLConnection(sslioSession);
try {
- ssliosession.initialize();
+ sslioSession.initialize();
} catch (final SSLException ex) {
this.handler.exception(conn, ex);
- ssliosession.shutdown();
+ sslioSession.shutdown();
}
return conn;
}
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/d956f67e/httpcore-nio/src/main/java/org/apache/http/impl/nio/DefaultNHttpClientConnection.java
----------------------------------------------------------------------
diff --git a/httpcore-nio/src/main/java/org/apache/http/impl/nio/DefaultNHttpClientConnection.java b/httpcore-nio/src/main/java/org/apache/http/impl/nio/DefaultNHttpClientConnection.java
index 4bbab09..cb9bd59 100644
--- a/httpcore-nio/src/main/java/org/apache/http/impl/nio/DefaultNHttpClientConnection.java
+++ b/httpcore-nio/src/main/java/org/apache/http/impl/nio/DefaultNHttpClientConnection.java
@@ -110,9 +110,9 @@ public class DefaultNHttpClientConnection
* @param allocator memory allocator.
* If {@code null} {@link org.apache.http.nio.util.HeapByteBufferAllocator#INSTANCE}
* will be used.
- * @param chardecoder decoder to be used for decoding HTTP protocol elements.
+ * @param charDecoder decoder to be used for decoding HTTP protocol elements.
* If {@code null} simple type cast will be used for byte to char conversion.
- * @param charencoder encoder to be used for encoding HTTP protocol elements.
+ * @param charEncoder encoder to be used for encoding HTTP protocol elements.
* If {@code null} simple type cast will be used for char to byte conversion.
* @param constraints Message constraints. If {@code null}
* {@link MessageConstraints#DEFAULT} will be used.
@@ -128,14 +128,14 @@ public class DefaultNHttpClientConnection
final int bufferSize,
final int fragmentSizeHint,
final ByteBufferAllocator allocator,
- final CharsetDecoder chardecoder,
- final CharsetEncoder charencoder,
+ final CharsetDecoder charDecoder,
+ final CharsetEncoder charEncoder,
final MessageConstraints constraints,
final ContentLengthStrategy incomingContentStrategy,
final ContentLengthStrategy outgoingContentStrategy,
final NHttpMessageWriterFactory<HttpRequest> requestWriterFactory,
final NHttpMessageParserFactory<HttpResponse> responseParserFactory) {
- super(session, bufferSize, fragmentSizeHint, allocator, chardecoder, charencoder,
+ super(session, bufferSize, fragmentSizeHint, allocator, charDecoder, charEncoder,
constraints, incomingContentStrategy, outgoingContentStrategy);
this.requestWriter = (requestWriterFactory != null ? requestWriterFactory :
DefaultHttpRequestWriterFactory.INSTANCE).create(this.outbuf);
@@ -149,10 +149,10 @@ public class DefaultNHttpClientConnection
public DefaultNHttpClientConnection(
final IOSession session,
final int bufferSize,
- final CharsetDecoder chardecoder,
- final CharsetEncoder charencoder,
+ final CharsetDecoder charDecoder,
+ final CharsetEncoder charEncoder,
final MessageConstraints constraints) {
- this(session, bufferSize, bufferSize, null, chardecoder, charencoder, constraints,
+ this(session, bufferSize, bufferSize, null, charDecoder, charEncoder, constraints,
null, null, null, null);
}
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/d956f67e/httpcore-nio/src/main/java/org/apache/http/impl/nio/DefaultNHttpServerConnection.java
----------------------------------------------------------------------
diff --git a/httpcore-nio/src/main/java/org/apache/http/impl/nio/DefaultNHttpServerConnection.java b/httpcore-nio/src/main/java/org/apache/http/impl/nio/DefaultNHttpServerConnection.java
index cef68f1..8d7ee6b 100644
--- a/httpcore-nio/src/main/java/org/apache/http/impl/nio/DefaultNHttpServerConnection.java
+++ b/httpcore-nio/src/main/java/org/apache/http/impl/nio/DefaultNHttpServerConnection.java
@@ -110,9 +110,9 @@ public class DefaultNHttpServerConnection
* @param allocator memory allocator.
* If {@code null} {@link org.apache.http.nio.util.HeapByteBufferAllocator#INSTANCE}
* will be used.
- * @param chardecoder decoder to be used for decoding HTTP protocol elements.
+ * @param charDecoder decoder to be used for decoding HTTP protocol elements.
* If {@code null} simple type cast will be used for byte to char conversion.
- * @param charencoder encoder to be used for encoding HTTP protocol elements.
+ * @param charEncoder encoder to be used for encoding HTTP protocol elements.
* If {@code null} simple type cast will be used for char to byte conversion.
* @param constraints Message constraints. If {@code null}
* {@link MessageConstraints#DEFAULT} will be used.
@@ -132,14 +132,14 @@ public class DefaultNHttpServerConnection
final int bufferSize,
final int fragmentSizeHint,
final ByteBufferAllocator allocator,
- final CharsetDecoder chardecoder,
- final CharsetEncoder charencoder,
+ final CharsetDecoder charDecoder,
+ final CharsetEncoder charEncoder,
final MessageConstraints constraints,
final ContentLengthStrategy incomingContentStrategy,
final ContentLengthStrategy outgoingContentStrategy,
final NHttpMessageParserFactory<HttpRequest> requestParserFactory,
final NHttpMessageWriterFactory<HttpResponse> responseWriterFactory) {
- super(session, bufferSize, fragmentSizeHint, allocator, chardecoder, charencoder,
+ super(session, bufferSize, fragmentSizeHint, allocator, charDecoder, charEncoder,
constraints,
incomingContentStrategy != null ? incomingContentStrategy :
DisallowIdentityContentLengthStrategy.INSTANCE,
@@ -157,10 +157,10 @@ public class DefaultNHttpServerConnection
public DefaultNHttpServerConnection(
final IOSession session,
final int bufferSize,
- final CharsetDecoder chardecoder,
- final CharsetEncoder charencoder,
+ final CharsetDecoder charDecoder,
+ final CharsetEncoder charEncoder,
final MessageConstraints constraints) {
- this(session, bufferSize, bufferSize, null, chardecoder, charencoder, constraints,
+ this(session, bufferSize, bufferSize, null, charDecoder, charEncoder, constraints,
null, null, null, null);
}
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/d956f67e/httpcore-nio/src/main/java/org/apache/http/impl/nio/NHttpConnectionBase.java
----------------------------------------------------------------------
diff --git a/httpcore-nio/src/main/java/org/apache/http/impl/nio/NHttpConnectionBase.java b/httpcore-nio/src/main/java/org/apache/http/impl/nio/NHttpConnectionBase.java
index a071346..713cc03 100644
--- a/httpcore-nio/src/main/java/org/apache/http/impl/nio/NHttpConnectionBase.java
+++ b/httpcore-nio/src/main/java/org/apache/http/impl/nio/NHttpConnectionBase.java
@@ -189,9 +189,9 @@ public class NHttpConnectionBase
* @param allocator memory allocator.
* If {@code null} {@link org.apache.http.nio.util.HeapByteBufferAllocator#INSTANCE}
* will be used.
- * @param chardecoder decoder to be used for decoding HTTP protocol elements.
+ * @param charDecoder decoder to be used for decoding HTTP protocol elements.
* If {@code null} simple type cast will be used for byte to char conversion.
- * @param charencoder encoder to be used for encoding HTTP protocol elements.
+ * @param charEncoder encoder to be used for encoding HTTP protocol elements.
* If {@code null} simple type cast will be used for char to byte conversion.
* @param constraints Message constraints. If {@code null}
* {@link MessageConstraints#DEFAULT} will be used.
@@ -207,8 +207,8 @@ public class NHttpConnectionBase
final int bufferSize,
final int fragmentSizeHint,
final ByteBufferAllocator allocator,
- final CharsetDecoder chardecoder,
- final CharsetEncoder charencoder,
+ final CharsetDecoder charDecoder,
+ final CharsetEncoder charEncoder,
final MessageConstraints constraints,
final ContentLengthStrategy incomingContentStrategy,
final ContentLengthStrategy outgoingContentStrategy) {
@@ -218,8 +218,8 @@ public class NHttpConnectionBase
if (lineBufferSize > 512) {
lineBufferSize = 512;
}
- this.inbuf = new SessionInputBufferImpl(bufferSize, lineBufferSize, chardecoder, allocator);
- this.outbuf = new SessionOutputBufferImpl(bufferSize, lineBufferSize, charencoder, allocator);
+ this.inbuf = new SessionInputBufferImpl(bufferSize, lineBufferSize, charDecoder, allocator);
+ this.outbuf = new SessionOutputBufferImpl(bufferSize, lineBufferSize, charEncoder, allocator);
this.fragmentSizeHint = fragmentSizeHint >= 0 ? fragmentSizeHint : bufferSize;
this.inTransportMetrics = new HttpTransportMetricsImpl();
@@ -244,9 +244,9 @@ public class NHttpConnectionBase
* @param allocator memory allocator.
* If {@code null} {@link org.apache.http.nio.util.HeapByteBufferAllocator#INSTANCE}
* will be used.
- * @param chardecoder decoder to be used for decoding HTTP protocol elements.
+ * @param charDecoder decoder to be used for decoding HTTP protocol elements.
* If {@code null} simple type cast will be used for byte to char conversion.
- * @param charencoder encoder to be used for encoding HTTP protocol elements.
+ * @param charEncoder encoder to be used for encoding HTTP protocol elements.
* If {@code null} simple type cast will be used for char to byte conversion.
* @param incomingContentStrategy incoming content length strategy. If {@code null}
* {@link LaxContentLengthStrategy#INSTANCE} will be used.
@@ -260,11 +260,11 @@ public class NHttpConnectionBase
final int bufferSize,
final int fragmentSizeHint,
final ByteBufferAllocator allocator,
- final CharsetDecoder chardecoder,
- final CharsetEncoder charencoder,
+ final CharsetDecoder charDecoder,
+ final CharsetEncoder charEncoder,
final ContentLengthStrategy incomingContentStrategy,
final ContentLengthStrategy outgoingContentStrategy) {
- this(session, bufferSize, fragmentSizeHint, allocator, chardecoder, charencoder,
+ this(session, bufferSize, fragmentSizeHint, allocator, charDecoder, charEncoder,
null, incomingContentStrategy, outgoingContentStrategy);
}
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/d956f67e/httpcore-nio/src/main/java/org/apache/http/impl/nio/SSLNHttpClientConnectionFactory.java
----------------------------------------------------------------------
diff --git a/httpcore-nio/src/main/java/org/apache/http/impl/nio/SSLNHttpClientConnectionFactory.java b/httpcore-nio/src/main/java/org/apache/http/impl/nio/SSLNHttpClientConnectionFactory.java
index 93d7bfe..6573c46 100644
--- a/httpcore-nio/src/main/java/org/apache/http/impl/nio/SSLNHttpClientConnectionFactory.java
+++ b/httpcore-nio/src/main/java/org/apache/http/impl/nio/SSLNHttpClientConnectionFactory.java
@@ -215,21 +215,21 @@ public class SSLNHttpClientConnectionFactory
* @since 4.3
*/
protected SSLIOSession createSSLIOSession(
- final IOSession iosession,
+ final IOSession ioSession,
final SSLContext sslContext,
final SSLSetupHandler sslHandler) {
- final Object attachment = iosession.getAttribute(IOSession.ATTACHMENT_KEY);
- return new SSLIOSession(iosession, SSLMode.CLIENT,
+ final Object attachment = ioSession.getAttribute(IOSession.ATTACHMENT_KEY);
+ return new SSLIOSession(ioSession, SSLMode.CLIENT,
attachment instanceof HttpHost ? (HttpHost) attachment : null,
sslContext, sslHandler);
}
@Override
- public DefaultNHttpClientConnection createConnection(final IOSession iosession) {
- final SSLIOSession ssliosession = createSSLIOSession(iosession, this.sslContext, this.sslHandler);
- iosession.setAttribute(SSLIOSession.SESSION_KEY, ssliosession);
+ public DefaultNHttpClientConnection createConnection(final IOSession ioSession) {
+ final SSLIOSession sslioSession = createSSLIOSession(ioSession, this.sslContext, this.sslHandler);
+ ioSession.setAttribute(SSLIOSession.SESSION_KEY, sslioSession);
return new DefaultNHttpClientConnection(
- ssliosession,
+ sslioSession,
this.cconfig.getBufferSize(),
this.cconfig.getFragmentSizeHint(),
this.allocator,
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/d956f67e/httpcore-nio/src/main/java/org/apache/http/impl/nio/SSLNHttpServerConnectionFactory.java
----------------------------------------------------------------------
diff --git a/httpcore-nio/src/main/java/org/apache/http/impl/nio/SSLNHttpServerConnectionFactory.java b/httpcore-nio/src/main/java/org/apache/http/impl/nio/SSLNHttpServerConnectionFactory.java
index 294f8af..74cab17 100644
--- a/httpcore-nio/src/main/java/org/apache/http/impl/nio/SSLNHttpServerConnectionFactory.java
+++ b/httpcore-nio/src/main/java/org/apache/http/impl/nio/SSLNHttpServerConnectionFactory.java
@@ -212,19 +212,19 @@ public class SSLNHttpServerConnectionFactory
* @since 4.3
*/
protected SSLIOSession createSSLIOSession(
- final IOSession iosession,
+ final IOSession ioSession,
final SSLContext sslContext,
final SSLSetupHandler sslHandler) {
- final SSLIOSession ssliosession = new SSLIOSession(iosession, SSLMode.SERVER,
+ final SSLIOSession sslioSession = new SSLIOSession(ioSession, SSLMode.SERVER,
sslContext, sslHandler);
- return ssliosession;
+ return sslioSession;
}
@Override
- public DefaultNHttpServerConnection createConnection(final IOSession iosession) {
- final SSLIOSession ssliosession = createSSLIOSession(iosession, this.sslContext, this.sslHandler);
- iosession.setAttribute(SSLIOSession.SESSION_KEY, ssliosession);
- return new DefaultNHttpServerConnection(ssliosession,
+ public DefaultNHttpServerConnection createConnection(final IOSession ioSession) {
+ final SSLIOSession sslioSession = createSSLIOSession(ioSession, this.sslContext, this.sslHandler);
+ ioSession.setAttribute(SSLIOSession.SESSION_KEY, sslioSession);
+ return new DefaultNHttpServerConnection(sslioSession,
this.cconfig.getBufferSize(),
this.cconfig.getFragmentSizeHint(),
this.allocator,
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/d956f67e/httpcore-nio/src/main/java/org/apache/http/impl/nio/SessionHttpContext.java
----------------------------------------------------------------------
diff --git a/httpcore-nio/src/main/java/org/apache/http/impl/nio/SessionHttpContext.java b/httpcore-nio/src/main/java/org/apache/http/impl/nio/SessionHttpContext.java
index 21b6ed6..d31cc72 100644
--- a/httpcore-nio/src/main/java/org/apache/http/impl/nio/SessionHttpContext.java
+++ b/httpcore-nio/src/main/java/org/apache/http/impl/nio/SessionHttpContext.java
@@ -32,26 +32,26 @@ import org.apache.http.protocol.HttpContext;
class SessionHttpContext implements HttpContext {
- private final IOSession iosession;
+ private final IOSession ioSession;
- public SessionHttpContext(final IOSession iosession) {
+ public SessionHttpContext(final IOSession ioSession) {
super();
- this.iosession = iosession;
+ this.ioSession = ioSession;
}
@Override
public Object getAttribute(final String id) {
- return this.iosession.getAttribute(id);
+ return this.ioSession.getAttribute(id);
}
@Override
public Object removeAttribute(final String id) {
- return this.iosession.removeAttribute(id);
+ return this.ioSession.removeAttribute(id);
}
@Override
public void setAttribute(final String id, final Object obj) {
- this.iosession.setAttribute(id, obj);
+ this.ioSession.setAttribute(id, obj);
}
/**
@@ -60,8 +60,8 @@ class SessionHttpContext implements HttpContext {
@Override
public String toString() {
final StringBuilder sb = new StringBuilder();
- sb.append("[iosession=");
- sb.append(iosession);
+ sb.append("[ioSession=");
+ sb.append(ioSession);
sb.append("]");
return sb.toString();
}
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/d956f67e/httpcore-nio/src/main/java/org/apache/http/impl/nio/pool/BasicNIOConnPool.java
----------------------------------------------------------------------
diff --git a/httpcore-nio/src/main/java/org/apache/http/impl/nio/pool/BasicNIOConnPool.java b/httpcore-nio/src/main/java/org/apache/http/impl/nio/pool/BasicNIOConnPool.java
index 2cf6f46..654af97 100644
--- a/httpcore-nio/src/main/java/org/apache/http/impl/nio/pool/BasicNIOConnPool.java
+++ b/httpcore-nio/src/main/java/org/apache/http/impl/nio/pool/BasicNIOConnPool.java
@@ -92,10 +92,10 @@ public class BasicNIOConnPool extends AbstractNIOConnPool<HttpHost, NHttpClientC
*/
@Deprecated
public BasicNIOConnPool(
- final ConnectingIOReactor ioreactor,
+ final ConnectingIOReactor ioReactor,
final NIOConnFactory<HttpHost, NHttpClientConnection> connFactory,
final HttpParams params) {
- super(ioreactor, connFactory, 2, 20);
+ super(ioReactor, connFactory, 2, 20);
Args.notNull(params, "HTTP parameters");
this.connectTimeout = params.getIntParameter(CoreConnectionPNames.CONNECTION_TIMEOUT, 0);
}
@@ -106,18 +106,18 @@ public class BasicNIOConnPool extends AbstractNIOConnPool<HttpHost, NHttpClientC
*/
@Deprecated
public BasicNIOConnPool(
- final ConnectingIOReactor ioreactor, final HttpParams params) {
- this(ioreactor, new BasicNIOConnFactory(params), params);
+ final ConnectingIOReactor ioReactor, final HttpParams params) {
+ this(ioReactor, new BasicNIOConnFactory(params), params);
}
/**
* @since 4.3
*/
public BasicNIOConnPool(
- final ConnectingIOReactor ioreactor,
+ final ConnectingIOReactor ioReactor,
final NIOConnFactory<HttpHost, NHttpClientConnection> connFactory,
final int connectTimeout) {
- super(ioreactor, connFactory, new BasicAddressResolver(), 2, 20);
+ super(ioReactor, connFactory, new BasicAddressResolver(), 2, 20);
this.connectTimeout = connectTimeout;
}
@@ -125,26 +125,26 @@ public class BasicNIOConnPool extends AbstractNIOConnPool<HttpHost, NHttpClientC
* @since 4.3
*/
public BasicNIOConnPool(
- final ConnectingIOReactor ioreactor,
+ final ConnectingIOReactor ioReactor,
final int connectTimeout,
final ConnectionConfig config) {
- this(ioreactor, new BasicNIOConnFactory(config), connectTimeout);
+ this(ioReactor, new BasicNIOConnFactory(config), connectTimeout);
}
/**
* @since 4.3
*/
public BasicNIOConnPool(
- final ConnectingIOReactor ioreactor,
+ final ConnectingIOReactor ioReactor,
final ConnectionConfig config) {
- this(ioreactor, new BasicNIOConnFactory(config), 0);
+ this(ioReactor, new BasicNIOConnFactory(config), 0);
}
/**
* @since 4.3
*/
- public BasicNIOConnPool(final ConnectingIOReactor ioreactor) {
- this(ioreactor, new BasicNIOConnFactory(ConnectionConfig.DEFAULT), 0);
+ public BasicNIOConnPool(final ConnectingIOReactor ioReactor) {
+ this(ioReactor, new BasicNIOConnFactory(ConnectionConfig.DEFAULT), 0);
}
/**
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/d956f67e/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/AbstractIODispatch.java
----------------------------------------------------------------------
diff --git a/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/AbstractIODispatch.java b/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/AbstractIODispatch.java
index a0fbb87..0326771 100644
--- a/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/AbstractIODispatch.java
+++ b/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/AbstractIODispatch.java
@@ -71,18 +71,18 @@ public abstract class AbstractIODispatch<T> implements IOEventDispatch {
session.setAttribute(IOEventDispatch.CONNECTION_KEY, conn);
}
onConnected(conn);
- final SSLIOSession ssliosession = (SSLIOSession) session.getAttribute(
+ final SSLIOSession sslioSession = (SSLIOSession) session.getAttribute(
SSLIOSession.SESSION_KEY);
- if (ssliosession != null) {
+ if (sslioSession != null) {
try {
- synchronized (ssliosession) {
- if (!ssliosession.isInitialized()) {
- ssliosession.initialize();
+ synchronized (sslioSession) {
+ if (!sslioSession.isInitialized()) {
+ sslioSession.initialize();
}
}
} catch (final IOException ex) {
onException(conn, ex);
- ssliosession.shutdown();
+ sslioSession.shutdown();
}
}
} catch (final RuntimeException ex) {
@@ -108,22 +108,22 @@ public abstract class AbstractIODispatch<T> implements IOEventDispatch {
T conn = (T) session.getAttribute(IOEventDispatch.CONNECTION_KEY);
try {
ensureNotNull(conn);
- final SSLIOSession ssliosession = (SSLIOSession) session.getAttribute(
+ final SSLIOSession sslioSession = (SSLIOSession) session.getAttribute(
SSLIOSession.SESSION_KEY);
- if (ssliosession == null) {
+ if (sslioSession == null) {
onInputReady(conn);
} else {
try {
- if (!ssliosession.isInitialized()) {
- ssliosession.initialize();
+ if (!sslioSession.isInitialized()) {
+ sslioSession.initialize();
}
- if (ssliosession.isAppInputReady()) {
+ if (sslioSession.isAppInputReady()) {
onInputReady(conn);
}
- ssliosession.inboundTransport();
+ sslioSession.inboundTransport();
} catch (final IOException ex) {
onException(conn, ex);
- ssliosession.shutdown();
+ sslioSession.shutdown();
}
}
} catch (final RuntimeException ex) {
@@ -139,22 +139,22 @@ public abstract class AbstractIODispatch<T> implements IOEventDispatch {
T conn = (T) session.getAttribute(IOEventDispatch.CONNECTION_KEY);
try {
ensureNotNull(conn);
- final SSLIOSession ssliosession = (SSLIOSession) session.getAttribute(
+ final SSLIOSession sslioSession = (SSLIOSession) session.getAttribute(
SSLIOSession.SESSION_KEY);
- if (ssliosession == null) {
+ if (sslioSession == null) {
onOutputReady(conn);
} else {
try {
- if (!ssliosession.isInitialized()) {
- ssliosession.initialize();
+ if (!sslioSession.isInitialized()) {
+ sslioSession.initialize();
}
- if (ssliosession.isAppOutputReady()) {
+ if (sslioSession.isAppOutputReady()) {
onOutputReady(conn);
}
- ssliosession.outboundTransport();
+ sslioSession.outboundTransport();
} catch (final IOException ex) {
onException(conn, ex);
- ssliosession.shutdown();
+ sslioSession.shutdown();
}
}
} catch (final RuntimeException ex) {
@@ -169,15 +169,15 @@ public abstract class AbstractIODispatch<T> implements IOEventDispatch {
final
T conn = (T) session.getAttribute(IOEventDispatch.CONNECTION_KEY);
try {
- final SSLIOSession ssliosession = (SSLIOSession) session.getAttribute(
+ final SSLIOSession sslioSession = (SSLIOSession) session.getAttribute(
SSLIOSession.SESSION_KEY);
ensureNotNull(conn);
onTimeout(conn);
- if (ssliosession != null) {
- synchronized (ssliosession) {
- if (ssliosession.isOutboundDone() && !ssliosession.isInboundDone()) {
+ if (sslioSession != null) {
+ synchronized (sslioSession) {
+ if (sslioSession.isOutboundDone() && !sslioSession.isInboundDone()) {
// The session failed to terminate cleanly
- ssliosession.shutdown();
+ sslioSession.shutdown();
}
}
}
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/d956f67e/httpcore-nio/src/main/java/org/apache/http/nio/pool/AbstractNIOConnPool.java
----------------------------------------------------------------------
diff --git a/httpcore-nio/src/main/java/org/apache/http/nio/pool/AbstractNIOConnPool.java b/httpcore-nio/src/main/java/org/apache/http/nio/pool/AbstractNIOConnPool.java
index 179aea5..058ce58 100644
--- a/httpcore-nio/src/main/java/org/apache/http/nio/pool/AbstractNIOConnPool.java
+++ b/httpcore-nio/src/main/java/org/apache/http/nio/pool/AbstractNIOConnPool.java
@@ -75,7 +75,7 @@ import org.apache.http.util.LangUtils;
public abstract class AbstractNIOConnPool<T, C, E extends PoolEntry<T, C>>
implements ConnPool<T, E>, ConnPoolControl<T> {
- private final ConnectingIOReactor ioreactor;
+ private final ConnectingIOReactor ioReactor;
private final NIOConnFactory<T, C> connFactory;
private final SocketAddressResolver<T> addressResolver;
private final SessionRequestCallback sessionRequestCallback;
@@ -98,16 +98,16 @@ public abstract class AbstractNIOConnPool<T, C, E extends PoolEntry<T, C>>
*/
@Deprecated
public AbstractNIOConnPool(
- final ConnectingIOReactor ioreactor,
+ final ConnectingIOReactor ioReactor,
final NIOConnFactory<T, C> connFactory,
final int defaultMaxPerRoute,
final int maxTotal) {
super();
- Args.notNull(ioreactor, "I/O reactor");
+ Args.notNull(ioReactor, "I/O reactor");
Args.notNull(connFactory, "Connection factory");
Args.positive(defaultMaxPerRoute, "Max per route value");
Args.positive(maxTotal, "Max total value");
- this.ioreactor = ioreactor;
+ this.ioReactor = ioReactor;
this.connFactory = connFactory;
this.addressResolver = new SocketAddressResolver<T>() {
@@ -140,18 +140,18 @@ public abstract class AbstractNIOConnPool<T, C, E extends PoolEntry<T, C>>
* @since 4.3
*/
public AbstractNIOConnPool(
- final ConnectingIOReactor ioreactor,
+ final ConnectingIOReactor ioReactor,
final NIOConnFactory<T, C> connFactory,
final SocketAddressResolver<T> addressResolver,
final int defaultMaxPerRoute,
final int maxTotal) {
super();
- Args.notNull(ioreactor, "I/O reactor");
+ Args.notNull(ioReactor, "I/O reactor");
Args.notNull(connFactory, "Connection factory");
Args.notNull(addressResolver, "Address resolver");
Args.positive(defaultMaxPerRoute, "Max per route value");
Args.positive(maxTotal, "Max total value");
- this.ioreactor = ioreactor;
+ this.ioReactor = ioReactor;
this.connFactory = connFactory;
this.addressResolver = addressResolver;
this.sessionRequestCallback = new InternalSessionRequestCallback();
@@ -230,7 +230,7 @@ public abstract class AbstractNIOConnPool<T, C, E extends PoolEntry<T, C>>
this.pending.clear();
this.available.clear();
this.leasingRequests.clear();
- this.ioreactor.shutdown(waitMs);
+ this.ioReactor.shutdown(waitMs);
} finally {
this.lock.unlock();
}
@@ -255,9 +255,9 @@ public abstract class AbstractNIOConnPool<T, C, E extends PoolEntry<T, C>>
public Future<E> lease(
final T route, final Object state,
- final long connectTimeout, final TimeUnit tunit,
+ final long connectTimeout, final TimeUnit timeUnit,
final FutureCallback<E> callback) {
- return this.lease(route, state, connectTimeout, connectTimeout, tunit, callback);
+ return this.lease(route, state, connectTimeout, connectTimeout, timeUnit, callback);
}
/**
@@ -265,15 +265,15 @@ public abstract class AbstractNIOConnPool<T, C, E extends PoolEntry<T, C>>
*/
public Future<E> lease(
final T route, final Object state,
- final long connectTimeout, final long leaseTimeout, final TimeUnit tunit,
+ final long connectTimeout, final long leaseTimeout, final TimeUnit timeUnit,
final FutureCallback<E> callback) {
Args.notNull(route, "Route");
- Args.notNull(tunit, "Time unit");
+ Args.notNull(timeUnit, "Time unit");
Asserts.check(!this.isShutDown.get(), "Connection pool shut down");
final BasicFuture<E> future = new BasicFuture<E>(callback);
final LeaseRequest<T, C, E> leaseRequest = new LeaseRequest<T, C, E>(route, state,
- connectTimeout >= 0 ? tunit.toMillis(connectTimeout) : -1,
- leaseTimeout > 0 ? tunit.toMillis(leaseTimeout) : 0,
+ connectTimeout >= 0 ? timeUnit.toMillis(connectTimeout) : -1,
+ leaseTimeout > 0 ? timeUnit.toMillis(leaseTimeout) : 0,
future);
this.lock.lock();
try {
@@ -478,7 +478,7 @@ public abstract class AbstractNIOConnPool<T, C, E extends PoolEntry<T, C>>
return false;
}
- final SessionRequest sessionRequest = this.ioreactor.connect(
+ final SessionRequest sessionRequest = this.ioReactor.connect(
remoteAddress, localAddress, route, this.sessionRequestCallback);
request.attachSessionRequest(sessionRequest);
final long connectTimeout = request.getConnectTimeout();
@@ -562,7 +562,7 @@ public abstract class AbstractNIOConnPool<T, C, E extends PoolEntry<T, C>>
onLease(entry);
} else {
this.available.add(entry);
- if (this.ioreactor.getStatus().compareTo(IOReactorStatus.ACTIVE) <= 0) {
+ if (this.ioReactor.getStatus().compareTo(IOReactorStatus.ACTIVE) <= 0) {
processNextPendingRequest();
}
}
@@ -587,7 +587,7 @@ public abstract class AbstractNIOConnPool<T, C, E extends PoolEntry<T, C>>
this.pending.remove(request);
final RouteSpecificPool<T, C, E> pool = getPool(route);
pool.cancelled(request);
- if (this.ioreactor.getStatus().compareTo(IOReactorStatus.ACTIVE) <= 0) {
+ if (this.ioReactor.getStatus().compareTo(IOReactorStatus.ACTIVE) <= 0) {
processNextPendingRequest();
}
} finally {
@@ -831,9 +831,9 @@ public abstract class AbstractNIOConnPool<T, C, E extends PoolEntry<T, C>>
}
}
- public void closeIdle(final long idletime, final TimeUnit tunit) {
- Args.notNull(tunit, "Time unit");
- long time = tunit.toMillis(idletime);
+ public void closeIdle(final long idletime, final TimeUnit timeUnit) {
+ Args.notNull(timeUnit, "Time unit");
+ long time = timeUnit.toMillis(idletime);
if (time < 0) {
time = 0;
}
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/d956f67e/httpcore-nio/src/main/java/org/apache/http/nio/reactor/ssl/SSLIOSession.java
----------------------------------------------------------------------
diff --git a/httpcore-nio/src/main/java/org/apache/http/nio/reactor/ssl/SSLIOSession.java b/httpcore-nio/src/main/java/org/apache/http/nio/reactor/ssl/SSLIOSession.java
index 297989b..641059b 100644
--- a/httpcore-nio/src/main/java/org/apache/http/nio/reactor/ssl/SSLIOSession.java
+++ b/httpcore-nio/src/main/java/org/apache/http/nio/reactor/ssl/SSLIOSession.java
@@ -65,8 +65,8 @@ import org.apache.http.util.Asserts;
* SSLContext sslContext = SSLContext.getInstance("SSL");
* sslContext.init(null, null, null);
* SSLIOSession sslsession = new SSLIOSession(
- * iosession, SSLMode.CLIENT, sslContext, null);
- * iosession.setAttribute(SSLIOSession.SESSION_KEY, sslsession);
+ * ioSession, SSLMode.CLIENT, sslContext, null);
+ * ioSession.setAttribute(SSLIOSession.SESSION_KEY, sslsession);
* </pre>
*
* @since 4.2
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/d956f67e/httpcore-nio/src/test/java/org/apache/http/impl/nio/pool/TestBasicNIOConnPool.java
----------------------------------------------------------------------
diff --git a/httpcore-nio/src/test/java/org/apache/http/impl/nio/pool/TestBasicNIOConnPool.java b/httpcore-nio/src/test/java/org/apache/http/impl/nio/pool/TestBasicNIOConnPool.java
index 78f9cdc..25e2781 100644
--- a/httpcore-nio/src/test/java/org/apache/http/impl/nio/pool/TestBasicNIOConnPool.java
+++ b/httpcore-nio/src/test/java/org/apache/http/impl/nio/pool/TestBasicNIOConnPool.java
@@ -52,16 +52,16 @@ public class TestBasicNIOConnPool {
static class LocalPool extends BasicNIOConnPool {
public LocalPool(
- final ConnectingIOReactor ioreactor,
+ final ConnectingIOReactor ioReactor,
final NIOConnFactory<HttpHost, NHttpClientConnection> connFactory,
final int connectTimeout) {
- super(ioreactor, connFactory, connectTimeout);
+ super(ioReactor, connFactory, connectTimeout);
}
public LocalPool(
- final ConnectingIOReactor ioreactor,
+ final ConnectingIOReactor ioReactor,
final ConnectionConfig config) {
- super(ioreactor, config);
+ super(ioReactor, config);
}
@Override
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/d956f67e/httpcore-nio/src/test/java/org/apache/http/impl/nio/reactor/TestDefaultListeningIOReactor.java
----------------------------------------------------------------------
diff --git a/httpcore-nio/src/test/java/org/apache/http/impl/nio/reactor/TestDefaultListeningIOReactor.java b/httpcore-nio/src/test/java/org/apache/http/impl/nio/reactor/TestDefaultListeningIOReactor.java
index fab6a58..784b423 100644
--- a/httpcore-nio/src/test/java/org/apache/http/impl/nio/reactor/TestDefaultListeningIOReactor.java
+++ b/httpcore-nio/src/test/java/org/apache/http/impl/nio/reactor/TestDefaultListeningIOReactor.java
@@ -74,14 +74,14 @@ public class TestDefaultListeningIOReactor {
public void testEndpointUpAndDown() throws Exception {
final IOEventDispatch eventDispatch = createIOEventDispatch();
final IOReactorConfig config = IOReactorConfig.custom().setIoThreadCount(1).build();
- final ListeningIOReactor ioreactor = new DefaultListeningIOReactor(config);
+ final ListeningIOReactor ioReactor = new DefaultListeningIOReactor(config);
final Thread t = new Thread(new Runnable() {
@Override
public void run() {
try {
- ioreactor.execute(eventDispatch);
+ ioReactor.execute(eventDispatch);
} catch (final IOException ex) {
}
}
@@ -90,24 +90,24 @@ public class TestDefaultListeningIOReactor {
t.start();
- Set<ListenerEndpoint> endpoints = ioreactor.getEndpoints();
+ Set<ListenerEndpoint> endpoints = ioReactor.getEndpoints();
Assert.assertNotNull(endpoints);
Assert.assertEquals(0, endpoints.size());
- final ListenerEndpoint endpoint1 = ioreactor.listen(new InetSocketAddress(0));
+ final ListenerEndpoint endpoint1 = ioReactor.listen(new InetSocketAddress(0));
endpoint1.waitFor();
- final ListenerEndpoint endpoint2 = ioreactor.listen(new InetSocketAddress(0));
+ final ListenerEndpoint endpoint2 = ioReactor.listen(new InetSocketAddress(0));
endpoint2.waitFor();
final int port = ((InetSocketAddress) endpoint2.getAddress()).getPort();
- endpoints = ioreactor.getEndpoints();
+ endpoints = ioReactor.getEndpoints();
Assert.assertNotNull(endpoints);
Assert.assertEquals(2, endpoints.size());
endpoint1.close();
- endpoints = ioreactor.getEndpoints();
+ endpoints = ioReactor.getEndpoints();
Assert.assertNotNull(endpoints);
Assert.assertEquals(1, endpoints.size());
@@ -115,17 +115,17 @@ public class TestDefaultListeningIOReactor {
Assert.assertEquals(port, ((InetSocketAddress) endpoint.getAddress()).getPort());
- ioreactor.shutdown(1000);
+ ioReactor.shutdown(1000);
t.join(1000);
- Assert.assertEquals(IOReactorStatus.SHUT_DOWN, ioreactor.getStatus());
+ Assert.assertEquals(IOReactorStatus.SHUT_DOWN, ioReactor.getStatus());
}
@Test
public void testEndpointAlreadyBoundFatal() throws Exception {
final IOEventDispatch eventDispatch = createIOEventDispatch();
final IOReactorConfig config = IOReactorConfig.custom().setIoThreadCount(1).build();
- final ListeningIOReactor ioreactor = new DefaultListeningIOReactor(config);
+ final ListeningIOReactor ioReactor = new DefaultListeningIOReactor(config);
final CountDownLatch latch = new CountDownLatch(1);
@@ -134,7 +134,7 @@ public class TestDefaultListeningIOReactor {
@Override
public void run() {
try {
- ioreactor.execute(eventDispatch);
+ ioReactor.execute(eventDispatch);
Assert.fail("IOException should have been thrown");
} catch (final IOException ex) {
latch.countDown();
@@ -145,35 +145,35 @@ public class TestDefaultListeningIOReactor {
t.start();
- final ListenerEndpoint endpoint1 = ioreactor.listen(new InetSocketAddress(0));
+ final ListenerEndpoint endpoint1 = ioReactor.listen(new InetSocketAddress(0));
endpoint1.waitFor();
final int port = ((InetSocketAddress) endpoint1.getAddress()).getPort();
- final ListenerEndpoint endpoint2 = ioreactor.listen(new InetSocketAddress(port));
+ final ListenerEndpoint endpoint2 = ioReactor.listen(new InetSocketAddress(port));
endpoint2.waitFor();
Assert.assertNotNull(endpoint2.getException());
// I/O reactor is now expected to be shutting down
latch.await(2000, TimeUnit.MILLISECONDS);
- Assert.assertTrue(ioreactor.getStatus().compareTo(IOReactorStatus.SHUTTING_DOWN) >= 0);
+ Assert.assertTrue(ioReactor.getStatus().compareTo(IOReactorStatus.SHUTTING_DOWN) >= 0);
- final Set<ListenerEndpoint> endpoints = ioreactor.getEndpoints();
+ final Set<ListenerEndpoint> endpoints = ioReactor.getEndpoints();
Assert.assertNotNull(endpoints);
Assert.assertEquals(0, endpoints.size());
- ioreactor.shutdown(1000);
+ ioReactor.shutdown(1000);
t.join(1000);
- Assert.assertEquals(IOReactorStatus.SHUT_DOWN, ioreactor.getStatus());
+ Assert.assertEquals(IOReactorStatus.SHUT_DOWN, ioReactor.getStatus());
}
@Test
public void testEndpointAlreadyBoundNonFatal() throws Exception {
final IOEventDispatch eventDispatch = createIOEventDispatch();
final IOReactorConfig config = IOReactorConfig.custom().setIoThreadCount(1).build();
- final DefaultListeningIOReactor ioreactor = new DefaultListeningIOReactor(config);
+ final DefaultListeningIOReactor ioReactor = new DefaultListeningIOReactor(config);
- ioreactor.setExceptionHandler(new IOReactorExceptionHandler() {
+ ioReactor.setExceptionHandler(new IOReactorExceptionHandler() {
@Override
public boolean handle(final IOException ex) {
@@ -192,7 +192,7 @@ public class TestDefaultListeningIOReactor {
@Override
public void run() {
try {
- ioreactor.execute(eventDispatch);
+ ioReactor.execute(eventDispatch);
} catch (final IOException ex) {
}
}
@@ -201,22 +201,22 @@ public class TestDefaultListeningIOReactor {
t.start();
- final ListenerEndpoint endpoint1 = ioreactor.listen(new InetSocketAddress(9999));
+ final ListenerEndpoint endpoint1 = ioReactor.listen(new InetSocketAddress(9999));
endpoint1.waitFor();
- final ListenerEndpoint endpoint2 = ioreactor.listen(new InetSocketAddress(9999));
+ final ListenerEndpoint endpoint2 = ioReactor.listen(new InetSocketAddress(9999));
endpoint2.waitFor();
Assert.assertNotNull(endpoint2.getException());
// Sleep a little to make sure the I/O reactor is not shutting down
Thread.sleep(500);
- Assert.assertEquals(IOReactorStatus.ACTIVE, ioreactor.getStatus());
+ Assert.assertEquals(IOReactorStatus.ACTIVE, ioReactor.getStatus());
- ioreactor.shutdown(1000);
+ ioReactor.shutdown(1000);
t.join(1000);
- Assert.assertEquals(IOReactorStatus.SHUT_DOWN, ioreactor.getStatus());
+ Assert.assertEquals(IOReactorStatus.SHUT_DOWN, ioReactor.getStatus());
}
}
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/d956f67e/httpcore-nio/src/test/java/org/apache/http/nio/integration/TestCustomSSL.java
----------------------------------------------------------------------
diff --git a/httpcore-nio/src/test/java/org/apache/http/nio/integration/TestCustomSSL.java b/httpcore-nio/src/test/java/org/apache/http/nio/integration/TestCustomSSL.java
index 435c0c8..f3f96f3 100644
--- a/httpcore-nio/src/test/java/org/apache/http/nio/integration/TestCustomSSL.java
+++ b/httpcore-nio/src/test/java/org/apache/http/nio/integration/TestCustomSSL.java
@@ -93,9 +93,9 @@ public class TestCustomSSL {
@Override
public void verify(
- final IOSession iosession, final SSLSession sslsession) throws SSLException {
+ final IOSession ioSession, final SSLSession sslsession) throws SSLException {
final BigInteger sslid = new BigInteger(sslsession.getId());
- iosession.setAttribute("ssl-id", sslid);
+ ioSession.setAttribute("ssl-id", sslid);
}
};