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 2006/02/22 14:01:44 UTC
svn commit: r379761 - in /jakarta/httpcomponents/trunk:
coyote-httpconnector/src/java/org/apache/http/coyote/impl/
http-core/src/contrib/org/apache/http/contrib/compress/
http-core/src/java/org/apache/http/
http-core/src/java/org/apache/http/protocol/ ...
Author: olegk
Date: Wed Feb 22 05:01:42 2006
New Revision: 379761
URL: http://svn.apache.org/viewcvs?rev=379761&view=rev
Log:
Removed superfluous 'auto-generated' flag in Header class. The same net result can be achieved by sub-classing Header
Modified:
jakarta/httpcomponents/trunk/coyote-httpconnector/src/java/org/apache/http/coyote/impl/HttpConnectionProcessor.java
jakarta/httpcomponents/trunk/http-core/src/contrib/org/apache/http/contrib/compress/GzipCompressingEntity.java
jakarta/httpcomponents/trunk/http-core/src/contrib/org/apache/http/contrib/compress/RequestAcceptEncoding.java
jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/Header.java
jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/protocol/RequestConnControl.java
jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/protocol/RequestContent.java
jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/protocol/RequestExpectContinue.java
jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/protocol/RequestTargetHost.java
jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/protocol/RequestUserAgent.java
jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/protocol/ResponseConnControl.java
jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/protocol/ResponseContent.java
jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/protocol/ResponseDate.java
jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/protocol/ResponseServer.java
jakarta/httpcomponents/trunk/http-core/src/test/org/apache/http/TestHeader.java
Modified: jakarta/httpcomponents/trunk/coyote-httpconnector/src/java/org/apache/http/coyote/impl/HttpConnectionProcessor.java
URL: http://svn.apache.org/viewcvs/jakarta/httpcomponents/trunk/coyote-httpconnector/src/java/org/apache/http/coyote/impl/HttpConnectionProcessor.java?rev=379761&r1=379760&r2=379761&view=diff
==============================================================================
--- jakarta/httpcomponents/trunk/coyote-httpconnector/src/java/org/apache/http/coyote/impl/HttpConnectionProcessor.java (original)
+++ jakarta/httpcomponents/trunk/coyote-httpconnector/src/java/org/apache/http/coyote/impl/HttpConnectionProcessor.java Wed Feb 22 05:01:42 2006
@@ -403,11 +403,11 @@
for (int i = 0; i < size; i++) {
String name = headers.getName(i).getString();
String value = headers.getValue(i).getString();
- this.httpres.addHeader(new Header(name, value, false));
+ this.httpres.addHeader(new Header(name, value));
}
String lang = this.coyoteres.getContentLanguage();
if (lang != null) {
- this.httpres.setHeader(new Header("Content-Language", lang, false));
+ this.httpres.setHeader(new Header("Content-Language", lang));
}
if (canResponseHaveBody(this.httpreq, this.httpres)) {
BasicHttpEntity entity = new BasicHttpEntity();
Modified: jakarta/httpcomponents/trunk/http-core/src/contrib/org/apache/http/contrib/compress/GzipCompressingEntity.java
URL: http://svn.apache.org/viewcvs/jakarta/httpcomponents/trunk/http-core/src/contrib/org/apache/http/contrib/compress/GzipCompressingEntity.java?rev=379761&r1=379760&r2=379761&view=diff
==============================================================================
--- jakarta/httpcomponents/trunk/http-core/src/contrib/org/apache/http/contrib/compress/GzipCompressingEntity.java (original)
+++ jakarta/httpcomponents/trunk/http-core/src/contrib/org/apache/http/contrib/compress/GzipCompressingEntity.java Wed Feb 22 05:01:42 2006
@@ -57,7 +57,7 @@
}
public Header getContentEncoding() {
- return new Header(HTTP.CONTENT_ENCODING, GZIP_CODEC, true);
+ return new Header(HTTP.CONTENT_ENCODING, GZIP_CODEC);
}
public long getContentLength() {
Modified: jakarta/httpcomponents/trunk/http-core/src/contrib/org/apache/http/contrib/compress/RequestAcceptEncoding.java
URL: http://svn.apache.org/viewcvs/jakarta/httpcomponents/trunk/http-core/src/contrib/org/apache/http/contrib/compress/RequestAcceptEncoding.java?rev=379761&r1=379760&r2=379761&view=diff
==============================================================================
--- jakarta/httpcomponents/trunk/http-core/src/contrib/org/apache/http/contrib/compress/RequestAcceptEncoding.java (original)
+++ jakarta/httpcomponents/trunk/http-core/src/contrib/org/apache/http/contrib/compress/RequestAcceptEncoding.java Wed Feb 22 05:01:42 2006
@@ -54,7 +54,7 @@
public void process(final HttpRequest request, final HttpContext context)
throws HttpException, IOException {
if (!request.containsHeader(ACCEPT_ENCODING)) {
- request.addHeader(new Header(ACCEPT_ENCODING, GZIP_CODEC, true));
+ request.addHeader(new Header(ACCEPT_ENCODING, GZIP_CODEC));
}
}
Modified: jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/Header.java
URL: http://svn.apache.org/viewcvs/jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/Header.java?rev=379761&r1=379760&r2=379761&view=diff
==============================================================================
--- jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/Header.java (original)
+++ jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/Header.java Wed Feb 22 05:01:42 2006
@@ -56,38 +56,18 @@
private final String value;
/**
- * Autogenerated header flag.
- */
- private final boolean isAutogenerated;
-
- /**
- * Constructor with name and value, and autogenerated flag
+ * Constructor with name and value
*
* @param name the header name
* @param value the header value
- * @param isAutogenerated <tt>true</tt> if the header is autogenerated,
*/
- public Header(final String name, final String value, boolean isAutogenerated) {
+ public Header(final String name, final String value) {
super();
if (name == null) {
throw new IllegalArgumentException("Name may not be null");
}
this.name = name;
this.value = value;
- this.isAutogenerated = isAutogenerated;
- }
-
- /**
- * Constructor with name and value
- *
- * @param name the header name
- * @param value the header value
- * <tt>false</tt> otherwise.
- *
- * @since 3.0
- */
- public Header(final String name, final String value) {
- this(name, value, false);
}
/**
@@ -109,18 +89,6 @@
}
/**
- * Returns the value of the auto-generated header flag.
- *
- * @return <tt>true</tt> if the header is autogenerated,
- * <tt>false</tt> otherwise.
- *
- * @since 3.0
- */
- public boolean isAutogenerated() {
- return this.isAutogenerated;
- }
-
- /**
* Returns a {@link String} representation of the header.
*
* @return a string
@@ -182,7 +150,7 @@
private final int posValue;
private BufferedHeader(final String name, final CharArrayBuffer buffer, int posValue) {
- super(name, null, false);
+ super(name, null);
this.buffer = buffer;
this.posValue = posValue;
}
Modified: jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/protocol/RequestConnControl.java
URL: http://svn.apache.org/viewcvs/jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/protocol/RequestConnControl.java?rev=379761&r1=379760&r2=379761&view=diff
==============================================================================
--- jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/protocol/RequestConnControl.java (original)
+++ jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/protocol/RequestConnControl.java Wed Feb 22 05:01:42 2006
@@ -59,7 +59,7 @@
if (!request.containsHeader(HTTP.CONN_DIRECTIVE)) {
// Default policy is to keep connection alive
// whenever possible
- request.addHeader(new Header(HTTP.CONN_DIRECTIVE, HTTP.CONN_KEEP_ALIVE, true));
+ request.addHeader(new Header(HTTP.CONN_DIRECTIVE, HTTP.CONN_KEEP_ALIVE));
}
}
Modified: jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/protocol/RequestContent.java
URL: http://svn.apache.org/viewcvs/jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/protocol/RequestContent.java?rev=379761&r1=379760&r2=379761&view=diff
==============================================================================
--- jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/protocol/RequestContent.java (original)
+++ jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/protocol/RequestContent.java Wed Feb 22 05:01:42 2006
@@ -64,7 +64,7 @@
HttpVersion ver = request.getRequestLine().getHttpVersion();
HttpEntity entity = ((HttpEntityEnclosingRequest)request).getEntity();
if (entity == null) {
- request.setHeader(new Header(HTTP.CONTENT_LEN, "0", true));
+ request.setHeader(new Header(HTTP.CONTENT_LEN, "0"));
return;
}
// Must specify a transfer encoding or a content length
@@ -74,11 +74,11 @@
"Chunked transfer encoding not allowed for " + ver);
}
request.setHeader(
- new Header(HTTP.TRANSFER_ENCODING, HTTP.CHUNK_CODING, true));
+ new Header(HTTP.TRANSFER_ENCODING, HTTP.CHUNK_CODING));
request.removeHeaders(HTTP.CONTENT_LEN);
} else {
request.setHeader(new Header(HTTP.CONTENT_LEN,
- Long.toString(entity.getContentLength()), true));
+ Long.toString(entity.getContentLength())));
request.removeHeaders(HTTP.TRANSFER_ENCODING);
}
// Specify a content type if known
Modified: jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/protocol/RequestExpectContinue.java
URL: http://svn.apache.org/viewcvs/jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/protocol/RequestExpectContinue.java?rev=379761&r1=379760&r2=379761&view=diff
==============================================================================
--- jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/protocol/RequestExpectContinue.java (original)
+++ jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/protocol/RequestExpectContinue.java Wed Feb 22 05:01:42 2006
@@ -67,8 +67,7 @@
HttpVersion ver = request.getRequestLine().getHttpVersion();
if (HttpProtocolParams.useExpectContinue(request.getParams())
&& ver.greaterEquals(HttpVersion.HTTP_1_1)) {
- request.addHeader(new Header(
- HTTP.EXPECT_DIRECTIVE, HTTP.EXPECT_CONTINUE, true));
+ request.addHeader(new Header(HTTP.EXPECT_DIRECTIVE, HTTP.EXPECT_CONTINUE));
}
}
}
Modified: jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/protocol/RequestTargetHost.java
URL: http://svn.apache.org/viewcvs/jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/protocol/RequestTargetHost.java?rev=379761&r1=379760&r2=379761&view=diff
==============================================================================
--- jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/protocol/RequestTargetHost.java (original)
+++ jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/protocol/RequestTargetHost.java Wed Feb 22 05:01:42 2006
@@ -71,7 +71,7 @@
if (virtualhost != null) {
targethost = new HttpHost(virtualhost, targethost.getPort());
}
- request.addHeader(new Header(HTTP.TARGET_HOST, targethost.toHostString(), true));
+ request.addHeader(new Header(HTTP.TARGET_HOST, targethost.toHostString()));
}
}
Modified: jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/protocol/RequestUserAgent.java
URL: http://svn.apache.org/viewcvs/jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/protocol/RequestUserAgent.java?rev=379761&r1=379760&r2=379761&view=diff
==============================================================================
--- jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/protocol/RequestUserAgent.java (original)
+++ jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/protocol/RequestUserAgent.java Wed Feb 22 05:01:42 2006
@@ -60,7 +60,7 @@
if (!request.containsHeader(HTTP.USER_AGENT)) {
String useragent = HttpProtocolParams.getUserAgent(request.getParams());
if (useragent != null) {
- request.addHeader(new Header(HTTP.USER_AGENT, useragent, true));
+ request.addHeader(new Header(HTTP.USER_AGENT, useragent));
}
}
}
Modified: jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/protocol/ResponseConnControl.java
URL: http://svn.apache.org/viewcvs/jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/protocol/ResponseConnControl.java?rev=379761&r1=379760&r2=379761&view=diff
==============================================================================
--- jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/protocol/ResponseConnControl.java (original)
+++ jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/protocol/ResponseConnControl.java Wed Feb 22 05:01:42 2006
@@ -74,7 +74,7 @@
status == HttpStatus.SC_INTERNAL_SERVER_ERROR ||
status == HttpStatus.SC_SERVICE_UNAVAILABLE ||
status == HttpStatus.SC_NOT_IMPLEMENTED) {
- response.setHeader(new Header(HTTP.CONN_DIRECTIVE, HTTP.CONN_CLOSE, true));
+ response.setHeader(new Header(HTTP.CONN_DIRECTIVE, HTTP.CONN_CLOSE));
return;
}
// Always drop connection for HTTP/1.0 responses and below
@@ -84,7 +84,7 @@
HttpVersion ver = response.getStatusLine().getHttpVersion();
if (entity.getContentLength() < 0 &&
(!entity.isChunked()) || ver.lessEquals(HttpVersion.HTTP_1_0)) {
- response.setHeader(new Header(HTTP.CONN_DIRECTIVE, HTTP.CONN_CLOSE, true));
+ response.setHeader(new Header(HTTP.CONN_DIRECTIVE, HTTP.CONN_CLOSE));
return;
}
}
@@ -92,7 +92,7 @@
HttpRequest request = (HttpRequest) context.getAttribute(HttpContext.HTTP_REQUEST);
Header header = request.getFirstHeader(HTTP.CONN_DIRECTIVE);
if (header != null) {
- response.setHeader(new Header(HTTP.CONN_DIRECTIVE, header.getValue(), true));
+ response.setHeader(new Header(HTTP.CONN_DIRECTIVE, header.getValue()));
}
}
Modified: jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/protocol/ResponseContent.java
URL: http://svn.apache.org/viewcvs/jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/protocol/ResponseContent.java?rev=379761&r1=379760&r2=379761&view=diff
==============================================================================
--- jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/protocol/ResponseContent.java (original)
+++ jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/protocol/ResponseContent.java Wed Feb 22 05:01:42 2006
@@ -64,11 +64,11 @@
if (entity != null) {
long len = entity.getContentLength();
if (entity.isChunked() && ver.greaterEquals(HttpVersion.HTTP_1_1)) {
- response.setHeader(new Header(HTTP.TRANSFER_ENCODING, HTTP.CHUNK_CODING, true));
+ response.setHeader(new Header(HTTP.TRANSFER_ENCODING, HTTP.CHUNK_CODING));
response.removeHeaders(HTTP.CONTENT_LEN);
} else if (len >= 0) {
response.setHeader(new Header(HTTP.CONTENT_LEN,
- Long.toString(entity.getContentLength()), true));
+ Long.toString(entity.getContentLength())));
response.removeHeaders(HTTP.TRANSFER_ENCODING);
}
// Specify a content type if known
Modified: jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/protocol/ResponseDate.java
URL: http://svn.apache.org/viewcvs/jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/protocol/ResponseDate.java?rev=379761&r1=379760&r2=379761&view=diff
==============================================================================
--- jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/protocol/ResponseDate.java (original)
+++ jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/protocol/ResponseDate.java Wed Feb 22 05:01:42 2006
@@ -63,7 +63,7 @@
int status = response.getStatusLine().getStatusCode();
if (status >= HttpStatus.SC_OK) {
String httpdate = DATE_GENERATOR.getCurrentDate();
- response.setHeader(new Header(HTTP.DATE_DIRECTIVE, httpdate, true));
+ response.setHeader(new Header(HTTP.DATE_DIRECTIVE, httpdate));
}
}
Modified: jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/protocol/ResponseServer.java
URL: http://svn.apache.org/viewcvs/jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/protocol/ResponseServer.java?rev=379761&r1=379760&r2=379761&view=diff
==============================================================================
--- jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/protocol/ResponseServer.java (original)
+++ jakarta/httpcomponents/trunk/http-core/src/java/org/apache/http/protocol/ResponseServer.java Wed Feb 22 05:01:42 2006
@@ -62,7 +62,7 @@
String s = (String) response.getParams().getParameter(
HttpProtocolParams.ORIGIN_SERVER);
if (s != null) {
- response.setHeader(new Header(HTTP.SERVER_DIRECTIVE, s, true));
+ response.setHeader(new Header(HTTP.SERVER_DIRECTIVE, s));
}
}
}
Modified: jakarta/httpcomponents/trunk/http-core/src/test/org/apache/http/TestHeader.java
URL: http://svn.apache.org/viewcvs/jakarta/httpcomponents/trunk/http-core/src/test/org/apache/http/TestHeader.java?rev=379761&r1=379760&r2=379761&view=diff
==============================================================================
--- jakarta/httpcomponents/trunk/http-core/src/test/org/apache/http/TestHeader.java (original)
+++ jakarta/httpcomponents/trunk/http-core/src/test/org/apache/http/TestHeader.java Wed Feb 22 05:01:42 2006
@@ -58,17 +58,15 @@
}
public void testBasicConstructor() {
- Header header = new Header("name", "value", true);
+ Header header = new Header("name", "value");
assertEquals("name", header.getName());
assertEquals("value", header.getValue());
- assertTrue(header.isAutogenerated());
}
public void testBasicConstructorNullValue() {
- Header header = new Header("name", null, true);
+ Header header = new Header("name", null);
assertEquals("name", header.getName());
assertEquals(null, header.getValue());
- assertTrue(header.isAutogenerated());
}
public void testInvalidName() {