Deprecated HttpRequestParser in favor of DefaultHttpRequestParser; deprecated HttpResponseParser in favor of DefaultHttpResponseParser
git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpcore/trunk@1329914 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/httpcore/src/main/java/org/apache/http/impl/AbstractHttpClientConnection.java b/httpcore/src/main/java/org/apache/http/impl/AbstractHttpClientConnection.java
index d5daa0a..9d7f208 100644
--- a/httpcore/src/main/java/org/apache/http/impl/AbstractHttpClientConnection.java
+++ b/httpcore/src/main/java/org/apache/http/impl/AbstractHttpClientConnection.java
@@ -46,7 +46,6 @@
import org.apache.http.impl.entity.StrictContentLengthStrategy;
import org.apache.http.impl.io.DefaultHttpResponseParser;
import org.apache.http.impl.io.HttpRequestWriter;
-import org.apache.http.impl.io.HttpResponseParser;
import org.apache.http.io.EofSensor;
import org.apache.http.io.HttpMessageParser;
import org.apache.http.io.HttpMessageWriter;
@@ -156,8 +155,8 @@
* <p>
* This method can be overridden in a super class in order to provide
* a different implementation of the {@link HttpMessageParser} interface or
- * to pass a different implementation of {@link LineParser} to the
- * the default implementation {@link HttpResponseParser}.
+ * to pass a different implementation of the {@link LineParser} to the
+ * the {@link DefaultHttpResponseParser} constructor.
*
* @param buffer the session input buffer.
* @param responseFactory the HTTP response factory.
diff --git a/httpcore/src/main/java/org/apache/http/impl/AbstractHttpServerConnection.java b/httpcore/src/main/java/org/apache/http/impl/AbstractHttpServerConnection.java
index 72a62cc..4cb5ac6 100644
--- a/httpcore/src/main/java/org/apache/http/impl/AbstractHttpServerConnection.java
+++ b/httpcore/src/main/java/org/apache/http/impl/AbstractHttpServerConnection.java
@@ -45,7 +45,6 @@
import org.apache.http.impl.entity.LaxContentLengthStrategy;
import org.apache.http.impl.entity.StrictContentLengthStrategy;
import org.apache.http.impl.io.DefaultHttpRequestParser;
-import org.apache.http.impl.io.HttpRequestParser;
import org.apache.http.impl.io.HttpResponseWriter;
import org.apache.http.io.EofSensor;
import org.apache.http.io.HttpMessageParser;
@@ -157,8 +156,8 @@
* <p>
* This method can be overridden in a super class in order to provide
* a different implementation of the {@link HttpMessageParser} interface or
- * to pass a different implementation of {@link LineParser} to the
- * the default implementation {@link HttpRequestParser}.
+ * to pass a different implementation of the {@link LineParser} to the
+ * the {@link DefaultHttpRequestParser} constructor.
*
* @param buffer the session input buffer.
* @param requestFactory the HTTP request factory.
diff --git a/httpcore/src/main/java/org/apache/http/impl/io/HttpRequestParser.java b/httpcore/src/main/java/org/apache/http/impl/io/HttpRequestParser.java
index 491351e..e662411 100644
--- a/httpcore/src/main/java/org/apache/http/impl/io/HttpRequestParser.java
+++ b/httpcore/src/main/java/org/apache/http/impl/io/HttpRequestParser.java
@@ -55,7 +55,10 @@
* </ul>
*
* @since 4.0
+ *
+ * @deprecated (4.2) use {@link DefaultHttpRequestParser}
*/
+@Deprecated
@NotThreadSafe
public class HttpRequestParser extends AbstractMessageParser<HttpMessage> {
diff --git a/httpcore/src/main/java/org/apache/http/impl/io/HttpResponseParser.java b/httpcore/src/main/java/org/apache/http/impl/io/HttpResponseParser.java
index ac2ff63..14f7e0f 100644
--- a/httpcore/src/main/java/org/apache/http/impl/io/HttpResponseParser.java
+++ b/httpcore/src/main/java/org/apache/http/impl/io/HttpResponseParser.java
@@ -55,7 +55,10 @@
* </ul>
*
* @since 4.0
+ *
+ * @deprecated (4.2) use {@link DefaultHttpResponseParser}
*/
+@Deprecated
@NotThreadSafe
public class HttpResponseParser extends AbstractMessageParser<HttpMessage> {
diff --git a/httpcore/src/test/java/org/apache/http/impl/io/TestRequestParser.java b/httpcore/src/test/java/org/apache/http/impl/io/TestRequestParser.java
index 35f9dcc..c36fac4 100644
--- a/httpcore/src/test/java/org/apache/http/impl/io/TestRequestParser.java
+++ b/httpcore/src/test/java/org/apache/http/impl/io/TestRequestParser.java
@@ -47,14 +47,14 @@
import org.junit.Test;
/**
- * Unit tests for {@link HttpRequestParser}.
+ * Unit tests for {@link DefaultHttpRequestParser}.
*/
public class TestRequestParser {
@Test
public void testInvalidConstructorInput() throws Exception {
try {
- new HttpRequestParser(
+ new DefaultHttpRequestParser(
null,
BasicLineParser.DEFAULT,
new DefaultHttpRequestFactory(),
@@ -65,7 +65,7 @@
}
try {
SessionInputBuffer inbuffer = new SessionInputBufferMock(new byte[] {});
- new HttpRequestParser(
+ new DefaultHttpRequestParser(
inbuffer,
BasicLineParser.DEFAULT,
null,
@@ -76,7 +76,7 @@
}
try {
SessionInputBuffer inbuffer = new SessionInputBufferMock(new byte[] {});
- new HttpRequestParser(
+ new DefaultHttpRequestParser(
inbuffer,
BasicLineParser.DEFAULT,
new DefaultHttpRequestFactory(),
@@ -118,7 +118,7 @@
public void testConnectionClosedException() throws Exception {
SessionInputBuffer inbuffer = new SessionInputBufferMock(new byte[] {});
- HttpRequestParser parser = new HttpRequestParser(
+ DefaultHttpRequestParser parser = new DefaultHttpRequestParser(
inbuffer,
BasicLineParser.DEFAULT,
new DefaultHttpRequestFactory(),
diff --git a/httpcore/src/test/java/org/apache/http/impl/io/TestResponseParser.java b/httpcore/src/test/java/org/apache/http/impl/io/TestResponseParser.java
index 5b090e7..011d624 100644
--- a/httpcore/src/test/java/org/apache/http/impl/io/TestResponseParser.java
+++ b/httpcore/src/test/java/org/apache/http/impl/io/TestResponseParser.java
@@ -50,7 +50,7 @@
@Test
public void testInvalidConstructorInput() throws Exception {
try {
- new HttpResponseParser(
+ new DefaultHttpResponseParser(
null,
BasicLineParser.DEFAULT,
new DefaultHttpResponseFactory(),
@@ -61,7 +61,7 @@
}
try {
SessionInputBuffer inbuffer = new SessionInputBufferMock(new byte[] {});
- new HttpResponseParser(
+ new DefaultHttpResponseParser(
inbuffer,
BasicLineParser.DEFAULT,
null,
@@ -72,7 +72,7 @@
}
try {
SessionInputBuffer inbuffer = new SessionInputBufferMock(new byte[] {});
- new HttpResponseParser(
+ new DefaultHttpResponseParser(
inbuffer,
BasicLineParser.DEFAULT,
new DefaultHttpResponseFactory(),
@@ -114,7 +114,7 @@
public void testConnectionClosedException() throws Exception {
SessionInputBuffer inbuffer = new SessionInputBufferMock(new byte[] {});
- HttpResponseParser parser = new HttpResponseParser(
+ DefaultHttpResponseParser parser = new DefaultHttpResponseParser(
inbuffer,
BasicLineParser.DEFAULT,
new DefaultHttpResponseFactory(),
