rwaldhoff 01/08/16 19:09:24
Modified: httpclient/src/java/org/apache/commons/httpclient Tag:
rlwrefactoring Header.java
httpclient/src/test/org/apache/commons/httpclient Tag:
rlwrefactoring TestHeader.java
Log:
removing getValues (HeaderElement really does handle this much better)
returning empty string in toExternalForm for null values
Revision Changes Path
No revision
No revision
1.2.2.3 +7 -16
jakarta-commons/httpclient/src/java/org/apache/commons/httpclient/Header.java
Index: Header.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/httpclient/src/java/org/apache/commons/httpclient/Header.java,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -u -r1.2.2.2 -r1.2.2.3
--- Header.java 2001/08/14 18:01:29 1.2.2.2
+++ Header.java 2001/08/17 02:09:24 1.2.2.3
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-commons/httpclient/src/java/org/apache/commons/httpclient/Header.java,v
1.2.2.2 2001/08/14 18:01:29 rwaldhoff Exp $
- * $Revision: 1.2.2.2 $
- * $Date: 2001/08/14 18:01:29 $
+ * $Header:
/home/cvs/jakarta-commons/httpclient/src/java/org/apache/commons/httpclient/Header.java,v
1.2.2.3 2001/08/17 02:09:24 rwaldhoff Exp $
+ * $Revision: 1.2.2.3 $
+ * $Date: 2001/08/17 02:09:24 $
* ====================================================================
* Copyright (C) The Apache Software Foundation. All rights reserved.
*
@@ -53,7 +53,10 @@
* for use in an HTTP head.
*/
public String toExternalForm() {
- return (name + ": " + value + "\r\n");
+ return ((null == name ? "" : name) +
+ ": " +
+ (null == value ? "" : value) +
+ "\r\n");
}
/**
@@ -62,17 +65,5 @@
*/
public String toString() {
return toExternalForm();
- }
-
- /**
- * Returns an array of values, as parsed by {@link HeaderElement}.
- */
- public String[] getValues() throws HttpException {
- HeaderElement[] elts = HeaderElement.parse(getValue());
- String[] values = new String[elts.length];
- for(int i=0;i<values.length;i++) {
- values[i] = elts[i].getValue();
- }
- return values;
}
}
No revision
No revision
1.1.2.2 +5 -5
jakarta-commons/httpclient/src/test/org/apache/commons/httpclient/TestHeader.java
Index: TestHeader.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/httpclient/src/test/org/apache/commons/httpclient/TestHeader.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- TestHeader.java 2001/08/14 18:01:30 1.1.2.1
+++ TestHeader.java 2001/08/17 02:09:24 1.1.2.2
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-commons/httpclient/src/test/org/apache/commons/httpclient/TestHeader.java,v
1.1.2.1 2001/08/14 18:01:30 rwaldhoff Exp $
- * $Revision: 1.1.2.1 $
- * $Date: 2001/08/14 18:01:30 $
+ * $Header:
/home/cvs/jakarta-commons/httpclient/src/test/org/apache/commons/httpclient/TestHeader.java,v
1.1.2.2 2001/08/17 02:09:24 rwaldhoff Exp $
+ * $Revision: 1.1.2.2 $
+ * $Date: 2001/08/17 02:09:24 $
* ====================================================================
* Copyright (C) The Apache Software Foundation. All rights reserved.
*
@@ -18,7 +18,7 @@
* Simple tests for {@link NameValuePair}.
*
* @author Rodney Waldhoff
- * @version $Id: TestHeader.java,v 1.1.2.1 2001/08/14 18:01:30 rwaldhoff Exp $
+ * @version $Id: TestHeader.java,v 1.1.2.2 2001/08/17 02:09:24 rwaldhoff Exp $
*/
public class TestHeader extends TestNVP {
@@ -54,7 +54,7 @@
public void testToExternalFormNull() {
Header header = (Header)makePair();
- assertEquals("null: null\r\n",header.toExternalForm());
+ assertEquals(": \r\n",header.toExternalForm());
}
public void testToExternalForm() {
