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 2008/01/09 18:19:04 UTC
svn commit: r610470 - in
/httpcomponents/httpclient/trunk/module-client/src/test/java/org/apache/http:
impl/conn/ impl/conn/tsccm/ localserver/
Author: olegk
Date: Wed Jan 9 09:18:45 2008
New Revision: 610470
URL: http://svn.apache.org/viewvc?rev=610470&view=rev
Log:
Replaced HTTP parameter linking with a simple child/parent stack
Modified:
httpcomponents/httpclient/trunk/module-client/src/test/java/org/apache/http/impl/conn/Helper.java
httpcomponents/httpclient/trunk/module-client/src/test/java/org/apache/http/impl/conn/TestLocalServer.java
httpcomponents/httpclient/trunk/module-client/src/test/java/org/apache/http/impl/conn/tsccm/TestWaitingThread.java
httpcomponents/httpclient/trunk/module-client/src/test/java/org/apache/http/localserver/LocalTestServer.java
httpcomponents/httpclient/trunk/module-client/src/test/java/org/apache/http/localserver/ServerTestBase.java
Modified: httpcomponents/httpclient/trunk/module-client/src/test/java/org/apache/http/impl/conn/Helper.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/module-client/src/test/java/org/apache/http/impl/conn/Helper.java?rev=610470&r1=610469&r2=610470&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/module-client/src/test/java/org/apache/http/impl/conn/Helper.java (original)
+++ httpcomponents/httpclient/trunk/module-client/src/test/java/org/apache/http/impl/conn/Helper.java Wed Jan 9 09:18:45 2008
@@ -35,7 +35,7 @@
import org.apache.http.HttpRequest;
import org.apache.http.HttpResponse;
import org.apache.http.params.HttpParams;
-import org.apache.http.params.HttpParamsLinker;
+import org.apache.http.params.SimpleParamStack;
import org.apache.http.protocol.HttpContext;
import org.apache.http.protocol.ExecutionContext;
import org.apache.http.protocol.HttpProcessor;
@@ -69,10 +69,10 @@
ctxt.setAttribute(ExecutionContext.HTTP_TARGET_HOST, target);
ctxt.setAttribute(ExecutionContext.HTTP_REQUEST, req);
- HttpParamsLinker.link(req, params);
+ req.setParams(new SimpleParamStack(req.getParams(), params));
exec.preProcess(req, proc, ctxt);
HttpResponse rsp = exec.execute(req, conn, ctxt);
- HttpParamsLinker.link(rsp, params);
+ rsp.setParams(new SimpleParamStack(rsp.getParams(), params));
exec.postProcess(rsp, proc, ctxt);
return rsp;
Modified: httpcomponents/httpclient/trunk/module-client/src/test/java/org/apache/http/impl/conn/TestLocalServer.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/module-client/src/test/java/org/apache/http/impl/conn/TestLocalServer.java?rev=610470&r1=610469&r2=610470&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/module-client/src/test/java/org/apache/http/impl/conn/TestLocalServer.java (original)
+++ httpcomponents/httpclient/trunk/module-client/src/test/java/org/apache/http/impl/conn/TestLocalServer.java Wed Jan 9 09:18:45 2008
@@ -42,7 +42,7 @@
import org.apache.http.entity.StringEntity;
import org.apache.http.localserver.LocalTestServer;
import org.apache.http.localserver.ServerTestBase;
-import org.apache.http.params.HttpParamsLinker;
+import org.apache.http.params.SimpleParamStack;
import org.apache.http.protocol.ExecutionContext;
import org.apache.http.util.EntityUtils;
@@ -87,12 +87,14 @@
httpContext.setAttribute(
ExecutionContext.HTTP_REQUEST, request);
- HttpParamsLinker.link(request, defaultParams);
+ request.setParams(
+ new SimpleParamStack(request.getParams(), defaultParams));
httpExecutor.preProcess
(request, httpProcessor, httpContext);
HttpResponse response = httpExecutor.execute
(request, conn, httpContext);
- HttpParamsLinker.link(response, defaultParams);
+ response.setParams(
+ new SimpleParamStack(response.getParams(), defaultParams));
httpExecutor.postProcess
(response, httpProcessor, httpContext);
@@ -130,12 +132,14 @@
httpContext.setAttribute(
ExecutionContext.HTTP_REQUEST, request);
- HttpParamsLinker.link(request, defaultParams);
+ request.setParams(
+ new SimpleParamStack(request.getParams(), defaultParams));
httpExecutor.preProcess
(request, httpProcessor, httpContext);
HttpResponse response = httpExecutor.execute
(request, conn, httpContext);
- HttpParamsLinker.link(response, defaultParams);
+ response.setParams(
+ new SimpleParamStack(response.getParams(), defaultParams));
httpExecutor.postProcess
(response, httpProcessor, httpContext);
Modified: httpcomponents/httpclient/trunk/module-client/src/test/java/org/apache/http/impl/conn/tsccm/TestWaitingThread.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/module-client/src/test/java/org/apache/http/impl/conn/tsccm/TestWaitingThread.java?rev=610470&r1=610469&r2=610470&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/module-client/src/test/java/org/apache/http/impl/conn/tsccm/TestWaitingThread.java (original)
+++ httpcomponents/httpclient/trunk/module-client/src/test/java/org/apache/http/impl/conn/tsccm/TestWaitingThread.java Wed Jan 9 09:18:45 2008
@@ -30,7 +30,6 @@
package org.apache.http.impl.conn.tsccm;
-import java.util.Date;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.Condition;
import java.util.concurrent.locks.ReentrantLock;
Modified: httpcomponents/httpclient/trunk/module-client/src/test/java/org/apache/http/localserver/LocalTestServer.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/module-client/src/test/java/org/apache/http/localserver/LocalTestServer.java?rev=610470&r1=610469&r2=610470&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/module-client/src/test/java/org/apache/http/localserver/LocalTestServer.java (original)
+++ httpcomponents/httpclient/trunk/module-client/src/test/java/org/apache/http/localserver/LocalTestServer.java Wed Jan 9 09:18:45 2008
@@ -146,7 +146,7 @@
* @return default parameters
*/
public static HttpParams newDefaultParams() {
- HttpParams params = new BasicHttpParams(null);
+ HttpParams params = new BasicHttpParams();
params
.setIntParameter(CoreConnectionPNames.SO_TIMEOUT,
5000)
Modified: httpcomponents/httpclient/trunk/module-client/src/test/java/org/apache/http/localserver/ServerTestBase.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/module-client/src/test/java/org/apache/http/localserver/ServerTestBase.java?rev=610470&r1=610469&r2=610470&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/module-client/src/test/java/org/apache/http/localserver/ServerTestBase.java (original)
+++ httpcomponents/httpclient/trunk/module-client/src/test/java/org/apache/http/localserver/ServerTestBase.java Wed Jan 9 09:18:45 2008
@@ -112,7 +112,7 @@
protected void setUp() throws Exception {
if (defaultParams == null) {
- defaultParams = new BasicHttpParams(null);
+ defaultParams = new BasicHttpParams();
HttpProtocolParams.setVersion
(defaultParams, HttpVersion.HTTP_1_1);
HttpProtocolParams.setContentCharset