You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by ol...@apache.org on 2014/01/14 16:22:34 UTC
svn commit: r1558077 [1/4] - in /httpcomponents/httpcore/trunk:
httpcore-ab/src/main/java/org/apache/http/benchmark/
httpcore-ab/src/test/java/org/apache/http/benchmark/
httpcore-nio/src/main/java/org/apache/http/impl/nio/
httpcore-nio/src/main/java/or...
Author: olegk
Date: Tue Jan 14 15:22:31 2014
New Revision: 1558077
URL: http://svn.apache.org/r1558077
Log:
Added missing @Override annotations (Java 1.6)
Modified:
httpcomponents/httpcore/trunk/httpcore-ab/src/main/java/org/apache/http/benchmark/BenchmarkWorker.java
httpcomponents/httpcore/trunk/httpcore-ab/src/main/java/org/apache/http/benchmark/HttpBenchmark.java
httpcomponents/httpcore/trunk/httpcore-ab/src/test/java/org/apache/http/benchmark/HttpServer.java
httpcomponents/httpcore/trunk/httpcore-ab/src/test/java/org/apache/http/benchmark/SmokeTest.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/DefaultNHttpClientConnection.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/DefaultNHttpClientConnectionFactory.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/DefaultNHttpServerConnection.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/DefaultNHttpServerConnectionFactory.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/NHttpClientEventHandlerAdaptor.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/NHttpConnectionBase.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/NHttpServerEventHandlerAdaptor.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/SSLNHttpClientConnectionFactory.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/SSLNHttpServerConnectionFactory.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/SessionHttpContext.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/AbstractContentDecoder.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/AbstractContentEncoder.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/AbstractMessageParser.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/AbstractMessageWriter.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/ChunkDecoder.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/ChunkEncoder.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/DefaultHttpRequestParserFactory.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/DefaultHttpRequestWriterFactory.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/DefaultHttpResponseParserFactory.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/DefaultHttpResponseWriterFactory.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/IdentityDecoder.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/IdentityEncoder.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/LengthDelimitedDecoder.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/LengthDelimitedEncoder.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/pool/BasicNIOConnFactory.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/pool/BasicNIOConnPool.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/AbstractIODispatch.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/AbstractIOReactor.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/AbstractMultiworkerIOReactor.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/BaseIOReactor.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/DefaultConnectingIOReactor.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/DefaultListeningIOReactor.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/IOSessionImpl.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/ListenerEndpointImpl.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/SessionInputBufferImpl.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/SessionOutputBufferImpl.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/SessionRequestImpl.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/ContentDecoderChannel.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/ContentEncoderChannel.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/EntityAsyncContentProducer.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/NByteArrayEntity.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/NFileEntity.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/NStringEntity.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/pool/AbstractNIOConnPool.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/AbstractAsyncRequestConsumer.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/AbstractAsyncResponseConsumer.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/BasicAsyncClientExchangeHandler.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/BasicAsyncRequestHandler.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/BasicAsyncRequestProducer.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/BasicAsyncResponseProducer.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/ErrorResponseProducer.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/HttpAsyncRequestExecutor.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/HttpAsyncRequester.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/HttpAsyncService.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/NullRequestConsumer.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/NullRequestHandler.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/UriHttpAsyncRequestHandlerMapper.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/reactor/ssl/SSLIOSession.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/util/DirectByteBufferAllocator.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/util/ExpandableBuffer.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/util/HeapByteBufferAllocator.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/util/SharedInputBuffer.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/util/SharedOutputBuffer.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/util/SimpleInputBuffer.java
httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/util/SimpleOutputBuffer.java
httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/ByteChannelMock.java
httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/ReadableByteChannelMock.java
httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/WritableByteChannelMock.java
httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/TestDefaultNHttpClientConnection.java
httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/TestDefaultNHttpServerConnection.java
httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/reactor/TestDefaultIOReactors.java
httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/reactor/TestDefaultListeningIOReactor.java
httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/integration/SimpleRequestHandler.java
httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/integration/TestCustomSSL.java
httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/integration/TestHttpAsyncHandlerCancellable.java
httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/integration/TestHttpAsyncHandlers.java
httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/integration/TestHttpAsyncPrematureTermination.java
httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/integration/TestHttpsAsyncTimeout.java
httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/integration/TestPipelining.java
httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/integration/TestTruncatedChunks.java
httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/pool/TestNIOConnPool.java
httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/testserver/HttpClientNio.java
httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/testserver/LoggingClientConnectionFactory.java
httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/testserver/LoggingIOSession.java
httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/testserver/LoggingSSLClientConnectionFactory.java
httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/testserver/LoggingSSLServerConnectionFactory.java
httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/testserver/LoggingServerConnectionFactory.java
httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/testserver/SimpleIOReactorExceptionHandler.java
httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/util/ContentDecoderMock.java
httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/util/ContentEncoderMock.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/HeaderElementIterator.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/HeaderIterator.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/HttpConnection.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/TokenIterator.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/concurrent/BasicFuture.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/config/Registry.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/entity/AbstractHttpEntity.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/entity/BasicHttpEntity.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/entity/ByteArrayEntity.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/entity/EntityTemplate.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/entity/FileEntity.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/entity/HttpEntityWrapper.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/entity/InputStreamEntity.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/entity/SerializableEntity.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/entity/StringEntity.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/BHttpConnectionBase.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/DefaultBHttpClientConnection.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/DefaultBHttpClientConnectionFactory.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/DefaultBHttpServerConnection.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/DefaultBHttpServerConnectionFactory.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/DefaultConnectionReuseStrategy.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/DefaultHttpRequestFactory.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/DefaultHttpResponseFactory.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/EnglishReasonPhraseCatalog.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/HttpConnectionMetricsImpl.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/NoConnectionReuseStrategy.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/entity/DisallowIdentityContentLengthStrategy.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/entity/LaxContentLengthStrategy.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/entity/StrictContentLengthStrategy.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/AbstractMessageParser.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/AbstractMessageWriter.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/DefaultHttpRequestParserFactory.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/DefaultHttpRequestWriterFactory.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/DefaultHttpResponseParserFactory.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/DefaultHttpResponseWriterFactory.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/HttpTransportMetricsImpl.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/SessionInputBufferImpl.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/SessionOutputBufferImpl.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/pool/BasicConnFactory.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/AbstractHttpMessage.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicHeader.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicHeaderElement.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicHeaderElementIterator.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicHeaderIterator.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicHeaderValueFormatter.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicHeaderValueParser.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicHttpEntityEnclosingRequest.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicHttpRequest.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicHttpResponse.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicLineFormatter.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicLineParser.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicListHeaderIterator.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicNameValuePair.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicRequestLine.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicStatusLine.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicTokenIterator.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BufferedHeader.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/params/AbstractHttpParams.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/params/BasicHttpParams.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/pool/AbstractConnPool.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/pool/PoolEntryFuture.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/BasicHttpContext.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/HttpCoreContext.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/HttpService.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/ImmutableHttpProcessor.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/RequestConnControl.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/RequestContent.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/RequestDate.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/RequestExpectContinue.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/RequestTargetHost.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/RequestUserAgent.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/ResponseConnControl.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/ResponseContent.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/ResponseDate.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/ResponseServer.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/UriHttpRequestHandlerMapper.java
httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/concurrent/BasicFutureCallback.java
httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/entity/TestEntityTemplate.java
httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/entity/DummyHttpMessage.java
httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/integration/TestSyncHttp.java
httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/message/TestAbstractMessage.java
httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/protocol/TestHttpService.java
httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/testserver/HttpServer.java
Modified: httpcomponents/httpcore/trunk/httpcore-ab/src/main/java/org/apache/http/benchmark/BenchmarkWorker.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-ab/src/main/java/org/apache/http/benchmark/BenchmarkWorker.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-ab/src/main/java/org/apache/http/benchmark/BenchmarkWorker.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-ab/src/main/java/org/apache/http/benchmark/BenchmarkWorker.java Tue Jan 14 15:22:31 2014
@@ -97,6 +97,7 @@ class BenchmarkWorker implements Runnabl
this.socketFactory = socketFactory;
}
+ @Override
public void run() {
HttpResponse response = null;
final BenchmarkConnection conn = new BenchmarkConnection(8 * 1024, stats);
Modified: httpcomponents/httpcore/trunk/httpcore-ab/src/main/java/org/apache/http/benchmark/HttpBenchmark.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-ab/src/main/java/org/apache/http/benchmark/HttpBenchmark.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-ab/src/main/java/org/apache/http/benchmark/HttpBenchmark.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-ab/src/main/java/org/apache/http/benchmark/HttpBenchmark.java Tue Jan 14 15:22:31 2014
@@ -174,6 +174,7 @@ public class HttpBenchmark {
new LinkedBlockingQueue<Runnable>(),
new ThreadFactory() {
+ @Override
public Thread newThread(final Runnable r) {
return new Thread(r, "ClientPool");
}
@@ -189,14 +190,17 @@ public class HttpBenchmark {
trustManagers = new TrustManager[] {
new X509TrustManager() {
+ @Override
public java.security.cert.X509Certificate[] getAcceptedIssuers() {
return null;
}
+ @Override
public void checkClientTrusted(
final java.security.cert.X509Certificate[] certs, final String authType) {
}
+ @Override
public void checkServerTrusted(
final java.security.cert.X509Certificate[] certs, final String authType) {
}
Modified: httpcomponents/httpcore/trunk/httpcore-ab/src/test/java/org/apache/http/benchmark/HttpServer.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-ab/src/test/java/org/apache/http/benchmark/HttpServer.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-ab/src/test/java/org/apache/http/benchmark/HttpServer.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-ab/src/test/java/org/apache/http/benchmark/HttpServer.java Tue Jan 14 15:22:31 2014
@@ -100,6 +100,7 @@ public class HttpServer {
Asserts.check(this.listener == null, "Listener already running");
this.listener = new Thread(new Runnable() {
+ @Override
public void run() {
while (!shutdown && !Thread.interrupted()) {
try {
Modified: httpcomponents/httpcore/trunk/httpcore-ab/src/test/java/org/apache/http/benchmark/SmokeTest.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-ab/src/test/java/org/apache/http/benchmark/SmokeTest.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-ab/src/test/java/org/apache/http/benchmark/SmokeTest.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-ab/src/test/java/org/apache/http/benchmark/SmokeTest.java Tue Jan 14 15:22:31 2014
@@ -50,6 +50,7 @@ public class SmokeTest {
public void setup() throws Exception {
server = new HttpServer();
server.registerHandler("/", new HttpRequestHandler() {
+ @Override
public void handle(
final HttpRequest request,
final HttpResponse response,
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/DefaultNHttpClientConnection.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/DefaultNHttpClientConnection.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/DefaultNHttpClientConnection.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/DefaultNHttpClientConnection.java Tue Jan 14 15:22:31 2014
@@ -217,12 +217,14 @@ public class DefaultNHttpClientConnectio
protected void onRequestSubmitted(final HttpRequest request) {
}
+ @Override
public void resetInput() {
this.response = null;
this.contentDecoder = null;
this.responseParser.reset();
}
+ @Override
public void resetOutput() {
this.request = null;
this.contentEncoder = null;
@@ -316,6 +318,7 @@ public class DefaultNHttpClientConnectio
}
}
+ @Override
public void submitRequest(final HttpRequest request) throws IOException, HttpException {
Args.notNull(request, "HTTP request");
assertNotClosed();
@@ -335,14 +338,17 @@ public class DefaultNHttpClientConnectio
this.session.setEvent(EventMask.WRITE);
}
+ @Override
public boolean isRequestSubmitted() {
return this.request != null;
}
+ @Override
public void consumeInput(final NHttpClientHandler handler) {
consumeInput(new NHttpClientEventHandlerAdaptor(handler));
}
+ @Override
public void produceOutput(final NHttpClientHandler handler) {
produceOutput(new NHttpClientEventHandlerAdaptor(handler));
}
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/DefaultNHttpClientConnectionFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/DefaultNHttpClientConnectionFactory.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/DefaultNHttpClientConnectionFactory.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/DefaultNHttpClientConnectionFactory.java Tue Jan 14 15:22:31 2014
@@ -164,6 +164,7 @@ public class DefaultNHttpClientConnectio
return new DefaultNHttpClientConnection(session, responseFactory, allocator, params);
}
+ @Override
public DefaultNHttpClientConnection createConnection(final IOSession session) {
return new DefaultNHttpClientConnection(
session,
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/DefaultNHttpServerConnection.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/DefaultNHttpServerConnection.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/DefaultNHttpServerConnection.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/DefaultNHttpServerConnection.java Tue Jan 14 15:22:31 2014
@@ -233,12 +233,14 @@ public class DefaultNHttpServerConnectio
protected void onResponseSubmitted(final HttpResponse response) {
}
+ @Override
public void resetInput() {
this.request = null;
this.contentDecoder = null;
this.requestParser.reset();
}
+ @Override
public void resetOutput() {
this.response = null;
this.contentEncoder = null;
@@ -335,6 +337,7 @@ public class DefaultNHttpServerConnectio
}
}
+ @Override
public void submitResponse(final HttpResponse response) throws IOException, HttpException {
Args.notNull(response, "HTTP response");
assertNotClosed();
@@ -356,14 +359,17 @@ public class DefaultNHttpServerConnectio
this.session.setEvent(EventMask.WRITE);
}
+ @Override
public boolean isResponseSubmitted() {
return this.response != null;
}
+ @Override
public void consumeInput(final NHttpServiceHandler handler) {
consumeInput(new NHttpServerEventHandlerAdaptor(handler));
}
+ @Override
public void produceOutput(final NHttpServiceHandler handler) {
produceOutput(new NHttpServerEventHandlerAdaptor(handler));
}
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/DefaultNHttpServerConnectionFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/DefaultNHttpServerConnectionFactory.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/DefaultNHttpServerConnectionFactory.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/DefaultNHttpServerConnectionFactory.java Tue Jan 14 15:22:31 2014
@@ -151,6 +151,7 @@ public class DefaultNHttpServerConnectio
this(null, null, null, null, null, null);
}
+ @Override
public DefaultNHttpServerConnection createConnection(final IOSession session) {
return new DefaultNHttpServerConnection(session,
this.cconfig.getBufferSize(),
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/NHttpClientEventHandlerAdaptor.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/NHttpClientEventHandlerAdaptor.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/NHttpClientEventHandlerAdaptor.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/NHttpClientEventHandlerAdaptor.java Tue Jan 14 15:22:31 2014
@@ -49,32 +49,38 @@ class NHttpClientEventHandlerAdaptor imp
this.handler = handler;
}
+ @Override
public void connected(final NHttpClientConnection conn, final Object attachment) {
this.handler.connected(conn, attachment);
}
+ @Override
public void requestReady(
final NHttpClientConnection conn) throws IOException, HttpException {
this.handler.requestReady(conn);
}
+ @Override
public void responseReceived(
final NHttpClientConnection conn) throws IOException, HttpException {
this.handler.responseReceived(conn);
}
+ @Override
public void inputReady(
final NHttpClientConnection conn,
final ContentDecoder decoder) throws IOException, HttpException {
this.handler.inputReady(conn, decoder);
}
+ @Override
public void outputReady(
final NHttpClientConnection conn,
final ContentEncoder encoder) throws IOException, HttpException {
this.handler.outputReady(conn, encoder);
}
+ @Override
public void exception(final NHttpClientConnection conn, final Exception ex) {
if (ex instanceof HttpException) {
this.handler.exception(conn, (HttpException) ex);
@@ -89,14 +95,17 @@ class NHttpClientEventHandlerAdaptor imp
}
}
+ @Override
public void endOfInput(final NHttpClientConnection conn) throws IOException {
conn.close();
}
+ @Override
public void timeout(final NHttpClientConnection conn) {
this.handler.timeout(conn);
}
+ @Override
public void closed(final NHttpClientConnection conn) {
this.handler.closed(conn);
}
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/NHttpConnectionBase.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/NHttpConnectionBase.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/NHttpConnectionBase.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/NHttpConnectionBase.java Tue Jan 14 15:22:31 2014
@@ -291,34 +291,42 @@ public class NHttpConnectionBase
return new HttpConnectionMetricsImpl(inTransportMetric, outTransportMetric);
}
+ @Override
public int getStatus() {
return this.status;
}
+ @Override
public HttpContext getContext() {
return this.context;
}
+ @Override
public HttpRequest getHttpRequest() {
return this.request;
}
+ @Override
public HttpResponse getHttpResponse() {
return this.response;
}
+ @Override
public void requestInput() {
this.session.setEvent(EventMask.READ);
}
+ @Override
public void requestOutput() {
this.session.setEvent(EventMask.WRITE);
}
+ @Override
public void suspendInput() {
this.session.clearEvent(EventMask.READ);
}
+ @Override
public void suspendOutput() {
this.session.clearEvent(EventMask.WRITE);
}
@@ -432,10 +440,12 @@ public class NHttpConnectionBase
}
}
+ @Override
public boolean hasBufferedInput() {
return this.hasBufferedInput;
}
+ @Override
public boolean hasBufferedOutput() {
return this.hasBufferedOutput;
}
@@ -452,6 +462,7 @@ public class NHttpConnectionBase
}
}
+ @Override
public void close() throws IOException {
if (this.status != ACTIVE) {
return;
@@ -465,14 +476,17 @@ public class NHttpConnectionBase
}
}
+ @Override
public boolean isOpen() {
return this.status == ACTIVE && !this.session.isClosed();
}
+ @Override
public boolean isStale() {
return this.session.isClosed();
}
+ @Override
public InetAddress getLocalAddress() {
final SocketAddress address = this.session.getLocalAddress();
if (address instanceof InetSocketAddress) {
@@ -482,6 +496,7 @@ public class NHttpConnectionBase
}
}
+ @Override
public int getLocalPort() {
final SocketAddress address = this.session.getLocalAddress();
if (address instanceof InetSocketAddress) {
@@ -491,6 +506,7 @@ public class NHttpConnectionBase
}
}
+ @Override
public InetAddress getRemoteAddress() {
final SocketAddress address = this.session.getRemoteAddress();
if (address instanceof InetSocketAddress) {
@@ -500,6 +516,7 @@ public class NHttpConnectionBase
}
}
+ @Override
public int getRemotePort() {
final SocketAddress address = this.session.getRemoteAddress();
if (address instanceof InetSocketAddress) {
@@ -509,19 +526,23 @@ public class NHttpConnectionBase
}
}
+ @Override
public void setSocketTimeout(final int timeout) {
this.session.setSocketTimeout(timeout);
}
+ @Override
public int getSocketTimeout() {
return this.session.getSocketTimeout();
}
+ @Override
public void shutdown() throws IOException {
this.status = CLOSED;
this.session.shutdown();
}
+ @Override
public HttpConnectionMetrics getMetrics() {
return this.connMetrics;
}
@@ -552,6 +573,7 @@ public class NHttpConnectionBase
return buffer.toString();
}
+ @Override
public Socket getSocket() {
if (this.session instanceof SocketAccessor) {
return ((SocketAccessor) this.session).getSocket();
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/NHttpServerEventHandlerAdaptor.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/NHttpServerEventHandlerAdaptor.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/NHttpServerEventHandlerAdaptor.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/NHttpServerEventHandlerAdaptor.java Tue Jan 14 15:22:31 2014
@@ -49,32 +49,38 @@ class NHttpServerEventHandlerAdaptor imp
this.handler = handler;
}
+ @Override
public void connected(final NHttpServerConnection conn) {
this.handler.connected(conn);
}
+ @Override
public void responseReady(
final NHttpServerConnection conn) throws IOException, HttpException {
this.handler.responseReady(conn);
}
+ @Override
public void requestReceived(
final NHttpServerConnection conn) throws IOException, HttpException {
this.handler.requestReceived(conn);
}
+ @Override
public void inputReady(
final NHttpServerConnection conn,
final ContentDecoder decoder) throws IOException, HttpException {
this.handler.inputReady(conn, decoder);
}
+ @Override
public void outputReady(
final NHttpServerConnection conn,
final ContentEncoder encoder) throws IOException, HttpException {
this.handler.outputReady(conn, encoder);
}
+ @Override
public void exception(final NHttpServerConnection conn, final Exception ex) {
if (ex instanceof HttpException) {
this.handler.exception(conn, (HttpException) ex);
@@ -89,14 +95,17 @@ class NHttpServerEventHandlerAdaptor imp
}
}
+ @Override
public void endOfInput(final NHttpServerConnection conn) throws IOException {
conn.close();
}
+ @Override
public void timeout(final NHttpServerConnection conn) {
this.handler.timeout(conn);
}
+ @Override
public void closed(final NHttpServerConnection conn) {
this.handler.closed(conn);
}
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/SSLNHttpClientConnectionFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/SSLNHttpClientConnectionFactory.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/SSLNHttpClientConnectionFactory.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/SSLNHttpClientConnectionFactory.java Tue Jan 14 15:22:31 2014
@@ -221,6 +221,7 @@ public class SSLNHttpClientConnectionFac
return ssliosession;
}
+ @Override
public DefaultNHttpClientConnection createConnection(final IOSession iosession) {
final SSLIOSession ssliosession = createSSLIOSession(iosession, this.sslcontext, this.sslHandler);
iosession.setAttribute(SSLIOSession.SESSION_KEY, ssliosession);
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/SSLNHttpServerConnectionFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/SSLNHttpServerConnectionFactory.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/SSLNHttpServerConnectionFactory.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/SSLNHttpServerConnectionFactory.java Tue Jan 14 15:22:31 2014
@@ -219,6 +219,7 @@ public class SSLNHttpServerConnectionFac
return ssliosession;
}
+ @Override
public DefaultNHttpServerConnection createConnection(final IOSession iosession) {
final SSLIOSession ssliosession = createSSLIOSession(iosession, this.sslcontext, this.sslHandler);
iosession.setAttribute(SSLIOSession.SESSION_KEY, ssliosession);
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/SessionHttpContext.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/SessionHttpContext.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/SessionHttpContext.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/SessionHttpContext.java Tue Jan 14 15:22:31 2014
@@ -39,14 +39,17 @@ class SessionHttpContext implements Http
this.iosession = iosession;
}
+ @Override
public Object getAttribute(final String id) {
return this.iosession.getAttribute(id);
}
+ @Override
public Object removeAttribute(final String id) {
return this.iosession.removeAttribute(id);
}
+ @Override
public void setAttribute(final String id, final Object obj) {
this.iosession.setAttribute(id, obj);
}
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/AbstractContentDecoder.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/AbstractContentDecoder.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/AbstractContentDecoder.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/AbstractContentDecoder.java Tue Jan 14 15:22:31 2014
@@ -73,6 +73,7 @@ public abstract class AbstractContentDec
this.metrics = metrics;
}
+ @Override
public boolean isCompleted() {
return this.completed;
}
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/AbstractContentEncoder.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/AbstractContentEncoder.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/AbstractContentEncoder.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/AbstractContentEncoder.java Tue Jan 14 15:22:31 2014
@@ -77,10 +77,12 @@ public abstract class AbstractContentEnc
this.metrics = metrics;
}
+ @Override
public boolean isCompleted() {
return this.completed;
}
+ @Override
public void complete() throws IOException {
this.completed = true;
}
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/AbstractMessageParser.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/AbstractMessageParser.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/AbstractMessageParser.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/AbstractMessageParser.java Tue Jan 14 15:22:31 2014
@@ -125,6 +125,7 @@ public abstract class AbstractMessagePar
this.endOfStream = false;
}
+ @Override
public void reset() {
this.state = READ_HEAD_LINE;
this.endOfStream = false;
@@ -132,6 +133,7 @@ public abstract class AbstractMessagePar
this.message = null;
}
+ @Override
public int fillBuffer(final ReadableByteChannel channel) throws IOException {
final int bytesRead = this.sessionBuffer.fill(channel);
if (bytesRead == -1) {
@@ -182,6 +184,7 @@ public abstract class AbstractMessagePar
}
}
+ @Override
public T parse() throws IOException, HttpException {
while (this.state != COMPLETED) {
if (this.lineBuf == null) {
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/AbstractMessageWriter.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/AbstractMessageWriter.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/AbstractMessageWriter.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/AbstractMessageWriter.java Tue Jan 14 15:22:31 2014
@@ -95,6 +95,7 @@ public abstract class AbstractMessageWri
this.lineBuf = new CharArrayBuffer(64);
}
+ @Override
public void reset() {
}
@@ -105,6 +106,7 @@ public abstract class AbstractMessageWri
*/
protected abstract void writeHeadLine(T message) throws IOException;
+ @Override
public void write(final T message) throws IOException, HttpException {
Args.notNull(message, "HTTP message");
writeHeadLine(message);
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/ChunkDecoder.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/ChunkDecoder.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/ChunkDecoder.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/ChunkDecoder.java Tue Jan 14 15:22:31 2014
@@ -152,6 +152,7 @@ public class ChunkDecoder extends Abstra
this.trailerBufs.clear();
}
+ @Override
public int read(final ByteBuffer dst) throws IOException {
Args.notNull(dst, "Byte buffer");
if (this.state == COMPLETED) {
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/ChunkEncoder.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/ChunkEncoder.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/ChunkEncoder.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/ChunkEncoder.java Tue Jan 14 15:22:31 2014
@@ -83,6 +83,7 @@ public class ChunkEncoder extends Abstra
this(channel, buffer, metrics, 0);
}
+ @Override
public int write(final ByteBuffer src) throws IOException {
if (src == null) {
return 0;
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/DefaultHttpRequestParserFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/DefaultHttpRequestParserFactory.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/DefaultHttpRequestParserFactory.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/DefaultHttpRequestParserFactory.java Tue Jan 14 15:22:31 2014
@@ -63,6 +63,7 @@ public class DefaultHttpRequestParserFac
this(null, null);
}
+ @Override
public NHttpMessageParser<HttpRequest> create(final SessionInputBuffer buffer,
final MessageConstraints constraints) {
return new DefaultHttpRequestParser(buffer, lineParser, requestFactory, constraints);
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/DefaultHttpRequestWriterFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/DefaultHttpRequestWriterFactory.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/DefaultHttpRequestWriterFactory.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/DefaultHttpRequestWriterFactory.java Tue Jan 14 15:22:31 2014
@@ -56,6 +56,7 @@ public class DefaultHttpRequestWriterFac
this(null);
}
+ @Override
public NHttpMessageWriter<HttpRequest> create(final SessionOutputBuffer buffer) {
return new DefaultHttpRequestWriter(buffer, lineFormatter);
}
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/DefaultHttpResponseParserFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/DefaultHttpResponseParserFactory.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/DefaultHttpResponseParserFactory.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/DefaultHttpResponseParserFactory.java Tue Jan 14 15:22:31 2014
@@ -63,6 +63,7 @@ public class DefaultHttpResponseParserFa
this(null, null);
}
+ @Override
public NHttpMessageParser<HttpResponse> create(final SessionInputBuffer buffer,
final MessageConstraints constraints) {
return new DefaultHttpResponseParser(buffer, lineParser, responseFactory, constraints);
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/DefaultHttpResponseWriterFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/DefaultHttpResponseWriterFactory.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/DefaultHttpResponseWriterFactory.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/DefaultHttpResponseWriterFactory.java Tue Jan 14 15:22:31 2014
@@ -56,6 +56,7 @@ public class DefaultHttpResponseWriterFa
this(null);
}
+ @Override
public NHttpMessageWriter<HttpResponse> create(final SessionOutputBuffer buffer) {
return new DefaultHttpResponseWriter(buffer, lineFormatter);
}
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/IdentityDecoder.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/IdentityDecoder.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/IdentityDecoder.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/IdentityDecoder.java Tue Jan 14 15:22:31 2014
@@ -72,6 +72,7 @@ public class IdentityDecoder extends Abs
this.completed = completed;
}
+ @Override
public int read(final ByteBuffer dst) throws IOException {
Args.notNull(dst, "Byte buffer");
if (this.completed) {
@@ -90,6 +91,7 @@ public class IdentityDecoder extends Abs
return bytesRead;
}
+ @Override
public long transfer(
final FileChannel dst,
final long position,
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/IdentityEncoder.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/IdentityEncoder.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/IdentityEncoder.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/IdentityEncoder.java Tue Jan 14 15:22:31 2014
@@ -81,6 +81,7 @@ public class IdentityEncoder extends Abs
this(channel, buffer, metrics, 0);
}
+ @Override
public int write(final ByteBuffer src) throws IOException {
if (src == null) {
return 0;
@@ -118,6 +119,7 @@ public class IdentityEncoder extends Abs
return total;
}
+ @Override
public long transfer(
final FileChannel src,
final long position,
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/LengthDelimitedDecoder.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/LengthDelimitedDecoder.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/LengthDelimitedDecoder.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/LengthDelimitedDecoder.java Tue Jan 14 15:22:31 2014
@@ -70,6 +70,7 @@ public class LengthDelimitedDecoder exte
this.contentLength = contentLength;
}
+ @Override
public int read(final ByteBuffer dst) throws IOException {
Args.notNull(dst, "Byte buffer");
if (this.completed) {
@@ -103,6 +104,7 @@ public class LengthDelimitedDecoder exte
}
}
+ @Override
public long transfer(
final FileChannel dst,
final long position,
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/LengthDelimitedEncoder.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/LengthDelimitedEncoder.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/LengthDelimitedEncoder.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/LengthDelimitedEncoder.java Tue Jan 14 15:22:31 2014
@@ -96,6 +96,7 @@ public class LengthDelimitedEncoder exte
return (int) Math.min(Math.min(this.remaining, Integer.MAX_VALUE), src.remaining());
}
+ @Override
public int write(final ByteBuffer src) throws IOException {
if (src == null) {
return 0;
@@ -143,6 +144,7 @@ public class LengthDelimitedEncoder exte
return total;
}
+ @Override
public long transfer(
final FileChannel src,
final long position,
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/pool/BasicNIOConnFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/pool/BasicNIOConnFactory.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/pool/BasicNIOConnFactory.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/pool/BasicNIOConnFactory.java Tue Jan 14 15:22:31 2014
@@ -152,6 +152,7 @@ public class BasicNIOConnFactory impleme
this(new DefaultNHttpClientConnectionFactory(config), null);
}
+ @Override
public NHttpClientConnection create(final HttpHost route, final IOSession session) throws IOException {
final NHttpClientConnection conn;
if (route.getSchemeName().equalsIgnoreCase("https")) {
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/pool/BasicNIOConnPool.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/pool/BasicNIOConnPool.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/pool/BasicNIOConnPool.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/pool/BasicNIOConnPool.java Tue Jan 14 15:22:31 2014
@@ -65,10 +65,12 @@ public class BasicNIOConnPool extends Ab
static class BasicAddressResolver implements SocketAddressResolver<HttpHost> {
+ @Override
public SocketAddress resolveLocalAddress(final HttpHost host) {
return null;
}
+ @Override
public SocketAddress resolveRemoteAddress(final HttpHost host) {
final String hostname = host.getHostName();
int port = host.getPort();
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/AbstractIODispatch.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/AbstractIODispatch.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/AbstractIODispatch.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/AbstractIODispatch.java Tue Jan 14 15:22:31 2014
@@ -63,6 +63,7 @@ public abstract class AbstractIODispatch
Asserts.notNull(conn, "HTTP connection");
}
+ @Override
public void connected(final IOSession session) {
@SuppressWarnings("unchecked")
T conn = (T) session.getAttribute(IOEventDispatch.CONNECTION_KEY);
@@ -92,6 +93,7 @@ public abstract class AbstractIODispatch
}
}
+ @Override
public void disconnected(final IOSession session) {
@SuppressWarnings("unchecked")
final
@@ -101,6 +103,7 @@ public abstract class AbstractIODispatch
}
}
+ @Override
public void inputReady(final IOSession session) {
@SuppressWarnings("unchecked")
final
@@ -131,6 +134,7 @@ public abstract class AbstractIODispatch
}
}
+ @Override
public void outputReady(final IOSession session) {
@SuppressWarnings("unchecked")
final
@@ -161,6 +165,7 @@ public abstract class AbstractIODispatch
}
}
+ @Override
public void timeout(final IOSession session) {
@SuppressWarnings("unchecked")
final
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/AbstractIOReactor.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/AbstractIOReactor.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/AbstractIOReactor.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/AbstractIOReactor.java Tue Jan 14 15:22:31 2014
@@ -198,6 +198,7 @@ public abstract class AbstractIOReactor
return (IOSession) key.attachment();
}
+ @Override
public IOReactorStatus getStatus() {
return this.status;
}
@@ -382,6 +383,7 @@ public abstract class AbstractIOReactor
final SessionClosedCallback sessionClosedCallback = new SessionClosedCallback() {
+ @Override
public void sessionClosed(final IOSession session) {
queueClosedSession(session);
}
@@ -392,6 +394,7 @@ public abstract class AbstractIOReactor
if (this.interestOpsQueueing) {
interestOpsCallback = new InterestOpsCallback() {
+ @Override
public void addInterestOps(final InterestOpEntry entry) {
queueInterestOps(entry);
}
@@ -598,6 +601,7 @@ public abstract class AbstractIOReactor
}
}
+ @Override
public void shutdown(final long gracePeriod) throws IOReactorException {
if (this.status != IOReactorStatus.INACTIVE) {
gracefulShutdown();
@@ -611,6 +615,7 @@ public abstract class AbstractIOReactor
}
}
+ @Override
public void shutdown() throws IOReactorException {
shutdown(1000);
}
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/AbstractMultiworkerIOReactor.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/AbstractMultiworkerIOReactor.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/AbstractMultiworkerIOReactor.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/AbstractMultiworkerIOReactor.java Tue Jan 14 15:22:31 2014
@@ -206,6 +206,7 @@ public abstract class AbstractMultiworke
this(convert(workerCount, params), threadFactory);
}
+ @Override
public IOReactorStatus getStatus() {
return this.status;
}
@@ -301,6 +302,7 @@ public abstract class AbstractMultiworke
* @throws InterruptedIOException if the dispatch thread is interrupted.
* @throws IOReactorException in case if a non-recoverable I/O error.
*/
+ @Override
public void execute(
final IOEventDispatch eventDispatch) throws InterruptedIOException, IOReactorException {
Args.notNull(eventDispatch, "Event dispatcher");
@@ -536,10 +538,12 @@ public abstract class AbstractMultiworke
}
}
+ @Override
public void shutdown() throws IOException {
shutdown(2000);
}
+ @Override
public void shutdown(final long waitMs) throws IOException {
synchronized (this.statusLock) {
if (this.status.compareTo(IOReactorStatus.ACTIVE) > 0) {
@@ -579,6 +583,7 @@ public abstract class AbstractMultiworke
this.eventDispatch = eventDispatch;
}
+ @Override
public void run() {
try {
this.dispatcher.execute(this.eventDispatch);
@@ -597,6 +602,7 @@ public abstract class AbstractMultiworke
private static volatile int COUNT = 0;
+ @Override
public Thread newThread(final Runnable r) {
return new Thread(r, "I/O dispatcher " + (++COUNT));
}
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/BaseIOReactor.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/BaseIOReactor.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/BaseIOReactor.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/BaseIOReactor.java Tue Jan 14 15:22:31 2014
@@ -98,6 +98,7 @@ public class BaseIOReactor extends Abstr
* @throws InterruptedIOException if the dispatch thread is interrupted.
* @throws IOReactorException in case if a non-recoverable I/O error.
*/
+ @Override
public void execute(
final IOEventDispatch eventDispatch) throws InterruptedIOException, IOReactorException {
Args.notNull(eventDispatch, "Event dispatcher");
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/DefaultConnectingIOReactor.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/DefaultConnectingIOReactor.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/DefaultConnectingIOReactor.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/DefaultConnectingIOReactor.java Tue Jan 14 15:22:31 2014
@@ -204,6 +204,7 @@ public class DefaultConnectingIOReactor
}
}
+ @Override
public SessionRequest connect(
final SocketAddress remoteAddress,
final SocketAddress localAddress,
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/DefaultListeningIOReactor.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/DefaultListeningIOReactor.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/DefaultListeningIOReactor.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/DefaultListeningIOReactor.java Tue Jan 14 15:22:31 2014
@@ -204,6 +204,7 @@ public class DefaultListeningIOReactor e
address,
new ListenerEndpointClosedCallback() {
+ @Override
public void endpointClosed(final ListenerEndpoint endpoint) {
endpoints.remove(endpoint);
}
@@ -211,6 +212,7 @@ public class DefaultListeningIOReactor e
});
}
+ @Override
public ListenerEndpoint listen(final SocketAddress address) {
Asserts.check(this.status.compareTo(IOReactorStatus.ACTIVE) <= 0,
"I/O reactor has been shut down");
@@ -266,6 +268,7 @@ public class DefaultListeningIOReactor e
}
}
+ @Override
public Set<ListenerEndpoint> getEndpoints() {
final Set<ListenerEndpoint> set = new HashSet<ListenerEndpoint>();
synchronized (this.endpoints) {
@@ -282,6 +285,7 @@ public class DefaultListeningIOReactor e
return set;
}
+ @Override
public void pause() throws IOException {
if (this.paused) {
return;
@@ -298,6 +302,7 @@ public class DefaultListeningIOReactor e
}
}
+ @Override
public void resume() throws IOException {
if (!this.paused) {
return;
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/IOSessionImpl.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/IOSessionImpl.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/IOSessionImpl.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/IOSessionImpl.java Tue Jan 14 15:22:31 2014
@@ -111,10 +111,12 @@ public class IOSessionImpl implements IO
this(key, null, sessionClosedCallback);
}
+ @Override
public ByteChannel channel() {
return this.channel;
}
+ @Override
public SocketAddress getLocalAddress() {
if (this.channel instanceof SocketChannel) {
return ((SocketChannel)this.channel).socket().getLocalSocketAddress();
@@ -123,6 +125,7 @@ public class IOSessionImpl implements IO
}
}
+ @Override
public SocketAddress getRemoteAddress() {
if (this.channel instanceof SocketChannel) {
return ((SocketChannel)this.channel).socket().getRemoteSocketAddress();
@@ -131,10 +134,12 @@ public class IOSessionImpl implements IO
}
}
+ @Override
public synchronized int getEventMask() {
return this.interestOpsCallback != null ? this.currentEventMask : this.key.interestOps();
}
+ @Override
public synchronized void setEventMask(final int ops) {
if (this.status == CLOSED) {
return;
@@ -154,6 +159,7 @@ public class IOSessionImpl implements IO
this.key.selector().wakeup();
}
+ @Override
public synchronized void setEvent(final int op) {
if (this.status == CLOSED) {
return;
@@ -174,6 +180,7 @@ public class IOSessionImpl implements IO
this.key.selector().wakeup();
}
+ @Override
public synchronized void clearEvent(final int op) {
if (this.status == CLOSED) {
return;
@@ -194,15 +201,18 @@ public class IOSessionImpl implements IO
this.key.selector().wakeup();
}
+ @Override
public int getSocketTimeout() {
return this.socketTimeout;
}
+ @Override
public synchronized void setSocketTimeout(final int timeout) {
this.socketTimeout = timeout;
this.lastAccessTime = System.currentTimeMillis();
}
+ @Override
public synchronized void close() {
if (this.status == CLOSED) {
return;
@@ -223,42 +233,51 @@ public class IOSessionImpl implements IO
}
}
+ @Override
public int getStatus() {
return this.status;
}
+ @Override
public boolean isClosed() {
return this.status == CLOSED;
}
+ @Override
public void shutdown() {
// For this type of session, a close() does exactly
// what we need and nothing more.
close();
}
+ @Override
public boolean hasBufferedInput() {
final SessionBufferStatus buffStatus = this.bufferStatus;
return buffStatus != null && buffStatus.hasBufferedInput();
}
+ @Override
public boolean hasBufferedOutput() {
final SessionBufferStatus buffStatus = this.bufferStatus;
return buffStatus != null && buffStatus.hasBufferedOutput();
}
+ @Override
public void setBufferStatus(final SessionBufferStatus bufferStatus) {
this.bufferStatus = bufferStatus;
}
+ @Override
public Object getAttribute(final String name) {
return this.attributes.get(name);
}
+ @Override
public Object removeAttribute(final String name) {
return this.attributes.remove(name);
}
+ @Override
public void setAttribute(final String name, final Object obj) {
this.attributes.put(name, obj);
}
@@ -351,6 +370,7 @@ public class IOSessionImpl implements IO
return buffer.toString();
}
+ @Override
public Socket getSocket() {
if (this.channel instanceof SocketChannel) {
return ((SocketChannel) this.channel).socket();
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/ListenerEndpointImpl.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/ListenerEndpointImpl.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/ListenerEndpointImpl.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/ListenerEndpointImpl.java Tue Jan 14 15:22:31 2014
@@ -61,6 +61,7 @@ public class ListenerEndpointImpl implem
this.callback = callback;
}
+ @Override
public SocketAddress getAddress() {
return this.address;
}
@@ -69,10 +70,12 @@ public class ListenerEndpointImpl implem
return this.completed;
}
+ @Override
public IOException getException() {
return this.exception;
}
+ @Override
public void waitFor() throws InterruptedException {
if (this.completed) {
return;
@@ -125,10 +128,12 @@ public class ListenerEndpointImpl implem
this.key = key;
}
+ @Override
public boolean isClosed() {
return this.closed || (this.key != null && !this.key.isValid());
}
+ @Override
public void close() {
if (this.closed) {
return;
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/SessionInputBufferImpl.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/SessionInputBufferImpl.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/SessionInputBufferImpl.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/SessionInputBufferImpl.java Tue Jan 14 15:22:31 2014
@@ -155,6 +155,7 @@ public class SessionInputBufferImpl exte
this(buffersize, 256, null, HeapByteBufferAllocator.INSTANCE);
}
+ @Override
public int fill(final ReadableByteChannel channel) throws IOException {
Args.notNull(channel, "Channel");
setInputMode();
@@ -164,11 +165,13 @@ public class SessionInputBufferImpl exte
return channel.read(this.buffer);
}
+ @Override
public int read() {
setOutputMode();
return this.buffer.get() & 0xff;
}
+ @Override
public int read(final ByteBuffer dst, final int maxLen) {
if (dst == null) {
return 0;
@@ -189,6 +192,7 @@ public class SessionInputBufferImpl exte
return chunk;
}
+ @Override
public int read(final ByteBuffer dst) {
if (dst == null) {
return 0;
@@ -196,6 +200,7 @@ public class SessionInputBufferImpl exte
return read(dst, dst.remaining());
}
+ @Override
public int read(final WritableByteChannel dst, final int maxLen) throws IOException {
if (dst == null) {
return 0;
@@ -214,6 +219,7 @@ public class SessionInputBufferImpl exte
return bytesRead;
}
+ @Override
public int read(final WritableByteChannel dst) throws IOException {
if (dst == null) {
return 0;
@@ -222,6 +228,7 @@ public class SessionInputBufferImpl exte
return dst.write(this.buffer);
}
+ @Override
public boolean readLine(
final CharArrayBuffer linebuffer,
final boolean endOfStream) throws CharacterCodingException {
@@ -326,6 +333,7 @@ public class SessionInputBufferImpl exte
return true;
}
+ @Override
public String readLine(final boolean endOfStream) throws CharacterCodingException {
final CharArrayBuffer buffer = new CharArrayBuffer(64);
final boolean found = readLine(buffer, endOfStream);
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/SessionOutputBufferImpl.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/SessionOutputBufferImpl.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/SessionOutputBufferImpl.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/SessionOutputBufferImpl.java Tue Jan 14 15:22:31 2014
@@ -161,12 +161,14 @@ public class SessionOutputBufferImpl ext
clear();
}
+ @Override
public int flush(final WritableByteChannel channel) throws IOException {
Args.notNull(channel, "Channel");
setOutputMode();
return channel.write(this.buffer);
}
+ @Override
public void write(final ByteBuffer src) {
if (src == null) {
return;
@@ -177,6 +179,7 @@ public class SessionOutputBufferImpl ext
this.buffer.put(src);
}
+ @Override
public void write(final ReadableByteChannel src) throws IOException {
if (src == null) {
return;
@@ -201,6 +204,7 @@ public class SessionOutputBufferImpl ext
write(CRLF);
}
+ @Override
public void writeLine(final CharArrayBuffer linebuffer) throws CharacterCodingException {
if (linebuffer == null) {
return;
@@ -275,6 +279,7 @@ public class SessionOutputBufferImpl ext
writeCRLF();
}
+ @Override
public void writeLine(final String s) throws IOException {
if (s == null) {
return;
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/SessionRequestImpl.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/SessionRequestImpl.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/SessionRequestImpl.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/reactor/SessionRequestImpl.java Tue Jan 14 15:22:31 2014
@@ -72,18 +72,22 @@ public class SessionRequestImpl implemen
this.connectTimeout = 0;
}
+ @Override
public SocketAddress getRemoteAddress() {
return this.remoteAddress;
}
+ @Override
public SocketAddress getLocalAddress() {
return this.localAddress;
}
+ @Override
public Object getAttachment() {
return this.attachment;
}
+ @Override
public boolean isCompleted() {
return this.completed;
}
@@ -92,6 +96,7 @@ public class SessionRequestImpl implemen
this.key = key;
}
+ @Override
public void waitFor() throws InterruptedException {
if (this.completed) {
return;
@@ -103,12 +108,14 @@ public class SessionRequestImpl implemen
}
}
+ @Override
public IOSession getSession() {
synchronized (this) {
return this.session;
}
}
+ @Override
public IOException getException() {
synchronized (this) {
return this.exception;
@@ -179,10 +186,12 @@ public class SessionRequestImpl implemen
}
}
+ @Override
public int getConnectTimeout() {
return this.connectTimeout;
}
+ @Override
public void setConnectTimeout(final int timeout) {
if (this.connectTimeout != timeout) {
this.connectTimeout = timeout;
@@ -193,6 +202,7 @@ public class SessionRequestImpl implemen
}
}
+ @Override
public void cancel() {
if (this.completed) {
return;
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/ContentDecoderChannel.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/ContentDecoderChannel.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/ContentDecoderChannel.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/ContentDecoderChannel.java Tue Jan 14 15:22:31 2014
@@ -46,12 +46,15 @@ public class ContentDecoderChannel imple
this.decoder = decoder;
}
+ @Override
public int read(final ByteBuffer dst) throws IOException {
return decoder.read(dst);
}
+ @Override
public void close() {}
+ @Override
public boolean isOpen() {
return true;
}
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/ContentEncoderChannel.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/ContentEncoderChannel.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/ContentEncoderChannel.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/ContentEncoderChannel.java Tue Jan 14 15:22:31 2014
@@ -46,12 +46,15 @@ public class ContentEncoderChannel imple
this.contentEncoder = contentEncoder;
}
+ @Override
public int write(final ByteBuffer src) throws IOException {
return contentEncoder.write(src);
}
+ @Override
public void close() {}
+ @Override
public boolean isOpen() {
return true;
}
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/EntityAsyncContentProducer.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/EntityAsyncContentProducer.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/EntityAsyncContentProducer.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/EntityAsyncContentProducer.java Tue Jan 14 15:22:31 2014
@@ -60,6 +60,7 @@ public class EntityAsyncContentProducer
this.buffer = ByteBuffer.allocate(4096);
}
+ @Override
public void produceContent(
final ContentEncoder encoder, final IOControl ioctrl) throws IOException {
if (this.channel == null) {
@@ -76,10 +77,12 @@ public class EntityAsyncContentProducer
}
}
+ @Override
public boolean isRepeatable() {
return this.entity.isRepeatable();
}
+ @Override
public void close() throws IOException {
final ReadableByteChannel local = this.channel;
this.channel = null;
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/NByteArrayEntity.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/NByteArrayEntity.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/NByteArrayEntity.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/NByteArrayEntity.java Tue Jan 14 15:22:31 2014
@@ -116,6 +116,7 @@ public class NByteArrayEntity extends Ab
*
* @since 4.2
*/
+ @Override
public void close() {
this.buf.rewind();
}
@@ -130,6 +131,7 @@ public class NByteArrayEntity extends Ab
close();
}
+ @Override
public void produceContent(final ContentEncoder encoder, final IOControl ioctrl)
throws IOException {
encoder.write(this.buf);
@@ -138,22 +140,27 @@ public class NByteArrayEntity extends Ab
}
}
+ @Override
public long getContentLength() {
return this.len;
}
+ @Override
public boolean isRepeatable() {
return true;
}
+ @Override
public boolean isStreaming() {
return false;
}
+ @Override
public InputStream getContent() {
return new ByteArrayInputStream(this.b, this.off, this.len);
}
+ @Override
public void writeTo(final OutputStream outstream) throws IOException {
Args.notNull(outstream, "Output stream");
outstream.write(this.b, this.off, this.len);
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/NFileEntity.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/NFileEntity.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/NFileEntity.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/NFileEntity.java Tue Jan 14 15:22:31 2014
@@ -129,6 +129,7 @@ public class NFileEntity extends Abstrac
*
* @since 4.2
*/
+ @Override
public void close() throws IOException {
if (accessfile != null) {
accessfile.close();
@@ -147,14 +148,17 @@ public class NFileEntity extends Abstrac
close();
}
+ @Override
public long getContentLength() {
return file.length();
}
+ @Override
public boolean isRepeatable() {
return true;
}
+ @Override
public void produceContent(final ContentEncoder encoder, final IOControl ioctrl)
throws IOException {
if (accessfile == null) {
@@ -182,14 +186,17 @@ public class NFileEntity extends Abstrac
}
}
+ @Override
public boolean isStreaming() {
return false;
}
+ @Override
public InputStream getContent() throws IOException {
return new FileInputStream(this.file);
}
+ @Override
public void writeTo(final OutputStream outstream) throws IOException {
Args.notNull(outstream, "Output stream");
final InputStream instream = new FileInputStream(this.file);