You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by ro...@apache.org on 2007/11/04 17:19:30 UTC
svn commit: r591798 - in /jakarta/httpcomponents/httpcore/trunk:
module-main/src/main/java/org/apache/http/message/
module-main/src/test/java/org/apache/http/impl/io/
module-nio/src/main/java/org/apache/http/impl/nio/codecs/
Author: rolandw
Date: Sun Nov 4 08:19:29 2007
New Revision: 591798
URL: http://svn.apache.org/viewvc?rev=591798&view=rev
Log:
HTTPCORE-124, step 1: drop BufferedHeader.valueParser attribute
Modified:
jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/message/BasicLineParser.java
jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/message/BufferedHeader.java
jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/impl/io/TestMessageParser.java
jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/codecs/ChunkDecoder.java
Modified: jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/message/BasicLineParser.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/message/BasicLineParser.java?rev=591798&r1=591797&r2=591798&view=diff
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/message/BasicLineParser.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/message/BasicLineParser.java Sun Nov 4 08:19:29 2007
@@ -484,19 +484,7 @@
throws ParseException {
// the actual parser code is in the constructor of BufferedHeader
- return new BufferedHeader(buffer, getHeaderValueParser());
- }
-
-
- /**
- * Obtains the header value parser to use.
- * Called by {@link #parseHeader}.
- *
- * @return the header value parser, or
- * <code>null</code> for the default
- */
- protected HeaderValueParser getHeaderValueParser() {
- return null;
+ return new BufferedHeader(buffer);
}
Modified: jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/message/BufferedHeader.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/message/BufferedHeader.java?rev=591798&r1=591797&r2=591798&view=diff
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/message/BufferedHeader.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/message/BufferedHeader.java Sun Nov 4 08:19:29 2007
@@ -63,11 +63,6 @@
*/
private final int valuePos;
- /**
- * The parser for the header value, or <code>null</code>.
- */
- private HeaderValueParser parser;
-
/**
* Creates a new header from a buffer.
@@ -79,8 +74,7 @@
*
* @throws ParseException in case of a parse error
*/
- public BufferedHeader(final CharArrayBuffer buffer,
- final HeaderValueParser parser)
+ public BufferedHeader(final CharArrayBuffer buffer)
throws ParseException {
super();
@@ -101,12 +95,6 @@
this.buffer = buffer;
this.name = s;
this.valuePos = colon + 1;
- this.parser = parser;
- }
-
- public BufferedHeader(final CharArrayBuffer buffer)
- throws ParseException {
- this(buffer, null);
}
@@ -118,21 +106,11 @@
return this.buffer.substringTrimmed(this.valuePos, this.buffer.length());
}
- public HeaderValueParser getParser() {
- return this.parser;
- }
-
- public void setParser(HeaderValueParser parser) {
- this.parser = parser;
- }
-
public HeaderElement[] getElements() throws ParseException {
- HeaderValueParser hvp = this.parser;
- if (hvp == null)
- hvp = BasicHeaderValueParser.DEFAULT;
ParserCursor cursor = new ParserCursor(0, this.buffer.length());
cursor.updatePos(this.valuePos);
- return hvp.parseElements(this.buffer, cursor);
+ return BasicHeaderValueParser.DEFAULT
+ .parseElements(this.buffer, cursor);
}
public int getValuePos() {
Modified: jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/impl/io/TestMessageParser.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/impl/io/TestMessageParser.java?rev=591798&r1=591797&r2=591798&view=diff
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/impl/io/TestMessageParser.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-main/src/test/java/org/apache/http/impl/io/TestMessageParser.java Sun Nov 4 08:19:29 2007
@@ -74,7 +74,7 @@
// expected
}
try {
- new BufferedHeader(null, null);
+ new BufferedHeader(null);
fail("IllegalArgumentException should have been thrown");
} catch (IllegalArgumentException ex) {
// expected
Modified: jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/codecs/ChunkDecoder.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/codecs/ChunkDecoder.java?rev=591798&r1=591797&r2=591798&view=diff
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/codecs/ChunkDecoder.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/codecs/ChunkDecoder.java Sun Nov 4 08:19:29 2007
@@ -138,7 +138,7 @@
for (int i = 0; i < this.trailerBufs.size(); i++) {
CharArrayBuffer buffer = (CharArrayBuffer) this.trailerBufs.get(i);
try {
- this.footers[i] = new BufferedHeader(buffer, null);
+ this.footers[i] = new BufferedHeader(buffer);
} catch (ParseException ex) {
throw new IOException(ex.getMessage());
}