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 2010/04/23 15:44:05 UTC
svn commit: r937295 [5/9] - in /httpcomponents/httpcore/trunk/httpcore/src:
main/java/org/apache/http/ main/java/org/apache/http/entity/
main/java/org/apache/http/impl/ main/java/org/apache/http/impl/entity/
main/java/org/apache/http/impl/io/ main/java...
Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/params/HttpProtocolParams.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/params/HttpProtocolParams.java?rev=937295&r1=937294&r2=937295&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/params/HttpProtocolParams.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/params/HttpProtocolParams.java Fri Apr 23 13:44:00 2010
@@ -33,13 +33,13 @@ import org.apache.http.protocol.HTTP;
/**
* Utility class for accessing protocol parameters in {@link HttpParams}.
- *
+ *
* @since 4.0
*
* @see CoreProtocolPNames
*/
public final class HttpProtocolParams implements CoreProtocolPNames {
-
+
private HttpProtocolParams() {
super();
}
@@ -47,7 +47,7 @@ public final class HttpProtocolParams im
/**
* Obtains value of the {@link CoreProtocolPNames#HTTP_ELEMENT_CHARSET} parameter.
* If not set, defaults to <code>US-ASCII</code>.
- *
+ *
* @param params HTTP parameters.
* @return HTTP element charset.
*/
@@ -62,10 +62,10 @@ public final class HttpProtocolParams im
}
return charset;
}
-
+
/**
* Sets value of the {@link CoreProtocolPNames#HTTP_ELEMENT_CHARSET} parameter.
- *
+ *
* @param params HTTP parameters.
* @param charset HTTP element charset.
*/
@@ -79,7 +79,7 @@ public final class HttpProtocolParams im
/**
* Obtains value of the {@link CoreProtocolPNames#HTTP_CONTENT_CHARSET} parameter.
* If not set, defaults to <code>ISO-8859-1</code>.
- *
+ *
* @param params HTTP parameters.
* @return HTTP content charset.
*/
@@ -94,10 +94,10 @@ public final class HttpProtocolParams im
}
return charset;
}
-
+
/**
* Sets value of the {@link CoreProtocolPNames#HTTP_CONTENT_CHARSET} parameter.
- *
+ *
* @param params HTTP parameters.
* @param charset HTTP content charset.
*/
@@ -111,11 +111,11 @@ public final class HttpProtocolParams im
/**
* Obtains value of the {@link CoreProtocolPNames#PROTOCOL_VERSION} parameter.
* If not set, defaults to {@link HttpVersion#HTTP_1_1}.
- *
+ *
* @param params HTTP parameters.
* @return HTTP protocol version.
*/
- public static ProtocolVersion getVersion(final HttpParams params) {
+ public static ProtocolVersion getVersion(final HttpParams params) {
if (params == null) {
throw new IllegalArgumentException("HTTP parameters may not be null");
}
@@ -126,10 +126,10 @@ public final class HttpProtocolParams im
}
return (ProtocolVersion)param;
}
-
+
/**
* Sets value of the {@link CoreProtocolPNames#PROTOCOL_VERSION} parameter.
- *
+ *
* @param params HTTP parameters.
* @param version HTTP protocol version.
*/
@@ -143,20 +143,20 @@ public final class HttpProtocolParams im
/**
* Obtains value of the {@link CoreProtocolPNames#USER_AGENT} parameter.
* If not set, returns <code>null</code>.
- *
+ *
* @param params HTTP parameters.
* @return User agent string.
*/
- public static String getUserAgent(final HttpParams params) {
+ public static String getUserAgent(final HttpParams params) {
if (params == null) {
throw new IllegalArgumentException("HTTP parameters may not be null");
}
return (String) params.getParameter(CoreProtocolPNames.USER_AGENT);
}
-
+
/**
* Sets value of the {@link CoreProtocolPNames#USER_AGENT} parameter.
- *
+ *
* @param params HTTP parameters.
* @param useragent User agent string.
*/
@@ -170,7 +170,7 @@ public final class HttpProtocolParams im
/**
* Obtains value of the {@link CoreProtocolPNames#USE_EXPECT_CONTINUE} parameter.
* If not set, returns <code>false</code>.
- *
+ *
* @param params HTTP parameters.
* @return User agent string.
*/
@@ -181,10 +181,10 @@ public final class HttpProtocolParams im
return params.getBooleanParameter
(CoreProtocolPNames.USE_EXPECT_CONTINUE, false);
}
-
+
/**
* Sets value of the {@link CoreProtocolPNames#USE_EXPECT_CONTINUE} parameter.
- *
+ *
* @param params HTTP parameters.
* @param b expect-continue flag.
*/
Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/params/SyncBasicHttpParams.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/params/SyncBasicHttpParams.java?rev=937295&r1=937294&r2=937295&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/params/SyncBasicHttpParams.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/params/SyncBasicHttpParams.java Fri Apr 23 13:44:00 2010
@@ -62,7 +62,7 @@ public class SyncBasicHttpParams extends
public synchronized void setParameters(final String[] names, final Object value) {
super.setParameters(names, value);
}
-
+
public synchronized void clear() {
super.clear();
}
Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/params/package.html
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/params/package.html?rev=937295&r1=937294&r2=937295&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/params/package.html (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/params/package.html Fri Apr 23 13:44:00 2010
@@ -30,7 +30,7 @@
-->
</head>
<body>
-The parameterization framework for HTTP components. This package also provides
+The parameterization framework for HTTP components. This package also provides
core protocol and I/O parameters.
</body>
</html>
Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/BasicHttpContext.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/BasicHttpContext.java?rev=937295&r1=937294&r2=937295&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/BasicHttpContext.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/BasicHttpContext.java Fri Apr 23 13:44:00 2010
@@ -35,23 +35,23 @@ import java.util.Map;
* <p>
* Please note methods of this class are not synchronized and therefore may
* be threading unsafe.
- *
+ *
* @since 4.0
*/
public class BasicHttpContext implements HttpContext {
-
+
private final HttpContext parentContext;
private Map map = null;
-
+
public BasicHttpContext() {
this(null);
}
-
+
public BasicHttpContext(final HttpContext parentContext) {
super();
this.parentContext = parentContext;
}
-
+
public Object getAttribute(final String id) {
if (id == null) {
throw new IllegalArgumentException("Id may not be null");
@@ -75,7 +75,7 @@ public class BasicHttpContext implements
}
this.map.put(id, obj);
}
-
+
public Object removeAttribute(final String id) {
if (id == null) {
throw new IllegalArgumentException("Id may not be null");
Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/BasicHttpProcessor.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/BasicHttpProcessor.java?rev=937295&r1=937294&r2=937295&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/BasicHttpProcessor.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/BasicHttpProcessor.java Fri Apr 23 13:44:00 2010
@@ -41,9 +41,9 @@ import org.apache.http.HttpResponseInter
/**
* Default implementation of {@link HttpProcessor}.
* <p>
- * Please note access to the internal structures of this class is not
+ * Please note access to the internal structures of this class is not
* synchronized and therefore this class may be thread-unsafe.
- *
+ *
* @since 4.0
*/
//@NotThreadSafe // Lists are not synchronized
@@ -51,7 +51,7 @@ public final class BasicHttpProcessor im
HttpProcessor, HttpRequestInterceptorList, HttpResponseInterceptorList, Cloneable {
// Don't allow direct access, as nulls are not allowed
- protected final List requestInterceptors = new ArrayList();
+ protected final List requestInterceptors = new ArrayList();
protected final List responseInterceptors = new ArrayList();
public void addRequestInterceptor(final HttpRequestInterceptor itcp) {
@@ -60,7 +60,7 @@ public final class BasicHttpProcessor im
}
this.requestInterceptors.add(itcp);
}
-
+
public void addRequestInterceptor(
final HttpRequestInterceptor itcp, int index) {
if (itcp == null) {
@@ -68,7 +68,7 @@ public final class BasicHttpProcessor im
}
this.requestInterceptors.add(index, itcp);
}
-
+
public void addResponseInterceptor(
final HttpResponseInterceptor itcp, int index) {
if (itcp == null) {
@@ -76,7 +76,7 @@ public final class BasicHttpProcessor im
}
this.responseInterceptors.add(index, itcp);
}
-
+
public void removeRequestInterceptorByClass(final Class clazz) {
for (Iterator it = this.requestInterceptors.iterator();
it.hasNext(); ) {
@@ -86,7 +86,7 @@ public final class BasicHttpProcessor im
}
}
}
-
+
public void removeResponseInterceptorByClass(final Class clazz) {
for (Iterator it = this.responseInterceptors.iterator();
it.hasNext(); ) {
@@ -96,58 +96,58 @@ public final class BasicHttpProcessor im
}
}
}
-
+
public final void addInterceptor(final HttpRequestInterceptor interceptor) {
addRequestInterceptor(interceptor);
}
-
+
public final void addInterceptor(final HttpRequestInterceptor interceptor, int index) {
addRequestInterceptor(interceptor, index);
}
-
+
public int getRequestInterceptorCount() {
return this.requestInterceptors.size();
}
-
+
public HttpRequestInterceptor getRequestInterceptor(int index) {
if ((index < 0) || (index >= this.requestInterceptors.size()))
return null;
return (HttpRequestInterceptor) this.requestInterceptors.get(index);
}
-
+
public void clearRequestInterceptors() {
this.requestInterceptors.clear();
}
-
+
public void addResponseInterceptor(final HttpResponseInterceptor itcp) {
if (itcp == null) {
return;
}
this.responseInterceptors.add(itcp);
}
-
+
public final void addInterceptor(final HttpResponseInterceptor interceptor) {
addResponseInterceptor(interceptor);
}
-
+
public final void addInterceptor(final HttpResponseInterceptor interceptor, int index) {
addResponseInterceptor(interceptor, index);
}
-
+
public int getResponseInterceptorCount() {
return this.responseInterceptors.size();
}
-
+
public HttpResponseInterceptor getResponseInterceptor(int index) {
if ((index < 0) || (index >= this.responseInterceptors.size()))
return null;
return (HttpResponseInterceptor) this.responseInterceptors.get(index);
}
-
+
public void clearResponseInterceptors() {
this.responseInterceptors.clear();
}
-
+
/**
* Sets the interceptor lists.
* First, both interceptor lists maintained by this processor
@@ -181,7 +181,7 @@ public final class BasicHttpProcessor im
}
}
}
-
+
/**
* Clears both interceptor lists maintained by this processor.
*/
@@ -189,7 +189,7 @@ public final class BasicHttpProcessor im
clearRequestInterceptors();
clearResponseInterceptors();
}
-
+
public void process(
final HttpRequest request,
final HttpContext context)
@@ -200,7 +200,7 @@ public final class BasicHttpProcessor im
interceptor.process(request, context);
}
}
-
+
public void process(
final HttpResponse response,
final HttpContext context)
@@ -215,7 +215,7 @@ public final class BasicHttpProcessor im
/**
* Sets up the target to have the same list of interceptors
* as the current instance.
- *
+ *
* @param target object to be initialised
*/
protected void copyInterceptors(final BasicHttpProcessor target) {
@@ -224,7 +224,7 @@ public final class BasicHttpProcessor im
target.responseInterceptors.clear();
target.responseInterceptors.addAll(this.responseInterceptors);
}
-
+
/**
* Creates a copy of this instance
*
@@ -235,11 +235,11 @@ public final class BasicHttpProcessor im
copyInterceptors(clone);
return clone;
}
-
+
public Object clone() throws CloneNotSupportedException {
BasicHttpProcessor clone = (BasicHttpProcessor) super.clone();
copyInterceptors(clone);
return clone;
}
-
+
}
Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/DefaultedHttpContext.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/DefaultedHttpContext.java?rev=937295&r1=937294&r2=937295&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/DefaultedHttpContext.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/DefaultedHttpContext.java Fri Apr 23 13:44:00 2010
@@ -29,7 +29,7 @@ package org.apache.http.protocol;
/**
* {@link HttpContext} implementation that delegates resolution of an attribute
- * to the given default {@link HttpContext} instance if the attribute is not
+ * to the given default {@link HttpContext} instance if the attribute is not
* present in the local one. The state of the local context can be mutated,
* whereas the default context is treated as read-only.
*
@@ -39,7 +39,7 @@ public final class DefaultedHttpContext
private final HttpContext local;
private final HttpContext defaults;
-
+
public DefaultedHttpContext(final HttpContext local, final HttpContext defaults) {
super();
if (local == null) {
@@ -69,5 +69,5 @@ public final class DefaultedHttpContext
public HttpContext getDefaults() {
return this.defaults;
}
-
+
}
Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/ExecutionContext.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/ExecutionContext.java?rev=937295&r1=937294&r2=937295&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/ExecutionContext.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/ExecutionContext.java Fri Apr 23 13:44:00 2010
@@ -29,46 +29,46 @@ package org.apache.http.protocol;
/**
* {@link HttpContext} attribute names for protocol execution.
- *
+ *
* @since 4.0
*/
public interface ExecutionContext {
/**
- * Attribute name of a {@link org.apache.http.HttpConnection} object that
+ * Attribute name of a {@link org.apache.http.HttpConnection} object that
* represents the actual HTTP connection.
*/
- public static final String HTTP_CONNECTION = "http.connection";
+ public static final String HTTP_CONNECTION = "http.connection";
/**
- * Attribute name of a {@link org.apache.http.HttpRequest} object that
+ * Attribute name of a {@link org.apache.http.HttpRequest} object that
* represents the actual HTTP request.
*/
- public static final String HTTP_REQUEST = "http.request";
+ public static final String HTTP_REQUEST = "http.request";
/**
- * Attribute name of a {@link org.apache.http.HttpResponse} object that
+ * Attribute name of a {@link org.apache.http.HttpResponse} object that
* represents the actual HTTP response.
*/
- public static final String HTTP_RESPONSE = "http.response";
+ public static final String HTTP_RESPONSE = "http.response";
/**
- * Attribute name of a {@link org.apache.http.HttpHost} object that
+ * Attribute name of a {@link org.apache.http.HttpHost} object that
* represents the connection target.
*/
- public static final String HTTP_TARGET_HOST = "http.target_host";
+ public static final String HTTP_TARGET_HOST = "http.target_host";
/**
- * Attribute name of a {@link org.apache.http.HttpHost} object that
+ * Attribute name of a {@link org.apache.http.HttpHost} object that
* represents the connection proxy.
*/
- public static final String HTTP_PROXY_HOST = "http.proxy_host";
+ public static final String HTTP_PROXY_HOST = "http.proxy_host";
/**
- * Attribute name of a {@link Boolean} object that represents the
- * the flag indicating whether the actual request has been fully transmitted
+ * Attribute name of a {@link Boolean} object that represents the
+ * the flag indicating whether the actual request has been fully transmitted
* to the target host.
*/
- public static final String HTTP_REQ_SENT = "http.request_sent";
+ public static final String HTTP_REQ_SENT = "http.request_sent";
}
Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/HTTP.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/HTTP.java?rev=937295&r1=937294&r2=937295&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/HTTP.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/HTTP.java Fri Apr 23 13:44:00 2010
@@ -29,7 +29,7 @@ package org.apache.http.protocol;
/**
* Constants and static helpers related to the HTTP protocol.
- *
+ *
* @since 4.0
*/
public final class HTTP {
@@ -39,7 +39,7 @@ public final class HTTP {
public static final int SP = 32; // <US-ASCII SP, space (32)>
public static final int HT = 9; // <US-ASCII HT, horizontal-tab (9)>
- /** HTTP header definitions */
+ /** HTTP header definitions */
public static final String TRANSFER_ENCODING = "Transfer-Encoding";
public static final String CONTENT_LEN = "Content-Length";
public static final String CONTENT_TYPE = "Content-Type";
@@ -50,18 +50,18 @@ public final class HTTP {
public static final String USER_AGENT = "User-Agent";
public static final String DATE_HEADER = "Date";
public static final String SERVER_HEADER = "Server";
-
+
/** HTTP expectations */
public static final String EXPECT_CONTINUE = "100-continue";
/** HTTP connection control */
public static final String CONN_CLOSE = "Close";
public static final String CONN_KEEP_ALIVE = "Keep-Alive";
-
+
/** Transfer encoding definitions */
public static final String CHUNK_CODING = "chunked";
public static final String IDENTITY_CODING = "identity";
-
+
/** Common charset definitions */
public static final String UTF_8 = "UTF-8";
public static final String UTF_16 = "UTF-16";
@@ -82,10 +82,10 @@ public final class HTTP {
public final static String DEFAULT_CONTENT_TYPE = OCTET_STREAM_TYPE;
public static boolean isWhitespace(char ch) {
- return ch == SP || ch == HT || ch == CR || ch == LF;
+ return ch == SP || ch == HT || ch == CR || ch == LF;
}
-
+
private HTTP() {
}
-
+
}
Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/HttpContext.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/HttpContext.java?rev=937295&r1=937294&r2=937295&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/HttpContext.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/HttpContext.java Fri Apr 23 13:44:00 2010
@@ -30,26 +30,26 @@ package org.apache.http.protocol;
import java.util.HashMap;
/**
- * HttpContext represents execution state of an HTTP process. It is a structure
- * that can be used to map an attribute name to an attribute value. Internally
- * HTTP context implementations are usually backed by a {@link HashMap}.
+ * HttpContext represents execution state of an HTTP process. It is a structure
+ * that can be used to map an attribute name to an attribute value. Internally
+ * HTTP context implementations are usually backed by a {@link HashMap}.
* <p>
- * The primary purpose of the HTTP context is to facilitate information sharing
- * among various logically related components. HTTP context can be used
- * to store a processing state for one message or several consecutive messages.
- * Multiple logically related messages can participate in a logical session
+ * The primary purpose of the HTTP context is to facilitate information sharing
+ * among various logically related components. HTTP context can be used
+ * to store a processing state for one message or several consecutive messages.
+ * Multiple logically related messages can participate in a logical session
* if the same context is reused between consecutive messages.
- *
+ *
* @since 4.0
*/
public interface HttpContext {
/** The prefix reserved for use by HTTP components. "http." */
public static final String RESERVED_PREFIX = "http.";
-
+
/**
* Obtains attribute with the given name.
- *
+ *
* @param id the attribute name.
* @return attribute value, or <code>null</code> if not set.
*/
@@ -57,7 +57,7 @@ public interface HttpContext {
/**
* Sets value of the attribute with the given name.
- *
+ *
* @param id the attribute name.
* @param obj the attribute value.
*/
@@ -65,10 +65,10 @@ public interface HttpContext {
/**
* Removes attribute with the given name from the context.
- *
+ *
* @param id the attribute name.
* @return attribute value, or <code>null</code> if not set.
*/
Object removeAttribute(String id);
-
+
}
Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/HttpDateGenerator.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/HttpDateGenerator.java?rev=937295&r1=937294&r2=937295&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/HttpDateGenerator.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/HttpDateGenerator.java Fri Apr 23 13:44:00 2010
@@ -36,7 +36,7 @@ import java.util.TimeZone;
/**
* Generates a date in the format required by the HTTP protocol.
- *
+ *
* @since 4.0
*/
public class HttpDateGenerator {
@@ -50,7 +50,7 @@ public class HttpDateGenerator {
private final DateFormat dateformat;
-
+
private long dateAsLong = 0L;
private String dateAsText = null;
@@ -59,7 +59,7 @@ public class HttpDateGenerator {
this.dateformat = new SimpleDateFormat(PATTERN_RFC1123, Locale.US);
this.dateformat.setTimeZone(GMT);
}
-
+
public synchronized String getCurrentDate() {
long now = System.currentTimeMillis();
if (now - this.dateAsLong > 1000) {
@@ -69,5 +69,5 @@ public class HttpDateGenerator {
}
return this.dateAsText;
}
-
+
}
Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/HttpExpectationVerifier.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/HttpExpectationVerifier.java?rev=937295&r1=937294&r2=937295&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/HttpExpectationVerifier.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/HttpExpectationVerifier.java Fri Apr 23 13:44:00 2010
@@ -32,8 +32,8 @@ import org.apache.http.HttpRequest;
import org.apache.http.HttpResponse;
/**
- * Defines an interface to verify whether an incoming HTTP request meets
- * the target server's expectations.
+ * Defines an interface to verify whether an incoming HTTP request meets
+ * the target server's expectations.
*<p>
* The Expect request-header field is used to indicate that particular
* server behaviors are required by the client.
@@ -54,22 +54,22 @@ import org.apache.http.HttpResponse;
* or, if there are other problems with the request, some other 4xx
* status.
*</p>
- *
+ *
* @since 4.0
*/
public interface HttpExpectationVerifier {
/**
- * Verifies whether the given request meets the server's expectations.
+ * Verifies whether the given request meets the server's expectations.
* <p>
* If the request fails to meet particular criteria, this method can
* trigger a terminal response back to the client by setting the status
- * code of the response object to a value greater or equal to
- * <code>200</code>. In this case the client will not have to transmit
- * the request body. If the request meets expectations this method can
- * terminate without modifying the response object. Per default the status
+ * code of the response object to a value greater or equal to
+ * <code>200</code>. In this case the client will not have to transmit
+ * the request body. If the request meets expectations this method can
+ * terminate without modifying the response object. Per default the status
* code of the response object will be set to <code>100</code>.
- *
+ *
* @param request the HTTP request.
* @param response the HTTP response.
* @param context the HTTP context.
@@ -77,5 +77,5 @@ public interface HttpExpectationVerifier
*/
void verify(HttpRequest request, HttpResponse response, HttpContext context)
throws HttpException;
-
+
}
Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/HttpProcessor.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/HttpProcessor.java?rev=937295&r1=937294&r2=937295&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/HttpProcessor.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/HttpProcessor.java Fri Apr 23 13:44:00 2010
@@ -31,21 +31,21 @@ import org.apache.http.HttpRequestInterc
import org.apache.http.HttpResponseInterceptor;
/**
- * HTTP protocol processor is a collection of protocol interceptors that
- * implements the 'Chain of Responsibility' pattern, where each individual
- * protocol interceptor is expected to work on a particular aspect of the HTTP
- * protocol the interceptor is responsible for.
+ * HTTP protocol processor is a collection of protocol interceptors that
+ * implements the 'Chain of Responsibility' pattern, where each individual
+ * protocol interceptor is expected to work on a particular aspect of the HTTP
+ * protocol the interceptor is responsible for.
* <p>
- * Usually the order in which interceptors are executed should not matter as
- * long as they do not depend on a particular state of the execution context.
- * If protocol interceptors have interdependencies and therefore must be
- * executed in a particular order, they should be added to the protocol
+ * Usually the order in which interceptors are executed should not matter as
+ * long as they do not depend on a particular state of the execution context.
+ * If protocol interceptors have interdependencies and therefore must be
+ * executed in a particular order, they should be added to the protocol
* processor in the same sequence as their expected execution order.
* <p>
- * Protocol interceptors must be implemented as thread-safe. Similarly to
- * servlets, protocol interceptors should not use instance variables unless
+ * Protocol interceptors must be implemented as thread-safe. Similarly to
+ * servlets, protocol interceptors should not use instance variables unless
* access to those variables is synchronized.
- *
+ *
* @since 4.0
*/
public interface HttpProcessor
Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/HttpRequestExecutor.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/HttpRequestExecutor.java?rev=937295&r1=937294&r2=937295&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/HttpRequestExecutor.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/HttpRequestExecutor.java Fri Apr 23 13:44:00 2010
@@ -42,22 +42,22 @@ import org.apache.http.ProtocolVersion;
import org.apache.http.params.CoreProtocolPNames;
/**
- * HttpRequestExecutor is a client side HTTP protocol handler based on the
- * blocking I/O model that implements the essential requirements of the HTTP
- * protocol for the client side message processing, as described by RFC 2616.
+ * HttpRequestExecutor is a client side HTTP protocol handler based on the
+ * blocking I/O model that implements the essential requirements of the HTTP
+ * protocol for the client side message processing, as described by RFC 2616.
* <br>
- * HttpRequestExecutor relies on {@link HttpProcessor} to generate mandatory
- * protocol headers for all outgoing messages and apply common, cross-cutting
- * message transformations to all incoming and outgoing messages. Application
- * specific processing can be implemented outside HttpRequestExecutor once the
+ * HttpRequestExecutor relies on {@link HttpProcessor} to generate mandatory
+ * protocol headers for all outgoing messages and apply common, cross-cutting
+ * message transformations to all incoming and outgoing messages. Application
+ * specific processing can be implemented outside HttpRequestExecutor once the
* request has been executed and a response has been received.
* <p>
- * The following parameters can be used to customize the behavior of this
- * class:
+ * The following parameters can be used to customize the behavior of this
+ * class:
* <ul>
* <li>{@link org.apache.http.params.CoreProtocolPNames#WAIT_FOR_CONTINUE}</li>
* </ul>
- *
+ *
* @since 4.0
*/
public class HttpRequestExecutor {
@@ -85,11 +85,11 @@ public class HttpRequestExecutor {
if ("HEAD".equalsIgnoreCase(request.getRequestLine().getMethod())) {
return false;
}
- int status = response.getStatusLine().getStatusCode();
- return status >= HttpStatus.SC_OK
- && status != HttpStatus.SC_NO_CONTENT
+ int status = response.getStatusLine().getStatusCode();
+ return status >= HttpStatus.SC_OK
+ && status != HttpStatus.SC_NO_CONTENT
&& status != HttpStatus.SC_NOT_MODIFIED
- && status != HttpStatus.SC_RESET_CONTENT;
+ && status != HttpStatus.SC_RESET_CONTENT;
}
/**
@@ -101,13 +101,13 @@ public class HttpRequestExecutor {
* @return the response to the request.
*
* @throws IOException in case of an I/O error.
- * @throws HttpException in case of HTTP protocol violation or a processing
+ * @throws HttpException in case of HTTP protocol violation or a processing
* problem.
- */
+ */
public HttpResponse execute(
final HttpRequest request,
final HttpClientConnection conn,
- final HttpContext context)
+ final HttpContext context)
throws IOException, HttpException {
if (request == null) {
throw new IllegalArgumentException("HTTP request may not be null");
@@ -138,7 +138,7 @@ public class HttpRequestExecutor {
}
/**
- * Pre-process the given request using the given protocol processor and
+ * Pre-process the given request using the given protocol processor and
* initiates the process of request execution.
*
* @param request the request to prepare
@@ -146,7 +146,7 @@ public class HttpRequestExecutor {
* @param context the context for sending the request
*
* @throws IOException in case of an I/O error.
- * @throws HttpException in case of HTTP protocol violation or a processing
+ * @throws HttpException in case of HTTP protocol violation or a processing
* problem.
*/
public void preProcess(
@@ -186,7 +186,7 @@ public class HttpRequestExecutor {
* <code>null</code> if the expect-continue handshake is not used
*
* @throws IOException in case of an I/O error.
- * @throws HttpException in case of HTTP protocol violation or a processing
+ * @throws HttpException in case of HTTP protocol violation or a processing
* problem.
*/
protected HttpResponse doSendRequest(
@@ -225,7 +225,7 @@ public class HttpRequestExecutor {
// 100-continue response forever. On timeout, send the entity.
int tms = request.getParams().getIntParameter(
CoreProtocolPNames.WAIT_FOR_CONTINUE, 2000);
-
+
if (conn.isResponseAvailable(tms)) {
response = conn.receiveResponseHeader();
if (canResponseHaveBody(request, response)) {
@@ -251,7 +251,7 @@ public class HttpRequestExecutor {
conn.flush();
context.setAttribute(ExecutionContext.HTTP_REQ_SENT, Boolean.TRUE);
return response;
- }
+ }
/**
* Waits for and receives a response.
@@ -265,7 +265,7 @@ public class HttpRequestExecutor {
* @return the terminal response, not yet post-processed
*
* @throws IOException in case of an I/O error.
- * @throws HttpException in case of HTTP protocol violation or a processing
+ * @throws HttpException in case of HTTP protocol violation or a processing
* problem.
*/
protected HttpResponse doReceiveResponse(
@@ -301,12 +301,12 @@ public class HttpRequestExecutor {
}
/**
- * Post-processes the given response using the given protocol processor and
+ * Post-processes the given response using the given protocol processor and
* completes the process of request execution.
* <p>
* This method does <i>not</i> read the response entity, if any.
- * The connection over which content of the response entity is being
- * streamed from cannot be reused until {@link HttpEntity#consumeContent()}
+ * The connection over which content of the response entity is being
+ * streamed from cannot be reused until {@link HttpEntity#consumeContent()}
* has been invoked.
*
* @param response the response object to post-process
@@ -314,7 +314,7 @@ public class HttpRequestExecutor {
* @param context the context for post-processing the response
*
* @throws IOException in case of an I/O error.
- * @throws HttpException in case of HTTP protocol violation or a processing
+ * @throws HttpException in case of HTTP protocol violation or a processing
* problem.
*/
public void postProcess(
Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/HttpRequestHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/HttpRequestHandler.java?rev=937295&r1=937294&r2=937295&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/HttpRequestHandler.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/HttpRequestHandler.java Fri Apr 23 13:44:00 2010
@@ -34,29 +34,29 @@ import org.apache.http.HttpRequest;
import org.apache.http.HttpResponse;
/**
- * HttpRequestHandler represents a routine for processing of a specific group
- * of HTTP requests. Protocol handlers are designed to take care of protocol
- * specific aspects, whereas individual request handlers are expected to take
- * care of application specific HTTP processing. The main purpose of a request
- * handler is to generate a response object with a content entity to be sent
+ * HttpRequestHandler represents a routine for processing of a specific group
+ * of HTTP requests. Protocol handlers are designed to take care of protocol
+ * specific aspects, whereas individual request handlers are expected to take
+ * care of application specific HTTP processing. The main purpose of a request
+ * handler is to generate a response object with a content entity to be sent
* back to the client in response to the given request
- *
+ *
* @since 4.0
*/
public interface HttpRequestHandler {
/**
- * Handles the request and produces a response to be sent back to
+ * Handles the request and produces a response to be sent back to
* the client.
- *
+ *
* @param request the HTTP request.
* @param response the HTTP response.
* @param context the HTTP execution context.
* @throws IOException in case of an I/O error.
- * @throws HttpException in case of HTTP protocol violation or a processing
+ * @throws HttpException in case of HTTP protocol violation or a processing
* problem.
*/
- void handle(HttpRequest request, HttpResponse response, HttpContext context)
+ void handle(HttpRequest request, HttpResponse response, HttpContext context)
throws HttpException, IOException;
-
+
}
Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/HttpRequestHandlerRegistry.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/HttpRequestHandlerRegistry.java?rev=937295&r1=937294&r2=937295&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/HttpRequestHandlerRegistry.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/HttpRequestHandlerRegistry.java Fri Apr 23 13:44:00 2010
@@ -39,9 +39,9 @@ import java.util.Map;
* <li><code><uri>*</code></li>
* </ul>
* <br>
- * This class can be used to resolve an instance of
- * {@link HttpRequestHandler} matching a particular request URI. Usually the
- * resolved request handler will be used to process the request with the
+ * This class can be used to resolve an instance of
+ * {@link HttpRequestHandler} matching a particular request URI. Usually the
+ * resolved request handler will be used to process the request with the
* specified request URI.
*
* @since 4.0
@@ -57,7 +57,7 @@ public class HttpRequestHandlerRegistry
/**
* Registers the given {@link HttpRequestHandler} as a handler for URIs
* matching the given pattern.
- *
+ *
* @param pattern the pattern to register the handler for.
* @param handler the handler.
*/
@@ -73,7 +73,7 @@ public class HttpRequestHandlerRegistry
/**
* Removes registered handler, if exists, for the given pattern.
- *
+ *
* @param pattern the pattern to unregister the handler for.
*/
public void unregister(final String pattern) {
Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/HttpRequestHandlerResolver.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/HttpRequestHandlerResolver.java?rev=937295&r1=937294&r2=937295&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/HttpRequestHandlerResolver.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/HttpRequestHandlerResolver.java Fri Apr 23 13:44:00 2010
@@ -28,9 +28,9 @@
package org.apache.http.protocol;
/**
- * HttpRequestHandlerResolver can be used to resolve an instance of
- * {@link HttpRequestHandler} matching a particular request URI. Usually the
- * resolved request handler will be used to process the request with the
+ * HttpRequestHandlerResolver can be used to resolve an instance of
+ * {@link HttpRequestHandler} matching a particular request URI. Usually the
+ * resolved request handler will be used to process the request with the
* specified request URI.
*
* @since 4.0
@@ -39,11 +39,11 @@ public interface HttpRequestHandlerResol
/**
* Looks up a handler matching the given request URI.
- *
+ *
* @param requestURI the request URI
* @return HTTP request handler or <code>null</code> if no match
* is found.
*/
HttpRequestHandler lookup(String requestURI);
-
+
}
Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/HttpRequestInterceptorList.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/HttpRequestInterceptorList.java?rev=937295&r1=937294&r2=937295&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/HttpRequestInterceptorList.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/HttpRequestInterceptorList.java Fri Apr 23 13:44:00 2010
@@ -35,7 +35,7 @@ import org.apache.http.HttpRequestInterc
* Provides access to an ordered list of request interceptors.
* Lists are expected to be built upfront and used read-only afterwards
* for {@link HttpProcessor processing}.
- *
+ *
* @since 4.0
*/
public interface HttpRequestInterceptorList {
@@ -54,7 +54,7 @@ public interface HttpRequestInterceptorL
* @param index the index to insert the interceptor at
*/
void addRequestInterceptor(HttpRequestInterceptor interceptor, int index);
-
+
/**
* Obtains the current size of this list.
*
@@ -84,7 +84,7 @@ public interface HttpRequestInterceptorL
* @param clazz the class of the instances to be removed.
*/
void removeRequestInterceptorByClass(Class clazz);
-
+
/**
* Sets the request interceptors in this list.
* This list will be cleared and re-initialized to contain
Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/HttpResponseInterceptorList.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/HttpResponseInterceptorList.java?rev=937295&r1=937294&r2=937295&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/HttpResponseInterceptorList.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/HttpResponseInterceptorList.java Fri Apr 23 13:44:00 2010
@@ -35,7 +35,7 @@ import org.apache.http.HttpResponseInter
* Provides access to an ordered list of response interceptors.
* Lists are expected to be built upfront and used read-only afterwards
* for {@link HttpProcessor processing}.
- *
+ *
* @since 4.0
*/
public interface HttpResponseInterceptorList {
@@ -54,7 +54,7 @@ public interface HttpResponseInterceptor
* @param index the index to insert the interceptor at
*/
void addResponseInterceptor(HttpResponseInterceptor interceptor, int index);
-
+
/**
* Obtains the current size of this list.
*
Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/HttpService.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/HttpService.java?rev=937295&r1=937294&r2=937295&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/HttpService.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/HttpService.java Fri Apr 23 13:44:00 2010
@@ -50,20 +50,20 @@ import org.apache.http.util.EncodingUtil
import org.apache.http.util.EntityUtils;
/**
- * HttpService is a server side HTTP protocol handler based in the blocking
- * I/O model that implements the essential requirements of the HTTP protocol
- * for the server side message processing as described by RFC 2616.
+ * HttpService is a server side HTTP protocol handler based in the blocking
+ * I/O model that implements the essential requirements of the HTTP protocol
+ * for the server side message processing as described by RFC 2616.
* <br>
- * HttpService relies on {@link HttpProcessor} to generate mandatory protocol
- * headers for all outgoing messages and apply common, cross-cutting message
- * transformations to all incoming and outgoing messages, whereas individual
- * {@link HttpRequestHandler}s are expected to take care of application specific
+ * HttpService relies on {@link HttpProcessor} to generate mandatory protocol
+ * headers for all outgoing messages and apply common, cross-cutting message
+ * transformations to all incoming and outgoing messages, whereas individual
+ * {@link HttpRequestHandler}s are expected to take care of application specific
* content generation and processing.
* <br>
- * HttpService relies on {@link HttpRequestHandler} to resolve matching request
+ * HttpService relies on {@link HttpRequestHandler} to resolve matching request
* handler for a particular request URI of an incoming HTTP request.
* <br>
- * HttpService can use optional {@link HttpExpectationVerifier} to ensure that
+ * HttpService can use optional {@link HttpExpectationVerifier} to ensure that
* incoming requests meet server's expectations.
*
* @since 4.0
@@ -89,7 +89,7 @@ public class HttpService {
* @param handlerResolver the handler resolver. May be null.
* @param expectationVerifier the expectation verifier. May be null.
* @param params the HTTP parameters
- *
+ *
* @since 4.1
*/
public HttpService(
@@ -119,7 +119,7 @@ public class HttpService {
this.expectationVerifier = expectationVerifier;
this.params = params;
}
-
+
/**
* Create a new HTTP service.
*
@@ -128,7 +128,7 @@ public class HttpService {
* @param responseFactory the response factory
* @param handlerResolver the handler resolver. May be null.
* @param params the HTTP parameters
- *
+ *
* @since 4.1
*/
public HttpService(
@@ -146,8 +146,8 @@ public class HttpService {
* @param proc the processor to use on requests and responses
* @param connStrategy the connection reuse strategy
* @param responseFactory the response factory
- *
- * @deprecated use {@link HttpService#HttpService(HttpProcessor,
+ *
+ * @deprecated use {@link HttpService#HttpService(HttpProcessor,
* ConnectionReuseStrategy, HttpResponseFactory, HttpRequestHandlerResolver, HttpParams)}
*/
public HttpService(
@@ -159,7 +159,7 @@ public class HttpService {
setConnReuseStrategy(connStrategy);
setResponseFactory(responseFactory);
}
-
+
/**
* @deprecated set {@link HttpProcessor} using constructor
*/
@@ -189,14 +189,14 @@ public class HttpService {
}
this.responseFactory = responseFactory;
}
-
+
/**
* @deprecated set {@link HttpResponseFactory} using constructor
*/
public void setParams(final HttpParams params) {
this.params = params;
}
-
+
/**
* @deprecated set {@link HttpRequestHandlerResolver} using constructor
*/
@@ -214,51 +214,51 @@ public class HttpService {
public HttpParams getParams() {
return this.params;
}
-
+
/**
- * Handles receives one HTTP request over the given connection within the
+ * Handles receives one HTTP request over the given connection within the
* given execution context and sends a response back to the client.
- *
+ *
* @param conn the active connection to the client
* @param context the actual execution context.
* @throws IOException in case of an I/O error.
- * @throws HttpException in case of HTTP protocol violation or a processing
+ * @throws HttpException in case of HTTP protocol violation or a processing
* problem.
*/
public void handleRequest(
- final HttpServerConnection conn,
- final HttpContext context) throws IOException, HttpException {
-
+ final HttpServerConnection conn,
+ final HttpContext context) throws IOException, HttpException {
+
context.setAttribute(ExecutionContext.HTTP_CONNECTION, conn);
HttpResponse response = null;
-
+
try {
HttpRequest request = conn.receiveRequestHeader();
request.setParams(
new DefaultedHttpParams(request.getParams(), this.params));
-
+
ProtocolVersion ver =
request.getRequestLine().getProtocolVersion();
if (!ver.lessEquals(HttpVersion.HTTP_1_1)) {
- // Downgrade protocol version if greater than HTTP/1.1
+ // Downgrade protocol version if greater than HTTP/1.1
ver = HttpVersion.HTTP_1_1;
}
if (request instanceof HttpEntityEnclosingRequest) {
if (((HttpEntityEnclosingRequest) request).expectContinue()) {
- response = this.responseFactory.newHttpResponse(ver,
+ response = this.responseFactory.newHttpResponse(ver,
HttpStatus.SC_CONTINUE, context);
response.setParams(
new DefaultedHttpParams(response.getParams(), this.params));
-
+
if (this.expectationVerifier != null) {
try {
this.expectationVerifier.verify(request, response, context);
} catch (HttpException ex) {
- response = this.responseFactory.newHttpResponse(HttpVersion.HTTP_1_0,
+ response = this.responseFactory.newHttpResponse(HttpVersion.HTTP_1_0,
HttpStatus.SC_INTERNAL_SERVER_ERROR, context);
response.setParams(
new DefaultedHttpParams(response.getParams(), this.params));
@@ -289,13 +289,13 @@ public class HttpService {
this.processor.process(request, context);
doService(request, response, context);
}
-
+
// Make sure the request content is fully consumed
if (request instanceof HttpEntityEnclosingRequest) {
HttpEntity entity = ((HttpEntityEnclosingRequest)request).getEntity();
EntityUtils.consume(entity);
}
-
+
} catch (HttpException ex) {
response = this.responseFactory.newHttpResponse
(HttpVersion.HTTP_1_0, HttpStatus.SC_INTERNAL_SERVER_ERROR,
@@ -304,22 +304,22 @@ public class HttpService {
new DefaultedHttpParams(response.getParams(), this.params));
handleException(ex, response);
}
-
+
this.processor.process(response, context);
conn.sendResponseHeader(response);
conn.sendResponseEntity(response);
conn.flush();
-
+
if (!this.connStrategy.keepAlive(response, context)) {
conn.close();
}
}
/**
- * Handles the given exception and generates an HTTP response to be sent
+ * Handles the given exception and generates an HTTP response to be sent
* back to the client to inform about the exceptional condition encountered
* in the course of the request processing.
- *
+ *
* @param ex the exception.
* @param response the HTTP response.
*/
@@ -338,9 +338,9 @@ public class HttpService {
entity.setContentType("text/plain; charset=US-ASCII");
response.setEntity(entity);
}
-
+
/**
- * The default implementation of this method attempts to resolve an
+ * The default implementation of this method attempts to resolve an
* {@link HttpRequestHandler} for the request URI of the given request
* and, if found, executes its
* {@link HttpRequestHandler#handle(HttpRequest, HttpResponse, HttpContext)}
@@ -348,16 +348,16 @@ public class HttpService {
* <p>
* Super-classes can override this method in order to provide a custom
* implementation of the request processing logic.
- *
+ *
* @param request the HTTP request.
* @param response the HTTP response.
* @param context the execution context.
* @throws IOException in case of an I/O error.
- * @throws HttpException in case of HTTP protocol violation or a processing
+ * @throws HttpException in case of HTTP protocol violation or a processing
* problem.
*/
protected void doService(
- final HttpRequest request,
+ final HttpRequest request,
final HttpResponse response,
final HttpContext context) throws HttpException, IOException {
HttpRequestHandler handler = null;
@@ -371,5 +371,5 @@ public class HttpService {
response.setStatusCode(HttpStatus.SC_NOT_IMPLEMENTED);
}
}
-
+
}
Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/ImmutableHttpProcessor.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/ImmutableHttpProcessor.java?rev=937295&r1=937294&r2=937295&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/ImmutableHttpProcessor.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/ImmutableHttpProcessor.java Fri Apr 23 13:44:00 2010
@@ -36,13 +36,13 @@ import org.apache.http.HttpResponseInter
/**
* Immutable {@link HttpProcessor}.
- *
+ *
* @since 4.1
*/
//@ThreadSafe
public final class ImmutableHttpProcessor implements HttpProcessor {
- private final HttpRequestInterceptor[] requestInterceptors;
+ private final HttpRequestInterceptor[] requestInterceptors;
private final HttpResponseInterceptor[] responseInterceptors;
public ImmutableHttpProcessor(
@@ -53,7 +53,7 @@ public final class ImmutableHttpProcesso
int count = requestInterceptors.length;
this.requestInterceptors = new HttpRequestInterceptor[count];
for (int i = 0; i < count; i++) {
- this.requestInterceptors[i] = requestInterceptors[i];
+ this.requestInterceptors[i] = requestInterceptors[i];
}
} else {
this.requestInterceptors = new HttpRequestInterceptor[0];
@@ -62,13 +62,13 @@ public final class ImmutableHttpProcesso
int count = responseInterceptors.length;
this.responseInterceptors = new HttpResponseInterceptor[count];
for (int i = 0; i < count; i++) {
- this.responseInterceptors[i] = responseInterceptors[i];
+ this.responseInterceptors[i] = responseInterceptors[i];
}
} else {
this.responseInterceptors = new HttpResponseInterceptor[0];
}
}
-
+
public ImmutableHttpProcessor(
final HttpRequestInterceptorList requestInterceptors,
final HttpResponseInterceptorList responseInterceptors) {
@@ -77,7 +77,7 @@ public final class ImmutableHttpProcesso
int count = requestInterceptors.getRequestInterceptorCount();
this.requestInterceptors = new HttpRequestInterceptor[count];
for (int i = 0; i < count; i++) {
- this.requestInterceptors[i] = requestInterceptors.getRequestInterceptor(i);
+ this.requestInterceptors[i] = requestInterceptors.getRequestInterceptor(i);
}
} else {
this.requestInterceptors = new HttpRequestInterceptor[0];
@@ -86,13 +86,13 @@ public final class ImmutableHttpProcesso
int count = responseInterceptors.getResponseInterceptorCount();
this.responseInterceptors = new HttpResponseInterceptor[count];
for (int i = 0; i < count; i++) {
- this.responseInterceptors[i] = responseInterceptors.getResponseInterceptor(i);
+ this.responseInterceptors[i] = responseInterceptors.getResponseInterceptor(i);
}
} else {
this.responseInterceptors = new HttpResponseInterceptor[0];
}
}
-
+
public ImmutableHttpProcessor(final HttpRequestInterceptor[] requestInterceptors) {
this(requestInterceptors, null);
}
@@ -100,7 +100,7 @@ public final class ImmutableHttpProcesso
public ImmutableHttpProcessor(final HttpResponseInterceptor[] responseInterceptors) {
this(null, responseInterceptors);
}
-
+
public void process(
final HttpRequest request,
final HttpContext context) throws IOException, HttpException {
@@ -108,7 +108,7 @@ public final class ImmutableHttpProcesso
this.requestInterceptors[i].process(request, context);
}
}
-
+
public void process(
final HttpResponse response,
final HttpContext context) throws IOException, HttpException {
Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/RequestConnControl.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/RequestConnControl.java?rev=937295&r1=937294&r2=937295&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/RequestConnControl.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/RequestConnControl.java Fri Apr 23 13:44:00 2010
@@ -34,11 +34,11 @@ import org.apache.http.HttpRequest;
import org.apache.http.HttpRequestInterceptor;
/**
- * RequestConnControl is responsible for adding <code>Connection</code> header
- * to the outgoing requests, which is essential for managing persistence of
- * <code>HTTP/1.0</code> connections. This interceptor is recommended for
+ * RequestConnControl is responsible for adding <code>Connection</code> header
+ * to the outgoing requests, which is essential for managing persistence of
+ * <code>HTTP/1.0</code> connections. This interceptor is recommended for
* client side protocol processors.
- *
+ *
* @since 4.0
*/
public class RequestConnControl implements HttpRequestInterceptor {
@@ -46,23 +46,23 @@ public class RequestConnControl implemen
public RequestConnControl() {
super();
}
-
- public void process(final HttpRequest request, final HttpContext context)
+
+ public void process(final HttpRequest request, final HttpContext context)
throws HttpException, IOException {
if (request == null) {
throw new IllegalArgumentException("HTTP request may not be null");
}
-
+
String method = request.getRequestLine().getMethod();
if (method.equalsIgnoreCase("CONNECT")) {
return;
}
-
+
if (!request.containsHeader(HTTP.CONN_DIRECTIVE)) {
// Default policy is to keep connection alive
// whenever possible
request.addHeader(HTTP.CONN_DIRECTIVE, HTTP.CONN_KEEP_ALIVE);
}
}
-
+
}
Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/RequestContent.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/RequestContent.java?rev=937295&r1=937294&r2=937295&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/RequestContent.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/RequestContent.java Fri Apr 23 13:44:00 2010
@@ -39,13 +39,13 @@ import org.apache.http.ProtocolVersion;
import org.apache.http.ProtocolException;
/**
- * RequestContent is the most important interceptor for outgoing requests.
- * It is responsible for delimiting content length by adding
- * <code>Content-Length</code> or <code>Transfer-Content</code> headers based
- * on the properties of the enclosed entity and the protocol version.
- * This interceptor is required for correct functioning of client side protocol
+ * RequestContent is the most important interceptor for outgoing requests.
+ * It is responsible for delimiting content length by adding
+ * <code>Content-Length</code> or <code>Transfer-Content</code> headers based
+ * on the properties of the enclosed entity and the protocol version.
+ * This interceptor is required for correct functioning of client side protocol
* processors.
- *
+ *
* @since 4.0
*/
public class RequestContent implements HttpRequestInterceptor {
@@ -53,8 +53,8 @@ public class RequestContent implements H
public RequestContent() {
super();
}
-
- public void process(final HttpRequest request, final HttpContext context)
+
+ public void process(final HttpRequest request, final HttpContext context)
throws HttpException, IOException {
if (request == null) {
throw new IllegalArgumentException("HTTP request may not be null");
@@ -72,7 +72,7 @@ public class RequestContent implements H
request.addHeader(HTTP.CONTENT_LEN, "0");
return;
}
- // Must specify a transfer encoding or a content length
+ // Must specify a transfer encoding or a content length
if (entity.isChunked() || entity.getContentLength() < 0) {
if (ver.lessEquals(HttpVersion.HTTP_1_0)) {
throw new ProtocolException(
@@ -85,14 +85,14 @@ public class RequestContent implements H
// Specify a content type if known
if (entity.getContentType() != null && !request.containsHeader(
HTTP.CONTENT_TYPE )) {
- request.addHeader(entity.getContentType());
+ request.addHeader(entity.getContentType());
}
// Specify a content encoding if known
if (entity.getContentEncoding() != null && !request.containsHeader(
HTTP.CONTENT_ENCODING)) {
- request.addHeader(entity.getContentEncoding());
+ request.addHeader(entity.getContentEncoding());
}
}
}
-
+
}
Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/RequestDate.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/RequestDate.java?rev=937295&r1=937294&r2=937295&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/RequestDate.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/RequestDate.java Fri Apr 23 13:44:00 2010
@@ -35,21 +35,21 @@ import org.apache.http.HttpEntityEnclosi
import org.apache.http.HttpRequestInterceptor;
/**
- * RequestDate interceptor is responsible for adding <code>Date</code> header
- * to the outgoing requests This interceptor is optional for client side
+ * RequestDate interceptor is responsible for adding <code>Date</code> header
+ * to the outgoing requests This interceptor is optional for client side
* protocol processors.
- *
+ *
* @since 4.0
*/
public class RequestDate implements HttpRequestInterceptor {
- private static final HttpDateGenerator DATE_GENERATOR = new HttpDateGenerator();
-
+ private static final HttpDateGenerator DATE_GENERATOR = new HttpDateGenerator();
+
public RequestDate() {
super();
}
- public void process(final HttpRequest request, final HttpContext context)
+ public void process(final HttpRequest request, final HttpContext context)
throws HttpException, IOException {
if (request == null) {
throw new IllegalArgumentException
@@ -58,8 +58,8 @@ public class RequestDate implements Http
if ((request instanceof HttpEntityEnclosingRequest) &&
!request.containsHeader(HTTP.DATE_HEADER)) {
String httpdate = DATE_GENERATOR.getCurrentDate();
- request.setHeader(HTTP.DATE_HEADER, httpdate);
+ request.setHeader(HTTP.DATE_HEADER, httpdate);
}
}
-
+
}
Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/RequestExpectContinue.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/RequestExpectContinue.java?rev=937295&r1=937294&r2=937295&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/RequestExpectContinue.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/RequestExpectContinue.java Fri Apr 23 13:44:00 2010
@@ -39,16 +39,16 @@ import org.apache.http.ProtocolVersion;
import org.apache.http.params.HttpProtocolParams;
/**
- * RequestExpectContinue is responsible for enabling the 'expect-continue'
- * handshake by adding <code>Expect</code> header. This interceptor is
- * recommended for client side protocol processors.
+ * RequestExpectContinue is responsible for enabling the 'expect-continue'
+ * handshake by adding <code>Expect</code> header. This interceptor is
+ * recommended for client side protocol processors.
* <p>
- * The following parameters can be used to customize the behavior of this
- * class:
+ * The following parameters can be used to customize the behavior of this
+ * class:
* <ul>
* <li>{@link org.apache.http.params.CoreProtocolPNames#USE_EXPECT_CONTINUE}</li>
* </ul>
- *
+ *
* @since 4.0
*/
public class RequestExpectContinue implements HttpRequestInterceptor {
@@ -56,8 +56,8 @@ public class RequestExpectContinue imple
public RequestExpectContinue() {
super();
}
-
- public void process(final HttpRequest request, final HttpContext context)
+
+ public void process(final HttpRequest request, final HttpContext context)
throws HttpException, IOException {
if (request == null) {
throw new IllegalArgumentException("HTTP request may not be null");
@@ -65,14 +65,14 @@ public class RequestExpectContinue imple
if (request instanceof HttpEntityEnclosingRequest) {
HttpEntity entity = ((HttpEntityEnclosingRequest)request).getEntity();
// Do not send the expect header if request body is known to be empty
- if (entity != null && entity.getContentLength() != 0) {
+ if (entity != null && entity.getContentLength() != 0) {
ProtocolVersion ver = request.getRequestLine().getProtocolVersion();
- if (HttpProtocolParams.useExpectContinue(request.getParams())
+ if (HttpProtocolParams.useExpectContinue(request.getParams())
&& !ver.lessEquals(HttpVersion.HTTP_1_0)) {
request.addHeader(HTTP.EXPECT_DIRECTIVE, HTTP.EXPECT_CONTINUE);
}
}
}
}
-
+
}
Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/RequestTargetHost.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/RequestTargetHost.java?rev=937295&r1=937294&r2=937295&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/RequestTargetHost.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/RequestTargetHost.java Fri Apr 23 13:44:00 2010
@@ -41,9 +41,9 @@ import org.apache.http.ProtocolVersion;
import org.apache.http.ProtocolException;
/**
- * RequestTargetHost is responsible for adding <code>Host</code> header. This
- * interceptor is required for client side protocol processors.
- *
+ * RequestTargetHost is responsible for adding <code>Host</code> header. This
+ * interceptor is required for client side protocol processors.
+ *
* @since 4.0
*/
public class RequestTargetHost implements HttpRequestInterceptor {
@@ -51,8 +51,8 @@ public class RequestTargetHost implement
public RequestTargetHost() {
super();
}
-
- public void process(final HttpRequest request, final HttpContext context)
+
+ public void process(final HttpRequest request, final HttpContext context)
throws HttpException, IOException {
if (request == null) {
throw new IllegalArgumentException("HTTP request may not be null");
@@ -60,13 +60,13 @@ public class RequestTargetHost implement
if (context == null) {
throw new IllegalArgumentException("HTTP context may not be null");
}
-
+
ProtocolVersion ver = request.getRequestLine().getProtocolVersion();
String method = request.getRequestLine().getMethod();
if (method.equalsIgnoreCase("CONNECT") && ver.lessEquals(HttpVersion.HTTP_1_0)) {
return;
}
-
+
if (!request.containsHeader(HTTP.TARGET_HOST)) {
HttpHost targethost = (HttpHost) context
.getAttribute(ExecutionContext.HTTP_TARGET_HOST);
@@ -74,7 +74,7 @@ public class RequestTargetHost implement
HttpConnection conn = (HttpConnection) context
.getAttribute(ExecutionContext.HTTP_CONNECTION);
if (conn instanceof HttpInetConnection) {
- // Populate the context with a default HTTP host based on the
+ // Populate the context with a default HTTP host based on the
// inet address of the target host
InetAddress address = ((HttpInetConnection) conn).getRemoteAddress();
int port = ((HttpInetConnection) conn).getRemotePort();
@@ -93,5 +93,5 @@ public class RequestTargetHost implement
request.addHeader(HTTP.TARGET_HOST, targethost.toHostString());
}
}
-
+
}
Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/RequestUserAgent.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/RequestUserAgent.java?rev=937295&r1=937294&r2=937295&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/RequestUserAgent.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/RequestUserAgent.java Fri Apr 23 13:44:00 2010
@@ -35,15 +35,15 @@ import org.apache.http.HttpRequestInterc
import org.apache.http.params.HttpProtocolParams;
/**
- * RequestUserAgent is responsible for adding <code>User-Agent</code> header.
- * This interceptor is recommended for client side protocol processors.
+ * RequestUserAgent is responsible for adding <code>User-Agent</code> header.
+ * This interceptor is recommended for client side protocol processors.
* <p>
- * The following parameters can be used to customize the behavior of this
- * class:
+ * The following parameters can be used to customize the behavior of this
+ * class:
* <ul>
* <li>{@link org.apache.http.params.CoreProtocolPNames#USER_AGENT}</li>
* </ul>
- *
+ *
* @since 4.0
*/
public class RequestUserAgent implements HttpRequestInterceptor {
@@ -51,8 +51,8 @@ public class RequestUserAgent implements
public RequestUserAgent() {
super();
}
-
- public void process(final HttpRequest request, final HttpContext context)
+
+ public void process(final HttpRequest request, final HttpContext context)
throws HttpException, IOException {
if (request == null) {
throw new IllegalArgumentException("HTTP request may not be null");
@@ -64,5 +64,5 @@ public class RequestUserAgent implements
}
}
}
-
+
}
Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/ResponseConnControl.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/ResponseConnControl.java?rev=937295&r1=937294&r2=937295&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/ResponseConnControl.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/ResponseConnControl.java Fri Apr 23 13:44:00 2010
@@ -40,11 +40,11 @@ import org.apache.http.HttpVersion;
import org.apache.http.ProtocolVersion;
/**
- * ResponseConnControl is responsible for adding <code>Connection</code> header
- * to the outgoing responses, which is essential for managing persistence of
- * <code>HTTP/1.0</code> connections. This interceptor is recommended for
+ * ResponseConnControl is responsible for adding <code>Connection</code> header
+ * to the outgoing responses, which is essential for managing persistence of
+ * <code>HTTP/1.0</code> connections. This interceptor is recommended for
* server side protocol processors.
- *
+ *
* @since 4.0
*/
public class ResponseConnControl implements HttpResponseInterceptor {
@@ -52,8 +52,8 @@ public class ResponseConnControl impleme
public ResponseConnControl() {
super();
}
-
- public void process(final HttpResponse response, final HttpContext context)
+
+ public void process(final HttpResponse response, final HttpContext context)
throws HttpException, IOException {
if (response == null) {
throw new IllegalArgumentException("HTTP response may not be null");
@@ -78,7 +78,7 @@ public class ResponseConnControl impleme
HttpEntity entity = response.getEntity();
if (entity != null) {
ProtocolVersion ver = response.getStatusLine().getProtocolVersion();
- if (entity.getContentLength() < 0 &&
+ if (entity.getContentLength() < 0 &&
(!entity.isChunked() || ver.lessEquals(HttpVersion.HTTP_1_0))) {
response.setHeader(HTTP.CONN_DIRECTIVE, HTTP.CONN_CLOSE);
return;
@@ -94,5 +94,5 @@ public class ResponseConnControl impleme
}
}
}
-
+
}
Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/ResponseContent.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/ResponseContent.java?rev=937295&r1=937294&r2=937295&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/ResponseContent.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/ResponseContent.java Fri Apr 23 13:44:00 2010
@@ -39,13 +39,13 @@ import org.apache.http.ProtocolVersion;
import org.apache.http.ProtocolException;
/**
- * ResponseContent is the most important interceptor for outgoing responses.
- * It is responsible for delimiting content length by adding
- * <code>Content-Length</code> or <code>Transfer-Content</code> headers based
- * on the properties of the enclosed entity and the protocol version.
- * This interceptor is required for correct functioning of server side protocol
+ * ResponseContent is the most important interceptor for outgoing responses.
+ * It is responsible for delimiting content length by adding
+ * <code>Content-Length</code> or <code>Transfer-Content</code> headers based
+ * on the properties of the enclosed entity and the protocol version.
+ * This interceptor is required for correct functioning of server side protocol
* processors.
- *
+ *
* @since 4.0
*/
public class ResponseContent implements HttpResponseInterceptor {
@@ -53,8 +53,8 @@ public class ResponseContent implements
public ResponseContent() {
super();
}
-
- public void process(final HttpResponse response, final HttpContext context)
+
+ public void process(final HttpResponse response, final HttpContext context)
throws HttpException, IOException {
if (response == null) {
throw new IllegalArgumentException("HTTP request may not be null");
@@ -77,21 +77,21 @@ public class ResponseContent implements
// Specify a content type if known
if (entity.getContentType() != null && !response.containsHeader(
HTTP.CONTENT_TYPE )) {
- response.addHeader(entity.getContentType());
+ response.addHeader(entity.getContentType());
}
// Specify a content encoding if known
if (entity.getContentEncoding() != null && !response.containsHeader(
HTTP.CONTENT_ENCODING)) {
- response.addHeader(entity.getContentEncoding());
+ response.addHeader(entity.getContentEncoding());
}
} else {
int status = response.getStatusLine().getStatusCode();
- if (status != HttpStatus.SC_NO_CONTENT
+ if (status != HttpStatus.SC_NO_CONTENT
&& status != HttpStatus.SC_NOT_MODIFIED
&& status != HttpStatus.SC_RESET_CONTENT) {
response.addHeader(HTTP.CONTENT_LEN, "0");
}
}
}
-
+
}
Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/ResponseDate.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/ResponseDate.java?rev=937295&r1=937294&r2=937295&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/ResponseDate.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/ResponseDate.java Fri Apr 23 13:44:00 2010
@@ -35,21 +35,21 @@ import org.apache.http.HttpResponseInter
import org.apache.http.HttpStatus;
/**
- * ResponseDate is responsible for adding <code>Date<c/ode> header to the
- * outgoing responses. This interceptor is recommended for server side protocol
+ * ResponseDate is responsible for adding <code>Date<c/ode> header to the
+ * outgoing responses. This interceptor is recommended for server side protocol
* processors.
- *
+ *
* @since 4.0
*/
public class ResponseDate implements HttpResponseInterceptor {
- private static final HttpDateGenerator DATE_GENERATOR = new HttpDateGenerator();
-
+ private static final HttpDateGenerator DATE_GENERATOR = new HttpDateGenerator();
+
public ResponseDate() {
super();
}
- public void process(final HttpResponse response, final HttpContext context)
+ public void process(final HttpResponse response, final HttpContext context)
throws HttpException, IOException {
if (response == null) {
throw new IllegalArgumentException
@@ -59,8 +59,8 @@ public class ResponseDate implements Htt
if ((status >= HttpStatus.SC_OK) &&
!response.containsHeader(HTTP.DATE_HEADER)) {
String httpdate = DATE_GENERATOR.getCurrentDate();
- response.setHeader(HTTP.DATE_HEADER, httpdate);
+ response.setHeader(HTTP.DATE_HEADER, httpdate);
}
}
-
+
}
Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/ResponseServer.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/ResponseServer.java?rev=937295&r1=937294&r2=937295&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/ResponseServer.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/ResponseServer.java Fri Apr 23 13:44:00 2010
@@ -35,15 +35,15 @@ import org.apache.http.HttpResponseInter
import org.apache.http.params.CoreProtocolPNames;
/**
- * ResponseServer is responsible for adding <code>Server</code> header. This
- * interceptor is recommended for server side protocol processors.
+ * ResponseServer is responsible for adding <code>Server</code> header. This
+ * interceptor is recommended for server side protocol processors.
* <p>
- * The following parameters can be used to customize the behavior of this
- * class:
+ * The following parameters can be used to customize the behavior of this
+ * class:
* <ul>
* <li>{@link org.apache.http.params.CoreProtocolPNames#ORIGIN_SERVER}</li>
* </ul>
- *
+ *
* @since 4.0
*/
public class ResponseServer implements HttpResponseInterceptor {
@@ -52,7 +52,7 @@ public class ResponseServer implements H
super();
}
- public void process(final HttpResponse response, final HttpContext context)
+ public void process(final HttpResponse response, final HttpContext context)
throws HttpException, IOException {
if (response == null) {
throw new IllegalArgumentException("HTTP request may not be null");
@@ -65,5 +65,5 @@ public class ResponseServer implements H
}
}
}
-
+
}
Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/SyncBasicHttpContext.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/SyncBasicHttpContext.java?rev=937295&r1=937294&r2=937295&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/SyncBasicHttpContext.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/SyncBasicHttpContext.java Fri Apr 23 13:44:00 2010
@@ -29,15 +29,15 @@ package org.apache.http.protocol;
/**
* Thread-safe extension of the {@link BasicHttpContext}.
- *
+ *
* @since 4.0
*/
public class SyncBasicHttpContext extends BasicHttpContext {
-
+
public SyncBasicHttpContext(final HttpContext parentContext) {
super(parentContext);
}
-
+
public synchronized Object getAttribute(final String id) {
return super.getAttribute(id);
}
@@ -45,7 +45,7 @@ public class SyncBasicHttpContext extend
public synchronized void setAttribute(final String id, final Object obj) {
super.setAttribute(id, obj);
}
-
+
public synchronized Object removeAttribute(final String id) {
return super.removeAttribute(id);
}
Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/UriPatternMatcher.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/UriPatternMatcher.java?rev=937295&r1=937294&r2=937295&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/UriPatternMatcher.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/UriPatternMatcher.java Fri Apr 23 13:44:00 2010
@@ -41,8 +41,8 @@ import java.util.Map;
* <li><code><uri>*</code></li>
* </ul>
* <br>
- * This class can be used to resolve an object matching a particular request
- * URI.
+ * This class can be used to resolve an object matching a particular request
+ * URI.
*
* @since 4.0
*/
@@ -60,7 +60,7 @@ public class UriPatternMatcher {
/**
* Registers the given object for URIs matching the given pattern.
- *
+ *
* @param pattern the pattern to register the handler for.
* @param obj the object.
*/
@@ -73,7 +73,7 @@ public class UriPatternMatcher {
/**
* Removes registered object, if exists, for the given pattern.
- *
+ *
* @param pattern the pattern to unregister.
*/
public synchronized void unregister(final String pattern) {
@@ -108,7 +108,7 @@ public class UriPatternMatcher {
/**
* Looks up an object matching the given request URI.
- *
+ *
* @param requestURI the request URI
* @return object or <code>null</code> if no match is found.
*/
@@ -145,7 +145,7 @@ public class UriPatternMatcher {
/**
* Tests if the given request URI matches the given pattern.
- *
+ *
* @param pattern the pattern
* @param requestUri the request URI
* @return <code>true</code> if the request URI matches the pattern,
Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/package.html
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/package.html?rev=937295&r1=937294&r2=937295&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/package.html (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/package.html Fri Apr 23 13:44:00 2010
@@ -31,7 +31,7 @@
</head>
<body>
HTTP protocol execution framework. This package contains common protocol
-aspects implemented as protocol interceptors as well as protocol handler
-implementations based on classic (blocking) I/O model.
+aspects implemented as protocol interceptors as well as protocol handler
+implementations based on classic (blocking) I/O model.
</body>
</html>