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 2007/05/28 13:23:47 UTC
svn commit: r542199 - in
/jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http:
./ impl/ protocol/
Author: olegk
Date: Mon May 28 04:23:46 2007
New Revision: 542199
URL: http://svn.apache.org/viewvc?view=rev&rev=542199
Log:
params refactoring, step 5: removed params argument from HttpClientConnection#receiveResponseHeader and HttpServerConnection#receiveRequestHeader methods
Modified:
jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/HttpClientConnection.java
jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/HttpServerConnection.java
jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/impl/AbstractHttpClientConnection.java
jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/impl/AbstractHttpServerConnection.java
jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/protocol/HttpRequestExecutor.java
jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/protocol/HttpService.java
Modified: jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/HttpClientConnection.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/HttpClientConnection.java?view=diff&rev=542199&r1=542198&r2=542199
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/HttpClientConnection.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/HttpClientConnection.java Mon May 28 04:23:46 2007
@@ -33,8 +33,6 @@
import java.io.IOException;
-import org.apache.http.params.HttpParams;
-
/**
* An HTTP connection for use on the client side.
* It is used for sending requests and receiving responses.
@@ -85,13 +83,12 @@
* this connection. The caller should examine the HttpResponse object to
* find out if it should try to receive a response entity as well.
*
- * @param params the parameters in effect
* @return a new HttpResponse object with status line and headers
* initialized.
* @throws HttpException
* @throws IOException
*/
- HttpResponse receiveResponseHeader(HttpParams params)
+ HttpResponse receiveResponseHeader()
throws HttpException, IOException;
/**
Modified: jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/HttpServerConnection.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/HttpServerConnection.java?view=diff&rev=542199&r1=542198&r2=542199
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/HttpServerConnection.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/HttpServerConnection.java Mon May 28 04:23:46 2007
@@ -33,8 +33,6 @@
import java.io.IOException;
-import org.apache.http.params.HttpParams;
-
/**
* An HTTP connection for use on the server side.
* Requests are received, responses are sent.
@@ -52,13 +50,12 @@
* The caller should examine the returned request and decide if to receive a
* request entity as well.
*
- * @param params the parameters in effect for this connection
* @return a new HttpRequest object whose request line and headers are
* initialized.
* @throws HttpException
* @throws IOException
*/
- HttpRequest receiveRequestHeader(HttpParams params)
+ HttpRequest receiveRequestHeader()
throws HttpException, IOException;
/**
Modified: jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/impl/AbstractHttpClientConnection.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/impl/AbstractHttpClientConnection.java?view=diff&rev=542199&r1=542198&r2=542199
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/impl/AbstractHttpClientConnection.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/impl/AbstractHttpClientConnection.java Mon May 28 04:23:46 2007
@@ -55,7 +55,6 @@
import org.apache.http.message.BasicRequestLine;
import org.apache.http.message.BasicStatusLine;
import org.apache.http.message.BufferedHeader;
-import org.apache.http.params.HttpParams;
import org.apache.http.protocol.HTTP;
import org.apache.http.util.CharArrayBuffer;
import org.apache.http.util.HeaderUtils;
@@ -189,13 +188,10 @@
this.datatransmitter.writeLine(this.buffer);
}
- public HttpResponse receiveResponseHeader(final HttpParams params)
+ public HttpResponse receiveResponseHeader()
throws HttpException, IOException {
- if (params == null) {
- throw new IllegalArgumentException("HTTP parameters may not be null");
- }
assertOpen();
- HttpResponse response = readResponseStatusLine(params);
+ HttpResponse response = readResponseStatusLine();
readResponseHeaders(response);
return response;
}
@@ -231,7 +227,7 @@
}
}
- protected HttpResponse readResponseStatusLine(final HttpParams params)
+ protected HttpResponse readResponseStatusLine()
throws HttpException, IOException {
// clear the buffer
this.buffer.clear();
Modified: jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/impl/AbstractHttpServerConnection.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/impl/AbstractHttpServerConnection.java?view=diff&rev=542199&r1=542198&r2=542199
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/impl/AbstractHttpServerConnection.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/impl/AbstractHttpServerConnection.java Mon May 28 04:23:46 2007
@@ -54,7 +54,6 @@
import org.apache.http.message.BasicRequestLine;
import org.apache.http.message.BasicStatusLine;
import org.apache.http.message.BufferedHeader;
-import org.apache.http.params.HttpParams;
import org.apache.http.util.CharArrayBuffer;
import org.apache.http.util.HeaderUtils;
@@ -119,13 +118,10 @@
this.datatransmitter = datatransmitter;
}
- public HttpRequest receiveRequestHeader(final HttpParams params)
+ public HttpRequest receiveRequestHeader()
throws HttpException, IOException {
- if (params == null) {
- throw new IllegalArgumentException("HTTP parameters may not be null");
- }
assertOpen();
- HttpRequest request = receiveRequestLine(params);
+ HttpRequest request = receiveRequestLine();
receiveRequestHeaders(request);
return request;
}
@@ -140,7 +136,7 @@
request.setEntity(entity);
}
- protected HttpRequest receiveRequestLine(final HttpParams params)
+ protected HttpRequest receiveRequestLine()
throws HttpException, IOException {
this.buffer.clear();
int i = this.datareceiver.readLine(this.buffer);
Modified: jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/protocol/HttpRequestExecutor.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/protocol/HttpRequestExecutor.java?view=diff&rev=542199&r1=542198&r2=542199
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/protocol/HttpRequestExecutor.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/protocol/HttpRequestExecutor.java Mon May 28 04:23:46 2007
@@ -226,7 +226,7 @@
int tms = params.getIntParameter(HttpProtocolParams.WAIT_FOR_CONTINUE, 2000);
if (conn.isResponseAvailable(tms)) {
- response = conn.receiveResponseHeader(request.getParams());
+ response = conn.receiveResponseHeader();
if (canResponseHaveBody(request, response)) {
conn.receiveResponseEntity(response);
}
@@ -286,7 +286,7 @@
while (response == null || statuscode < HttpStatus.SC_OK) {
- response = conn.receiveResponseHeader(request.getParams());
+ response = conn.receiveResponseHeader();
if (canResponseHaveBody(request, response)) {
conn.receiveResponseEntity(response);
}
Modified: jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/protocol/HttpService.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/protocol/HttpService.java?view=diff&rev=542199&r1=542198&r2=542199
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/protocol/HttpService.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/protocol/HttpService.java Mon May 28 04:23:46 2007
@@ -130,7 +130,7 @@
try {
- HttpRequest request = conn.receiveRequestHeader(this.params);
+ HttpRequest request = conn.receiveRequestHeader();
request.getParams().setDefaults(this.params);
HttpVersion ver = request.getRequestLine().getHttpVersion();
if (!ver.lessEquals(HttpVersion.HTTP_1_1)) {