hc-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject svn commit: r1634009 [1/3] - in /httpcomponents/httpcore/trunk: httpcore-ab/src/main/java/org/apache/http/benchmark/ httpcore-nio/src/examples/org/apache/http/examples/nio/ httpcore-nio/src/main/java/org/apache/http/impl/nio/ httpcore-nio/src/main/java...
Date Fri, 24 Oct 2014 07:15:01 GMT
Author: olegk
Date: Fri Oct 24 07:14:58 2014
New Revision: 1634009

URL: http://svn.apache.org/r1634009
Log:
Removed deprecated code

Removed:
    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/NHttpServerEventHandlerAdaptor.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/NHttpClientHandler.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/NHttpClientIOTarget.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/NHttpServerIOTarget.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/NHttpServiceHandler.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/ConsumingNHttpEntity.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/entity/ProducingNHttpEntity.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/params/
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/HttpAsyncRequestHandlerResolver.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/util/BufferInfo.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/io/EofSensor.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/params/
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/HttpRequestHandlerResolver.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/HttpRequestInterceptorList.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/HttpResponseInterceptorList.java
Modified:
    httpcomponents/httpcore/trunk/httpcore-ab/src/main/java/org/apache/http/benchmark/BenchmarkWorker.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/examples/org/apache/http/examples/nio/NHttpClient.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/examples/org/apache/http/examples/nio/NHttpReverseProxy.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/examples/org/apache/http/examples/nio/PipeliningHttpClient.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/DefaultHttpClientIODispatch.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/DefaultHttpServerIODispatch.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/NHttpConnectionBase.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/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/DefaultHttpRequestParser.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/DefaultHttpRequestWriter.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/DefaultHttpResponseParser.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/DefaultHttpResponseWriter.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/AbstractMultiworkerIOReactor.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/IOReactorConfig.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/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/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/reactor/ssl/SSLIOSession.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/util/ContentInputBuffer.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/util/ContentOutputBuffer.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/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/nio/integration/TestHttpAsyncHandlers.java
    httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/testserver/HttpClientNio.java
    httpcomponents/httpcore/trunk/httpcore/src/examples/org/apache/http/examples/ElementalHttpGet.java
    httpcomponents/httpcore/trunk/httpcore/src/examples/org/apache/http/examples/ElementalHttpPost.java
    httpcomponents/httpcore/trunk/httpcore/src/examples/org/apache/http/examples/ElementalPoolingHttpGet.java
    httpcomponents/httpcore/trunk/httpcore/src/examples/org/apache/http/examples/ElementalReverseProxy.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/HttpEntity.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/HttpMessage.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/ByteArrayEntity.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/StringEntity.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/ChunkedOutputStream.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/DefaultHttpRequestParser.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/DefaultHttpResponseParser.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/pool/BasicConnFactory.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/pool/BasicConnPool.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/io/SessionInputBuffer.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/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/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/pool/PoolEntry.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/HTTP.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/RequestExpectContinue.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/UriPatternMatcher.java
    httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/util/EntityUtils.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/SessionInputBufferMock.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/integration/TestSyncHttp.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/protocol/TestChainBuilder.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/protocol/TestStandardInterceptors.java
    httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/testserver/HttpClient.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=1634009&r1=1634008&r2=1634009&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 Fri Oct 24 07:14:58 2014
@@ -48,8 +48,8 @@ import org.apache.http.impl.DefaultConne
 import org.apache.http.protocol.HTTP;
 import org.apache.http.protocol.HttpCoreContext;
 import org.apache.http.protocol.HttpProcessor;
+import org.apache.http.protocol.HttpProcessorBuilder;
 import org.apache.http.protocol.HttpRequestExecutor;
-import org.apache.http.protocol.ImmutableHttpProcessor;
 import org.apache.http.protocol.RequestConnControl;
 import org.apache.http.protocol.RequestContent;
 import org.apache.http.protocol.RequestExpectContinue;
@@ -85,12 +85,16 @@ class BenchmarkWorker implements Runnabl
         this.request = request;
         this.targetHost = targetHost;
         this.config = config;
-        this.httpProcessor = new ImmutableHttpProcessor(
-                new RequestContent(),
-                new RequestTargetHost(),
-                new RequestConnControl(),
-                new RequestUserAgent("HttpCore-AB/1.1"),
-                new RequestExpectContinue(this.config.isUseExpectContinue()));
+        final HttpProcessorBuilder builder = HttpProcessorBuilder.create()
+                .addAll(
+                        new RequestContent(),
+                        new RequestTargetHost(),
+                        new RequestConnControl(),
+                        new RequestUserAgent("HttpCore-AB/1.1"));
+        if (this.config.isUseExpectContinue()) {
+            builder.add(new RequestExpectContinue());
+        }
+        this.httpProcessor = builder.build();
         this.httpexecutor = new HttpRequestExecutor();
 
         this.connstrategy = DefaultConnectionReuseStrategy.INSTANCE;

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/examples/org/apache/http/examples/nio/NHttpClient.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/examples/org/apache/http/examples/nio/NHttpClient.java?rev=1634009&r1=1634008&r2=1634009&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/examples/org/apache/http/examples/nio/NHttpClient.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/examples/org/apache/http/examples/nio/NHttpClient.java Fri Oct 24 07:14:58 2014
@@ -75,7 +75,7 @@ public class NHttpClient {
                 .add(new RequestTargetHost())
                 .add(new RequestConnControl())
                 .add(new RequestUserAgent("Test/1.1"))
-                .add(new RequestExpectContinue(true)).build();
+                .add(new RequestExpectContinue()).build();
         // Create client-side HTTP protocol handler
         HttpAsyncRequestExecutor protocolHandler = new HttpAsyncRequestExecutor();
         // Create client-side I/O event dispatch

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/examples/org/apache/http/examples/nio/NHttpReverseProxy.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/examples/org/apache/http/examples/nio/NHttpReverseProxy.java?rev=1634009&r1=1634008&r2=1634009&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/examples/org/apache/http/examples/nio/NHttpReverseProxy.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/examples/org/apache/http/examples/nio/NHttpReverseProxy.java Fri Oct 24 07:14:58 2014
@@ -144,7 +144,7 @@ public class NHttpReverseProxy {
                         new RequestTargetHost(),
                         new RequestConnControl(),
                         new RequestUserAgent("Test/1.1"),
-                        new RequestExpectContinue(true)
+                        new RequestExpectContinue()
         });
 
         ProxyClientProtocolHandler clientHandler = new ProxyClientProtocolHandler();

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/examples/org/apache/http/examples/nio/PipeliningHttpClient.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/examples/org/apache/http/examples/nio/PipeliningHttpClient.java?rev=1634009&r1=1634008&r2=1634009&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/examples/org/apache/http/examples/nio/PipeliningHttpClient.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/examples/org/apache/http/examples/nio/PipeliningHttpClient.java Fri Oct 24 07:14:58 2014
@@ -77,7 +77,7 @@ public class PipeliningHttpClient {
                 .add(new RequestTargetHost())
                 .add(new RequestConnControl())
                 .add(new RequestUserAgent("Test/1.1"))
-                .add(new RequestExpectContinue(true)).build();
+                .add(new RequestExpectContinue()).build();
         // Create client-side HTTP protocol handler
         HttpAsyncRequestExecutor protocolHandler = new HttpAsyncRequestExecutor();
         // Create client-side I/O event dispatch

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/DefaultHttpClientIODispatch.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/DefaultHttpClientIODispatch.java?rev=1634009&r1=1634008&r2=1634009&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/DefaultHttpClientIODispatch.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/DefaultHttpClientIODispatch.java Fri Oct 24 07:14:58 2014
@@ -38,7 +38,6 @@ import org.apache.http.nio.NHttpClientEv
 import org.apache.http.nio.NHttpConnectionFactory;
 import org.apache.http.nio.reactor.IOSession;
 import org.apache.http.nio.reactor.ssl.SSLSetupHandler;
-import org.apache.http.params.HttpParams;
 import org.apache.http.util.Args;
 
 /**
@@ -48,7 +47,6 @@ import org.apache.http.util.Args;
  *
  * @since 4.2
  */
-@SuppressWarnings("deprecation")
 @Immutable // provided injected dependencies are immutable
 public class DefaultHttpClientIODispatch
                     extends AbstractIODispatch<DefaultNHttpClientConnection> {
@@ -72,42 +70,6 @@ public class DefaultHttpClientIODispatch
     }
 
     /**
-     * @deprecated (4.3) use {@link DefaultHttpClientIODispatch#DefaultHttpClientIODispatch(
-     *  NHttpClientEventHandler, ConnectionConfig)}
-     */
-    @Deprecated
-    public DefaultHttpClientIODispatch(
-            final NHttpClientEventHandler handler,
-            final HttpParams params) {
-        this(handler, new DefaultNHttpClientConnectionFactory(params));
-    }
-
-    /**
-     * @deprecated (4.3) use {@link DefaultHttpClientIODispatch#DefaultHttpClientIODispatch(
-     *  NHttpClientEventHandler, SSLContext, SSLSetupHandler, ConnectionConfig)}
-     */
-    @Deprecated
-    public DefaultHttpClientIODispatch(
-            final NHttpClientEventHandler handler,
-            final SSLContext sslcontext,
-            final SSLSetupHandler sslHandler,
-            final HttpParams params) {
-        this(handler, new SSLNHttpClientConnectionFactory(sslcontext, sslHandler, params));
-    }
-
-    /**
-     * @deprecated (4.3) use {@link DefaultHttpClientIODispatch#DefaultHttpClientIODispatch(
-     *   NHttpClientEventHandler, SSLContext, ConnectionConfig)}
-     */
-    @Deprecated
-    public DefaultHttpClientIODispatch(
-            final NHttpClientEventHandler handler,
-            final SSLContext sslcontext,
-            final HttpParams params) {
-        this(handler, sslcontext, null, params);
-    }
-
-    /**
      * @since 4.3
      */
     public DefaultHttpClientIODispatch(final NHttpClientEventHandler handler, final ConnectionConfig config) {

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/DefaultHttpServerIODispatch.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/DefaultHttpServerIODispatch.java?rev=1634009&r1=1634008&r2=1634009&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/DefaultHttpServerIODispatch.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/DefaultHttpServerIODispatch.java Fri Oct 24 07:14:58 2014
@@ -38,7 +38,6 @@ import org.apache.http.nio.NHttpConnecti
 import org.apache.http.nio.NHttpServerEventHandler;
 import org.apache.http.nio.reactor.IOSession;
 import org.apache.http.nio.reactor.ssl.SSLSetupHandler;
-import org.apache.http.params.HttpParams;
 import org.apache.http.util.Args;
 
 /**
@@ -48,7 +47,6 @@ import org.apache.http.util.Args;
  *
  * @since 4.2
  */
-@SuppressWarnings("deprecation")
 @Immutable // provided injected dependencies are immutable
 public class DefaultHttpServerIODispatch
                     extends AbstractIODispatch<DefaultNHttpServerConnection> {
@@ -65,42 +63,6 @@ public class DefaultHttpServerIODispatch
     }
 
     /**
-     * @deprecated (4.3) use {@link DefaultHttpServerIODispatch#DefaultHttpServerIODispatch(
-     *   NHttpServerEventHandler, ConnectionConfig)}
-     */
-    @Deprecated
-    public DefaultHttpServerIODispatch(
-            final NHttpServerEventHandler handler,
-            final HttpParams params) {
-        this(handler, new DefaultNHttpServerConnectionFactory(params));
-    }
-
-    /**
-     * @deprecated (4.3) use {@link DefaultHttpServerIODispatch#DefaultHttpServerIODispatch(
-     *   NHttpServerEventHandler, SSLContext, SSLSetupHandler, ConnectionConfig)}
-     */
-    @Deprecated
-    public DefaultHttpServerIODispatch(
-            final NHttpServerEventHandler handler,
-            final SSLContext sslcontext,
-            final SSLSetupHandler sslHandler,
-            final HttpParams params) {
-        this(handler, new SSLNHttpServerConnectionFactory(sslcontext, sslHandler, params));
-    }
-
-    /**
-     * @deprecated (4.3) use {@link DefaultHttpServerIODispatch#DefaultHttpServerIODispatch(
-     *   NHttpServerEventHandler, SSLContext, ConnectionConfig)}
-     */
-    @Deprecated
-    public DefaultHttpServerIODispatch(
-            final NHttpServerEventHandler handler,
-            final SSLContext sslcontext,
-            final HttpParams params) {
-        this(handler, sslcontext, null, params);
-    }
-
-    /**
      * @since 4.3
      */
     public DefaultHttpServerIODispatch(final NHttpServerEventHandler handler, final ConnectionConfig config) {

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=1634009&r1=1634008&r2=1634009&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 Fri Oct 24 07:14:58 2014
@@ -37,28 +37,20 @@ import org.apache.http.HttpEntityEnclosi
 import org.apache.http.HttpException;
 import org.apache.http.HttpRequest;
 import org.apache.http.HttpResponse;
-import org.apache.http.HttpResponseFactory;
 import org.apache.http.annotation.NotThreadSafe;
 import org.apache.http.config.MessageConstraints;
 import org.apache.http.entity.ContentLengthStrategy;
-import org.apache.http.impl.nio.codecs.DefaultHttpRequestWriter;
 import org.apache.http.impl.nio.codecs.DefaultHttpRequestWriterFactory;
-import org.apache.http.impl.nio.codecs.DefaultHttpResponseParser;
 import org.apache.http.impl.nio.codecs.DefaultHttpResponseParserFactory;
+import org.apache.http.nio.NHttpClientConnection;
 import org.apache.http.nio.NHttpClientEventHandler;
-import org.apache.http.nio.NHttpClientHandler;
-import org.apache.http.nio.NHttpClientIOTarget;
 import org.apache.http.nio.NHttpMessageParser;
 import org.apache.http.nio.NHttpMessageParserFactory;
 import org.apache.http.nio.NHttpMessageWriter;
 import org.apache.http.nio.NHttpMessageWriterFactory;
 import org.apache.http.nio.reactor.EventMask;
 import org.apache.http.nio.reactor.IOSession;
-import org.apache.http.nio.reactor.SessionInputBuffer;
-import org.apache.http.nio.reactor.SessionOutputBuffer;
 import org.apache.http.nio.util.ByteBufferAllocator;
-import org.apache.http.params.HttpParamConfig;
-import org.apache.http.params.HttpParams;
 import org.apache.http.util.Args;
 
 /**
@@ -67,43 +59,14 @@ import org.apache.http.util.Args;
  *
  * @since 4.0
  */
-@SuppressWarnings("deprecation")
 @NotThreadSafe
 public class DefaultNHttpClientConnection
-    extends NHttpConnectionBase implements NHttpClientIOTarget {
+    extends NHttpConnectionBase implements NHttpClientConnection {
 
     protected final NHttpMessageParser<HttpResponse> responseParser;
     protected final NHttpMessageWriter<HttpRequest> requestWriter;
 
     /**
-     * Creates a new instance of this class given the underlying I/O session.
-     *
-     * @param session the underlying I/O session.
-     * @param responseFactory HTTP response factory.
-     * @param allocator byte buffer allocator.
-     * @param params HTTP parameters.
-     *
-     * @deprecated (4.3) use {@link DefaultNHttpClientConnection#DefaultNHttpClientConnection(
-     *   IOSession, int, int, ByteBufferAllocator, CharsetDecoder, CharsetEncoder,
-     *   MessageConstraints, ContentLengthStrategy, ContentLengthStrategy,
-     *   NHttpMessageWriterFactory, NHttpMessageParserFactory)}
-     */
-    @Deprecated
-    public DefaultNHttpClientConnection(
-            final IOSession session,
-            final HttpResponseFactory responseFactory,
-            final ByteBufferAllocator allocator,
-            final HttpParams params) {
-        super(session, allocator, params);
-        Args.notNull(responseFactory, "Response factory");
-        this.responseParser = createResponseParser(this.inbuf, responseFactory, params);
-        this.requestWriter = createRequestWriter(this.outbuf, params);
-        this.hasBufferedInput = false;
-        this.hasBufferedOutput = false;
-        this.session.setBufferStatus(this);
-    }
-
-    /**
      * Creates new instance DefaultNHttpClientConnection given the underlying I/O session.
      *
      * @param session the underlying I/O session.
@@ -166,46 +129,6 @@ public class DefaultNHttpClientConnectio
     }
 
     /**
-     * Creates an instance of {@link NHttpMessageParser} to be used
-     * by this connection for parsing incoming {@link HttpResponse} messages.
-     * <p>
-     * This method can be overridden in a super class in order to provide
-     * a different implementation of the {@link NHttpMessageParser} interface.
-     *
-     * @return HTTP response parser.
-     *
-     * @deprecated (4.3) use constructor.
-     */
-    @Deprecated
-    protected NHttpMessageParser<HttpResponse> createResponseParser(
-            final SessionInputBuffer buffer,
-            final HttpResponseFactory responseFactory,
-            final HttpParams params) {
-        // override in derived class to specify a line parser
-        final MessageConstraints constraints = HttpParamConfig.getMessageConstraints(params);
-        return new DefaultHttpResponseParser(buffer, null, responseFactory, constraints);
-    }
-
-    /**
-     * Creates an instance of {@link NHttpMessageWriter} to be used
-     * by this connection for writing out outgoing {@link HttpRequest} messages.
-     * <p>
-     * This method can be overridden by a super class in order to provide
-     * a different implementation of the {@link NHttpMessageWriter} interface.
-     *
-     * @return HTTP response parser.
-     *
-     * @deprecated (4.3) use constructor.
-     */
-    @Deprecated
-    protected NHttpMessageWriter<HttpRequest> createRequestWriter(
-            final SessionOutputBuffer buffer,
-            final HttpParams params) {
-        // override in derived class to specify a line formatter
-        return new DefaultHttpRequestWriter(buffer, null);
-    }
-
-    /**
      * @since 4.2
      */
     protected void onResponseReceived(final HttpResponse response) {
@@ -344,14 +267,4 @@ public class DefaultNHttpClientConnectio
         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=1634009&r1=1634008&r2=1634009&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 Fri Oct 24 07:14:58 2014
@@ -28,22 +28,15 @@ package org.apache.http.impl.nio;
 
 import org.apache.http.HttpRequest;
 import org.apache.http.HttpResponse;
-import org.apache.http.HttpResponseFactory;
 import org.apache.http.annotation.Immutable;
 import org.apache.http.config.ConnectionConfig;
 import org.apache.http.entity.ContentLengthStrategy;
 import org.apache.http.impl.ConnSupport;
-import org.apache.http.impl.DefaultHttpResponseFactory;
-import org.apache.http.impl.nio.codecs.DefaultHttpResponseParserFactory;
 import org.apache.http.nio.NHttpConnectionFactory;
 import org.apache.http.nio.NHttpMessageParserFactory;
 import org.apache.http.nio.NHttpMessageWriterFactory;
 import org.apache.http.nio.reactor.IOSession;
 import org.apache.http.nio.util.ByteBufferAllocator;
-import org.apache.http.nio.util.HeapByteBufferAllocator;
-import org.apache.http.params.HttpParamConfig;
-import org.apache.http.params.HttpParams;
-import org.apache.http.util.Args;
 
 /**
  * Default factory for plain (non-encrypted), non-blocking
@@ -51,7 +44,6 @@ import org.apache.http.util.Args;
  *
  * @since 4.2
  */
-@SuppressWarnings("deprecation")
 @Immutable
 public class DefaultNHttpClientConnectionFactory
     implements NHttpConnectionFactory<DefaultNHttpClientConnection> {
@@ -66,39 +58,6 @@ public class DefaultNHttpClientConnectio
     private final ConnectionConfig cconfig;
 
     /**
-     * @deprecated (4.3) use {@link
-     *   DefaultNHttpClientConnectionFactory#DefaultNHttpClientConnectionFactory(
-     *      NHttpMessageParserFactory, NHttpMessageWriterFactory, ByteBufferAllocator,
-     *      ConnectionConfig)}
-     */
-    @Deprecated
-    public DefaultNHttpClientConnectionFactory(
-            final HttpResponseFactory responseFactory,
-            final ByteBufferAllocator allocator,
-            final HttpParams params) {
-        super();
-        Args.notNull(responseFactory, "HTTP response factory");
-        Args.notNull(allocator, "Byte buffer allocator");
-        Args.notNull(params, "HTTP parameters");
-        this.allocator = allocator;
-        this.incomingContentStrategy = null;
-        this.outgoingContentStrategy = null;
-        this.responseParserFactory = new DefaultHttpResponseParserFactory(null, responseFactory);
-        this.requestWriterFactory = null;
-        this.cconfig = HttpParamConfig.getConnectionConfig(params);
-    }
-
-    /**
-     * @deprecated (4.3) use {@link
-     *   DefaultNHttpClientConnectionFactory#DefaultNHttpClientConnectionFactory(
-     *     ConnectionConfig)}
-     */
-    @Deprecated
-    public DefaultNHttpClientConnectionFactory(final HttpParams params) {
-        this(DefaultHttpResponseFactory.INSTANCE, HeapByteBufferAllocator.INSTANCE, params);
-    }
-
-    /**
      * @since 4.3
      */
     public DefaultNHttpClientConnectionFactory(
@@ -152,18 +111,6 @@ public class DefaultNHttpClientConnectio
         this(null, null, null, null, null, null);
     }
 
-    /**
-     * @deprecated (4.3) no longer used.
-     */
-    @Deprecated
-    protected DefaultNHttpClientConnection createConnection(
-            final IOSession session,
-            final HttpResponseFactory responseFactory,
-            final ByteBufferAllocator allocator,
-            final HttpParams params) {
-        return new DefaultNHttpClientConnection(session, responseFactory, allocator, params);
-    }
-
     @Override
     public DefaultNHttpClientConnection createConnection(final IOSession session) {
         return new DefaultNHttpClientConnection(

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=1634009&r1=1634008&r2=1634009&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 Fri Oct 24 07:14:58 2014
@@ -36,32 +36,23 @@ import org.apache.http.HttpEntity;
 import org.apache.http.HttpEntityEnclosingRequest;
 import org.apache.http.HttpException;
 import org.apache.http.HttpRequest;
-import org.apache.http.HttpRequestFactory;
 import org.apache.http.HttpResponse;
 import org.apache.http.annotation.NotThreadSafe;
 import org.apache.http.config.MessageConstraints;
 import org.apache.http.entity.ContentLengthStrategy;
 import org.apache.http.impl.entity.DisallowIdentityContentLengthStrategy;
-import org.apache.http.impl.entity.LaxContentLengthStrategy;
 import org.apache.http.impl.entity.StrictContentLengthStrategy;
-import org.apache.http.impl.nio.codecs.DefaultHttpRequestParser;
 import org.apache.http.impl.nio.codecs.DefaultHttpRequestParserFactory;
-import org.apache.http.impl.nio.codecs.DefaultHttpResponseWriter;
 import org.apache.http.impl.nio.codecs.DefaultHttpResponseWriterFactory;
 import org.apache.http.nio.NHttpMessageParser;
 import org.apache.http.nio.NHttpMessageParserFactory;
 import org.apache.http.nio.NHttpMessageWriter;
 import org.apache.http.nio.NHttpMessageWriterFactory;
+import org.apache.http.nio.NHttpServerConnection;
 import org.apache.http.nio.NHttpServerEventHandler;
-import org.apache.http.nio.NHttpServerIOTarget;
-import org.apache.http.nio.NHttpServiceHandler;
 import org.apache.http.nio.reactor.EventMask;
 import org.apache.http.nio.reactor.IOSession;
-import org.apache.http.nio.reactor.SessionInputBuffer;
-import org.apache.http.nio.reactor.SessionOutputBuffer;
 import org.apache.http.nio.util.ByteBufferAllocator;
-import org.apache.http.params.HttpParamConfig;
-import org.apache.http.params.HttpParams;
 import org.apache.http.util.Args;
 
 /**
@@ -70,40 +61,14 @@ import org.apache.http.util.Args;
  *
  * @since 4.0
  */
-@SuppressWarnings("deprecation")
 @NotThreadSafe
 public class DefaultNHttpServerConnection
-    extends NHttpConnectionBase implements NHttpServerIOTarget {
+    extends NHttpConnectionBase implements NHttpServerConnection {
 
     protected final NHttpMessageParser<HttpRequest> requestParser;
     protected final NHttpMessageWriter<HttpResponse> responseWriter;
 
     /**
-     * Creates a new instance of this class given the underlying I/O session.
-     *
-     * @param session the underlying I/O session.
-     * @param requestFactory HTTP request factory.
-     * @param allocator byte buffer allocator.
-     * @param params HTTP parameters.
-     *
-     * @deprecated (4.3) use {@link DefaultNHttpServerConnection#DefaultNHttpServerConnection(
-     *   IOSession, int, int, ByteBufferAllocator, CharsetDecoder, CharsetEncoder,
-     *   MessageConstraints, ContentLengthStrategy, ContentLengthStrategy,
-     *   NHttpMessageParserFactory, NHttpMessageWriterFactory)}
-     */
-    @Deprecated
-    public DefaultNHttpServerConnection(
-            final IOSession session,
-            final HttpRequestFactory requestFactory,
-            final ByteBufferAllocator allocator,
-            final HttpParams params) {
-        super(session, allocator, params);
-        Args.notNull(requestFactory, "Request factory");
-        this.requestParser = createRequestParser(this.inbuf, requestFactory, params);
-        this.responseWriter = createResponseWriter(this.outbuf, params);
-    }
-
-    /**
      * Creates new instance DefaultNHttpServerConnection given the underlying I/O session.
      *
      * @param session the underlying I/O session.
@@ -174,55 +139,6 @@ public class DefaultNHttpServerConnectio
     }
 
     /**
-     * @deprecated (4.3) use constructor.
-     */
-    @Override
-    @Deprecated
-    protected ContentLengthStrategy createIncomingContentStrategy() {
-        return new DisallowIdentityContentLengthStrategy(new LaxContentLengthStrategy(0));
-    }
-
-    /**
-     * Creates an instance of {@link NHttpMessageParser} to be used
-     * by this connection for parsing incoming {@link HttpRequest} messages.
-     * <p>
-     * This method can be overridden in a super class in order to provide
-     * a different implementation of the {@link NHttpMessageParser} interface.
-     *
-     * @return HTTP response parser.
-     *
-     * @deprecated (4.3) use constructor.
-     */
-    @Deprecated
-    protected NHttpMessageParser<HttpRequest> createRequestParser(
-            final SessionInputBuffer buffer,
-            final HttpRequestFactory requestFactory,
-            final HttpParams params) {
-        final MessageConstraints constraints = HttpParamConfig.getMessageConstraints(params);
-        return new DefaultHttpRequestParser(buffer, null, requestFactory, constraints);
-    }
-
-    /**
-     * Creates an instance of {@link NHttpMessageWriter} to be used
-     * by this connection for writing out outgoing {@link HttpResponse}
-     * messages.
-     * <p>
-     * This method can be overridden by a super class in order to provide
-     * a different implementation of the {@link NHttpMessageWriter} interface.
-     *
-     * @return HTTP response parser.
-     *
-     * @deprecated (4.3) use constructor.
-     */
-    @Deprecated
-    protected NHttpMessageWriter<HttpResponse> createResponseWriter(
-            final SessionOutputBuffer buffer,
-            final HttpParams params) {
-        // override in derived class to specify a line formatter
-        return new DefaultHttpResponseWriter(buffer, null);
-    }
-
-    /**
      * @since 4.2
      */
     protected void onRequestReceived(final HttpRequest request) {
@@ -363,14 +279,4 @@ public class DefaultNHttpServerConnectio
         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=1634009&r1=1634008&r2=1634009&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 Fri Oct 24 07:14:58 2014
@@ -27,23 +27,16 @@
 package org.apache.http.impl.nio;
 
 import org.apache.http.HttpRequest;
-import org.apache.http.HttpRequestFactory;
 import org.apache.http.HttpResponse;
 import org.apache.http.annotation.Immutable;
 import org.apache.http.config.ConnectionConfig;
 import org.apache.http.entity.ContentLengthStrategy;
 import org.apache.http.impl.ConnSupport;
-import org.apache.http.impl.DefaultHttpRequestFactory;
-import org.apache.http.impl.nio.codecs.DefaultHttpRequestParserFactory;
 import org.apache.http.nio.NHttpConnectionFactory;
 import org.apache.http.nio.NHttpMessageParserFactory;
 import org.apache.http.nio.NHttpMessageWriterFactory;
 import org.apache.http.nio.reactor.IOSession;
 import org.apache.http.nio.util.ByteBufferAllocator;
-import org.apache.http.nio.util.HeapByteBufferAllocator;
-import org.apache.http.params.HttpParamConfig;
-import org.apache.http.params.HttpParams;
-import org.apache.http.util.Args;
 
 /**
  * Default factory for plain (non-encrypted), non-blocking
@@ -51,7 +44,6 @@ import org.apache.http.util.Args;
  *
  * @since 4.2
  */
-@SuppressWarnings("deprecation")
 @Immutable
 public class DefaultNHttpServerConnectionFactory
     implements NHttpConnectionFactory<DefaultNHttpServerConnection> {
@@ -64,50 +56,6 @@ public class DefaultNHttpServerConnectio
     private final ConnectionConfig cconfig;
 
     /**
-     * @deprecated (4.3) use {@link
-     *   DefaultNHttpServerConnectionFactory#DefaultNHttpServerConnectionFactory(
-     *      ByteBufferAllocator, NHttpMessageParserFactory, NHttpMessageWriterFactory,
-     *      ConnectionConfig)}
-     */
-    @Deprecated
-    public DefaultNHttpServerConnectionFactory(
-            final HttpRequestFactory requestFactory,
-            final ByteBufferAllocator allocator,
-            final HttpParams params) {
-        super();
-        Args.notNull(requestFactory, "HTTP request factory");
-        Args.notNull(allocator, "Byte buffer allocator");
-        Args.notNull(params, "HTTP parameters");
-        this.incomingContentStrategy = null;
-        this.outgoingContentStrategy = null;
-        this.requestParserFactory = new DefaultHttpRequestParserFactory(null, requestFactory);
-        this.responseWriterFactory = null;
-        this.allocator = allocator;
-        this.cconfig = HttpParamConfig.getConnectionConfig(params);
-    }
-
-    /**
-     * @deprecated (4.3) use {@link
-     *   DefaultNHttpServerConnectionFactory#DefaultNHttpServerConnectionFactory(ConnectionConfig)}
-     */
-    @Deprecated
-    public DefaultNHttpServerConnectionFactory(final HttpParams params) {
-        this(DefaultHttpRequestFactory.INSTANCE, HeapByteBufferAllocator.INSTANCE, params);
-    }
-
-    /**
-     * @deprecated (4.3) no longer used.
-     */
-    @Deprecated
-    protected DefaultNHttpServerConnection createConnection(
-            final IOSession session,
-            final HttpRequestFactory requestFactory,
-            final ByteBufferAllocator allocator,
-            final HttpParams params) {
-        return new DefaultNHttpServerConnection(session, requestFactory, allocator, params);
-    }
-
-    /**
      * @since 4.3
      */
     public DefaultNHttpServerConnectionFactory(

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=1634009&r1=1634008&r2=1634009&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 Fri Oct 24 07:14:58 2014
@@ -34,13 +34,10 @@ import java.net.Socket;
 import java.net.SocketAddress;
 import java.nio.channels.ReadableByteChannel;
 import java.nio.channels.WritableByteChannel;
-import java.nio.charset.Charset;
 import java.nio.charset.CharsetDecoder;
 import java.nio.charset.CharsetEncoder;
-import java.nio.charset.CodingErrorAction;
 
 import org.apache.http.ConnectionClosedException;
-import org.apache.http.Consts;
 import org.apache.http.Header;
 import org.apache.http.HttpConnectionMetrics;
 import org.apache.http.HttpEntity;
@@ -65,7 +62,6 @@ import org.apache.http.impl.nio.codecs.L
 import org.apache.http.impl.nio.codecs.LengthDelimitedEncoder;
 import org.apache.http.impl.nio.reactor.SessionInputBufferImpl;
 import org.apache.http.impl.nio.reactor.SessionOutputBufferImpl;
-import org.apache.http.io.HttpTransportMetrics;
 import org.apache.http.nio.ContentDecoder;
 import org.apache.http.nio.ContentEncoder;
 import org.apache.http.nio.NHttpConnection;
@@ -76,13 +72,9 @@ import org.apache.http.nio.reactor.Sessi
 import org.apache.http.nio.reactor.SessionOutputBuffer;
 import org.apache.http.nio.reactor.SocketAccessor;
 import org.apache.http.nio.util.ByteBufferAllocator;
-import org.apache.http.params.CoreConnectionPNames;
-import org.apache.http.params.CoreProtocolPNames;
-import org.apache.http.params.HttpParams;
 import org.apache.http.protocol.HTTP;
 import org.apache.http.protocol.HttpContext;
 import org.apache.http.util.Args;
-import org.apache.http.util.CharsetUtils;
 import org.apache.http.util.NetUtils;
 
 /**
@@ -91,7 +83,6 @@ import org.apache.http.util.NetUtils;
  *
  * @since 4.0
  */
-@SuppressWarnings("deprecation")
 @NotThreadSafe
 public class NHttpConnectionBase
         implements NHttpConnection, HttpInetConnection, SessionBufferStatus, SocketAccessor {
@@ -121,68 +112,6 @@ public class NHttpConnectionBase
     protected volatile int status;
 
     /**
-     * Creates a new instance of this class given the underlying I/O session.
-     *
-     * @param session the underlying I/O session.
-     * @param allocator byte buffer allocator.
-     * @param params HTTP parameters.
-     *
-     * @deprecated (4.3) use
-     *   {@link NHttpConnectionBase#NHttpConnectionBase(IOSession, int, int, ByteBufferAllocator,
-     *   CharsetDecoder, CharsetEncoder, ContentLengthStrategy, ContentLengthStrategy)}
-     */
-    @Deprecated
-    public NHttpConnectionBase(
-            final IOSession session,
-            final ByteBufferAllocator allocator,
-            final HttpParams params) {
-        super();
-        Args.notNull(session, "I/O session");
-        Args.notNull(params, "HTTP params");
-
-        int buffersize = params.getIntParameter(CoreConnectionPNames.SOCKET_BUFFER_SIZE, -1);
-        if (buffersize <= 0) {
-            buffersize = 4096;
-        }
-        int linebuffersize = buffersize;
-        if (linebuffersize > 512) {
-            linebuffersize = 512;
-        }
-
-        CharsetDecoder decoder = null;
-        CharsetEncoder encoder = null;
-        Charset charset = CharsetUtils.lookup(
-                (String) params.getParameter(CoreProtocolPNames.HTTP_ELEMENT_CHARSET));
-        if (charset != null) {
-            charset = Consts.ASCII;
-            decoder = charset.newDecoder();
-            encoder = charset.newEncoder();
-            final CodingErrorAction malformedCharAction = (CodingErrorAction) params.getParameter(
-                    CoreProtocolPNames.HTTP_MALFORMED_INPUT_ACTION);
-            final CodingErrorAction unmappableCharAction = (CodingErrorAction) params.getParameter(
-                    CoreProtocolPNames.HTTP_UNMAPPABLE_INPUT_ACTION);
-            decoder.onMalformedInput(malformedCharAction).onUnmappableCharacter(unmappableCharAction);
-            encoder.onMalformedInput(malformedCharAction).onUnmappableCharacter(unmappableCharAction);
-        }
-        this.inbuf = new SessionInputBufferImpl(buffersize, linebuffersize, decoder, allocator);
-        this.outbuf = new SessionOutputBufferImpl(buffersize, linebuffersize, encoder, allocator);
-        this.fragmentSizeHint = buffersize;
-        this.constraints = MessageConstraints.DEFAULT;
-
-        this.incomingContentStrategy = createIncomingContentStrategy();
-        this.outgoingContentStrategy = createOutgoingContentStrategy();
-
-        this.inTransportMetrics = createTransportMetrics();
-        this.outTransportMetrics = createTransportMetrics();
-        this.connMetrics = createConnectionMetrics(
-                this.inTransportMetrics,
-                this.outTransportMetrics);
-
-        setSession(session);
-        this.status = ACTIVE;
-    }
-
-    /**
      * Creates new instance NHttpConnectionBase given the underlying I/O session.
      *
      * @param session the underlying I/O session.
@@ -288,48 +217,6 @@ public class NHttpConnectionBase
         setSession(session);
     }
 
-    /**
-     * @since 4.2
-     *
-     * @deprecated (4.3) use constructor.
-     */
-    @Deprecated
-    protected ContentLengthStrategy createIncomingContentStrategy() {
-        return new LaxContentLengthStrategy();
-    }
-
-    /**
-     * @since 4.2
-     *
-     * @deprecated (4.3) use constructor.
-     */
-    @Deprecated
-    protected ContentLengthStrategy createOutgoingContentStrategy() {
-        return new StrictContentLengthStrategy();
-    }
-
-    /**
-     * @since 4.1
-     *
-     * @deprecated (4.3) no longer used.
-     */
-    @Deprecated
-    protected HttpTransportMetricsImpl createTransportMetrics() {
-        return new HttpTransportMetricsImpl();
-    }
-
-    /**
-     * @since 4.1
-     *
-     * @deprecated (4.3) use decorator to add additional metrics.
-     */
-    @Deprecated
-    protected HttpConnectionMetricsImpl createConnectionMetrics(
-            final HttpTransportMetrics inTransportMetric,
-            final HttpTransportMetrics outTransportMetric) {
-        return new HttpConnectionMetricsImpl(inTransportMetric, outTransportMetric);
-    }
-
     @Override
     public int getStatus() {
         return this.status;

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=1634009&r1=1634008&r2=1634009&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 Fri Oct 24 07:14:58 2014
@@ -30,13 +30,10 @@ import javax.net.ssl.SSLContext;
 
 import org.apache.http.HttpRequest;
 import org.apache.http.HttpResponse;
-import org.apache.http.HttpResponseFactory;
 import org.apache.http.annotation.Immutable;
 import org.apache.http.config.ConnectionConfig;
 import org.apache.http.entity.ContentLengthStrategy;
 import org.apache.http.impl.ConnSupport;
-import org.apache.http.impl.DefaultHttpResponseFactory;
-import org.apache.http.impl.nio.codecs.DefaultHttpResponseParserFactory;
 import org.apache.http.nio.NHttpConnectionFactory;
 import org.apache.http.nio.NHttpMessageParserFactory;
 import org.apache.http.nio.NHttpMessageWriterFactory;
@@ -45,11 +42,7 @@ import org.apache.http.nio.reactor.ssl.S
 import org.apache.http.nio.reactor.ssl.SSLMode;
 import org.apache.http.nio.reactor.ssl.SSLSetupHandler;
 import org.apache.http.nio.util.ByteBufferAllocator;
-import org.apache.http.nio.util.HeapByteBufferAllocator;
-import org.apache.http.params.HttpParamConfig;
-import org.apache.http.params.HttpParams;
 import org.apache.http.ssl.SSLContexts;
-import org.apache.http.util.Args;
 
 /**
  * Default factory for SSL encrypted, non-blocking
@@ -57,7 +50,6 @@ import org.apache.http.util.Args;
  *
  * @since 4.2
  */
-@SuppressWarnings("deprecation")
 @Immutable
 public class SSLNHttpClientConnectionFactory
     implements NHttpConnectionFactory<DefaultNHttpClientConnection> {
@@ -74,56 +66,6 @@ public class SSLNHttpClientConnectionFac
     private final ConnectionConfig cconfig;
 
     /**
-     * @deprecated (4.3) use {@link
-     *   SSLNHttpClientConnectionFactory#SSLNHttpClientConnectionFactory(SSLContext,
-     *      SSLSetupHandler, NHttpMessageParserFactory, NHttpMessageWriterFactory,
-     *      ByteBufferAllocator, ConnectionConfig)}
-     */
-    @Deprecated
-    public SSLNHttpClientConnectionFactory(
-            final SSLContext sslcontext,
-            final SSLSetupHandler sslHandler,
-            final HttpResponseFactory responseFactory,
-            final ByteBufferAllocator allocator,
-            final HttpParams params) {
-        super();
-        Args.notNull(responseFactory, "HTTP response factory");
-        Args.notNull(allocator, "Byte buffer allocator");
-        Args.notNull(params, "HTTP parameters");
-        this.sslcontext = sslcontext != null ? sslcontext : SSLContexts.createSystemDefault();
-        this.sslHandler = sslHandler;
-        this.allocator = allocator;
-        this.incomingContentStrategy = null;
-        this.outgoingContentStrategy = null;
-        this.responseParserFactory = new DefaultHttpResponseParserFactory(null, responseFactory);
-        this.requestWriterFactory = null;
-        this.cconfig = HttpParamConfig.getConnectionConfig(params);
-    }
-
-    /**
-     * @deprecated (4.3) use {@link
-     *   SSLNHttpClientConnectionFactory#SSLNHttpClientConnectionFactory(SSLContext,
-     *     SSLSetupHandler, ConnectionConfig)}
-     */
-    @Deprecated
-    public SSLNHttpClientConnectionFactory(
-            final SSLContext sslcontext,
-            final SSLSetupHandler sslHandler,
-            final HttpParams params) {
-        this(sslcontext, sslHandler, DefaultHttpResponseFactory.INSTANCE,
-                HeapByteBufferAllocator.INSTANCE, params);
-    }
-
-    /**
-     * @deprecated (4.3) use {@link
-     *   SSLNHttpClientConnectionFactory#SSLNHttpClientConnectionFactory(ConnectionConfig)}
-     */
-    @Deprecated
-    public SSLNHttpClientConnectionFactory(final HttpParams params) {
-        this(null, null, params);
-    }
-
-    /**
      * @since 4.3
      */
     public SSLNHttpClientConnectionFactory(
@@ -198,18 +140,6 @@ public class SSLNHttpClientConnectionFac
     }
 
     /**
-     * @deprecated (4.3) no longer used.
-     */
-    @Deprecated
-    protected DefaultNHttpClientConnection createConnection(
-            final IOSession session,
-            final HttpResponseFactory responseFactory,
-            final ByteBufferAllocator allocator,
-            final HttpParams params) {
-        return new DefaultNHttpClientConnection(session, responseFactory, allocator, params);
-    }
-
-    /**
      * @since 4.3
      */
     protected SSLIOSession createSSLIOSession(

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=1634009&r1=1634008&r2=1634009&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 Fri Oct 24 07:14:58 2014
@@ -29,14 +29,11 @@ package org.apache.http.impl.nio;
 import javax.net.ssl.SSLContext;
 
 import org.apache.http.HttpRequest;
-import org.apache.http.HttpRequestFactory;
 import org.apache.http.HttpResponse;
 import org.apache.http.annotation.Immutable;
 import org.apache.http.config.ConnectionConfig;
 import org.apache.http.entity.ContentLengthStrategy;
 import org.apache.http.impl.ConnSupport;
-import org.apache.http.impl.DefaultHttpRequestFactory;
-import org.apache.http.impl.nio.codecs.DefaultHttpRequestParserFactory;
 import org.apache.http.nio.NHttpConnectionFactory;
 import org.apache.http.nio.NHttpMessageParserFactory;
 import org.apache.http.nio.NHttpMessageWriterFactory;
@@ -45,11 +42,7 @@ import org.apache.http.nio.reactor.ssl.S
 import org.apache.http.nio.reactor.ssl.SSLMode;
 import org.apache.http.nio.reactor.ssl.SSLSetupHandler;
 import org.apache.http.nio.util.ByteBufferAllocator;
-import org.apache.http.nio.util.HeapByteBufferAllocator;
-import org.apache.http.params.HttpParamConfig;
-import org.apache.http.params.HttpParams;
 import org.apache.http.ssl.SSLContexts;
-import org.apache.http.util.Args;
 
 /**
  * Default factory for SSL encrypted, non-blocking
@@ -57,7 +50,6 @@ import org.apache.http.util.Args;
  *
  * @since 4.2
  */
-@SuppressWarnings("deprecation")
 @Immutable
 public class SSLNHttpServerConnectionFactory
     implements NHttpConnectionFactory<DefaultNHttpServerConnection> {
@@ -72,56 +64,6 @@ public class SSLNHttpServerConnectionFac
     private final ConnectionConfig cconfig;
 
     /**
-     * @deprecated (4.3) use {@link
-     *   SSLNHttpServerConnectionFactory#SSLNHttpServerConnectionFactory(SSLContext,
-     *      SSLSetupHandler, NHttpMessageParserFactory, NHttpMessageWriterFactory,
-     *      ByteBufferAllocator, ConnectionConfig)}
-     */
-    @Deprecated
-    public SSLNHttpServerConnectionFactory(
-            final SSLContext sslcontext,
-            final SSLSetupHandler sslHandler,
-            final HttpRequestFactory requestFactory,
-            final ByteBufferAllocator allocator,
-            final HttpParams params) {
-        super();
-        Args.notNull(requestFactory, "HTTP request factory");
-        Args.notNull(allocator, "Byte buffer allocator");
-        Args.notNull(params, "HTTP parameters");
-        this.sslcontext = sslcontext != null ? sslcontext : SSLContexts.createSystemDefault();
-        this.sslHandler = sslHandler;
-        this.incomingContentStrategy = null;
-        this.outgoingContentStrategy = null;
-        this.requestParserFactory = new DefaultHttpRequestParserFactory(null, requestFactory);
-        this.responseWriterFactory = null;
-        this.allocator = allocator;
-        this.cconfig = HttpParamConfig.getConnectionConfig(params);
-    }
-
-    /**
-     * @deprecated (4.3) use {@link
-     *   SSLNHttpServerConnectionFactory#SSLNHttpServerConnectionFactory(SSLContext,
-     *     SSLSetupHandler, ConnectionConfig)}
-     */
-    @Deprecated
-    public SSLNHttpServerConnectionFactory(
-            final SSLContext sslcontext,
-            final SSLSetupHandler sslHandler,
-            final HttpParams params) {
-        this(sslcontext, sslHandler, DefaultHttpRequestFactory.INSTANCE,
-                HeapByteBufferAllocator.INSTANCE, params);
-    }
-
-    /**
-     * @deprecated (4.3) use {@link
-     *   SSLNHttpServerConnectionFactory#SSLNHttpServerConnectionFactory(ConnectionConfig)}
-     */
-    @Deprecated
-    public SSLNHttpServerConnectionFactory(final HttpParams params) {
-        this(null, null, params);
-    }
-
-    /**
      * @since 4.3
      */
     public SSLNHttpServerConnectionFactory(
@@ -196,18 +138,6 @@ public class SSLNHttpServerConnectionFac
     }
 
     /**
-     * @deprecated (4.3) no longer used.
-     */
-    @Deprecated
-    protected DefaultNHttpServerConnection createConnection(
-            final IOSession session,
-            final HttpRequestFactory requestFactory,
-            final ByteBufferAllocator allocator,
-            final HttpParams params) {
-        return new DefaultNHttpServerConnection(session, requestFactory, allocator, params);
-    }
-
-    /**
      * @since 4.3
      */
     protected SSLIOSession createSSLIOSession(

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=1634009&r1=1634008&r2=1634009&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 Fri Oct 24 07:14:58 2014
@@ -43,8 +43,6 @@ import org.apache.http.message.BasicLine
 import org.apache.http.message.LineParser;
 import org.apache.http.nio.NHttpMessageParser;
 import org.apache.http.nio.reactor.SessionInputBuffer;
-import org.apache.http.params.HttpParamConfig;
-import org.apache.http.params.HttpParams;
 import org.apache.http.util.Args;
 import org.apache.http.util.CharArrayBuffer;
 
@@ -54,7 +52,6 @@ import org.apache.http.util.CharArrayBuf
  *
  * @since 4.0
  */
-@SuppressWarnings("deprecation")
 @NotThreadSafe
 public abstract class AbstractMessageParser<T extends HttpMessage> implements NHttpMessageParser<T> {
 
@@ -75,33 +72,6 @@ public abstract class AbstractMessagePar
     private final MessageConstraints constraints;
 
     /**
-     * Creates an instance of this class.
-     *
-     * @param buffer the session input buffer.
-     * @param lineParser the line parser.
-     * @param params HTTP parameters.
-     *
-     * @deprecated (4.3) use
-     *   {@link AbstractMessageParser#AbstractMessageParser(SessionInputBuffer, LineParser,
-     *     MessageConstraints)}
-     */
-    @Deprecated
-    public AbstractMessageParser(
-            final SessionInputBuffer buffer,
-            final LineParser lineParser,
-            final HttpParams params) {
-        super();
-        Args.notNull(buffer, "Session input buffer");
-        Args.notNull(params, "HTTP parameters");
-        this.sessionBuffer = buffer;
-        this.state = READ_HEAD_LINE;
-        this.endOfStream = false;
-        this.headerBufs = new ArrayList<CharArrayBuffer>();
-        this.constraints = HttpParamConfig.getMessageConstraints(params);
-        this.lineParser = (lineParser != null) ? lineParser : BasicLineParser.INSTANCE;
-    }
-
-    /**
      * Creates an instance of AbstractMessageParser.
      *
      * @param buffer the session input buffer.

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=1634009&r1=1634008&r2=1634009&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 Fri Oct 24 07:14:58 2014
@@ -38,7 +38,6 @@ import org.apache.http.message.BasicLine
 import org.apache.http.message.LineFormatter;
 import org.apache.http.nio.NHttpMessageWriter;
 import org.apache.http.nio.reactor.SessionOutputBuffer;
-import org.apache.http.params.HttpParams;
 import org.apache.http.util.Args;
 import org.apache.http.util.CharArrayBuffer;
 
@@ -48,7 +47,6 @@ import org.apache.http.util.CharArrayBuf
  *
  * @since 4.0
  */
-@SuppressWarnings("deprecation")
 @NotThreadSafe
 public abstract class AbstractMessageWriter<T extends HttpMessage> implements NHttpMessageWriter<T> {
 
@@ -57,27 +55,6 @@ public abstract class AbstractMessageWri
     protected final LineFormatter lineFormatter;
 
     /**
-     * Creates an instance of this class.
-     *
-     * @param buffer the session output buffer.
-     * @param formatter the line formatter.
-     * @param params HTTP parameters.
-     *
-     * @deprecated (4.3) use
-     *   {@link AbstractMessageWriter#AbstractMessageWriter(SessionOutputBuffer, LineFormatter)}
-     */
-    @Deprecated
-    public AbstractMessageWriter(final SessionOutputBuffer buffer,
-                                 final LineFormatter formatter,
-                                 final HttpParams params) {
-        super();
-        Args.notNull(buffer, "Session input buffer");
-        this.sessionBuffer = buffer;
-        this.lineBuf = new CharArrayBuffer(64);
-        this.lineFormatter = (formatter != null) ? formatter : BasicLineFormatter.INSTANCE;
-    }
-
-    /**
      * Creates an instance of AbstractMessageWriter.
      *
      * @param buffer the session output buffer.

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/DefaultHttpRequestParser.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/DefaultHttpRequestParser.java?rev=1634009&r1=1634008&r2=1634009&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/DefaultHttpRequestParser.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/DefaultHttpRequestParser.java Fri Oct 24 07:14:58 2014
@@ -38,8 +38,6 @@ import org.apache.http.impl.DefaultHttpR
 import org.apache.http.message.LineParser;
 import org.apache.http.message.ParserCursor;
 import org.apache.http.nio.reactor.SessionInputBuffer;
-import org.apache.http.params.HttpParams;
-import org.apache.http.util.Args;
 import org.apache.http.util.CharArrayBuffer;
 
 /**
@@ -48,35 +46,12 @@ import org.apache.http.util.CharArrayBuf
  *
  * @since 4.1
  */
-@SuppressWarnings("deprecation")
 @NotThreadSafe
 public class DefaultHttpRequestParser extends AbstractMessageParser<HttpRequest> {
 
     private final HttpRequestFactory requestFactory;
 
     /**
-     * Creates an instance of this class.
-     *
-     * @param buffer the session input buffer.
-     * @param parser the line parser.
-     * @param params HTTP parameters.
-     *
-     * @deprecated (4.3) use
-     *   {@link DefaultHttpRequestParser#DefaultHttpRequestParser(
-     *   SessionInputBuffer, LineParser, HttpRequestFactory, MessageConstraints)}
-     */
-    @Deprecated
-    public DefaultHttpRequestParser(
-            final SessionInputBuffer buffer,
-            final LineParser parser,
-            final HttpRequestFactory requestFactory,
-            final HttpParams params) {
-        super(buffer, parser, params);
-        Args.notNull(requestFactory, "Request factory");
-        this.requestFactory = requestFactory;
-    }
-
-    /**
      * Creates an instance of DefaultHttpRequestParser.
      *
      * @param buffer the session input buffer.

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/DefaultHttpRequestWriter.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/DefaultHttpRequestWriter.java?rev=1634009&r1=1634008&r2=1634009&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/DefaultHttpRequestWriter.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/DefaultHttpRequestWriter.java Fri Oct 24 07:14:58 2014
@@ -33,7 +33,6 @@ import org.apache.http.HttpRequest;
 import org.apache.http.annotation.NotThreadSafe;
 import org.apache.http.message.LineFormatter;
 import org.apache.http.nio.reactor.SessionOutputBuffer;
-import org.apache.http.params.HttpParams;
 import org.apache.http.util.CharArrayBuffer;
 
 /**
@@ -42,22 +41,10 @@ import org.apache.http.util.CharArrayBuf
  *
  * @since 4.1
  */
-@SuppressWarnings("deprecation")
 @NotThreadSafe
 public class DefaultHttpRequestWriter extends AbstractMessageWriter<HttpRequest> {
 
     /**
-     * @deprecated (4.3) use
-     *   {@link DefaultHttpRequestWriter#DefaultHttpRequestWriter(SessionOutputBuffer, LineFormatter)}
-     */
-    @Deprecated
-    public DefaultHttpRequestWriter(final SessionOutputBuffer buffer,
-                             final LineFormatter formatter,
-                             final HttpParams params) {
-        super(buffer, formatter, params);
-    }
-
-    /**
      * Creates an instance of DefaultHttpRequestWriter.
      *
      * @param buffer the session output buffer.

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/DefaultHttpResponseParser.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/DefaultHttpResponseParser.java?rev=1634009&r1=1634008&r2=1634009&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/DefaultHttpResponseParser.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/DefaultHttpResponseParser.java Fri Oct 24 07:14:58 2014
@@ -38,8 +38,6 @@ import org.apache.http.impl.DefaultHttpR
 import org.apache.http.message.LineParser;
 import org.apache.http.message.ParserCursor;
 import org.apache.http.nio.reactor.SessionInputBuffer;
-import org.apache.http.params.HttpParams;
-import org.apache.http.util.Args;
 import org.apache.http.util.CharArrayBuffer;
 
 /**
@@ -48,29 +46,12 @@ import org.apache.http.util.CharArrayBuf
  *
  * @since 4.1
  */
-@SuppressWarnings("deprecation")
 @NotThreadSafe
 public class DefaultHttpResponseParser extends AbstractMessageParser<HttpResponse> {
 
     private final HttpResponseFactory responseFactory;
 
     /**
-     * @deprecated (4.3) use
-     *   {@link DefaultHttpResponseParser#DefaultHttpResponseParser(
-     *   SessionInputBuffer, LineParser, HttpResponseFactory, MessageConstraints)}
-     */
-    @Deprecated
-    public DefaultHttpResponseParser(
-            final SessionInputBuffer buffer,
-            final LineParser parser,
-            final HttpResponseFactory responseFactory,
-            final HttpParams params) {
-        super(buffer, parser, params);
-        Args.notNull(responseFactory, "Response factory");
-        this.responseFactory = responseFactory;
-    }
-
-    /**
      * Creates an instance of DefaultHttpResponseParser.
      *
      * @param buffer the session input buffer.

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/DefaultHttpResponseWriter.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/DefaultHttpResponseWriter.java?rev=1634009&r1=1634008&r2=1634009&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/DefaultHttpResponseWriter.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/DefaultHttpResponseWriter.java Fri Oct 24 07:14:58 2014
@@ -33,7 +33,6 @@ import org.apache.http.HttpResponse;
 import org.apache.http.annotation.NotThreadSafe;
 import org.apache.http.message.LineFormatter;
 import org.apache.http.nio.reactor.SessionOutputBuffer;
-import org.apache.http.params.HttpParams;
 import org.apache.http.util.CharArrayBuffer;
 
 /**
@@ -42,22 +41,10 @@ import org.apache.http.util.CharArrayBuf
  *
  * @since 4.1
  */
-@SuppressWarnings("deprecation")
 @NotThreadSafe
 public class DefaultHttpResponseWriter extends AbstractMessageWriter<HttpResponse> {
 
     /**
-     * @deprecated (4.3) use
-     *   {@link DefaultHttpResponseWriter#DefaultHttpResponseWriter(SessionOutputBuffer, LineFormatter)}
-     */
-    @Deprecated
-    public DefaultHttpResponseWriter(final SessionOutputBuffer buffer,
-                              final LineFormatter formatter,
-                              final HttpParams params) {
-        super(buffer, formatter, params);
-    }
-
-    /**
      * Creates an instance of DefaultHttpResponseWriter.
      *
      * @param buffer the session output buffer.

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=1634009&r1=1634008&r2=1634009&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 Fri Oct 24 07:14:58 2014
@@ -33,10 +33,8 @@ import javax.net.ssl.SSLContext;
 import org.apache.http.HttpHost;
 import org.apache.http.HttpRequest;
 import org.apache.http.HttpResponse;
-import org.apache.http.HttpResponseFactory;
 import org.apache.http.annotation.Immutable;
 import org.apache.http.config.ConnectionConfig;
-import org.apache.http.impl.DefaultHttpResponseFactory;
 import org.apache.http.impl.nio.DefaultNHttpClientConnectionFactory;
 import org.apache.http.impl.nio.SSLNHttpClientConnectionFactory;
 import org.apache.http.nio.NHttpClientConnection;
@@ -48,8 +46,6 @@ import org.apache.http.nio.reactor.IOEve
 import org.apache.http.nio.reactor.IOSession;
 import org.apache.http.nio.reactor.ssl.SSLSetupHandler;
 import org.apache.http.nio.util.ByteBufferAllocator;
-import org.apache.http.nio.util.HeapByteBufferAllocator;
-import org.apache.http.params.HttpParams;
 import org.apache.http.util.Args;
 
 /**
@@ -58,7 +54,6 @@ import org.apache.http.util.Args;
  *
  * @since 4.2
  */
-@SuppressWarnings("deprecation")
 @Immutable
 public class BasicNIOConnFactory implements NIOConnFactory<HttpHost, NHttpClientConnection> {
 
@@ -80,45 +75,6 @@ public class BasicNIOConnFactory impleme
     }
 
     /**
-     * @deprecated (4.3) use {@link BasicNIOConnFactory#BasicNIOConnFactory(SSLContext,
-     *   SSLSetupHandler, NHttpMessageParserFactory, NHttpMessageWriterFactory,
-     *   ByteBufferAllocator, ConnectionConfig)}
-     */
-    @Deprecated
-    public BasicNIOConnFactory(
-            final SSLContext sslcontext,
-            final SSLSetupHandler sslHandler,
-            final HttpResponseFactory responseFactory,
-            final ByteBufferAllocator allocator,
-            final HttpParams params) {
-        this(new DefaultNHttpClientConnectionFactory(
-                responseFactory, allocator, params),
-                new SSLNHttpClientConnectionFactory(
-                        sslcontext, sslHandler, responseFactory, allocator, params));
-    }
-
-    /**
-     * @deprecated (4.3) use {@link BasicNIOConnFactory#BasicNIOConnFactory(SSLContext,
-     *   SSLSetupHandler, ConnectionConfig)}
-     */
-    @Deprecated
-    public BasicNIOConnFactory(
-            final SSLContext sslcontext,
-            final SSLSetupHandler sslHandler,
-            final HttpParams params) {
-        this(sslcontext, sslHandler,
-                DefaultHttpResponseFactory.INSTANCE, HeapByteBufferAllocator.INSTANCE, params);
-    }
-
-    /**
-     * @deprecated (4.3) use {@link BasicNIOConnFactory#BasicNIOConnFactory(ConnectionConfig)}
-     */
-    @Deprecated
-    public BasicNIOConnFactory(final HttpParams params) {
-        this(null, null, params);
-    }
-
-    /**
      * @since 4.3
      */
     public BasicNIOConnFactory(

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=1634009&r1=1634008&r2=1634009&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 Fri Oct 24 07:14:58 2014
@@ -41,9 +41,6 @@ import org.apache.http.nio.pool.Abstract
 import org.apache.http.nio.pool.NIOConnFactory;
 import org.apache.http.nio.pool.SocketAddressResolver;
 import org.apache.http.nio.reactor.ConnectingIOReactor;
-import org.apache.http.params.CoreConnectionPNames;
-import org.apache.http.params.HttpParams;
-import org.apache.http.util.Args;
 
 /**
  * A very basic {@link org.apache.http.pool.ConnPool} implementation that
@@ -55,7 +52,6 @@ import org.apache.http.util.Args;
  * @see HttpHost
  * @since 4.2
  */
-@SuppressWarnings("deprecation")
 @ThreadSafe
 public class BasicNIOConnPool extends AbstractNIOConnPool<HttpHost, NHttpClientConnection, BasicNIOPoolEntry> {
 
@@ -87,29 +83,6 @@ public class BasicNIOConnPool extends Ab
     }
 
     /**
-     * @deprecated (4.3) use {@link BasicNIOConnPool#BasicNIOConnPool(ConnectingIOReactor, NIOConnFactory, int)}
-     */
-    @Deprecated
-    public BasicNIOConnPool(
-            final ConnectingIOReactor ioreactor,
-            final NIOConnFactory<HttpHost, NHttpClientConnection> connFactory,
-            final HttpParams params) {
-        super(ioreactor, connFactory, 2, 20);
-        Args.notNull(params, "HTTP parameters");
-        this.connectTimeout = params.getIntParameter(CoreConnectionPNames.CONNECTION_TIMEOUT, 0);
-    }
-
-    /**
-     * @deprecated (4.3) use {@link BasicNIOConnPool#BasicNIOConnPool(ConnectingIOReactor,
-     *   ConnectionConfig)}
-     */
-    @Deprecated
-    public BasicNIOConnPool(
-            final ConnectingIOReactor ioreactor, final HttpParams params) {
-        this(ioreactor, new BasicNIOConnFactory(params), params);
-    }
-
-    /**
      * @since 4.3
      */
     public BasicNIOConnPool(
@@ -146,24 +119,6 @@ public class BasicNIOConnPool extends Ab
         this(ioreactor, new BasicNIOConnFactory(ConnectionConfig.DEFAULT), 0);
     }
 
-    /**
-     * @deprecated (4.3) use {@link SocketAddressResolver}
-     */
-    @Deprecated
-    @Override
-    protected SocketAddress resolveRemoteAddress(final HttpHost host) {
-        return new InetSocketAddress(host.getHostName(), host.getPort());
-    }
-
-    /**
-     * @deprecated (4.3) use {@link SocketAddressResolver}
-     */
-    @Deprecated
-    @Override
-    protected SocketAddress resolveLocalAddress(final HttpHost host) {
-        return null;
-    }
-
     @Override
     protected BasicNIOPoolEntry createEntry(final HttpHost host, final NHttpClientConnection conn) {
         final BasicNIOPoolEntry entry = new BasicNIOPoolEntry(

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=1634009&r1=1634008&r2=1634009&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 Fri Oct 24 07:14:58 2014
@@ -43,15 +43,11 @@ import java.util.concurrent.ThreadFactor
 import java.util.concurrent.atomic.AtomicLong;
 
 import org.apache.http.annotation.ThreadSafe;
-import org.apache.http.nio.params.NIOReactorPNames;
 import org.apache.http.nio.reactor.IOEventDispatch;
 import org.apache.http.nio.reactor.IOReactor;
 import org.apache.http.nio.reactor.IOReactorException;
 import org.apache.http.nio.reactor.IOReactorExceptionHandler;
 import org.apache.http.nio.reactor.IOReactorStatus;
-import org.apache.http.params.BasicHttpParams;
-import org.apache.http.params.CoreConnectionPNames;
-import org.apache.http.params.HttpParams;
 import org.apache.http.util.Args;
 import org.apache.http.util.Asserts;
 
@@ -95,17 +91,11 @@ import org.apache.http.util.Asserts;
  *
  * @since 4.0
  */
-@SuppressWarnings("deprecation")
 @ThreadSafe // public methods only
 public abstract class AbstractMultiworkerIOReactor implements IOReactor {
 
     protected volatile IOReactorStatus status;
 
-    /**
-     * @deprecated (4.2)
-     */
-    @Deprecated
-    protected final HttpParams params;
     protected final IOReactorConfig config;
     protected final Selector selector;
     protected final long selectTimeout;
@@ -139,7 +129,6 @@ public abstract class AbstractMultiworke
             final ThreadFactory threadFactory) throws IOReactorException {
         super();
         this.config = config != null ? config : IOReactorConfig.DEFAULT;
-        this.params = new BasicHttpParams();
         try {
             this.selector = Selector.open();
         } catch (final IOException ex) {
@@ -172,43 +161,6 @@ public abstract class AbstractMultiworke
         this(null, null);
     }
 
-    @Deprecated
-    static IOReactorConfig convert(final int workerCount, final HttpParams params) {
-        Args.notNull(params, "HTTP parameters");
-        return IOReactorConfig.custom()
-            .setSelectInterval(params.getLongParameter(NIOReactorPNames.SELECT_INTERVAL, 1000))
-            .setShutdownGracePeriod(params.getLongParameter(NIOReactorPNames.GRACE_PERIOD, 500))
-            .setInterestOpQueued(params.getBooleanParameter(NIOReactorPNames.SELECT_INTERVAL, false))
-            .setIoThreadCount(workerCount)
-            .setSoTimeout(params.getIntParameter(CoreConnectionPNames.SO_TIMEOUT, 0))
-            .setConnectTimeout(params.getIntParameter(CoreConnectionPNames.CONNECTION_TIMEOUT, 0))
-            .setSoTimeout(params.getIntParameter(CoreConnectionPNames.SO_TIMEOUT, 0))
-            .setSoReuseAddress(params.getBooleanParameter(CoreConnectionPNames.SO_REUSEADDR, false))
-            .setSoKeepAlive(params.getBooleanParameter(CoreConnectionPNames.SO_KEEPALIVE, false))
-            .setSoLinger(params.getIntParameter(CoreConnectionPNames.SO_LINGER, -1))
-            .setTcpNoDelay(params.getBooleanParameter(CoreConnectionPNames.TCP_NODELAY, true))
-            .build();
-    }
-
-    /**
-     * Creates an instance of AbstractMultiworkerIOReactor.
-     *
-     * @param workerCount number of worker I/O reactors.
-     * @param threadFactory the factory to create threads.
-     *   Can be {@code null}.
-     * @param params HTTP parameters.
-     * @throws IOReactorException in case if a non-recoverable I/O error.
-     *
-     * @deprecated (4.2) use {@link AbstractMultiworkerIOReactor#AbstractMultiworkerIOReactor(IOReactorConfig, ThreadFactory)}
-     */
-    @Deprecated
-    public AbstractMultiworkerIOReactor(
-            final int workerCount,
-            final ThreadFactory threadFactory,
-            final HttpParams params) throws IOReactorException {
-        this(convert(workerCount, params), threadFactory);
-    }
-
     @Override
     public IOReactorStatus getStatus() {
         return this.status;

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=1634009&r1=1634008&r2=1634009&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 Fri Oct 24 07:14:58 2014
@@ -46,7 +46,6 @@ import org.apache.http.nio.reactor.IORea
 import org.apache.http.nio.reactor.IOReactorStatus;
 import org.apache.http.nio.reactor.SessionRequest;
 import org.apache.http.nio.reactor.SessionRequestCallback;
-import org.apache.http.params.HttpParams;
 import org.apache.http.util.Asserts;
 
 /**
@@ -56,7 +55,6 @@ import org.apache.http.util.Asserts;
  *
  * @since 4.0
  */
-@SuppressWarnings("deprecation")
 @ThreadSafe // public methods only
 public class DefaultConnectingIOReactor extends AbstractMultiworkerIOReactor
         implements ConnectingIOReactor {
@@ -107,27 +105,6 @@ public class DefaultConnectingIOReactor 
         this(null, null);
     }
 
-    /**
-     * @deprecated (4.2) use {@link DefaultConnectingIOReactor#DefaultConnectingIOReactor(IOReactorConfig, ThreadFactory)}
-     */
-    @Deprecated
-    public DefaultConnectingIOReactor(
-            final int workerCount,
-            final ThreadFactory threadFactory,
-            final HttpParams params) throws IOReactorException {
-        this(convert(workerCount, params), threadFactory);
-    }
-
-    /**
-     * @deprecated (4.2) use {@link DefaultConnectingIOReactor#DefaultConnectingIOReactor(IOReactorConfig)}
-     */
-    @Deprecated
-    public DefaultConnectingIOReactor(
-            final int workerCount,
-            final HttpParams params) throws IOReactorException {
-        this(convert(workerCount, params), null);
-    }
-
     @Override
     protected void cancelRequests() throws IOReactorException {
         SessionRequestImpl request;

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=1634009&r1=1634008&r2=1634009&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 Fri Oct 24 07:14:58 2014
@@ -47,7 +47,6 @@ import org.apache.http.nio.reactor.IORea
 import org.apache.http.nio.reactor.IOReactorStatus;
 import org.apache.http.nio.reactor.ListenerEndpoint;
 import org.apache.http.nio.reactor.ListeningIOReactor;
-import org.apache.http.params.HttpParams;
 import org.apache.http.util.Asserts;
 
 /**
@@ -57,7 +56,6 @@ import org.apache.http.util.Asserts;
  *
  * @since 4.0
  */
-@SuppressWarnings("deprecation")
 @ThreadSafe // public methods only
 public class DefaultListeningIOReactor extends AbstractMultiworkerIOReactor
         implements ListeningIOReactor {
@@ -111,27 +109,6 @@ public class DefaultListeningIOReactor e
         this(null, null);
     }
 
-    /**
-     * @deprecated (4.2) use {@link DefaultListeningIOReactor#DefaultListeningIOReactor(IOReactorConfig, ThreadFactory)}
-     */
-    @Deprecated
-    public DefaultListeningIOReactor(
-            final int workerCount,
-            final ThreadFactory threadFactory,
-            final HttpParams params) throws IOReactorException {
-        this(convert(workerCount, params), threadFactory);
-    }
-
-    /**
-     * @deprecated (4.2) use {@link DefaultListeningIOReactor#DefaultListeningIOReactor(IOReactorConfig)}
-     */
-    @Deprecated
-    public DefaultListeningIOReactor(
-            final int workerCount,
-            final HttpParams params) throws IOReactorException {
-        this(convert(workerCount, params), null);
-    }
-
     @Override
     protected void cancelRequests() throws IOReactorException {
         ListenerEndpointImpl request;



Mime
View raw message