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 2005/12/21 22:17:01 UTC
svn commit: r358387 - in /jakarta/httpcomponents/trunk/http-core/src:
java/org/apache/http/ java/org/apache/http/entity/
java/org/apache/http/impl/ java/org/apache/http/impl/entity/
test/org/apache/http/impl/
Author: olegk
Date: Wed Dec 21 13:16:47 2005
New Revision: 358387
URL: http://svn.apache.org/viewcvs?rev=358387&view=rev
Log:
Removed superflouos HttpMutableEntity interface
Removed:
jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/HttpMutableEntity.java
Modified:
jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/entity/BasicHttpEntity.java
jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/entity/EntityGenerator.java
jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/impl/DefaultHttpClientConnection.java
jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/impl/DefaultHttpServerConnection.java
jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/impl/entity/DefaultEntityGenerator.java
jakarta/httpcomponents/trunk/http-core/src/test/org/apache/http/impl/TestDefaultConnectionReuseStrategy.java
Modified: jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/entity/BasicHttpEntity.java
URL: http://svn.apache.org/viewcvs/jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/entity/BasicHttpEntity.java?rev=358387&r1=358386&r2=358387&view=diff
==============================================================================
--- jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/entity/BasicHttpEntity.java (original)
+++ jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/entity/BasicHttpEntity.java Wed Dec 21 13:16:47 2005
@@ -33,7 +33,7 @@
import java.io.InputStream;
import java.io.OutputStream;
-import org.apache.http.HttpMutableEntity;
+import org.apache.http.HttpEntity;
/**
* <p>
@@ -44,7 +44,7 @@
*
* @since 4.0
*/
-public class BasicHttpEntity implements HttpMutableEntity {
+public class BasicHttpEntity implements HttpEntity {
private String contentType = null;
private String contentEncoding = null;
Modified: jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/entity/EntityGenerator.java
URL: http://svn.apache.org/viewcvs/jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/entity/EntityGenerator.java?rev=358387&r1=358386&r2=358387&view=diff
==============================================================================
--- jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/entity/EntityGenerator.java (original)
+++ jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/entity/EntityGenerator.java Wed Dec 21 13:16:47 2005
@@ -31,9 +31,9 @@
import java.io.IOException;
+import org.apache.http.HttpEntity;
import org.apache.http.HttpException;
import org.apache.http.HttpMessage;
-import org.apache.http.HttpMutableEntity;
import org.apache.http.io.HttpDataReceiver;
/**
@@ -47,7 +47,7 @@
*/
public interface EntityGenerator {
- HttpMutableEntity generate(
+ HttpEntity generate(
HttpDataReceiver datareceiver,
HttpMessage message) throws HttpException, IOException;
Modified: jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/impl/DefaultHttpClientConnection.java
URL: http://svn.apache.org/viewcvs/jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/impl/DefaultHttpClientConnection.java?rev=358387&r1=358386&r2=358387&view=diff
==============================================================================
--- jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/impl/DefaultHttpClientConnection.java (original)
+++ jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/impl/DefaultHttpClientConnection.java Wed Dec 21 13:16:47 2005
@@ -35,10 +35,10 @@
import org.apache.http.Header;
import org.apache.http.HttpClientConnection;
+import org.apache.http.HttpEntity;
import org.apache.http.HttpEntityEnclosingRequest;
import org.apache.http.HttpException;
import org.apache.http.HttpHost;
-import org.apache.http.HttpMutableEntity;
import org.apache.http.HttpMutableResponse;
import org.apache.http.HttpRequest;
import org.apache.http.HttpResponse;
@@ -361,7 +361,7 @@
protected void readResponseBody(
final HttpMutableResponse response) throws HttpException, IOException {
- HttpMutableEntity entity = this.entitygen.generate(this.datareceiver, response);
+ HttpEntity entity = this.entitygen.generate(this.datareceiver, response);
response.setEntity(entity);
}
Modified: jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/impl/DefaultHttpServerConnection.java
URL: http://svn.apache.org/viewcvs/jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/impl/DefaultHttpServerConnection.java?rev=358387&r1=358386&r2=358387&view=diff
==============================================================================
--- jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/impl/DefaultHttpServerConnection.java (original)
+++ jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/impl/DefaultHttpServerConnection.java Wed Dec 21 13:16:47 2005
@@ -34,8 +34,8 @@
import org.apache.http.ConnectionClosedException;
import org.apache.http.Header;
+import org.apache.http.HttpEntity;
import org.apache.http.HttpException;
-import org.apache.http.HttpMutableEntity;
import org.apache.http.HttpMutableEntityEnclosingRequest;
import org.apache.http.HttpMutableRequest;
import org.apache.http.HttpRequest;
@@ -153,7 +153,7 @@
protected void receiveRequestBody(final HttpMutableEntityEnclosingRequest request)
throws HttpException, IOException {
- HttpMutableEntity entity = this.entitygen.generate(this.datareceiver, request);
+ HttpEntity entity = this.entitygen.generate(this.datareceiver, request);
request.setEntity(entity);
}
Modified: jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/impl/entity/DefaultEntityGenerator.java
URL: http://svn.apache.org/viewcvs/jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/impl/entity/DefaultEntityGenerator.java?rev=358387&r1=358386&r2=358387&view=diff
==============================================================================
--- jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/impl/entity/DefaultEntityGenerator.java (original)
+++ jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/impl/entity/DefaultEntityGenerator.java Wed Dec 21 13:16:47 2005
@@ -35,7 +35,7 @@
import org.apache.http.HeaderElement;
import org.apache.http.HttpException;
import org.apache.http.HttpMessage;
-import org.apache.http.HttpMutableEntity;
+import org.apache.http.HttpEntity;
import org.apache.http.ProtocolException;
import org.apache.http.entity.BasicHttpEntity;
import org.apache.http.entity.EntityGenerator;
@@ -288,7 +288,7 @@
return entity;
}
- public HttpMutableEntity generate(
+ public HttpEntity generate(
final HttpDataReceiver datareceiver,
final HttpMessage message) throws HttpException, IOException {
return generateEntity(datareceiver, message);
Modified: jakarta/httpcomponents/trunk/http-core/src/test/org/apache/http/impl/TestDefaultConnectionReuseStrategy.java
URL: http://svn.apache.org/viewcvs/jakarta/httpcomponents/trunk/http-core/src/test/org/apache/http/impl/TestDefaultConnectionReuseStrategy.java?rev=358387&r1=358386&r2=358387&view=diff
==============================================================================
--- jakarta/httpcomponents/trunk/http-core/src/test/org/apache/http/impl/TestDefaultConnectionReuseStrategy.java (original)
+++ jakarta/httpcomponents/trunk/http-core/src/test/org/apache/http/impl/TestDefaultConnectionReuseStrategy.java Wed Dec 21 13:16:47 2005
@@ -29,7 +29,6 @@
package org.apache.http.impl;
import org.apache.http.Header;
-import org.apache.http.HttpMutableEntity;
import org.apache.http.HttpMutableResponse;
import org.apache.http.HttpVersion;
import org.apache.http.StatusLine;
@@ -69,7 +68,7 @@
}
public void testNoContentLengthResponse() throws Exception {
- HttpMutableEntity entity = new BasicHttpEntity();
+ BasicHttpEntity entity = new BasicHttpEntity();
entity.setChunked(false);
entity.setContentLength(-1);
StatusLine statusline = new StatusLine(HttpVersion.HTTP_1_0, 200, "OK");
@@ -81,7 +80,7 @@
}
public void testExplicitClose() throws Exception {
- HttpMutableEntity entity = new BasicHttpEntity();
+ BasicHttpEntity entity = new BasicHttpEntity();
entity.setChunked(true);
entity.setContentLength(-1);
// Use HTTP 1.1
@@ -95,7 +94,7 @@
}
public void testExplicitKeepAlive() throws Exception {
- HttpMutableEntity entity = new BasicHttpEntity();
+ BasicHttpEntity entity = new BasicHttpEntity();
entity.setChunked(false);
entity.setContentLength(10);
// Use HTTP 1.0