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 2012/10/19 18:21:43 UTC
svn commit: r1400154 - in /httpcomponents/httpcore/trunk:
httpcore-nio/src/examples/org/apache/http/examples/nio/
httpcore-nio/src/main/java/org/apache/http/impl/nio/
httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/
httpcore-nio/src/main/jav...
Author: olegk
Date: Fri Oct 19 16:21:41 2012
New Revision: 1400154
URL: http://svn.apache.org/viewvc?rev=1400154&view=rev
Log:
Configuration API changes: deprecated HttpParams and related classes; fixed javadocs
Removed:
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/params/Config.java
Modified:
httpcomponents/httpcore/trunk/httpcore-nio/src/examples/org/apache/http/examples/nio/NHttpReverseProxy.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/DefaultNHttpClientConnectionFactory.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/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/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/nio/protocol/BasicAsyncRequestExecutionHandler.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/test/java/org/apache/http/impl/nio/pool/TestBasicNIOConnPool.java
httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/testserver/HttpClientNio.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/HttpMessage.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/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/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/message/AbstractHttpMessage.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicHttpRequest.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/params/CoreConnectionPNames.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/params/CoreProtocolPNames.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/params/DefaultedHttpParams.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/params/HttpAbstractParamBean.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/params/HttpConnectionParamBean.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/params/HttpConnectionParams.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/params/HttpParamConfig.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/params/HttpParams.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/params/HttpParamsNames.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/params/HttpProtocolParamBean.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/params/HttpProtocolParams.java
httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/params/SyncBasicHttpParams.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/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/ResponseServer.java
httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/message/TestAbstractMessage.java
httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/params/TestBasicHttpParams.java
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=1400154&r1=1400153&r2=1400154&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 19 16:21:41 2012
@@ -32,7 +32,6 @@ import java.net.InetSocketAddress;
import java.net.URI;
import java.nio.ByteBuffer;
import java.util.Locale;
-import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicLong;
import org.apache.http.ConnectionReuseStrategy;
@@ -853,8 +852,8 @@ public class NHttpReverseProxy {
public ProxyConnPool(
final ConnectingIOReactor ioreactor,
final NIOConnFactory<HttpHost, NHttpClientConnection> connFactory,
- int connectTimeout, final TimeUnit tunit) {
- super(ioreactor, connFactory, connectTimeout, tunit);
+ final ConnectionConfig config) {
+ super(ioreactor, connFactory, config);
}
@Override
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=1400154&r1=1400153&r2=1400154&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 19 16:21:41 2012
@@ -48,6 +48,7 @@ import org.apache.http.util.Args;
*
* @since 4.2
*/
+@SuppressWarnings("deprecation")
@Immutable // provided injected dependencies are immutable
public class DefaultHttpClientIODispatch
extends AbstractIODispatch<DefaultNHttpClientConnection> {
@@ -72,7 +73,7 @@ public class DefaultHttpClientIODispatch
/**
* @deprecated (4.3) use {@link DefaultHttpClientIODispatch#DefaultHttpClientIODispatch(
- * NHttpClientEventHandler)}
+ * NHttpClientEventHandler, ConnectionConfig)}
*/
@Deprecated
public DefaultHttpClientIODispatch(
@@ -83,7 +84,7 @@ public class DefaultHttpClientIODispatch
/**
* @deprecated (4.3) use {@link DefaultHttpClientIODispatch#DefaultHttpClientIODispatch(
- * NHttpClientEventHandler, SSLContext, SSLSetupHandler)}
+ * NHttpClientEventHandler, SSLContext, SSLSetupHandler, ConnectionConfig)}
*/
@Deprecated
public DefaultHttpClientIODispatch(
@@ -96,7 +97,7 @@ public class DefaultHttpClientIODispatch
/**
* @deprecated (4.3) use {@link DefaultHttpClientIODispatch#DefaultHttpClientIODispatch(
- * NHttpClientEventHandler, SSLContext)}
+ * NHttpClientEventHandler, SSLContext, ConnectionConfig)}
*/
@Deprecated
public DefaultHttpClientIODispatch(
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=1400154&r1=1400153&r2=1400154&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 19 16:21:41 2012
@@ -48,6 +48,7 @@ import org.apache.http.util.Args;
*
* @since 4.2
*/
+@SuppressWarnings("deprecation")
@Immutable // provided injected dependencies are immutable
public class DefaultHttpServerIODispatch
extends AbstractIODispatch<DefaultNHttpServerConnection> {
@@ -65,7 +66,7 @@ public class DefaultHttpServerIODispatch
/**
* @deprecated (4.3) use {@link DefaultHttpServerIODispatch#DefaultHttpServerIODispatch(
- * NHttpServerEventHandler)}
+ * NHttpServerEventHandler, ConnectionConfig)}
*/
@Deprecated
public DefaultHttpServerIODispatch(
@@ -76,7 +77,7 @@ public class DefaultHttpServerIODispatch
/**
* @deprecated (4.3) use {@link DefaultHttpServerIODispatch#DefaultHttpServerIODispatch(
- * NHttpServerEventHandler, SSLContext, SSLSetupHandler)}
+ * NHttpServerEventHandler, SSLContext, SSLSetupHandler, ConnectionConfig)}
*/
@Deprecated
public DefaultHttpServerIODispatch(
@@ -89,7 +90,7 @@ public class DefaultHttpServerIODispatch
/**
* @deprecated (4.3) use {@link DefaultHttpServerIODispatch#DefaultHttpServerIODispatch(
- * NHttpServerEventHandler, SSLContext)}
+ * NHttpServerEventHandler, SSLContext, ConnectionConfig)}
*/
@Deprecated
public DefaultHttpServerIODispatch(
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=1400154&r1=1400153&r2=1400154&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 19 16:21:41 2012
@@ -64,7 +64,7 @@ public class DefaultNHttpClientConnectio
/**
* @deprecated (4.3) use {@link
* DefaultNHttpClientConnectionFactory#DefaultNHttpClientConnectionFactory(
- * HttpResponseFactory, ByteBufferAllocator)}
+ * HttpResponseFactory, ByteBufferAllocator, ConnectionConfig)}
*/
@Deprecated
public DefaultNHttpClientConnectionFactory(
@@ -82,7 +82,7 @@ public class DefaultNHttpClientConnectio
/**
* @deprecated (4.3) use {@link
- * DefaultNHttpClientConnectionFactory#DefaultNHttpClientConnectionFactory()}
+ * DefaultNHttpClientConnectionFactory#DefaultNHttpClientConnectionFactory(ConnectionConfig)}
*/
@Deprecated
public DefaultNHttpClientConnectionFactory(final HttpParams params) {
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=1400154&r1=1400153&r2=1400154&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 19 16:21:41 2012
@@ -64,7 +64,7 @@ public class DefaultNHttpServerConnectio
/**
* @deprecated (4.3) use {@link
* DefaultNHttpServerConnectionFactory#DefaultNHttpServerConnectionFactory(
- * ByteBufferAllocator, HttpRequestFactory)}
+ * ByteBufferAllocator, HttpRequestFactory, ConnectionConfig)}
*/
@Deprecated
public DefaultNHttpServerConnectionFactory(
@@ -82,7 +82,7 @@ public class DefaultNHttpServerConnectio
/**
* @deprecated (4.3) use {@link
- * DefaultNHttpServerConnectionFactory#DefaultNHttpServerConnectionFactory()}
+ * DefaultNHttpServerConnectionFactory#DefaultNHttpServerConnectionFactory(ConnectionConfig)}
*/
@Deprecated
public DefaultNHttpServerConnectionFactory(final HttpParams params) {
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=1400154&r1=1400153&r2=1400154&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 19 16:21:41 2012
@@ -77,10 +77,9 @@ import org.apache.http.nio.reactor.Sessi
import org.apache.http.nio.reactor.SocketAccessor;
import org.apache.http.nio.util.ByteBufferAllocator;
import org.apache.http.nio.util.HeapByteBufferAllocator;
-import org.apache.http.params.Config;
import org.apache.http.params.CoreConnectionPNames;
-import org.apache.http.params.CoreProtocolPNames;
import org.apache.http.params.HttpParams;
+import org.apache.http.params.HttpProtocolParams;
import org.apache.http.protocol.HTTP;
import org.apache.http.protocol.HttpContext;
import org.apache.http.util.Args;
@@ -140,7 +139,7 @@ public class NHttpConnectionBase
Args.notNull(session, "I/O session");
Args.notNull(params, "HTTP params");
- int buffersize = Config.getInt(params, CoreConnectionPNames.SOCKET_BUFFER_SIZE, -1);
+ int buffersize = params.getIntParameter(CoreConnectionPNames.SOCKET_BUFFER_SIZE, -1);
if (buffersize <= 0) {
buffersize = 4096;
}
@@ -151,16 +150,13 @@ public class NHttpConnectionBase
CharsetDecoder decoder = null;
CharsetEncoder encoder = null;
- Charset charset = CharsetUtils.lookup(Config.getString(params,
- CoreProtocolPNames.HTTP_ELEMENT_CHARSET));
+ Charset charset = CharsetUtils.lookup(HttpProtocolParams.getHttpElementCharset(params));
if (charset != null) {
charset = Consts.ASCII;
decoder = charset.newDecoder();
encoder = charset.newEncoder();
- CodingErrorAction malformedCharAction = Config.getValue(params,
- CoreProtocolPNames.HTTP_MALFORMED_INPUT_ACTION, CodingErrorAction.class);
- CodingErrorAction unmappableCharAction = Config.getValue(params,
- CoreProtocolPNames.HTTP_UNMAPPABLE_INPUT_ACTION, CodingErrorAction.class);
+ CodingErrorAction malformedCharAction = HttpProtocolParams.getMalformedInputAction(params);
+ CodingErrorAction unmappableCharAction = HttpProtocolParams.getUnmappableInputAction(params);
decoder.onMalformedInput(malformedCharAction);
decoder.onUnmappableCharacter(unmappableCharAction);
encoder.onMalformedInput(malformedCharAction);
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=1400154&r1=1400153&r2=1400154&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 19 16:21:41 2012
@@ -71,7 +71,7 @@ public class SSLNHttpClientConnectionFac
/**
* @deprecated (4.3) use {@link
* SSLNHttpClientConnectionFactory#SSLNHttpClientConnectionFactory(SSLContext,
- * SSLSetupHandler, HttpResponseFactory, ByteBufferAllocator)}
+ * SSLSetupHandler, HttpResponseFactory, ByteBufferAllocator, ConnectionConfig)}
*/
@Deprecated
public SSLNHttpClientConnectionFactory(
@@ -94,7 +94,7 @@ public class SSLNHttpClientConnectionFac
/**
* @deprecated (4.3) use {@link
* SSLNHttpClientConnectionFactory#SSLNHttpClientConnectionFactory(SSLContext,
- * SSLSetupHandler)}
+ * SSLSetupHandler, ConnectionConfig)}
*/
@Deprecated
public SSLNHttpClientConnectionFactory(
@@ -107,7 +107,7 @@ public class SSLNHttpClientConnectionFac
/**
* @deprecated (4.3) use {@link
- * SSLNHttpClientConnectionFactory#SSLNHttpClientConnectionFactory()}
+ * SSLNHttpClientConnectionFactory#SSLNHttpClientConnectionFactory(ConnectionConfig)}
*/
@Deprecated
public SSLNHttpClientConnectionFactory(final HttpParams params) {
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=1400154&r1=1400153&r2=1400154&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 19 16:21:41 2012
@@ -71,7 +71,7 @@ public class SSLNHttpServerConnectionFac
/**
* @deprecated (4.3) use {@link
* SSLNHttpServerConnectionFactory#SSLNHttpServerConnectionFactory(SSLContext,
- * SSLSetupHandler, HttpRequestFactory, ByteBufferAllocator)}
+ * SSLSetupHandler, HttpRequestFactory, ByteBufferAllocator, ConnectionConfig)}
*/
@Deprecated
public SSLNHttpServerConnectionFactory(
@@ -94,7 +94,7 @@ public class SSLNHttpServerConnectionFac
/**
* @deprecated (4.3) use {@link
* SSLNHttpServerConnectionFactory#SSLNHttpServerConnectionFactory(SSLContext,
- * SSLSetupHandler)}
+ * SSLSetupHandler, ConnectionConfig)}
*/
@Deprecated
public SSLNHttpServerConnectionFactory(
@@ -107,7 +107,7 @@ public class SSLNHttpServerConnectionFac
/**
* @deprecated (4.3) use {@link
- * SSLNHttpServerConnectionFactory#SSLNHttpServerConnectionFactory()}
+ * SSLNHttpServerConnectionFactory#SSLNHttpServerConnectionFactory(ConnectionConfig)}
*/
@Deprecated
public SSLNHttpServerConnectionFactory(final HttpParams params) {
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=1400154&r1=1400153&r2=1400154&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 19 16:21:41 2012
@@ -48,6 +48,7 @@ import org.apache.http.util.CharArrayBuf
*
* @since 4.0
*/
+@SuppressWarnings("deprecation")
@NotThreadSafe
public abstract class AbstractMessageWriter<T extends HttpMessage> implements NHttpMessageWriter<T> {
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=1400154&r1=1400153&r2=1400154&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 19 16:21:41 2012
@@ -49,6 +49,7 @@ import org.apache.http.util.CharArrayBuf
*
* @since 4.1
*/
+@SuppressWarnings("deprecation")
@NotThreadSafe
public class DefaultHttpRequestParser extends AbstractMessageParser<HttpRequest> {
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=1400154&r1=1400153&r2=1400154&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 19 16:21:41 2012
@@ -43,6 +43,7 @@ import org.apache.http.util.CharArrayBuf
*
* @since 4.1
*/
+@SuppressWarnings("deprecation")
@NotThreadSafe
public class DefaultHttpRequestWriter extends AbstractMessageWriter<HttpRequest> {
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=1400154&r1=1400153&r2=1400154&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 19 16:21:41 2012
@@ -49,6 +49,7 @@ import org.apache.http.util.CharArrayBuf
*
* @since 4.1
*/
+@SuppressWarnings("deprecation")
@NotThreadSafe
public class DefaultHttpResponseParser extends AbstractMessageParser<HttpResponse> {
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=1400154&r1=1400153&r2=1400154&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 19 16:21:41 2012
@@ -43,6 +43,7 @@ import org.apache.http.util.CharArrayBuf
*
* @since 4.1
*/
+@SuppressWarnings("deprecation")
@NotThreadSafe
public class DefaultHttpResponseWriter extends AbstractMessageWriter<HttpResponse> {
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=1400154&r1=1400153&r2=1400154&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 19 16:21:41 2012
@@ -54,6 +54,7 @@ import org.apache.http.util.Args;
*
* @since 4.2
*/
+@SuppressWarnings("deprecation")
@Immutable
public class BasicNIOConnFactory implements NIOConnFactory<HttpHost, NHttpClientConnection> {
@@ -76,7 +77,7 @@ public class BasicNIOConnFactory impleme
/**
* @deprecated (4.3) use {@link BasicNIOConnFactory#BasicNIOConnFactory(SSLContext,
- * SSLSetupHandler, HttpResponseFactory, ByteBufferAllocator)}
+ * SSLSetupHandler, HttpResponseFactory, ByteBufferAllocator, ConnectionConfig)}
*/
@Deprecated
public BasicNIOConnFactory(
@@ -93,7 +94,7 @@ public class BasicNIOConnFactory impleme
/**
* @deprecated (4.3) use {@link BasicNIOConnFactory#BasicNIOConnFactory(SSLContext,
- * SSLSetupHandler)}
+ * SSLSetupHandler, ConnectionConfig)}
*/
public BasicNIOConnFactory(
final SSLContext sslcontext,
@@ -104,7 +105,7 @@ public class BasicNIOConnFactory impleme
}
/**
- * @deprecated (4.3) use {@link BasicNIOConnFactory#BasicNIOConnFactory()}
+ * @deprecated (4.3) use {@link BasicNIOConnFactory#BasicNIOConnFactory(ConnectionConfig)}
*/
public BasicNIOConnFactory(final HttpParams params) {
this(null, null, params);
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=1400154&r1=1400153&r2=1400154&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 19 16:21:41 2012
@@ -40,8 +40,7 @@ import org.apache.http.nio.NHttpClientCo
import org.apache.http.nio.pool.AbstractNIOConnPool;
import org.apache.http.nio.pool.NIOConnFactory;
import org.apache.http.nio.reactor.ConnectingIOReactor;
-import org.apache.http.params.CoreConnectionPNames;
-import org.apache.http.params.Config;
+import org.apache.http.params.HttpParamConfig;
import org.apache.http.params.HttpParams;
import org.apache.http.pool.ConnPool;
import org.apache.http.util.Args;
@@ -62,12 +61,11 @@ public class BasicNIOConnPool extends Ab
private static AtomicLong COUNTER = new AtomicLong();
- private final int connectTimeout;
- private final TimeUnit tunit;
+ private final ConnectionConfig config;
/**
* @deprecated (4.3) use {@link BasicNIOConnPool#BasicNIOConnPool(ConnectingIOReactor,
- * NIOConnFactory, int, TimeUnit)}
+ * NIOConnFactory, ConnectionConfig)}
*/
@Deprecated
public BasicNIOConnPool(
@@ -76,13 +74,12 @@ public class BasicNIOConnPool extends Ab
final HttpParams params) {
super(ioreactor, connFactory, 2, 20);
Args.notNull(params, "HTTP parameters");
- this.connectTimeout = Config.getInt(params, CoreConnectionPNames.CONNECTION_TIMEOUT, 0);
- this.tunit = TimeUnit.MILLISECONDS;
+ this.config = HttpParamConfig.getConnectionConfig(params);
}
/**
* @deprecated (4.3) use {@link BasicNIOConnPool#BasicNIOConnPool(ConnectingIOReactor,
- * int, TimeUnit)}
+ * ConnectionConfig)}
*/
@Deprecated
public BasicNIOConnPool(
@@ -96,20 +93,9 @@ public class BasicNIOConnPool extends Ab
public BasicNIOConnPool(
final ConnectingIOReactor ioreactor,
final NIOConnFactory<HttpHost, NHttpClientConnection> connFactory,
- int connectTimeout,
- final TimeUnit tunit) {
+ final ConnectionConfig config) {
super(ioreactor, connFactory, 2, 20);
- this.connectTimeout = connectTimeout;
- this.tunit = tunit != null ? tunit : TimeUnit.MILLISECONDS;
- }
-
- /**
- * @since 4.3
- */
- public BasicNIOConnPool(
- final ConnectingIOReactor ioreactor,
- final NIOConnFactory<HttpHost, NHttpClientConnection> connFactory) {
- this(ioreactor, connFactory, 0, TimeUnit.MILLISECONDS);
+ this.config = config != null ? config : ConnectionConfig.DEFAULT;
}
/**
@@ -117,7 +103,7 @@ public class BasicNIOConnPool extends Ab
*/
public BasicNIOConnPool(
final ConnectingIOReactor ioreactor, final ConnectionConfig config) {
- this(ioreactor, new BasicNIOConnFactory(config));
+ this(ioreactor, new BasicNIOConnFactory(config), config);
}
@Override
@@ -140,14 +126,16 @@ public class BasicNIOConnPool extends Ab
final HttpHost route,
final Object state,
final FutureCallback<BasicNIOPoolEntry> callback) {
- return super.lease(route, state, this.connectTimeout, this.tunit, callback);
+ return super.lease(route, state,
+ this.config.getConnectTimeout(), TimeUnit.MILLISECONDS, callback);
}
@Override
public Future<BasicNIOPoolEntry> lease(
final HttpHost route,
final Object state) {
- return super.lease(route, state, this.connectTimeout, this.tunit, null);
+ return super.lease(route, state,
+ this.config.getConnectTimeout(), TimeUnit.MILLISECONDS, null);
}
}
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=1400154&r1=1400153&r2=1400154&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 19 16:21:41 2012
@@ -56,6 +56,7 @@ import org.apache.http.params.HttpParams
*
* @since 4.0
*/
+@SuppressWarnings("deprecation")
@ThreadSafe // public methods only
public class DefaultConnectingIOReactor extends AbstractMultiworkerIOReactor
implements ConnectingIOReactor {
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=1400154&r1=1400153&r2=1400154&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 19 16:21:41 2012
@@ -55,6 +55,7 @@ import org.apache.http.params.HttpParams
*
* @since 4.0
*/
+@SuppressWarnings("deprecation")
@ThreadSafe // public methods only
public class DefaultListeningIOReactor extends AbstractMultiworkerIOReactor
implements ListeningIOReactor {
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/BasicAsyncRequestExecutionHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/BasicAsyncRequestExecutionHandler.java?rev=1400154&r1=1400153&r2=1400154&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/BasicAsyncRequestExecutionHandler.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/BasicAsyncRequestExecutionHandler.java Fri Oct 19 16:21:41 2012
@@ -53,6 +53,7 @@ import org.apache.http.util.Args;
* @param <T> the result type of request execution.
* @since 4.2
*/
+@SuppressWarnings("deprecation")
public class BasicAsyncRequestExecutionHandler<T> implements HttpAsyncRequestExecutionHandler<T> {
private final HttpAsyncRequestProducer requestProducer;
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/HttpAsyncRequester.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/HttpAsyncRequester.java?rev=1400154&r1=1400153&r2=1400154&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/HttpAsyncRequester.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/HttpAsyncRequester.java Fri Oct 19 16:21:41 2012
@@ -56,6 +56,7 @@ import org.apache.http.util.Args;
*
* @since 4.2
*/
+@SuppressWarnings("deprecation")
@Immutable
public class HttpAsyncRequester {
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/HttpAsyncService.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/HttpAsyncService.java?rev=1400154&r1=1400153&r2=1400154&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/HttpAsyncService.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/HttpAsyncService.java Fri Oct 19 16:21:41 2012
@@ -93,6 +93,7 @@ import org.apache.http.util.Args;
*
* @since 4.2
*/
+@SuppressWarnings("deprecation")
@Immutable // provided injected dependencies are immutable
public class HttpAsyncService implements NHttpServerEventHandler {
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/pool/TestBasicNIOConnPool.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/pool/TestBasicNIOConnPool.java?rev=1400154&r1=1400153&r2=1400154&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/pool/TestBasicNIOConnPool.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/pool/TestBasicNIOConnPool.java Fri Oct 19 16:21:41 2012
@@ -51,7 +51,7 @@ public class TestBasicNIOConnPool {
route = new HttpHost("localhost", 80, "http");
connFactory = new BasicNIOConnFactory(ConnectionConfig.DEFAULT);
- pool = new BasicNIOConnPool(reactor, connFactory);
+ pool = new BasicNIOConnPool(reactor, connFactory, ConnectionConfig.DEFAULT);
}
@After
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/testserver/HttpClientNio.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/testserver/HttpClientNio.java?rev=1400154&r1=1400153&r2=1400154&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/testserver/HttpClientNio.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/testserver/HttpClientNio.java Fri Oct 19 16:21:41 2012
@@ -39,6 +39,7 @@ import org.apache.http.HttpRequestInterc
import org.apache.http.HttpResponse;
import org.apache.http.concurrent.BasicFuture;
import org.apache.http.concurrent.FutureCallback;
+import org.apache.http.config.ConnectionConfig;
import org.apache.http.impl.nio.DefaultHttpClientIODispatch;
import org.apache.http.impl.nio.DefaultNHttpClientConnection;
import org.apache.http.impl.nio.pool.BasicNIOConnFactory;
@@ -95,7 +96,8 @@ public class HttpClientNio {
super();
this.ioReactor = new DefaultConnectingIOReactor();
this.connFactory = connFactory;
- this.connpool = new BasicNIOConnPool(this.ioReactor, new BasicNIOConnFactory(connFactory));
+ this.connpool = new BasicNIOConnPool(this.ioReactor, new BasicNIOConnFactory(connFactory),
+ ConnectionConfig.DEFAULT);
}
public int getTimeout() {
Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/HttpMessage.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/HttpMessage.java?rev=1400154&r1=1400153&r2=1400154&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/HttpMessage.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/HttpMessage.java Fri Oct 19 16:21:41 2012
@@ -53,6 +53,7 @@ import org.apache.http.params.HttpParams
*
* @since 4.0
*/
+@SuppressWarnings("deprecation")
public interface HttpMessage {
/**
@@ -190,7 +191,8 @@ public interface HttpMessage {
* Returns the parameters effective for this message as set by
* {@link #setParams(HttpParams)}.
*
- * @deprecated (4.3) use constructor parameters of configuration API provided by HttpClient
+ * @deprecated (4.3) use configuration classes provided 'org.apache.http.config'
+ * and 'org.apache.http.client.config'
*/
@Deprecated
HttpParams getParams();
@@ -199,7 +201,8 @@ public interface HttpMessage {
* Provides parameters to be used for the processing of this message.
* @param params the parameters
*
- * @deprecated (4.3) use constructor parameters of configuration API provided by HttpClient
+ * @deprecated (4.3) use configuration classes provided 'org.apache.http.config'
+ * and 'org.apache.http.client.config'
*/
@Deprecated
void setParams(HttpParams params);
Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/AbstractMessageWriter.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/AbstractMessageWriter.java?rev=1400154&r1=1400153&r2=1400154&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/AbstractMessageWriter.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/AbstractMessageWriter.java Fri Oct 19 16:21:41 2012
@@ -48,6 +48,7 @@ import org.apache.http.util.CharArrayBuf
*
* @since 4.0
*/
+@SuppressWarnings("deprecation")
@NotThreadSafe
public abstract class AbstractMessageWriter<T extends HttpMessage> implements HttpMessageWriter<T> {
Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/DefaultHttpRequestParser.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/DefaultHttpRequestParser.java?rev=1400154&r1=1400153&r2=1400154&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/DefaultHttpRequestParser.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/DefaultHttpRequestParser.java Fri Oct 19 16:21:41 2012
@@ -52,6 +52,7 @@ import org.apache.http.util.CharArrayBuf
*
* @since 4.2
*/
+@SuppressWarnings("deprecation")
@NotThreadSafe
public class DefaultHttpRequestParser extends AbstractMessageParser<HttpRequest> {
Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/DefaultHttpResponseParser.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/DefaultHttpResponseParser.java?rev=1400154&r1=1400153&r2=1400154&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/DefaultHttpResponseParser.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/DefaultHttpResponseParser.java Fri Oct 19 16:21:41 2012
@@ -52,6 +52,7 @@ import org.apache.http.util.CharArrayBuf
*
* @since 4.2
*/
+@SuppressWarnings("deprecation")
@NotThreadSafe
public class DefaultHttpResponseParser extends AbstractMessageParser<HttpResponse> {
Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/pool/BasicConnFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/pool/BasicConnFactory.java?rev=1400154&r1=1400153&r2=1400154&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/pool/BasicConnFactory.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/pool/BasicConnFactory.java Fri Oct 19 16:21:41 2012
@@ -33,7 +33,6 @@ import java.nio.charset.Charset;
import java.nio.charset.CharsetDecoder;
import java.nio.charset.CharsetEncoder;
import java.nio.charset.CodingErrorAction;
-import java.util.concurrent.TimeUnit;
import javax.net.ssl.SSLSocketFactory;
@@ -44,7 +43,6 @@ import org.apache.http.config.Connection
import org.apache.http.config.SocketConfig;
import org.apache.http.impl.DefaultBHttpClientConnection;
import org.apache.http.params.CoreConnectionPNames;
-import org.apache.http.params.Config;
import org.apache.http.params.HttpParamConfig;
import org.apache.http.params.HttpParams;
import org.apache.http.pool.ConnFactory;
@@ -67,7 +65,7 @@ public class BasicConnFactory implements
/**
* @deprecated (4.3) use
- * {@link BasicConnFactory#BasicConnFactory(SSLSocketFactory, int, TimeUnit)}.
+ * {@link BasicConnFactory#BasicConnFactory(SSLSocketFactory, SocketConfig, ConnectionConfig)}.
*/
@Deprecated
public BasicConnFactory(final SSLSocketFactory sslfactory, final HttpParams params) {
@@ -79,7 +77,8 @@ public class BasicConnFactory implements
}
/**
- * @deprecated (4.3) use {@link BasicConnFactory#BasicConnFactory(int, TimeUnit)}.
+ * @deprecated (4.3) use
+ * {@link BasicConnFactory#BasicConnFactory(SocketConfig, ConnectionConfig)}.
*/
@Deprecated
public BasicConnFactory(final HttpParams params) {
@@ -116,7 +115,7 @@ public class BasicConnFactory implements
*/
@Deprecated
protected HttpClientConnection create(final Socket socket, final HttpParams params) throws IOException {
- int bufsize = Config.getInt(params, CoreConnectionPNames.SOCKET_BUFFER_SIZE, 8 * 1024);
+ int bufsize = params.getIntParameter(CoreConnectionPNames.SOCKET_BUFFER_SIZE, 8 * 1024);
DefaultBHttpClientConnection conn = new DefaultBHttpClientConnection(bufsize);
conn.bind(socket);
return conn;
Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/pool/BasicConnPool.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/pool/BasicConnPool.java?rev=1400154&r1=1400153&r2=1400154&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/pool/BasicConnPool.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/pool/BasicConnPool.java Fri Oct 19 16:21:41 2012
@@ -26,7 +26,6 @@
*/
package org.apache.http.impl.pool;
-import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicLong;
import org.apache.http.HttpClientConnection;
@@ -49,6 +48,7 @@ import org.apache.http.pool.ConnPool;
* @see HttpHost
* @since 4.2
*/
+@SuppressWarnings("deprecation")
@ThreadSafe
public class BasicConnPool extends AbstractConnPool<HttpHost, HttpClientConnection, BasicPoolEntry> {
@@ -59,8 +59,9 @@ public class BasicConnPool extends Abstr
}
/**
- * @deprecated (4.3) use {@link BasicConnPool#BasicConnPool(int, TimeUnit)}
+ * @deprecated (4.3) use {@link BasicConnPool#BasicConnPool(SocketConfig, ConnectionConfig)}
*/
+ @Deprecated
public BasicConnPool(final HttpParams params) {
super(new BasicConnFactory(params), 2, 20);
}
@@ -72,6 +73,13 @@ public class BasicConnPool extends Abstr
super(new BasicConnFactory(sconfig, cconfig), 2, 20);
}
+ /**
+ * @since 4.3
+ */
+ public BasicConnPool() {
+ super(new BasicConnFactory(SocketConfig.DEFAULT, ConnectionConfig.DEFAULT), 2, 20);
+ }
+
@Override
protected BasicPoolEntry createEntry(
final HttpHost host,
Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/AbstractHttpMessage.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/AbstractHttpMessage.java?rev=1400154&r1=1400153&r2=1400154&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/AbstractHttpMessage.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/AbstractHttpMessage.java Fri Oct 19 16:21:41 2012
@@ -40,13 +40,19 @@ import org.apache.http.util.Args;
*
* @since 4.0
*/
+@SuppressWarnings("deprecation")
@NotThreadSafe
public abstract class AbstractHttpMessage implements HttpMessage {
protected HeaderGroup headergroup;
+ @Deprecated
protected HttpParams params;
+ /**
+ * @deprecated (4.3) use {@link AbstractHttpMessage#AbstractHttpMessage()}
+ */
+ @Deprecated
protected AbstractHttpMessage(final HttpParams params) {
super();
this.headergroup = new HeaderGroup();
Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicHttpRequest.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicHttpRequest.java?rev=1400154&r1=1400153&r2=1400154&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicHttpRequest.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicHttpRequest.java Fri Oct 19 16:21:41 2012
@@ -32,16 +32,10 @@ import org.apache.http.HttpVersion;
import org.apache.http.ProtocolVersion;
import org.apache.http.RequestLine;
import org.apache.http.annotation.NotThreadSafe;
-import org.apache.http.params.HttpParams;
import org.apache.http.util.Args;
/**
* Basic implementation of {@link HttpRequest}.
- * <p>
- * The following parameters can be used to customize the behavior of this class:
- * <ul>
- * <li>{@link org.apache.http.params.CoreProtocolPNames#PROTOCOL_VERSION}</li>
- * </ul>
*
* @since 4.0
*/
@@ -55,10 +49,7 @@ public class BasicHttpRequest extends Ab
/**
* Creates an instance of this class using the given request method
- * and URI. The HTTP protocol version will be obtained from the
- * {@link HttpParams} instance associated with the object.
- * The initialization will be deferred
- * until {@link #getRequestLine()} is accessed for the first time.
+ * and URI.
*
* @param method request method.
* @param uri request URI.
@@ -95,10 +86,7 @@ public class BasicHttpRequest extends Ab
}
/**
- * Returns the HTTP protocol version to be used for this request. If an
- * HTTP protocol version was not explicitly set at the construction time,
- * this method will obtain it from the {@link HttpParams} instance
- * associated with the object.
+ * Returns the HTTP protocol version to be used for this request.
*
* @see #BasicHttpRequest(String, String)
*/
Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/params/AbstractHttpParams.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/params/AbstractHttpParams.java?rev=1400154&r1=1400153&r2=1400154&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/params/AbstractHttpParams.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/params/AbstractHttpParams.java Fri Oct 19 16:21:41 2012
@@ -29,7 +29,6 @@ package org.apache.http.params;
import java.util.Set;
-
/**
* Abstract base class for parameter collections.
* Type specific setters and getters are mapped to the abstract,
@@ -37,7 +36,8 @@ import java.util.Set;
*
* @since 4.0
*
- * @deprecated (4.3) use {@link Config} methods
+ * @deprecated (4.3) use configuration classes provided 'org.apache.http.config'
+ * and 'org.apache.http.client.config'
*/
@Deprecated
public abstract class AbstractHttpParams implements HttpParams, HttpParamsNames {
Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/params/BasicHttpParams.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/params/BasicHttpParams.java?rev=1400154&r1=1400153&r2=1400154&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/params/BasicHttpParams.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/params/BasicHttpParams.java Fri Oct 19 16:21:41 2012
@@ -43,8 +43,10 @@ import org.apache.http.annotation.Thread
* synchronized and therefore this class may be thread-unsafe.
*
* @since 4.0
+ *
+ * @deprecated (4.3) use configuration classes provided 'org.apache.http.config'
+ * and 'org.apache.http.client.config'
*/
-@SuppressWarnings("deprecation")
@ThreadSafe
public class BasicHttpParams extends AbstractHttpParams implements Serializable, Cloneable {
@@ -138,10 +140,8 @@ public class BasicHttpParams extends Abs
* @return a new set of params holding a copy of the
* <i>local</i> parameters in this object.
*
- * @deprecated (4.1)
* @throws UnsupportedOperationException if the clone() fails
*/
- @Deprecated
public HttpParams copy() {
try {
return (HttpParams) clone();
Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/params/CoreConnectionPNames.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/params/CoreConnectionPNames.java?rev=1400154&r1=1400153&r2=1400154&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/params/CoreConnectionPNames.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/params/CoreConnectionPNames.java Fri Oct 19 16:21:41 2012
@@ -32,7 +32,8 @@ package org.apache.http.params;
*
* @since 4.0
*
- * @deprecated (4.3) use constructor parameters of configuration API provided by HttpClient
+ * @deprecated (4.3) use configuration classes provided 'org.apache.http.config'
+ * and 'org.apache.http.client.config'
*/
@Deprecated
public interface CoreConnectionPNames {
Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/params/CoreProtocolPNames.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/params/CoreProtocolPNames.java?rev=1400154&r1=1400153&r2=1400154&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/params/CoreProtocolPNames.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/params/CoreProtocolPNames.java Fri Oct 19 16:21:41 2012
@@ -34,7 +34,8 @@ import org.apache.http.ProtocolVersion;
*
* @since 4.0
*
- * @deprecated (4.3) use constructor parameters of configuration API provided by HttpClient
+ * @deprecated (4.3) use configuration classes provided 'org.apache.http.config'
+ * and 'org.apache.http.client.config'
*/
@Deprecated
public interface CoreProtocolPNames {
Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/params/DefaultedHttpParams.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/params/DefaultedHttpParams.java?rev=1400154&r1=1400153&r2=1400154&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/params/DefaultedHttpParams.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/params/DefaultedHttpParams.java Fri Oct 19 16:21:41 2012
@@ -40,7 +40,8 @@ import org.apache.http.util.Args;
*
* @since 4.0
*
- * @deprecated (4.3) use constructor parameters of configuration API provided by HttpClient
+ * @deprecated (4.3) use configuration classes provided 'org.apache.http.config'
+ * and 'org.apache.http.client.config'
*/
@Deprecated
public final class DefaultedHttpParams extends AbstractHttpParams {
@@ -62,10 +63,7 @@ public final class DefaultedHttpParams e
/**
* Creates a copy of the local collection with the same default
- *
- * @deprecated (4.1)
*/
- @Deprecated
public HttpParams copy() {
HttpParams clone = this.local.copy();
return new DefaultedHttpParams(clone, this.defaults);
@@ -103,9 +101,7 @@ public final class DefaultedHttpParams e
/**
*
* @return the default HttpParams collection
- * @deprecated (4.1.1) do not use, will be removed in a later version
*/
- @Deprecated
public HttpParams getDefaults() {
return this.defaults;
}
Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/params/HttpAbstractParamBean.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/params/HttpAbstractParamBean.java?rev=1400154&r1=1400153&r2=1400154&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/params/HttpAbstractParamBean.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/params/HttpAbstractParamBean.java Fri Oct 19 16:21:41 2012
@@ -32,7 +32,8 @@ import org.apache.http.util.Args;
/**
* @since 4.0
*
- * @deprecated (4.3) use constructor parameters of configuration API provided by HttpClient
+ * @deprecated (4.3) use configuration classes provided 'org.apache.http.config'
+ * and 'org.apache.http.client.config'
*/
@Deprecated
public abstract class HttpAbstractParamBean {
Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/params/HttpConnectionParamBean.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/params/HttpConnectionParamBean.java?rev=1400154&r1=1400153&r2=1400154&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/params/HttpConnectionParamBean.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/params/HttpConnectionParamBean.java Fri Oct 19 16:21:41 2012
@@ -34,7 +34,8 @@ package org.apache.http.params;
*
* @since 4.0
*
- * @deprecated (4.3) use constructor parameters of configuration API provided by HttpClient
+ * @deprecated (4.3) use configuration classes provided 'org.apache.http.config'
+ * and 'org.apache.http.client.config'
*/
@Deprecated
public class HttpConnectionParamBean extends HttpAbstractParamBean {
Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/params/HttpConnectionParams.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/params/HttpConnectionParams.java?rev=1400154&r1=1400153&r2=1400154&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/params/HttpConnectionParams.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/params/HttpConnectionParams.java Fri Oct 19 16:21:41 2012
@@ -34,7 +34,8 @@ import org.apache.http.util.Args;
*
* @since 4.0
*
- * @deprecated (4.3) use constructor parameters of configuration API provided by HttpClient
+ * @deprecated (4.3) use configuration classes provided 'org.apache.http.config'
+ * and 'org.apache.http.client.config'
*/
@Deprecated
public final class HttpConnectionParams implements CoreConnectionPNames {
Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/params/HttpParamConfig.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/params/HttpParamConfig.java?rev=1400154&r1=1400153&r2=1400154&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/params/HttpParamConfig.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/params/HttpParamConfig.java Fri Oct 19 16:21:41 2012
@@ -39,6 +39,7 @@ import org.apache.http.config.SocketConf
*
* @since 4.3
*/
+@Deprecated
public final class HttpParamConfig {
private HttpParamConfig() {
Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/params/HttpParams.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/params/HttpParams.java?rev=1400154&r1=1400153&r2=1400154&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/params/HttpParams.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/params/HttpParams.java Fri Oct 19 16:21:41 2012
@@ -43,6 +43,9 @@ package org.apache.http.params;
* to obtain default values of parameters not present in the local set.
*
* @since 4.0
+ *
+ * @deprecated (4.3) use configuration classes provided 'org.apache.http.config'
+ * and 'org.apache.http.client.config'
*/
public interface HttpParams {
@@ -71,10 +74,7 @@ public interface HttpParams {
* Creates a copy of these parameters.
*
* @return a new set of parameters holding the same values as this one
- *
- * @deprecated (4.1)
*/
- @Deprecated
HttpParams copy();
/**
@@ -96,10 +96,7 @@ public interface HttpParams {
* @return a {@link Long} that represents the value of the parameter.
*
* @see #setLongParameter(String, long)
- *
- * @deprecated (4.3) use {@link Config#getLong(HttpParams, String, long)}
*/
- @Deprecated
long getLongParameter(String name, long defaultValue);
/**
@@ -107,10 +104,7 @@ public interface HttpParams {
*
* @param name parameter name
* @param value parameter value
- *
- * @deprecated (4.3) use constructor parameters of configuration API provided by HttpClient
*/
- @Deprecated
HttpParams setLongParameter(String name, long value);
/**
@@ -123,10 +117,7 @@ public interface HttpParams {
* @return a {@link Integer} that represents the value of the parameter.
*
* @see #setIntParameter(String, int)
- *
- * @deprecated (4.3) use {@link Config#getInt(HttpParams, String, int)}
*/
- @Deprecated
int getIntParameter(String name, int defaultValue);
/**
@@ -134,10 +125,7 @@ public interface HttpParams {
*
* @param name parameter name
* @param value parameter value
- *
- * @deprecated (4.3) use constructor parameters of configuration API provided by HttpClient
*/
- @Deprecated
HttpParams setIntParameter(String name, int value);
/**
@@ -150,10 +138,7 @@ public interface HttpParams {
* @return a {@link Double} that represents the value of the parameter.
*
* @see #setDoubleParameter(String, double)
- *
- * @deprecated (4.3) use {@link Config#getDouble(HttpParams, String, double)}
*/
- @Deprecated
double getDoubleParameter(String name, double defaultValue);
/**
@@ -161,10 +146,7 @@ public interface HttpParams {
*
* @param name parameter name
* @param value parameter value
- *
- * @deprecated (4.3) use constructor parameters of configuration API provided by HttpClient
*/
- @Deprecated
HttpParams setDoubleParameter(String name, double value);
/**
@@ -177,10 +159,7 @@ public interface HttpParams {
* @return a {@link Boolean} that represents the value of the parameter.
*
* @see #setBooleanParameter(String, boolean)
- *
- * @deprecated (4.3) use {@link Config#getBool(HttpParams, String, boolean)}
*/
- @Deprecated
boolean getBooleanParameter(String name, boolean defaultValue);
/**
@@ -188,10 +167,7 @@ public interface HttpParams {
*
* @param name parameter name
* @param value parameter value
- *
- * @deprecated (4.3) use constructor parameters of configuration API provided by HttpClient
*/
- @Deprecated
HttpParams setBooleanParameter(String name, boolean value);
/**
@@ -201,10 +177,7 @@ public interface HttpParams {
*
* @return <tt>true</tt> if the parameter is set to value <tt>true</tt>,
* <tt>false</tt> if it is not set or set to <code>false</code>
- *
- * @deprecated (4.3) use {@link Config#isTrue(HttpParams, String)}
*/
- @Deprecated
boolean isParameterTrue(String name);
/**
@@ -215,10 +188,7 @@ public interface HttpParams {
* @return <tt>true</tt> if the parameter is either not set or
* set to value <tt>false</tt>,
* <tt>false</tt> if it is set to <code>true</code>
- *
- * @deprecated (4.3) use {@link Config#isFalse(HttpParams, String)}
*/
- @Deprecated
boolean isParameterFalse(String name);
}
Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/params/HttpParamsNames.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/params/HttpParamsNames.java?rev=1400154&r1=1400153&r2=1400154&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/params/HttpParamsNames.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/params/HttpParamsNames.java Fri Oct 19 16:21:41 2012
@@ -35,7 +35,11 @@ import java.util.Set;
* @see HttpParams
*
* @since 4.2
+ *
+ * @deprecated (4.3) use configuration classes provided 'org.apache.http.config'
+ * and 'org.apache.http.client.config'
*/
+@Deprecated
public interface HttpParamsNames {
/**
Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/params/HttpProtocolParamBean.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/params/HttpProtocolParamBean.java?rev=1400154&r1=1400153&r2=1400154&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/params/HttpProtocolParamBean.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/params/HttpProtocolParamBean.java Fri Oct 19 16:21:41 2012
@@ -36,7 +36,8 @@ import org.apache.http.HttpVersion;
*
* @since 4.0
*
- * @deprecated (4.3) use constructor parameters of configuration API provided by HttpClient
+ * @deprecated (4.3) use configuration classes provided 'org.apache.http.config'
+ * and 'org.apache.http.client.config'
*/
@Deprecated
public class HttpProtocolParamBean extends HttpAbstractParamBean {
Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/params/HttpProtocolParams.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/params/HttpProtocolParams.java?rev=1400154&r1=1400153&r2=1400154&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/params/HttpProtocolParams.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/params/HttpProtocolParams.java Fri Oct 19 16:21:41 2012
@@ -39,7 +39,8 @@ import org.apache.http.util.Args;
*
* @since 4.0
*
- * @deprecated (4.3) use constructor parameters of configuration API provided by HttpClient
+ * @deprecated (4.3) use configuration classes provided 'org.apache.http.config'
+ * and 'org.apache.http.client.config'
*/
@Deprecated
public final class HttpProtocolParams implements CoreProtocolPNames {
Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/params/SyncBasicHttpParams.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/params/SyncBasicHttpParams.java?rev=1400154&r1=1400153&r2=1400154&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/params/SyncBasicHttpParams.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/params/SyncBasicHttpParams.java Fri Oct 19 16:21:41 2012
@@ -33,7 +33,8 @@ import org.apache.http.annotation.Thread
*
* @since 4.1
*
- * @deprecated (4.3) use {@link BasicHttpParams}.
+ * @deprecated (4.3) use configuration classes provided 'org.apache.http.config'
+ * and 'org.apache.http.client.config'
*/
@ThreadSafe
@Deprecated
Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/HttpService.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/HttpService.java?rev=1400154&r1=1400153&r2=1400154&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/HttpService.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/HttpService.java Fri Oct 19 16:21:41 2012
@@ -46,7 +46,6 @@ import org.apache.http.annotation.Immuta
import org.apache.http.entity.ByteArrayEntity;
import org.apache.http.impl.DefaultConnectionReuseStrategy;
import org.apache.http.impl.DefaultHttpResponseFactory;
-import org.apache.http.params.BasicHttpParams;
import org.apache.http.params.HttpParams;
import org.apache.http.util.Args;
import org.apache.http.util.EncodingUtils;
@@ -71,6 +70,7 @@ import org.apache.http.util.EntityUtils;
*
* @since 4.0
*/
+@SuppressWarnings("deprecation")
@Immutable // provided injected dependencies are immutable and deprecated methods are not used
public class HttpService {
@@ -111,6 +111,7 @@ public class HttpService {
responseFactory,
new HttpRequestHandlerResolverAdapter(handlerResolver),
expectationVerifier);
+ this.params = params;
}
/**
@@ -137,7 +138,7 @@ public class HttpService {
responseFactory,
new HttpRequestHandlerResolverAdapter(handlerResolver),
null);
- this.params = new BasicHttpParams();
+ this.params = params;
}
/**
@@ -274,6 +275,10 @@ public class HttpService {
this.expectationVerifier = expectationVerifier;
}
+ /**
+ * @deprecated (4.3) no longer used.
+ */
+ @Deprecated
public HttpParams getParams() {
return this.params;
}
Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/RequestExpectContinue.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/RequestExpectContinue.java?rev=1400154&r1=1400153&r2=1400154&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/RequestExpectContinue.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/RequestExpectContinue.java Fri Oct 19 16:21:41 2012
@@ -38,19 +38,13 @@ import org.apache.http.HttpVersion;
import org.apache.http.ProtocolVersion;
import org.apache.http.annotation.Immutable;
import org.apache.http.params.CoreProtocolPNames;
-import org.apache.http.params.Config;
+import org.apache.http.params.HttpParams;
import org.apache.http.util.Args;
/**
* RequestExpectContinue is responsible for enabling the 'expect-continue'
* handshake by adding <code>Expect</code> header. This interceptor is
* recommended for client side protocol processors.
- * <p>
- * The following parameters can be used to customize the behavior of this
- * class:
- * <ul>
- * <li>{@link org.apache.http.params.CoreProtocolPNames#USE_EXPECT_CONTINUE}</li>
- * </ul>
*
* @since 4.0
*/
@@ -71,8 +65,11 @@ public class RequestExpectContinue imple
HttpEntity entity = ((HttpEntityEnclosingRequest)request).getEntity();
// Do not send the expect header if request body is known to be empty
if (entity != null && entity.getContentLength() != 0 && !ver.lessEquals(HttpVersion.HTTP_1_0)) {
- Boolean useExpectCont = Config.getValue(request.getParams(),
- CoreProtocolPNames.USE_EXPECT_CONTINUE, Boolean.class);
+ Boolean useExpectCont = null;
+ HttpParams params = request.getParams();
+ if (params != null) {
+ useExpectCont = (Boolean) params.getParameter(CoreProtocolPNames.USE_EXPECT_CONTINUE);
+ }
if (useExpectCont == null) {
useExpectCont = (Boolean ) context.getAttribute(ExecutionContext.HTTP_EXPECT_CONT);
}
Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/RequestUserAgent.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/RequestUserAgent.java?rev=1400154&r1=1400153&r2=1400154&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/RequestUserAgent.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/RequestUserAgent.java Fri Oct 19 16:21:41 2012
@@ -33,20 +33,13 @@ import org.apache.http.HttpException;
import org.apache.http.HttpRequest;
import org.apache.http.HttpRequestInterceptor;
import org.apache.http.annotation.Immutable;
-import org.apache.http.params.CoreProtocolPNames;
-import org.apache.http.params.Config;
import org.apache.http.params.HttpParams;
+import org.apache.http.params.HttpProtocolParams;
import org.apache.http.util.Args;
/**
* RequestUserAgent is responsible for adding <code>User-Agent</code> header.
* This interceptor is recommended for client side protocol processors.
- * <p>
- * The following parameters can be used to customize the behavior of this
- * class:
- * <ul>
- * <li>{@link org.apache.http.params.CoreProtocolPNames#USER_AGENT}</li>
- * </ul>
*
* @since 4.0
*/
@@ -69,8 +62,11 @@ public class RequestUserAgent implements
throws HttpException, IOException {
Args.notNull(request, "HTTP request");
if (!request.containsHeader(HTTP.USER_AGENT)) {
+ String s = null;
HttpParams params = request.getParams();
- String s = Config.getString(params, CoreProtocolPNames.USER_AGENT);
+ if (params != null) {
+ s = HttpProtocolParams.getUserAgent(params);
+ }
if (s == null) {
s = this.userAgent;
}
Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/ResponseServer.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/ResponseServer.java?rev=1400154&r1=1400153&r2=1400154&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/ResponseServer.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/ResponseServer.java Fri Oct 19 16:21:41 2012
@@ -33,23 +33,14 @@ import org.apache.http.HttpException;
import org.apache.http.HttpResponse;
import org.apache.http.HttpResponseInterceptor;
import org.apache.http.annotation.Immutable;
-import org.apache.http.params.CoreProtocolPNames;
-import org.apache.http.params.Config;
import org.apache.http.util.Args;
/**
* ResponseServer is responsible for adding <code>Server</code> header. This
* interceptor is recommended for server side protocol processors.
- * <p>
- * The following parameters can be used to customize the behavior of this
- * class:
- * <ul>
- * <li>{@link org.apache.http.params.CoreProtocolPNames#ORIGIN_SERVER}</li>
- * </ul>
*
* @since 4.0
*/
-@SuppressWarnings("deprecation")
@Immutable
public class ResponseServer implements HttpResponseInterceptor {
@@ -71,12 +62,8 @@ public class ResponseServer implements H
throws HttpException, IOException {
Args.notNull(response, "HTTP response");
if (!response.containsHeader(HTTP.SERVER_HEADER)) {
- String s = Config.getString(response.getParams(), CoreProtocolPNames.ORIGIN_SERVER);
- if (s == null) {
- s = this.originServer;
- }
- if (s != null) {
- response.addHeader(HTTP.SERVER_HEADER, s);
+ if (this.originServer != null) {
+ response.addHeader(HTTP.SERVER_HEADER, this.originServer);
}
}
}
Modified: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/message/TestAbstractMessage.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/message/TestAbstractMessage.java?rev=1400154&r1=1400153&r2=1400154&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/message/TestAbstractMessage.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/message/TestAbstractMessage.java Fri Oct 19 16:21:41 2012
@@ -31,8 +31,6 @@ import org.apache.http.Header;
import org.apache.http.HttpMessage;
import org.apache.http.HttpVersion;
import org.apache.http.ProtocolVersion;
-import org.apache.http.params.BasicHttpParams;
-import org.apache.http.params.HttpParams;
import org.junit.Assert;
import org.junit.Test;
@@ -130,26 +128,9 @@ public class TestAbstractMessage {
}
@Test
- @Deprecated
- public void testParameters() {
- HttpMessage message = new TestHttpMessage();
- Assert.assertNotNull(message.getParams());
- HttpParams params = new BasicHttpParams();
- message.setParams(params);
- Assert.assertTrue(params == message.getParams());
- }
-
- @Test
- @Deprecated
public void testInvalidInput() {
HttpMessage message = new TestHttpMessage();
try {
- message.setParams(null);
- Assert.fail("IllegalArgumentException should have been thrown");
- } catch (IllegalArgumentException ex) {
- // expected
- }
- try {
message.addHeader(null, null);
Assert.fail("IllegalArgumentException should have been thrown");
} catch (IllegalArgumentException ex) {
Modified: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/params/TestBasicHttpParams.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/params/TestBasicHttpParams.java?rev=1400154&r1=1400153&r2=1400154&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/params/TestBasicHttpParams.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/params/TestBasicHttpParams.java Fri Oct 19 16:21:41 2012
@@ -35,8 +35,8 @@ import org.junit.Test;
/**
* Unit tests for {@link BasicHttpParams}.
- *
*/
+@Deprecated
public class TestBasicHttpParams {
@Test