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 16:57:57 UTC
svn commit: r1838035 [1/2] - in
/httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src:
examples/org/apache/http/examples/nio/client/
main/java-deprecated/org/apache/http/impl/nio/client/
main/java-deprecated/org/apache/http/impl/nio/conn/ ...
Author: ggregory
Date: Tue Aug 14 16:57:56 2018
New Revision: 1838035
URL: http://svn.apache.org/viewvc?rev=1838035&view=rev
Log:
Use camel-case; don't nest unnecessarily.
Modified:
httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/examples/org/apache/http/examples/nio/client/AsyncClientHttpExchangeStreaming.java
httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/examples/org/apache/http/examples/nio/client/AsyncClientPipelinedStreaming.java
httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/examples/org/apache/http/examples/nio/client/QuickStart.java
httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java-deprecated/org/apache/http/impl/nio/client/AbstractHttpAsyncClient.java
httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java-deprecated/org/apache/http/impl/nio/client/DefaultAsyncRequestDirector.java
httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java-deprecated/org/apache/http/impl/nio/conn/DefaultClientAsyncConnection.java
httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java-deprecated/org/apache/http/impl/nio/conn/DefaultClientAsyncConnectionFactory.java
httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java-deprecated/org/apache/http/impl/nio/conn/HttpNIOConnPool.java
httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java-deprecated/org/apache/http/impl/nio/conn/HttpPoolEntry.java
httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java-deprecated/org/apache/http/impl/nio/conn/ManagedClientAsyncConnectionImpl.java
httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java-deprecated/org/apache/http/impl/nio/conn/PoolingClientAsyncConnectionManager.java
httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java-deprecated/org/apache/http/nio/conn/ClientAsyncConnection.java
httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java-deprecated/org/apache/http/nio/conn/ClientAsyncConnectionFactory.java
httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java-deprecated/org/apache/http/nio/conn/ManagedClientAsyncConnection.java
httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java-deprecated/org/apache/http/nio/conn/scheme/LayeringStrategy.java
httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java-deprecated/org/apache/http/nio/conn/ssl/SSLLayeringStrategy.java
httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/DefaultClientExchangeHandlerImpl.java
httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/HttpAsyncClientBuilder.java
httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/HttpAsyncClients.java
httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/InternalClientExec.java
httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/MainClientExec.java
httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/MinimalClientExchangeHandlerImpl.java
httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/PipeliningClientExchangeHandlerImpl.java
httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/CPool.java
httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/CPoolEntry.java
httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/CPoolProxy.java
httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/LoggingIOSession.java
httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/ManagedNHttpClientConnectionFactory.java
httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/ManagedNHttpClientConnectionImpl.java
httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/PoolingNHttpClientConnectionManager.java
httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java/org/apache/http/nio/client/methods/AsyncByteConsumer.java
httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java/org/apache/http/nio/client/methods/AsyncCharConsumer.java
httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java/org/apache/http/nio/client/methods/BaseZeroCopyRequestProducer.java
httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java/org/apache/http/nio/client/methods/ZeroCopyConsumer.java
httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java/org/apache/http/nio/conn/ManagedNHttpClientConnection.java
httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java/org/apache/http/nio/conn/NHttpClientConnectionManager.java
httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java/org/apache/http/nio/conn/NHttpConnectionFactory.java
httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java/org/apache/http/nio/conn/NoopIOSessionStrategy.java
httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java/org/apache/http/nio/conn/SchemeIOSessionStrategy.java
httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java/org/apache/http/nio/conn/ssl/SSLIOSessionStrategy.java
httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/test/java/org/apache/http/impl/nio/conn/TestPoolingHttpClientAsyncConnectionManager.java
httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/test/java/org/apache/http/nio/client/integration/TestHttpAsync.java
httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/test/java/org/apache/http/nio/client/integration/TestHttpAsyncPrematureTermination.java
httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/test/java/org/apache/http/nio/client/integration/TestStatefulConnManagement.java
httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/test/java/org/apache/http/nio/client/methods/TestAsyncConsumers.java
httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/test/java/org/apache/http/nio/client/methods/TestZeroCopy.java
Modified: httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/examples/org/apache/http/examples/nio/client/AsyncClientHttpExchangeStreaming.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/examples/org/apache/http/examples/nio/client/AsyncClientHttpExchangeStreaming.java?rev=1838035&r1=1838034&r2=1838035&view=diff
==============================================================================
--- httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/examples/org/apache/http/examples/nio/client/AsyncClientHttpExchangeStreaming.java (original)
+++ httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/examples/org/apache/http/examples/nio/client/AsyncClientHttpExchangeStreaming.java Tue Aug 14 16:57:56 2018
@@ -71,7 +71,7 @@ public class AsyncClientHttpExchangeStre
}
@Override
- protected void onCharReceived(final CharBuffer buf, final IOControl ioctrl) throws IOException {
+ protected void onCharReceived(final CharBuffer buf, final IOControl ioControl) throws IOException {
while (buf.hasRemaining()) {
System.out.print(buf.get());
}
Modified: httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/examples/org/apache/http/examples/nio/client/AsyncClientPipelinedStreaming.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/examples/org/apache/http/examples/nio/client/AsyncClientPipelinedStreaming.java?rev=1838035&r1=1838034&r2=1838035&view=diff
==============================================================================
--- httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/examples/org/apache/http/examples/nio/client/AsyncClientPipelinedStreaming.java (original)
+++ httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/examples/org/apache/http/examples/nio/client/AsyncClientPipelinedStreaming.java Tue Aug 14 16:57:56 2018
@@ -113,7 +113,7 @@ public class AsyncClientPipelinedStreami
}
@Override
- protected void onCharReceived(final CharBuffer buf, final IOControl ioctrl) throws IOException {
+ protected void onCharReceived(final CharBuffer buf, final IOControl ioControl) throws IOException {
while (buf.hasRemaining()) {
System.out.print(buf.get());
}
Modified: httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/examples/org/apache/http/examples/nio/client/QuickStart.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/examples/org/apache/http/examples/nio/client/QuickStart.java?rev=1838035&r1=1838034&r2=1838035&view=diff
==============================================================================
--- httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/examples/org/apache/http/examples/nio/client/QuickStart.java (original)
+++ httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/examples/org/apache/http/examples/nio/client/QuickStart.java Tue Aug 14 16:57:56 2018
@@ -98,7 +98,7 @@ public class QuickStart {
}
@Override
- protected void onCharReceived(final CharBuffer buf, final IOControl ioctrl) throws IOException {
+ protected void onCharReceived(final CharBuffer buf, final IOControl ioControl) throws IOException {
// Do something useful
}
Modified: httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java-deprecated/org/apache/http/impl/nio/client/AbstractHttpAsyncClient.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java-deprecated/org/apache/http/impl/nio/client/AbstractHttpAsyncClient.java?rev=1838035&r1=1838034&r2=1838035&view=diff
==============================================================================
--- httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java-deprecated/org/apache/http/impl/nio/client/AbstractHttpAsyncClient.java (original)
+++ httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java-deprecated/org/apache/http/impl/nio/client/AbstractHttpAsyncClient.java Tue Aug 14 16:57:56 2018
@@ -132,9 +132,9 @@ public abstract class AbstractHttpAsyncC
protected AbstractHttpAsyncClient(final IOReactorConfig config) throws IOReactorException {
super();
- final DefaultConnectingIOReactor defaultioreactor = new DefaultConnectingIOReactor(config);
- defaultioreactor.setExceptionHandler(new InternalIOReactorExceptionHandler(this.log));
- this.connmgr = new PoolingClientAsyncConnectionManager(defaultioreactor);
+ final DefaultConnectingIOReactor defaultioReactor = new DefaultConnectingIOReactor(config);
+ defaultioReactor.setExceptionHandler(new InternalIOReactorExceptionHandler(this.log));
+ this.connmgr = new PoolingClientAsyncConnectionManager(defaultioReactor);
this.queue = new ConcurrentLinkedQueue<HttpAsyncRequestExecutionHandler<?>>();
}
Modified: httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java-deprecated/org/apache/http/impl/nio/client/DefaultAsyncRequestDirector.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java-deprecated/org/apache/http/impl/nio/client/DefaultAsyncRequestDirector.java?rev=1838035&r1=1838034&r2=1838035&view=diff
==============================================================================
--- httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java-deprecated/org/apache/http/impl/nio/client/DefaultAsyncRequestDirector.java (original)
+++ httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java-deprecated/org/apache/http/impl/nio/client/DefaultAsyncRequestDirector.java Tue Aug 14 16:57:56 2018
@@ -105,7 +105,7 @@ class DefaultAsyncRequestDirector<T> imp
private final HttpContext localContext;
private final ResultCallback<T> resultCallback;
private final ClientAsyncConnectionManager connmgr;
- private final HttpProcessor httppocessor;
+ private final HttpProcessor httpPocessor;
private final HttpRoutePlanner routePlanner;
private final HttpRouteDirector routeDirector;
private final ConnectionReuseStrategy reuseStrategy;
@@ -145,7 +145,7 @@ class DefaultAsyncRequestDirector<T> imp
final HttpContext localContext,
final ResultCallback<T> callback,
final ClientAsyncConnectionManager connmgr,
- final HttpProcessor httppocessor,
+ final HttpProcessor httpPocessor,
final HttpRoutePlanner routePlanner,
final ConnectionReuseStrategy reuseStrategy,
final ConnectionKeepAliveStrategy keepaliveStrategy,
@@ -161,7 +161,7 @@ class DefaultAsyncRequestDirector<T> imp
this.localContext = localContext;
this.resultCallback = callback;
this.connmgr = connmgr;
- this.httppocessor = httppocessor;
+ this.httpPocessor = httpPocessor;
this.routePlanner = routePlanner;
this.reuseStrategy = reuseStrategy;
this.keepaliveStrategy = keepaliveStrategy;
@@ -328,12 +328,12 @@ class DefaultAsyncRequestDirector<T> imp
@Override
public synchronized void produceContent(
- final ContentEncoder encoder, final IOControl ioctrl) throws IOException {
+ final ContentEncoder encoder, final IOControl ioControl) throws IOException {
if (this.log.isDebugEnabled()) {
this.log.debug("[exchange: " + this.id + "] produce content");
}
this.requestContentProduced = true;
- this.requestProducer.produceContent(encoder, ioctrl);
+ this.requestProducer.produceContent(encoder, ioControl);
if (encoder.isCompleted()) {
this.requestProducer.resetRequest();
}
@@ -404,12 +404,12 @@ class DefaultAsyncRequestDirector<T> imp
@Override
public synchronized void consumeContent(
- final ContentDecoder decoder, final IOControl ioctrl) throws IOException {
+ final ContentDecoder decoder, final IOControl ioControl) throws IOException {
if (this.log.isDebugEnabled()) {
this.log.debug("[exchange: " + this.id + "] Consume content");
}
if (this.finalResponse != null) {
- this.responseConsumer.consumeContent(decoder, ioctrl);
+ this.responseConsumer.consumeContent(decoder, ioControl);
} else {
if (this.tmpbuf == null) {
this.tmpbuf = ByteBuffer.allocate(2048);
@@ -881,7 +881,7 @@ class DefaultAsyncRequestDirector<T> imp
@Override
public HttpProcessor getHttpProcessor() {
- return this.httppocessor;
+ return this.httpPocessor;
}
@Override
Modified: httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java-deprecated/org/apache/http/impl/nio/conn/DefaultClientAsyncConnection.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java-deprecated/org/apache/http/impl/nio/conn/DefaultClientAsyncConnection.java?rev=1838035&r1=1838034&r2=1838035&view=diff
==============================================================================
--- httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java-deprecated/org/apache/http/impl/nio/conn/DefaultClientAsyncConnection.java (original)
+++ httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java-deprecated/org/apache/http/impl/nio/conn/DefaultClientAsyncConnection.java Tue Aug 14 16:57:56 2018
@@ -42,8 +42,8 @@ import org.apache.http.params.HttpParams
public class DefaultClientAsyncConnection
extends DefaultNHttpClientConnection implements ClientAsyncConnection {
- private final Log headerlog = LogFactory.getLog("org.apache.http.headers");
- private final Log wirelog = LogFactory.getLog("org.apache.http.wire");
+ private final Log headerLog = LogFactory.getLog("org.apache.http.headers");
+ private final Log wireLog = LogFactory.getLog("org.apache.http.wire");
private final Log log;
private final String id;
@@ -51,27 +51,27 @@ public class DefaultClientAsyncConnectio
public DefaultClientAsyncConnection(
final String id,
- final IOSession iosession,
+ final IOSession ioSession,
final HttpResponseFactory responseFactory,
final ByteBufferAllocator allocator,
final HttpParams params) {
- super(iosession, responseFactory, allocator, params);
+ super(ioSession, responseFactory, allocator, params);
this.id = id;
- this.original = iosession;
- this.log = LogFactory.getLog(iosession.getClass());
- if (this.log.isDebugEnabled() || this.wirelog.isDebugEnabled()) {
- bind(new LoggingIOSession(iosession, this.id, this.log, this.wirelog));
+ this.original = ioSession;
+ this.log = LogFactory.getLog(ioSession.getClass());
+ if (this.log.isDebugEnabled() || this.wireLog.isDebugEnabled()) {
+ bind(new LoggingIOSession(ioSession, this.id, this.log, this.wireLog));
}
}
@Override
- public void upgrade(final IOSession iosession) {
- this.original = iosession;
- if (this.log.isDebugEnabled() || this.wirelog.isDebugEnabled()) {
- this.log.debug(this.id + " Upgrade session " + iosession);
- bind(new LoggingIOSession(iosession, this.id, this.headerlog, this.wirelog));
+ public void upgrade(final IOSession ioSession) {
+ this.original = ioSession;
+ if (this.log.isDebugEnabled() || this.wireLog.isDebugEnabled()) {
+ this.log.debug(this.id + " Upgrade session " + ioSession);
+ bind(new LoggingIOSession(ioSession, this.id, this.headerLog, this.wireLog));
} else {
- bind(iosession);
+ bind(ioSession);
}
}
@@ -86,22 +86,22 @@ public class DefaultClientAsyncConnectio
@Override
protected void onResponseReceived(final HttpResponse response) {
- if (response != null && this.headerlog.isDebugEnabled()) {
- this.headerlog.debug(this.id + " << " + response.getStatusLine().toString());
+ if (response != null && this.headerLog.isDebugEnabled()) {
+ this.headerLog.debug(this.id + " << " + response.getStatusLine().toString());
final Header[] headers = response.getAllHeaders();
for (final Header header : headers) {
- this.headerlog.debug(this.id + " << " + header.toString());
+ this.headerLog.debug(this.id + " << " + header.toString());
}
}
}
@Override
protected void onRequestSubmitted(final HttpRequest request) {
- if (request != null && this.headerlog.isDebugEnabled()) {
- this.headerlog.debug(this.id + " >> " + request.getRequestLine().toString());
+ if (request != null && this.headerLog.isDebugEnabled()) {
+ this.headerLog.debug(this.id + " >> " + request.getRequestLine().toString());
final Header[] headers = request.getAllHeaders();
for (final Header header : headers) {
- this.headerlog.debug(this.id + " >> " + header.toString());
+ this.headerLog.debug(this.id + " >> " + header.toString());
}
}
}
Modified: httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java-deprecated/org/apache/http/impl/nio/conn/DefaultClientAsyncConnectionFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java-deprecated/org/apache/http/impl/nio/conn/DefaultClientAsyncConnectionFactory.java?rev=1838035&r1=1838034&r2=1838035&view=diff
==============================================================================
--- httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java-deprecated/org/apache/http/impl/nio/conn/DefaultClientAsyncConnectionFactory.java (original)
+++ httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java-deprecated/org/apache/http/impl/nio/conn/DefaultClientAsyncConnectionFactory.java Tue Aug 14 16:57:56 2018
@@ -55,8 +55,8 @@ import org.apache.http.params.HttpParams
public class DefaultClientAsyncConnectionFactory
implements ClientAsyncConnectionFactory, NHttpConnectionFactory<ManagedNHttpClientConnection> {
- private final Log headerlog = LogFactory.getLog("org.apache.http.headers");
- private final Log wirelog = LogFactory.getLog("org.apache.http.wire");
+ private final Log headerLog = LogFactory.getLog("org.apache.http.headers");
+ private final Log wireLog = LogFactory.getLog("org.apache.http.wire");
private final Log log = LogFactory.getLog(ManagedNHttpClientConnectionImpl.class);
public static final DefaultClientAsyncConnectionFactory INSTANCE = new DefaultClientAsyncConnectionFactory(null, null);
@@ -89,10 +89,10 @@ public class DefaultClientAsyncConnectio
@Deprecated
public ClientAsyncConnection create(
final String id,
- final IOSession iosession,
+ final IOSession ioSession,
final HttpParams params) {
return new DefaultClientAsyncConnection(
- id, iosession, this.responseFactory, this.allocator, params);
+ id, ioSession, this.responseFactory, this.allocator, params);
}
@Deprecated
@@ -107,36 +107,36 @@ public class DefaultClientAsyncConnectio
@Override
public ManagedNHttpClientConnection create(
- final IOSession iosession, final ConnectionConfig config) {
+ final IOSession ioSession, final ConnectionConfig config) {
final String id = "http-outgoing-" + Long.toString(COUNTER.getAndIncrement());
- CharsetDecoder chardecoder = null;
- CharsetEncoder charencoder = null;
+ CharsetDecoder charDecoder = null;
+ CharsetEncoder charEncoder = null;
final Charset charset = config.getCharset();
final CodingErrorAction malformedInputAction = config.getMalformedInputAction() != null ?
config.getMalformedInputAction() : CodingErrorAction.REPORT;
final CodingErrorAction unmappableInputAction = config.getUnmappableInputAction() != null ?
config.getUnmappableInputAction() : CodingErrorAction.REPORT;
if (charset != null) {
- chardecoder = charset.newDecoder();
- chardecoder.onMalformedInput(malformedInputAction);
- chardecoder.onUnmappableCharacter(unmappableInputAction);
- charencoder = charset.newEncoder();
- charencoder.onMalformedInput(malformedInputAction);
- charencoder.onUnmappableCharacter(unmappableInputAction);
+ charDecoder = charset.newDecoder();
+ charDecoder.onMalformedInput(malformedInputAction);
+ charDecoder.onUnmappableCharacter(unmappableInputAction);
+ charEncoder = charset.newEncoder();
+ charEncoder.onMalformedInput(malformedInputAction);
+ charEncoder.onUnmappableCharacter(unmappableInputAction);
}
final ManagedNHttpClientConnection conn = new ManagedNHttpClientConnectionImpl(
id,
this.log,
- this.headerlog,
- this.wirelog,
- iosession,
+ this.headerLog,
+ this.wireLog,
+ ioSession,
config.getBufferSize(),
config.getFragmentSizeHint(),
this.allocator,
- chardecoder, charencoder, config.getMessageConstraints(),
+ charDecoder, charEncoder, config.getMessageConstraints(),
null, null, null,
this.responseParserFactory);
- iosession.setAttribute(IOEventDispatch.CONNECTION_KEY, conn);
+ ioSession.setAttribute(IOEventDispatch.CONNECTION_KEY, conn);
return conn;
}
Modified: httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java-deprecated/org/apache/http/impl/nio/conn/HttpNIOConnPool.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java-deprecated/org/apache/http/impl/nio/conn/HttpNIOConnPool.java?rev=1838035&r1=1838034&r2=1838035&view=diff
==============================================================================
--- httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java-deprecated/org/apache/http/impl/nio/conn/HttpNIOConnPool.java (original)
+++ httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java-deprecated/org/apache/http/impl/nio/conn/HttpNIOConnPool.java Tue Aug 14 16:57:56 2018
@@ -48,18 +48,18 @@ class HttpNIOConnPool extends AbstractNI
private final Log log;
private final AsyncSchemeRegistry schemeRegistry;
private final long connTimeToLive;
- private final TimeUnit tunit;
+ private final TimeUnit timeUnit;
HttpNIOConnPool(
final Log log,
- final ConnectingIOReactor ioreactor,
+ final ConnectingIOReactor ioReactor,
final AsyncSchemeRegistry schemeRegistry,
- final long connTimeToLive, final TimeUnit tunit) {
- super(ioreactor, new HttpNIOConnPoolFactory(), 2, 20);
+ final long connTimeToLive, final TimeUnit timeUnit) {
+ super(ioReactor, new HttpNIOConnPoolFactory(), 2, 20);
this.log = log;
this.schemeRegistry = schemeRegistry;
this.connTimeToLive = connTimeToLive;
- this.tunit = tunit;
+ this.timeUnit = timeUnit;
}
@Override
@@ -85,7 +85,7 @@ class HttpNIOConnPool extends AbstractNI
@Override
protected HttpPoolEntry createEntry(final HttpRoute route, final IOSession session) {
final String id = Long.toString(COUNTER.getAndIncrement());
- return new HttpPoolEntry(this.log, id, route, session, this.connTimeToLive, this.tunit);
+ return new HttpPoolEntry(this.log, id, route, session, this.connTimeToLive, this.timeUnit);
}
}
Modified: httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java-deprecated/org/apache/http/impl/nio/conn/HttpPoolEntry.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java-deprecated/org/apache/http/impl/nio/conn/HttpPoolEntry.java?rev=1838035&r1=1838034&r2=1838035&view=diff
==============================================================================
--- httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java-deprecated/org/apache/http/impl/nio/conn/HttpPoolEntry.java (original)
+++ httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java-deprecated/org/apache/http/impl/nio/conn/HttpPoolEntry.java Tue Aug 14 16:57:56 2018
@@ -45,8 +45,8 @@ class HttpPoolEntry extends PoolEntry<Ht
private final RouteTracker tracker;
HttpPoolEntry(final Log log, final String id, final HttpRoute route, final IOSession session,
- final long timeToLive, final TimeUnit tunit) {
- super(id, route, session, timeToLive, tunit);
+ final long timeToLive, final TimeUnit timeUnit) {
+ super(id, route, session, timeToLive, timeUnit);
this.log = log;
this.tracker = new RouteTracker(route);
}
Modified: httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java-deprecated/org/apache/http/impl/nio/conn/ManagedClientAsyncConnectionImpl.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java-deprecated/org/apache/http/impl/nio/conn/ManagedClientAsyncConnectionImpl.java?rev=1838035&r1=1838034&r2=1838035&view=diff
==============================================================================
--- httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java-deprecated/org/apache/http/impl/nio/conn/ManagedClientAsyncConnectionImpl.java (original)
+++ httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java-deprecated/org/apache/http/impl/nio/conn/ManagedClientAsyncConnectionImpl.java Tue Aug 14 16:57:56 2018
@@ -271,9 +271,9 @@ class ManagedClientAsyncConnectionImpl i
@Override
public SSLSession getSSLSession() {
final ClientAsyncConnection conn = ensureConnection();
- final IOSession iosession = conn.getIOSession();
- return iosession instanceof SSLIOSession
- ? ((SSLIOSession) iosession).getSSLSession()
+ final IOSession ioSession = conn.getIOSession();
+ return ioSession instanceof SSLIOSession
+ ? ((SSLIOSession) ioSession).getSSLSession()
: null;
}
@@ -335,21 +335,21 @@ class ManagedClientAsyncConnectionImpl i
final HttpHost target = route.getTargetHost();
final HttpHost proxy = route.getProxyHost();
- IOSession iosession = entry.getConnection();
+ IOSession ioSession = entry.getConnection();
if (proxy == null) {
final AsyncScheme scheme = getSchemeRegistry(context).getScheme(target);
final LayeringStrategy layeringStrategy = scheme.getLayeringStrategy();
if (layeringStrategy != null) {
- iosession = layeringStrategy.layer(iosession);
+ ioSession = layeringStrategy.layer(ioSession);
}
}
final ClientAsyncConnection conn = this.connFactory.create(
"http-outgoing-" + entry.getId(),
- iosession,
+ ioSession,
params);
- iosession.setAttribute(IOEventDispatch.CONNECTION_KEY, conn);
+ ioSession.setAttribute(IOEventDispatch.CONNECTION_KEY, conn);
if (proxy == null) {
tracker.connectTarget(conn.getIOSession() instanceof SSLIOSession);
@@ -404,10 +404,10 @@ class ManagedClientAsyncConnectionImpl i
throw new IllegalStateException(scheme.getName() +
" scheme does not provider support for protocol layering");
}
- final IOSession iosession = entry.getConnection();
- final ClientAsyncConnection conn = (ClientAsyncConnection) iosession.getAttribute(
+ final IOSession ioSession = entry.getConnection();
+ final ClientAsyncConnection conn = (ClientAsyncConnection) ioSession.getAttribute(
IOEventDispatch.CONNECTION_KEY);
- conn.upgrade(layeringStrategy.layer(iosession));
+ conn.upgrade(layeringStrategy.layer(ioSession));
tracker.layerProtocol(layeringStrategy.isSecure());
}
@@ -426,8 +426,8 @@ class ManagedClientAsyncConnectionImpl i
return;
}
this.reusable = false;
- final IOSession iosession = this.poolEntry.getConnection();
- final ClientAsyncConnection conn = (ClientAsyncConnection) iosession.getAttribute(
+ final IOSession ioSession = this.poolEntry.getConnection();
+ final ClientAsyncConnection conn = (ClientAsyncConnection) ioSession.getAttribute(
IOEventDispatch.CONNECTION_KEY);
try {
conn.shutdown();
Modified: httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java-deprecated/org/apache/http/impl/nio/conn/PoolingClientAsyncConnectionManager.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java-deprecated/org/apache/http/impl/nio/conn/PoolingClientAsyncConnectionManager.java?rev=1838035&r1=1838034&r2=1838035&view=diff
==============================================================================
--- httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java-deprecated/org/apache/http/impl/nio/conn/PoolingClientAsyncConnectionManager.java (original)
+++ httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java-deprecated/org/apache/http/impl/nio/conn/PoolingClientAsyncConnectionManager.java Tue Aug 14 16:57:56 2018
@@ -53,34 +53,34 @@ public class PoolingClientAsyncConnectio
private final Log log = LogFactory.getLog(getClass());
- private final ConnectingIOReactor ioreactor;
+ private final ConnectingIOReactor ioReactor;
private final HttpNIOConnPool pool;
private final AsyncSchemeRegistry schemeRegistry;
private final ClientAsyncConnectionFactory connFactory;
public PoolingClientAsyncConnectionManager(
- final ConnectingIOReactor ioreactor,
+ final ConnectingIOReactor ioReactor,
final AsyncSchemeRegistry schemeRegistry,
- final long timeToLive, final TimeUnit tunit) {
+ final long timeToLive, final TimeUnit timeUnit) {
super();
- Args.notNull(ioreactor, "I/O reactor");
+ Args.notNull(ioReactor, "I/O reactor");
Args.notNull(schemeRegistry, "Scheme registory");
- Args.notNull(tunit, "Time unit");
- this.ioreactor = ioreactor;
- this.pool = new HttpNIOConnPool(this.log, ioreactor, schemeRegistry, timeToLive, tunit);
+ Args.notNull(timeUnit, "Time unit");
+ this.ioReactor = ioReactor;
+ this.pool = new HttpNIOConnPool(this.log, ioReactor, schemeRegistry, timeToLive, timeUnit);
this.schemeRegistry = schemeRegistry;
this.connFactory = createClientAsyncConnectionFactory();
}
public PoolingClientAsyncConnectionManager(
- final ConnectingIOReactor ioreactor,
+ final ConnectingIOReactor ioReactor,
final AsyncSchemeRegistry schemeRegistry) throws IOReactorException {
- this(ioreactor, schemeRegistry, -1, TimeUnit.MILLISECONDS);
+ this(ioReactor, schemeRegistry, -1, TimeUnit.MILLISECONDS);
}
public PoolingClientAsyncConnectionManager(
- final ConnectingIOReactor ioreactor) throws IOReactorException {
- this(ioreactor, AsyncSchemeRegistryFactory.createDefault());
+ final ConnectingIOReactor ioReactor) throws IOReactorException {
+ this(ioReactor, AsyncSchemeRegistryFactory.createDefault());
}
@Override
@@ -103,12 +103,12 @@ public class PoolingClientAsyncConnectio
@Override
public void execute(final IOEventDispatch eventDispatch) throws IOException {
- this.ioreactor.execute(eventDispatch);
+ this.ioReactor.execute(eventDispatch);
}
@Override
public IOReactorStatus getStatus() {
- return this.ioreactor.getStatus();
+ return this.ioReactor.getStatus();
}
@Override
@@ -162,16 +162,16 @@ public class PoolingClientAsyncConnectio
final HttpRoute route,
final Object state,
final long connectTimeout,
- final TimeUnit tunit,
+ final TimeUnit timeUnit,
final FutureCallback<ManagedClientAsyncConnection> callback) {
Args.notNull(route, "HTTP route");
- Args.notNull(tunit, "Time unit");
+ Args.notNull(timeUnit, "Time unit");
if (this.log.isDebugEnabled()) {
this.log.debug("Connection request: " + format(route, state) + formatStats(route));
}
final BasicFuture<ManagedClientAsyncConnection> future = new BasicFuture<ManagedClientAsyncConnection>(
callback);
- this.pool.lease(route, state, connectTimeout, tunit, new InternalPoolEntryCallback(future));
+ this.pool.lease(route, state, connectTimeout, timeUnit, new InternalPoolEntryCallback(future));
return future;
}
@@ -179,13 +179,13 @@ public class PoolingClientAsyncConnectio
public void releaseConnection(
final ManagedClientAsyncConnection conn,
final long keepalive,
- final TimeUnit tunit) {
+ final TimeUnit timeUnit) {
Args.notNull(conn, "HTTP connection");
if (!(conn instanceof ManagedClientAsyncConnectionImpl)) {
throw new IllegalArgumentException("Connection class mismatch, " +
"connection not obtained from this manager");
}
- Args.notNull(tunit, "Time unit");
+ Args.notNull(timeUnit, "Time unit");
final ManagedClientAsyncConnectionImpl managedConn = (ManagedClientAsyncConnectionImpl) conn;
final ClientAsyncConnectionManager manager = managedConn.getManager();
if (manager != null && manager != this) {
@@ -211,11 +211,11 @@ public class PoolingClientAsyncConnectio
}
}
if (managedConn.isOpen()) {
- entry.updateExpiry(keepalive, tunit != null ? tunit : TimeUnit.MILLISECONDS);
+ entry.updateExpiry(keepalive, timeUnit != null ? timeUnit : TimeUnit.MILLISECONDS);
if (this.log.isDebugEnabled()) {
final String s;
if (keepalive > 0) {
- s = "for " + keepalive + " " + tunit;
+ s = "for " + keepalive + " " + timeUnit;
} else {
s = "indefinitely";
}
@@ -273,11 +273,11 @@ public class PoolingClientAsyncConnectio
return this.pool.getMaxPerRoute(route);
}
- public void closeIdleConnections(final long idleTimeout, final TimeUnit tunit) {
+ public void closeIdleConnections(final long idleTimeout, final TimeUnit timeUnit) {
if (log.isDebugEnabled()) {
- log.debug("Closing connections idle longer than " + idleTimeout + " " + tunit);
+ log.debug("Closing connections idle longer than " + idleTimeout + " " + timeUnit);
}
- this.pool.closeIdle(idleTimeout, tunit);
+ this.pool.closeIdle(idleTimeout, timeUnit);
}
public void closeExpiredConnections() {
Modified: httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java-deprecated/org/apache/http/nio/conn/ClientAsyncConnection.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java-deprecated/org/apache/http/nio/conn/ClientAsyncConnection.java?rev=1838035&r1=1838034&r2=1838035&view=diff
==============================================================================
--- httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java-deprecated/org/apache/http/nio/conn/ClientAsyncConnection.java (original)
+++ httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java-deprecated/org/apache/http/nio/conn/ClientAsyncConnection.java Tue Aug 14 16:57:56 2018
@@ -33,7 +33,7 @@ import org.apache.http.nio.reactor.IOSes
@Deprecated
public interface ClientAsyncConnection extends NHttpClientConnection, HttpInetConnection {
- void upgrade(IOSession iosession);
+ void upgrade(IOSession ioSession);
IOSession getIOSession();
Modified: httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java-deprecated/org/apache/http/nio/conn/ClientAsyncConnectionFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java-deprecated/org/apache/http/nio/conn/ClientAsyncConnectionFactory.java?rev=1838035&r1=1838034&r2=1838035&view=diff
==============================================================================
--- httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java-deprecated/org/apache/http/nio/conn/ClientAsyncConnectionFactory.java (original)
+++ httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java-deprecated/org/apache/http/nio/conn/ClientAsyncConnectionFactory.java Tue Aug 14 16:57:56 2018
@@ -32,6 +32,6 @@ import org.apache.http.params.HttpParams
@Deprecated
public interface ClientAsyncConnectionFactory {
- ClientAsyncConnection create(String id, IOSession iosession, HttpParams params);
+ ClientAsyncConnection create(String id, IOSession ioSession, HttpParams params);
}
Modified: httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java-deprecated/org/apache/http/nio/conn/ManagedClientAsyncConnection.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java-deprecated/org/apache/http/nio/conn/ManagedClientAsyncConnection.java?rev=1838035&r1=1838034&r2=1838035&view=diff
==============================================================================
--- httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java-deprecated/org/apache/http/nio/conn/ManagedClientAsyncConnection.java (original)
+++ httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java-deprecated/org/apache/http/nio/conn/ManagedClientAsyncConnection.java Tue Aug 14 16:57:56 2018
@@ -59,6 +59,6 @@ public interface ManagedClientAsyncConne
void layerProtocol(HttpContext context, HttpParams params) throws IOException;
- void setIdleDuration(long duration, TimeUnit tunit);
+ void setIdleDuration(long duration, TimeUnit timeUnit);
}
Modified: httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java-deprecated/org/apache/http/nio/conn/scheme/LayeringStrategy.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java-deprecated/org/apache/http/nio/conn/scheme/LayeringStrategy.java?rev=1838035&r1=1838034&r2=1838035&view=diff
==============================================================================
--- httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java-deprecated/org/apache/http/nio/conn/scheme/LayeringStrategy.java (original)
+++ httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java-deprecated/org/apache/http/nio/conn/scheme/LayeringStrategy.java Tue Aug 14 16:57:56 2018
@@ -33,6 +33,6 @@ public interface LayeringStrategy {
boolean isSecure();
- IOSession layer(IOSession iosession);
+ IOSession layer(IOSession ioSession);
}
Modified: httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java-deprecated/org/apache/http/nio/conn/ssl/SSLLayeringStrategy.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java-deprecated/org/apache/http/nio/conn/ssl/SSLLayeringStrategy.java?rev=1838035&r1=1838034&r2=1838035&view=diff
==============================================================================
--- httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java-deprecated/org/apache/http/nio/conn/ssl/SSLLayeringStrategy.java (original)
+++ httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java-deprecated/org/apache/http/nio/conn/ssl/SSLLayeringStrategy.java Tue Aug 14 16:57:56 2018
@@ -184,9 +184,9 @@ public class SSLLayeringStrategy impleme
}
@Override
- public SSLIOSession layer(final IOSession iosession) {
- final SSLIOSession ssliosession = new SSLIOSession(
- iosession,
+ public SSLIOSession layer(final IOSession ioSession) {
+ final SSLIOSession sslioSession = new SSLIOSession(
+ ioSession,
SSLMode.CLIENT,
this.sslContext,
new SSLSetupHandler() {
@@ -199,23 +199,23 @@ public class SSLLayeringStrategy impleme
@Override
public void verify(
- final IOSession iosession,
+ final IOSession ioSession,
final SSLSession sslsession) throws SSLException {
- verifySession(iosession, sslsession);
+ verifySession(ioSession, sslsession);
}
});
- iosession.setAttribute(SSLIOSession.SESSION_KEY, ssliosession);
- return ssliosession;
+ ioSession.setAttribute(SSLIOSession.SESSION_KEY, sslioSession);
+ return sslioSession;
}
protected void initializeEngine(final SSLEngine engine) {
}
protected void verifySession(
- final IOSession iosession,
+ final IOSession ioSession,
final SSLSession sslsession) throws SSLException {
- final InetSocketAddress address = (InetSocketAddress) iosession.getRemoteAddress();
+ final InetSocketAddress address = (InetSocketAddress) ioSession.getRemoteAddress();
final Certificate[] certs = sslsession.getPeerCertificates();
final X509Certificate x509 = (X509Certificate) certs[0];
Modified: httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/DefaultClientExchangeHandlerImpl.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/DefaultClientExchangeHandlerImpl.java?rev=1838035&r1=1838034&r2=1838035&view=diff
==============================================================================
--- httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/DefaultClientExchangeHandlerImpl.java (original)
+++ httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/DefaultClientExchangeHandlerImpl.java Tue Aug 14 16:57:56 2018
@@ -136,8 +136,8 @@ class DefaultClientExchangeHandlerImpl<T
@Override
public void produceContent(
- final ContentEncoder encoder, final IOControl ioctrl) throws IOException {
- this.exec.produceContent(this.state, encoder, ioctrl);
+ final ContentEncoder encoder, final IOControl ioControl) throws IOException {
+ this.exec.produceContent(this.state, encoder, ioControl);
}
@Override
@@ -153,8 +153,8 @@ class DefaultClientExchangeHandlerImpl<T
@Override
public void consumeContent(
- final ContentDecoder decoder, final IOControl ioctrl) throws IOException {
- this.exec.consumeContent(this.state, decoder, ioctrl);
+ final ContentDecoder decoder, final IOControl ioControl) throws IOException {
+ this.exec.consumeContent(this.state, decoder, ioControl);
if (!decoder.isCompleted() && this.responseConsumer.isDone()) {
markConnectionNonReusable();
try {
Modified: httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/HttpAsyncClientBuilder.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/HttpAsyncClientBuilder.java?rev=1838035&r1=1838034&r2=1838035&view=diff
==============================================================================
--- httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/HttpAsyncClientBuilder.java (original)
+++ httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/HttpAsyncClientBuilder.java Tue Aug 14 16:57:56 2018
@@ -664,10 +664,10 @@ public class HttpAsyncClientBuilder {
sslStrategy = new SSLIOSessionStrategy(
sslcontext, supportedProtocols, supportedCipherSuites, hostnameVerifier);
}
- final ConnectingIOReactor ioreactor = IOReactorUtils.create(
+ final ConnectingIOReactor ioReactor = IOReactorUtils.create(
defaultIOReactorConfig != null ? defaultIOReactorConfig : IOReactorConfig.DEFAULT, threadFactory);
final PoolingNHttpClientConnectionManager poolingmgr = new PoolingNHttpClientConnectionManager(
- ioreactor,
+ ioReactor,
RegistryBuilder.<SchemeIOSessionStrategy>create()
.register("http", NoopIOSessionStrategy.INSTANCE)
.register("https", sslStrategy)
Modified: httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/HttpAsyncClients.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/HttpAsyncClients.java?rev=1838035&r1=1838034&r2=1838035&view=diff
==============================================================================
--- httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/HttpAsyncClients.java (original)
+++ httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/HttpAsyncClients.java Tue Aug 14 16:57:56 2018
@@ -86,9 +86,9 @@ public class HttpAsyncClients {
* aspects only. This client does not support HTTP state management, authentication
* and automatic redirects.
*/
- public static CloseableHttpAsyncClient createMinimal(final ConnectingIOReactor ioreactor) {
- Args.notNull(ioreactor, "I/O reactor");
- return createMinimal(new PoolingNHttpClientConnectionManager(ioreactor), false);
+ public static CloseableHttpAsyncClient createMinimal(final ConnectingIOReactor ioReactor) {
+ Args.notNull(ioReactor, "I/O reactor");
+ return createMinimal(new PoolingNHttpClientConnectionManager(ioReactor), false);
}
/**
@@ -138,8 +138,8 @@ public class HttpAsyncClients {
*
* @since 4.1
*/
- public static CloseableHttpPipeliningClient createPipelining(final ConnectingIOReactor ioreactor) {
- return createPipelining(new PoolingNHttpClientConnectionManager(ioreactor), false);
+ public static CloseableHttpPipeliningClient createPipelining(final ConnectingIOReactor ioReactor) {
+ return createPipelining(new PoolingNHttpClientConnectionManager(ioReactor), false);
}
/**
Modified: httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/InternalClientExec.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/InternalClientExec.java?rev=1838035&r1=1838034&r2=1838035&view=diff
==============================================================================
--- httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/InternalClientExec.java (original)
+++ httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/InternalClientExec.java Tue Aug 14 16:57:56 2018
@@ -51,7 +51,7 @@ interface InternalClientExec {
void produceContent(
InternalState state,
ContentEncoder encoder,
- IOControl ioctrl) throws IOException;
+ IOControl ioControl) throws IOException;
void requestCompleted(
InternalState state,
@@ -65,7 +65,7 @@ interface InternalClientExec {
void consumeContent(
InternalState state,
ContentDecoder decoder,
- IOControl ioctrl) throws IOException;
+ IOControl ioControl) throws IOException;
void responseCompleted(
InternalState state,
Modified: httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/MainClientExec.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/MainClientExec.java?rev=1838035&r1=1838034&r2=1838035&view=diff
==============================================================================
--- httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/MainClientExec.java (original)
+++ httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/MainClientExec.java Tue Aug 14 16:57:56 2018
@@ -253,13 +253,13 @@ class MainClientExec implements Internal
public void produceContent(
final InternalState state,
final ContentEncoder encoder,
- final IOControl ioctrl) throws IOException {
+ final IOControl ioControl) throws IOException {
if (this.log.isDebugEnabled()) {
this.log.debug("[exchange: " + state.getId() + "] produce content");
}
final HttpAsyncRequestProducer requestProducer = state.getRequestProducer();
state.setRequestContentProduced();
- requestProducer.produceContent(encoder, ioctrl);
+ requestProducer.produceContent(encoder, ioControl);
if (encoder.isCompleted()) {
requestProducer.resetRequest();
}
@@ -320,13 +320,13 @@ class MainClientExec implements Internal
public void consumeContent(
final InternalState state,
final ContentDecoder decoder,
- final IOControl ioctrl) throws IOException {
+ final IOControl ioControl) throws IOException {
if (this.log.isDebugEnabled()) {
this.log.debug("[exchange: " + state.getId() + "] Consume content");
}
if (state.getFinalResponse() != null) {
final HttpAsyncResponseConsumer<?> responseConsumer = state.getResponseConsumer();
- responseConsumer.consumeContent(decoder, ioctrl);
+ responseConsumer.consumeContent(decoder, ioControl);
} else {
final ByteBuffer tmpbuf = state.getTmpbuf();
tmpbuf.clear();
Modified: httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/MinimalClientExchangeHandlerImpl.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/MinimalClientExchangeHandlerImpl.java?rev=1838035&r1=1838034&r2=1838035&view=diff
==============================================================================
--- httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/MinimalClientExchangeHandlerImpl.java (original)
+++ httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/MinimalClientExchangeHandlerImpl.java Tue Aug 14 16:57:56 2018
@@ -171,11 +171,11 @@ class MinimalClientExchangeHandlerImpl<T
@Override
public void produceContent(
- final ContentEncoder encoder, final IOControl ioctrl) throws IOException {
+ final ContentEncoder encoder, final IOControl ioControl) throws IOException {
if (this.log.isDebugEnabled()) {
this.log.debug("[exchange: " + getId() + "] produce content");
}
- this.requestProducer.produceContent(encoder, ioctrl);
+ this.requestProducer.produceContent(encoder, ioControl);
if (encoder.isCompleted()) {
this.requestProducer.resetRequest();
}
@@ -205,11 +205,11 @@ class MinimalClientExchangeHandlerImpl<T
@Override
public void consumeContent(
- final ContentDecoder decoder, final IOControl ioctrl) throws IOException {
+ final ContentDecoder decoder, final IOControl ioControl) throws IOException {
if (this.log.isDebugEnabled()) {
this.log.debug("[exchange: " + getId() + "] Consume content");
}
- this.responseConsumer.consumeContent(decoder, ioctrl);
+ this.responseConsumer.consumeContent(decoder, ioControl);
if (!decoder.isCompleted() && this.responseConsumer.isDone()) {
markConnectionNonReusable();
try {
Modified: httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/PipeliningClientExchangeHandlerImpl.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/PipeliningClientExchangeHandlerImpl.java?rev=1838035&r1=1838034&r2=1838035&view=diff
==============================================================================
--- httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/PipeliningClientExchangeHandlerImpl.java (original)
+++ httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java/org/apache/http/impl/nio/client/PipeliningClientExchangeHandlerImpl.java Tue Aug 14 16:57:56 2018
@@ -214,13 +214,13 @@ class PipeliningClientExchangeHandlerImp
@Override
public void produceContent(
- final ContentEncoder encoder, final IOControl ioctrl) throws IOException {
+ final ContentEncoder encoder, final IOControl ioControl) throws IOException {
if (this.log.isDebugEnabled()) {
this.log.debug("[exchange: " + getId() + "] produce content");
}
final HttpAsyncRequestProducer requestProducer = this.requestProducerRef.get();
Asserts.check(requestProducer != null, "Inconsistent state: request producer is null");
- requestProducer.produceContent(encoder, ioctrl);
+ requestProducer.produceContent(encoder, ioControl);
if (encoder.isCompleted()) {
requestProducer.resetRequest();
}
@@ -268,13 +268,13 @@ class PipeliningClientExchangeHandlerImp
@Override
public void consumeContent(
- final ContentDecoder decoder, final IOControl ioctrl) throws IOException {
+ final ContentDecoder decoder, final IOControl ioControl) throws IOException {
if (this.log.isDebugEnabled()) {
this.log.debug("[exchange: " + getId() + "] Consume content");
}
final HttpAsyncResponseConsumer<T> responseConsumer = this.responseConsumerRef.get();
Asserts.check(responseConsumer != null, "Inconsistent state: response consumer is null");
- responseConsumer.consumeContent(decoder, ioctrl);
+ responseConsumer.consumeContent(decoder, ioControl);
}
@Override
Modified: httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/CPool.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/CPool.java?rev=1838035&r1=1838034&r2=1838035&view=diff
==============================================================================
--- httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/CPool.java (original)
+++ httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/CPool.java Tue Aug 14 16:57:56 2018
@@ -46,22 +46,22 @@ class CPool extends AbstractNIOConnPool<
private final Log log = LogFactory.getLog(CPool.class);
private final long timeToLive;
- private final TimeUnit tunit;
+ private final TimeUnit timeUnit;
public CPool(
- final ConnectingIOReactor ioreactor,
+ final ConnectingIOReactor ioReactor,
final NIOConnFactory<HttpRoute, ManagedNHttpClientConnection> connFactory,
final SocketAddressResolver<HttpRoute> addressResolver,
final int defaultMaxPerRoute, final int maxTotal,
- final long timeToLive, final TimeUnit tunit) {
- super(ioreactor, connFactory, addressResolver, defaultMaxPerRoute, maxTotal);
+ final long timeToLive, final TimeUnit timeUnit) {
+ super(ioReactor, connFactory, addressResolver, defaultMaxPerRoute, maxTotal);
this.timeToLive = timeToLive;
- this.tunit = tunit;
+ this.timeUnit = timeUnit;
}
@Override
protected CPoolEntry createEntry(final HttpRoute route, final ManagedNHttpClientConnection conn) {
- final CPoolEntry entry = new CPoolEntry(this.log, conn.getId(), route, conn, this.timeToLive, this.tunit);
+ final CPoolEntry entry = new CPoolEntry(this.log, conn.getId(), route, conn, this.timeToLive, this.timeUnit);
entry.setSocketTimeout(conn.getSocketTimeout());
return entry;
}
Modified: httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/CPoolEntry.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/CPoolEntry.java?rev=1838035&r1=1838034&r2=1838035&view=diff
==============================================================================
--- httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/CPoolEntry.java (original)
+++ httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/CPoolEntry.java Tue Aug 14 16:57:56 2018
@@ -49,8 +49,8 @@ class CPoolEntry extends PoolEntry<HttpR
final String id,
final HttpRoute route,
final ManagedNHttpClientConnection conn,
- final long timeToLive, final TimeUnit tunit) {
- super(id, route, conn, timeToLive, tunit);
+ final long timeToLive, final TimeUnit timeUnit) {
+ super(id, route, conn, timeToLive, timeUnit);
this.log = log;
}
Modified: httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/CPoolProxy.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/CPoolProxy.java?rev=1838035&r1=1838034&r2=1838035&view=diff
==============================================================================
--- httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/CPoolProxy.java (original)
+++ httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/CPoolProxy.java Tue Aug 14 16:57:56 2018
@@ -240,8 +240,8 @@ class CPoolProxy implements ManagedNHttp
}
@Override
- public void bind(final IOSession iosession) {
- getValidConnection().bind(iosession);
+ public void bind(final IOSession ioSession) {
+ getValidConnection().bind(ioSession);
}
@Override
Modified: httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/LoggingIOSession.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/LoggingIOSession.java?rev=1838035&r1=1838034&r2=1838035&view=diff
==============================================================================
--- httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/LoggingIOSession.java (original)
+++ httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/LoggingIOSession.java Tue Aug 14 16:57:56 2018
@@ -43,15 +43,15 @@ class LoggingIOSession implements IOSess
private final ByteChannel channel;
private final String id;
private final Log log;
- private final Wire wirelog;
+ private final Wire wireLog;
- public LoggingIOSession(final IOSession session, final String id, final Log log, final Log wirelog) {
+ public LoggingIOSession(final IOSession session, final String id, final Log log, final Log wireLog) {
super();
this.session = session;
this.channel = new LoggingByteChannel();
this.id = id;
this.log = log;
- this.wirelog = new Wire(wirelog, this.id);
+ this.wireLog = new Wire(wireLog, this.id);
}
@Override
@@ -205,12 +205,12 @@ class LoggingIOSession implements IOSess
if (log.isDebugEnabled()) {
log.debug(id + " " + session + ": " + bytesRead + " bytes read");
}
- if (bytesRead > 0 && wirelog.isEnabled()) {
+ if (bytesRead > 0 && wireLog.isEnabled()) {
final ByteBuffer b = dst.duplicate();
final int p = b.position();
b.limit(p);
b.position(p - bytesRead);
- wirelog.input(b);
+ wireLog.input(b);
}
return bytesRead;
}
@@ -221,12 +221,12 @@ class LoggingIOSession implements IOSess
if (log.isDebugEnabled()) {
log.debug(id + " " + session + ": " + byteWritten + " bytes written");
}
- if (byteWritten > 0 && wirelog.isEnabled()) {
+ if (byteWritten > 0 && wireLog.isEnabled()) {
final ByteBuffer b = src.duplicate();
final int p = b.position();
b.limit(p);
b.position(p - byteWritten);
- wirelog.output(b);
+ wireLog.output(b);
}
return byteWritten;
}
Modified: httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/ManagedNHttpClientConnectionFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/ManagedNHttpClientConnectionFactory.java?rev=1838035&r1=1838034&r2=1838035&view=diff
==============================================================================
--- httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/ManagedNHttpClientConnectionFactory.java (original)
+++ httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/ManagedNHttpClientConnectionFactory.java Tue Aug 14 16:57:56 2018
@@ -55,8 +55,8 @@ import org.apache.http.nio.util.HeapByte
*/
public class ManagedNHttpClientConnectionFactory implements NHttpConnectionFactory<ManagedNHttpClientConnection> {
- private final Log headerlog = LogFactory.getLog("org.apache.http.headers");
- private final Log wirelog = LogFactory.getLog("org.apache.http.wire");
+ private final Log headerLog = LogFactory.getLog("org.apache.http.headers");
+ private final Log wireLog = LogFactory.getLog("org.apache.http.wire");
private final Log log = LogFactory.getLog(ManagedNHttpClientConnectionImpl.class);
private static final AtomicLong COUNTER = new AtomicLong();
@@ -85,40 +85,40 @@ public class ManagedNHttpClientConnectio
@Override
public ManagedNHttpClientConnection create(
- final IOSession iosession, final ConnectionConfig config) {
+ final IOSession ioSession, final ConnectionConfig config) {
final String id = "http-outgoing-" + Long.toString(COUNTER.getAndIncrement());
- CharsetDecoder chardecoder = null;
- CharsetEncoder charencoder = null;
+ CharsetDecoder charDecoder = null;
+ CharsetEncoder charEncoder = null;
final Charset charset = config.getCharset();
final CodingErrorAction malformedInputAction = config.getMalformedInputAction() != null ?
config.getMalformedInputAction() : CodingErrorAction.REPORT;
final CodingErrorAction unmappableInputAction = config.getUnmappableInputAction() != null ?
config.getUnmappableInputAction() : CodingErrorAction.REPORT;
if (charset != null) {
- chardecoder = charset.newDecoder();
- chardecoder.onMalformedInput(malformedInputAction);
- chardecoder.onUnmappableCharacter(unmappableInputAction);
- charencoder = charset.newEncoder();
- charencoder.onMalformedInput(malformedInputAction);
- charencoder.onUnmappableCharacter(unmappableInputAction);
+ charDecoder = charset.newDecoder();
+ charDecoder.onMalformedInput(malformedInputAction);
+ charDecoder.onUnmappableCharacter(unmappableInputAction);
+ charEncoder = charset.newEncoder();
+ charEncoder.onMalformedInput(malformedInputAction);
+ charEncoder.onUnmappableCharacter(unmappableInputAction);
}
final ManagedNHttpClientConnection conn = new ManagedNHttpClientConnectionImpl(
id,
this.log,
- this.headerlog,
- this.wirelog,
- iosession,
+ this.headerLog,
+ this.wireLog,
+ ioSession,
config.getBufferSize(),
config.getFragmentSizeHint(),
this.allocator,
- chardecoder,
- charencoder,
+ charDecoder,
+ charEncoder,
config.getMessageConstraints(),
null,
null,
this.requestWriterFactory,
this.responseParserFactory);
- iosession.setAttribute(IOEventDispatch.CONNECTION_KEY, conn);
+ ioSession.setAttribute(IOEventDispatch.CONNECTION_KEY, conn);
return conn;
}
Modified: httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/ManagedNHttpClientConnectionImpl.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/ManagedNHttpClientConnectionImpl.java?rev=1838035&r1=1838034&r2=1838035&view=diff
==============================================================================
--- httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/ManagedNHttpClientConnectionImpl.java (original)
+++ httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/ManagedNHttpClientConnectionImpl.java Tue Aug 14 16:57:56 2018
@@ -50,8 +50,8 @@ import org.apache.http.util.Asserts;
class ManagedNHttpClientConnectionImpl
extends DefaultNHttpClientConnection implements ManagedNHttpClientConnection {
- private final Log headerlog;
- private final Log wirelog;
+ private final Log headerLog;
+ private final Log wireLog;
private final Log log;
private final String id;
@@ -60,43 +60,43 @@ class ManagedNHttpClientConnectionImpl
public ManagedNHttpClientConnectionImpl(
final String id,
final Log log,
- final Log headerlog,
- final Log wirelog,
- final IOSession iosession,
- final int buffersize,
+ final Log headerLog,
+ final Log wireLog,
+ final IOSession ioSession,
+ 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(iosession, buffersize, fragmentSizeHint, allocator, chardecoder, charencoder, constraints,
+ super(ioSession, bufferSize, fragmentSizeHint, allocator, charDecoder, charEncoder, constraints,
incomingContentStrategy, outgoingContentStrategy,
requestWriterFactory, responseParserFactory);
this.id = id;
this.log = log;
- this.headerlog = headerlog;
- this.wirelog = wirelog;
- this.original = iosession;
- if (this.log.isDebugEnabled() || this.wirelog.isDebugEnabled()) {
- super.bind(new LoggingIOSession(iosession, this.id, this.log, this.wirelog));
+ this.headerLog = headerLog;
+ this.wireLog = wireLog;
+ this.original = ioSession;
+ if (this.log.isDebugEnabled() || this.wireLog.isDebugEnabled()) {
+ super.bind(new LoggingIOSession(ioSession, this.id, this.log, this.wireLog));
}
}
@Override
- public void bind(final IOSession iosession) {
- Args.notNull(iosession, "I/O session");
- Asserts.check(!iosession.isClosed(), "I/O session is closed");
+ public void bind(final IOSession ioSession) {
+ Args.notNull(ioSession, "I/O session");
+ Asserts.check(!ioSession.isClosed(), "I/O session is closed");
this.status = ACTIVE;
- this.original = iosession;
- if (this.log.isDebugEnabled() || this.wirelog.isDebugEnabled()) {
- this.log.debug(this.id + " Upgrade session " + iosession);
- super.bind(new LoggingIOSession(iosession, this.id, this.log, this.wirelog));
+ this.original = ioSession;
+ if (this.log.isDebugEnabled() || this.wireLog.isDebugEnabled()) {
+ this.log.debug(this.id + " Upgrade session " + ioSession);
+ super.bind(new LoggingIOSession(ioSession, this.id, this.log, this.wireLog));
} else {
- super.bind(iosession);
+ super.bind(ioSession);
}
}
@@ -119,22 +119,22 @@ class ManagedNHttpClientConnectionImpl
@Override
protected void onResponseReceived(final HttpResponse response) {
- if (response != null && this.headerlog.isDebugEnabled()) {
- this.headerlog.debug(this.id + " << " + response.getStatusLine().toString());
+ if (response != null && this.headerLog.isDebugEnabled()) {
+ this.headerLog.debug(this.id + " << " + response.getStatusLine().toString());
final Header[] headers = response.getAllHeaders();
for (final Header header : headers) {
- this.headerlog.debug(this.id + " << " + header.toString());
+ this.headerLog.debug(this.id + " << " + header.toString());
}
}
}
@Override
protected void onRequestSubmitted(final HttpRequest request) {
- if (request != null && this.headerlog.isDebugEnabled()) {
- this.headerlog.debug(this.id + " >> " + request.getRequestLine().toString());
+ if (request != null && this.headerLog.isDebugEnabled()) {
+ this.headerLog.debug(this.id + " >> " + request.getRequestLine().toString());
final Header[] headers = request.getAllHeaders();
for (final Header header : headers) {
- this.headerlog.debug(this.id + " >> " + header.toString());
+ this.headerLog.debug(this.id + " >> " + header.toString());
}
}
}
Modified: httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/PoolingNHttpClientConnectionManager.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/PoolingNHttpClientConnectionManager.java?rev=1838035&r1=1838034&r2=1838035&view=diff
==============================================================================
--- httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/PoolingNHttpClientConnectionManager.java (original)
+++ httpcomponents/httpasyncclient/branches/4.1.x/httpasyncclient/src/main/java/org/apache/http/impl/nio/conn/PoolingNHttpClientConnectionManager.java Tue Aug 14 16:57:56 2018
@@ -97,12 +97,12 @@ public class PoolingNHttpClientConnectio
private final Log log = LogFactory.getLog(getClass());
- static final String IOSESSION_FACTORY_REGISTRY = "http.iosession-factory-registry";
+ static final String IOSESSION_FACTORY_REGISTRY = "http.ioSession-factory-registry";
- private final ConnectingIOReactor ioreactor;
+ private final ConnectingIOReactor ioReactor;
private final ConfigData configData;
private final CPool pool;
- private final Registry<SchemeIOSessionStrategy> iosessionFactoryRegistry;
+ private final Registry<SchemeIOSessionStrategy> ioSessionFactoryRegistry;
private static Registry<SchemeIOSessionStrategy> getDefaultRegistry() {
return RegistryBuilder.<SchemeIOSessionStrategy>create()
@@ -111,100 +111,100 @@ public class PoolingNHttpClientConnectio
.build();
}
- public PoolingNHttpClientConnectionManager(final ConnectingIOReactor ioreactor) {
- this(ioreactor, getDefaultRegistry());
+ public PoolingNHttpClientConnectionManager(final ConnectingIOReactor ioReactor) {
+ this(ioReactor, getDefaultRegistry());
}
public PoolingNHttpClientConnectionManager(
- final ConnectingIOReactor ioreactor,
- final Registry<SchemeIOSessionStrategy> iosessionFactoryRegistry) {
- this(ioreactor, null, iosessionFactoryRegistry, (DnsResolver) null);
+ final ConnectingIOReactor ioReactor,
+ final Registry<SchemeIOSessionStrategy> ioSessionFactoryRegistry) {
+ this(ioReactor, null, ioSessionFactoryRegistry, (DnsResolver) null);
}
public PoolingNHttpClientConnectionManager(
- final ConnectingIOReactor ioreactor,
+ final ConnectingIOReactor ioReactor,
final NHttpConnectionFactory<ManagedNHttpClientConnection> connFactory,
final DnsResolver dnsResolver) {
- this(ioreactor, connFactory, getDefaultRegistry(), dnsResolver);
+ this(ioReactor, connFactory, getDefaultRegistry(), dnsResolver);
}
public PoolingNHttpClientConnectionManager(
- final ConnectingIOReactor ioreactor,
+ final ConnectingIOReactor ioReactor,
final NHttpConnectionFactory<ManagedNHttpClientConnection> connFactory,
final SocketAddressResolver<HttpRoute> socketAddressResolver) {
- this(ioreactor, connFactory, getDefaultRegistry(), socketAddressResolver);
+ this(ioReactor, connFactory, getDefaultRegistry(), socketAddressResolver);
}
public PoolingNHttpClientConnectionManager(
- final ConnectingIOReactor ioreactor,
+ final ConnectingIOReactor ioReactor,
final NHttpConnectionFactory<ManagedNHttpClientConnection> connFactory) {
- this(ioreactor, connFactory, getDefaultRegistry(), (DnsResolver) null);
+ this(ioReactor, connFactory, getDefaultRegistry(), (DnsResolver) null);
}
public PoolingNHttpClientConnectionManager(
- final ConnectingIOReactor ioreactor,
+ final ConnectingIOReactor ioReactor,
final NHttpConnectionFactory<ManagedNHttpClientConnection> connFactory,
- final Registry<SchemeIOSessionStrategy> iosessionFactoryRegistry) {
- this(ioreactor, connFactory, iosessionFactoryRegistry, (DnsResolver) null);
+ final Registry<SchemeIOSessionStrategy> ioSessionFactoryRegistry) {
+ this(ioReactor, connFactory, ioSessionFactoryRegistry, (DnsResolver) null);
}
public PoolingNHttpClientConnectionManager(
- final ConnectingIOReactor ioreactor,
+ final ConnectingIOReactor ioReactor,
final NHttpConnectionFactory<ManagedNHttpClientConnection> connFactory,
- final Registry<SchemeIOSessionStrategy> iosessionFactoryRegistry,
+ final Registry<SchemeIOSessionStrategy> ioSessionFactoryRegistry,
final DnsResolver dnsResolver) {
- this(ioreactor, connFactory, iosessionFactoryRegistry, null, dnsResolver,
+ this(ioReactor, connFactory, ioSessionFactoryRegistry, null, dnsResolver,
-1, TimeUnit.MILLISECONDS);
}
public PoolingNHttpClientConnectionManager(
- final ConnectingIOReactor ioreactor,
+ final ConnectingIOReactor ioReactor,
final NHttpConnectionFactory<ManagedNHttpClientConnection> connFactory,
- final Registry<SchemeIOSessionStrategy> iosessionFactoryRegistry,
+ final Registry<SchemeIOSessionStrategy> ioSessionFactoryRegistry,
final SocketAddressResolver<HttpRoute> socketAddressResolver) {
- this(ioreactor, connFactory, iosessionFactoryRegistry, socketAddressResolver,
+ this(ioReactor, connFactory, ioSessionFactoryRegistry, socketAddressResolver,
-1, TimeUnit.MILLISECONDS);
}
public PoolingNHttpClientConnectionManager(
- final ConnectingIOReactor ioreactor,
+ final ConnectingIOReactor ioReactor,
final NHttpConnectionFactory<ManagedNHttpClientConnection> connFactory,
- final Registry<SchemeIOSessionStrategy> iosessionFactoryRegistry,
+ final Registry<SchemeIOSessionStrategy> ioSessionFactoryRegistry,
final SchemePortResolver schemePortResolver,
final DnsResolver dnsResolver,
- final long timeToLive, final TimeUnit tunit) {
- this(ioreactor, connFactory, iosessionFactoryRegistry,
- new InternalAddressResolver(schemePortResolver, dnsResolver), timeToLive, tunit);
+ final long timeToLive, final TimeUnit timeUnit) {
+ this(ioReactor, connFactory, ioSessionFactoryRegistry,
+ new InternalAddressResolver(schemePortResolver, dnsResolver), timeToLive, timeUnit);
}
public PoolingNHttpClientConnectionManager(
- final ConnectingIOReactor ioreactor,
+ final ConnectingIOReactor ioReactor,
final NHttpConnectionFactory<ManagedNHttpClientConnection> connFactory,
- final Registry<SchemeIOSessionStrategy> iosessionFactoryRegistry,
+ final Registry<SchemeIOSessionStrategy> ioSessionFactoryRegistry,
final SocketAddressResolver<HttpRoute> socketAddressResolver,
- final long timeToLive, final TimeUnit tunit) {
+ final long timeToLive, final TimeUnit timeUnit) {
super();
- Args.notNull(ioreactor, "I/O reactor");
- Args.notNull(iosessionFactoryRegistry, "I/O session factory registry");
+ Args.notNull(ioReactor, "I/O reactor");
+ Args.notNull(ioSessionFactoryRegistry, "I/O session factory registry");
Args.notNull(socketAddressResolver, "Socket address resolver");
- this.ioreactor = ioreactor;
+ this.ioReactor = ioReactor;
this.configData = new ConfigData();
- this.pool = new CPool(ioreactor,
+ this.pool = new CPool(ioReactor,
new InternalConnectionFactory(this.configData, connFactory),
socketAddressResolver,
- 2, 20, timeToLive, tunit != null ? tunit : TimeUnit.MILLISECONDS);
- this.iosessionFactoryRegistry = iosessionFactoryRegistry;
+ 2, 20, timeToLive, timeUnit != null ? timeUnit : TimeUnit.MILLISECONDS);
+ this.ioSessionFactoryRegistry = ioSessionFactoryRegistry;
}
PoolingNHttpClientConnectionManager(
- final ConnectingIOReactor ioreactor,
+ final ConnectingIOReactor ioReactor,
final CPool pool,
- final Registry<SchemeIOSessionStrategy> iosessionFactoryRegistry) {
+ final Registry<SchemeIOSessionStrategy> ioSessionFactoryRegistry) {
super();
- this.ioreactor = ioreactor;
+ this.ioReactor = ioReactor;
this.configData = new ConfigData();
this.pool = pool;
- this.iosessionFactoryRegistry = iosessionFactoryRegistry;
+ this.ioSessionFactoryRegistry = ioSessionFactoryRegistry;
}
@Override
@@ -218,7 +218,7 @@ public class PoolingNHttpClientConnectio
@Override
public void execute(final IOEventDispatch eventDispatch) throws IOException {
- this.ioreactor.execute(eventDispatch);
+ this.ioReactor.execute(eventDispatch);
}
public void shutdown(final long waitMs) throws IOException {
@@ -272,7 +272,7 @@ public class PoolingNHttpClientConnectio
final Object state,
final long connectTimeout,
final long leaseTimeout,
- final TimeUnit tunit,
+ final TimeUnit timeUnit,
final FutureCallback<NHttpClientConnection> callback) {
Args.notNull(route, "HTTP route");
if (this.log.isDebugEnabled()) {
@@ -285,7 +285,7 @@ public class PoolingNHttpClientConnectio
} else {
host = route.getTargetHost();
}
- final SchemeIOSessionStrategy sf = this.iosessionFactoryRegistry.lookup(
+ final SchemeIOSessionStrategy sf = this.ioSessionFactoryRegistry.lookup(
host.getSchemeName());
if (sf == null) {
resultFuture.failed(new UnsupportedSchemeException(host.getSchemeName() +
@@ -293,7 +293,7 @@ public class PoolingNHttpClientConnectio
return resultFuture;
}
final Future<CPoolEntry> leaseFuture = this.pool.lease(route, state,
- connectTimeout, leaseTimeout, tunit != null ? tunit : TimeUnit.MILLISECONDS,
+ connectTimeout, leaseTimeout, timeUnit != null ? timeUnit : TimeUnit.MILLISECONDS,
new FutureCallback<CPoolEntry>() {
@Override
@@ -362,7 +362,7 @@ public class PoolingNHttpClientConnectio
final NHttpClientConnection managedConn,
final Object state,
final long keepalive,
- final TimeUnit tunit) {
+ final TimeUnit timeUnit) {
Args.notNull(managedConn, "Managed connection");
synchronized (managedConn) {
final CPoolEntry entry = CPoolProxy.detach(managedConn);
@@ -376,7 +376,7 @@ public class PoolingNHttpClientConnectio
try {
if (conn.isOpen()) {
entry.setState(state);
- entry.updateExpiry(keepalive, tunit != null ? tunit : TimeUnit.MILLISECONDS);
+ entry.updateExpiry(keepalive, timeUnit != null ? timeUnit : TimeUnit.MILLISECONDS);
if (this.log.isDebugEnabled()) {
final String s;
if (keepalive > 0) {
@@ -401,7 +401,7 @@ public class PoolingNHttpClientConnectio
Lookup<SchemeIOSessionStrategy> reg = (Lookup<SchemeIOSessionStrategy>) context.getAttribute(
IOSESSION_FACTORY_REGISTRY);
if (reg == null) {
- reg = this.iosessionFactoryRegistry;
+ reg = this.ioSessionFactoryRegistry;
}
return reg;
}
@@ -486,11 +486,11 @@ public class PoolingNHttpClientConnectio
}
@Override
- public void closeIdleConnections(final long idleTimeout, final TimeUnit tunit) {
+ public void closeIdleConnections(final long idleTimeout, final TimeUnit timeUnit) {
if (this.log.isDebugEnabled()) {
- this.log.debug("Closing connections idle longer than " + idleTimeout + " " + tunit);
+ this.log.debug("Closing connections idle longer than " + idleTimeout + " " + timeUnit);
}
- this.pool.closeIdle(idleTimeout, tunit);
+ this.pool.closeIdle(idleTimeout, timeUnit);
}
@Override
@@ -611,7 +611,7 @@ public class PoolingNHttpClientConnectio
@Override
public ManagedNHttpClientConnection create(
- final HttpRoute route, final IOSession iosession) throws IOException {
+ final HttpRoute route, final IOSession ioSession) throws IOException {
ConnectionConfig config = null;
if (route.getProxyHost() != null) {
config = this.configData.getConnectionConfig(route.getProxyHost());
@@ -625,8 +625,8 @@ public class PoolingNHttpClientConnectio
if (config == null) {
config = ConnectionConfig.DEFAULT;
}
- final ManagedNHttpClientConnection conn = this.connFactory.create(iosession, config);
- iosession.setAttribute(IOEventDispatch.CONNECTION_KEY, conn);
+ final ManagedNHttpClientConnection conn = this.connFactory.create(ioSession, config);
+ ioSession.setAttribute(IOEventDispatch.CONNECTION_KEY, conn);
return conn;
}