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 21:19:31 UTC
svn commit: r937479 [2/12] - in /httpcomponents/httpclient/trunk:
httpclient-benchmark/src/main/java/org/apache/http/client/benchmark/
httpclient-contrib/src/main/java/org/apache/http/contrib/auth/
httpclient/src/main/java/org/apache/http/auth/ httpcli...
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/AuthState.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/AuthState.java?rev=937479&r1=937478&r2=937479&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/AuthState.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/AuthState.java Fri Apr 23 19:19:23 2010
@@ -32,7 +32,7 @@ import org.apache.http.annotation.NotThr
/**
* This class provides detailed information about the state of the
* authentication process.
- *
+ *
*
* @since 4.0
*/
@@ -44,13 +44,13 @@ public class AuthState {
/** Actual authentication scope */
private AuthScope authScope;
-
+
/** Credentials selected for authentication */
private Credentials credentials;
-
+
/**
* Default constructor.
- *
+ *
*/
public AuthState() {
super();
@@ -68,10 +68,10 @@ public class AuthState {
public boolean isValid() {
return this.authScheme != null;
}
-
+
/**
* Assigns the given {@link AuthScheme authentication scheme}.
- *
+ *
* @param authScheme the {@link AuthScheme authentication scheme}
*/
public void setAuthScheme(final AuthScheme authScheme) {
@@ -84,27 +84,27 @@ public class AuthState {
/**
* Returns the {@link AuthScheme authentication scheme}.
- *
+ *
* @return {@link AuthScheme authentication scheme}
*/
public AuthScheme getAuthScheme() {
return this.authScheme;
}
-
-
- /**
+
+
+ /**
* Returns user {@link Credentials} selected for authentication if available
- *
+ *
* @return user credentials if available, <code>null</code otherwise
*/
public Credentials getCredentials() {
return this.credentials;
}
-
- /**
+
+ /**
* Sets user {@link Credentials} to be used for authentication
- *
+ *
* @param credentials User credentials
*/
public void setCredentials(final Credentials credentials) {
@@ -112,25 +112,25 @@ public class AuthState {
}
- /**
+ /**
* Returns actual {@link AuthScope} if available
- *
+ *
* @return actual authentication scope if available, <code>null</code otherwise
*/
public AuthScope getAuthScope() {
return this.authScope;
}
- /**
+ /**
* Sets actual {@link AuthScope}.
- *
+ *
* @param authScope Authentication scope
*/
public void setAuthScope(final AuthScope authScope) {
this.authScope = authScope;
}
-
+
@Override
public String toString() {
StringBuilder buffer = new StringBuilder();
@@ -141,5 +141,5 @@ public class AuthState {
buffer.append("]");
return buffer.toString();
}
-
+
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/AuthenticationException.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/AuthenticationException.java?rev=937479&r1=937478&r2=937479&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/AuthenticationException.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/AuthenticationException.java Fri Apr 23 19:19:23 2010
@@ -33,7 +33,7 @@ import org.apache.http.ProtocolException
/**
* Signals a failure in authentication process
*
- *
+ *
* @since 4.0
*/
@Immutable
@@ -42,7 +42,7 @@ public class AuthenticationException ext
private static final long serialVersionUID = -6794031905674764776L;
/**
- * Creates a new AuthenticationException with a <tt>null</tt> detail message.
+ * Creates a new AuthenticationException with a <tt>null</tt> detail message.
*/
public AuthenticationException() {
super();
@@ -50,7 +50,7 @@ public class AuthenticationException ext
/**
* Creates a new AuthenticationException with the specified message.
- *
+ *
* @param message the exception detail message
*/
public AuthenticationException(String message) {
@@ -59,7 +59,7 @@ public class AuthenticationException ext
/**
* Creates a new AuthenticationException with the specified detail message and cause.
- *
+ *
* @param message the exception detail message
* @param cause the <tt>Throwable</tt> that caused this exception, or <tt>null</tt>
* if the cause is unavailable, unknown, or not a <tt>Throwable</tt>
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/BasicUserPrincipal.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/BasicUserPrincipal.java?rev=937479&r1=937478&r2=937479&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/BasicUserPrincipal.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/BasicUserPrincipal.java Fri Apr 23 19:19:23 2010
@@ -35,7 +35,7 @@ import org.apache.http.util.LangUtils;
/**
* Basic user principal used for HTTP authentication
- *
+ *
* @since 4.0
*/
@Immutable
@@ -44,7 +44,7 @@ public final class BasicUserPrincipal im
private static final long serialVersionUID = -2266305184969850467L;
private final String username;
-
+
public BasicUserPrincipal(final String username) {
super();
if (username == null) {
@@ -52,7 +52,7 @@ public final class BasicUserPrincipal im
}
this.username = username;
}
-
+
public String getName() {
return this.username;
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/ContextAwareAuthScheme.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/ContextAwareAuthScheme.java?rev=937479&r1=937478&r2=937479&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/ContextAwareAuthScheme.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/ContextAwareAuthScheme.java Fri Apr 23 19:19:23 2010
@@ -32,31 +32,31 @@ import org.apache.http.protocol.HttpCont
/**
* This interface represents an extended authentication scheme
- * that requires access to {@link HttpContext} in order to
+ * that requires access to {@link HttpContext} in order to
* generate an authorization string.
*
* TODO: Fix AuthScheme interface in the next major version
- *
+ *
* @since 4.1
*/
public interface ContextAwareAuthScheme extends AuthScheme {
/**
- * Produces an authorization string for the given set of
+ * Produces an authorization string for the given set of
* {@link Credentials}.
- *
+ *
* @param credentials The set of credentials to be used for athentication
* @param request The request being authenticated
* @param context HTTP context
- * @throws AuthenticationException if authorization string cannot
+ * @throws AuthenticationException if authorization string cannot
* be generated due to an authentication failure
- *
+ *
* @return the authorization string
*/
Header authenticate(
- Credentials credentials,
+ Credentials credentials,
HttpRequest request,
HttpContext context) throws AuthenticationException;
-
+
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/Credentials.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/Credentials.java?rev=937479&r1=937478&r2=937479&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/Credentials.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/Credentials.java Fri Apr 23 19:19:23 2010
@@ -29,7 +29,7 @@ package org.apache.http.auth;
import java.security.Principal;
/**
- * This interface represents a set of credentials consisting of a security
+ * This interface represents a set of credentials consisting of a security
* principal and a secret (password) that can be used to establish user
* identity
*
@@ -40,5 +40,5 @@ public interface Credentials {
Principal getUserPrincipal();
String getPassword();
-
+
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/InvalidCredentialsException.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/InvalidCredentialsException.java?rev=937479&r1=937478&r2=937479&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/InvalidCredentialsException.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/InvalidCredentialsException.java Fri Apr 23 19:19:23 2010
@@ -29,10 +29,10 @@ package org.apache.http.auth;
import org.apache.http.annotation.Immutable;
/**
- * Authentication credentials required to respond to a authentication
+ * Authentication credentials required to respond to a authentication
* challenge are invalid
*
- *
+ *
* @since 4.0
*/
@Immutable
@@ -41,7 +41,7 @@ public class InvalidCredentialsException
private static final long serialVersionUID = -4834003835215460648L;
/**
- * Creates a new InvalidCredentialsException with a <tt>null</tt> detail message.
+ * Creates a new InvalidCredentialsException with a <tt>null</tt> detail message.
*/
public InvalidCredentialsException() {
super();
@@ -49,7 +49,7 @@ public class InvalidCredentialsException
/**
* Creates a new InvalidCredentialsException with the specified message.
- *
+ *
* @param message the exception detail message
*/
public InvalidCredentialsException(String message) {
@@ -58,7 +58,7 @@ public class InvalidCredentialsException
/**
* Creates a new InvalidCredentialsException with the specified detail message and cause.
- *
+ *
* @param message the exception detail message
* @param cause the <tt>Throwable</tt> that caused this exception, or <tt>null</tt>
* if the cause is unavailable, unknown, or not a <tt>Throwable</tt>
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/MalformedChallengeException.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/MalformedChallengeException.java?rev=937479&r1=937478&r2=937479&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/MalformedChallengeException.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/MalformedChallengeException.java Fri Apr 23 19:19:23 2010
@@ -31,10 +31,10 @@ import org.apache.http.annotation.Immuta
import org.apache.http.ProtocolException;
/**
- * Signals that authentication challenge is in some way invalid or
+ * Signals that authentication challenge is in some way invalid or
* illegal in the given context
*
- *
+ *
* @since 4.0
*/
@Immutable
@@ -43,7 +43,7 @@ public class MalformedChallengeException
private static final long serialVersionUID = 814586927989932284L;
/**
- * Creates a new MalformedChallengeException with a <tt>null</tt> detail message.
+ * Creates a new MalformedChallengeException with a <tt>null</tt> detail message.
*/
public MalformedChallengeException() {
super();
@@ -51,7 +51,7 @@ public class MalformedChallengeException
/**
* Creates a new MalformedChallengeException with the specified message.
- *
+ *
* @param message the exception detail message
*/
public MalformedChallengeException(String message) {
@@ -60,7 +60,7 @@ public class MalformedChallengeException
/**
* Creates a new MalformedChallengeException with the specified detail message and cause.
- *
+ *
* @param message the exception detail message
* @param cause the <tt>Throwable</tt> that caused this exception, or <tt>null</tt>
* if the cause is unavailable, unknown, or not a <tt>Throwable</tt>
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/NTCredentials.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/NTCredentials.java?rev=937479&r1=937478&r2=937479&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/NTCredentials.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/NTCredentials.java Fri Apr 23 19:19:23 2010
@@ -34,10 +34,10 @@ import org.apache.http.annotation.Immuta
import org.apache.http.util.LangUtils;
-/**
- * {@link Credentials} implementation for Microsoft Windows platforms that includes
+/**
+ * {@link Credentials} implementation for Microsoft Windows platforms that includes
* Windows specific attributes such as name of the domain the user belongs to.
- *
+ *
* @since 4.0
*/
@Immutable
@@ -50,12 +50,12 @@ public class NTCredentials implements Cr
/** Password */
private final String password;
-
+
/** The host the authentication request is originating from. */
private final String workstation;
/**
- * The constructor with the fully qualified username and password combined
+ * The constructor with the fully qualified username and password combined
* string argument.
*
* @param usernamePassword the domain/username:password formed string
@@ -63,7 +63,7 @@ public class NTCredentials implements Cr
public NTCredentials(String usernamePassword) {
super();
if (usernamePassword == null) {
- throw new IllegalArgumentException("Username:password string may not be null");
+ throw new IllegalArgumentException("Username:password string may not be null");
}
String username;
int atColon = usernamePassword.indexOf(':');
@@ -92,13 +92,13 @@ public class NTCredentials implements Cr
* @param userName The user name. This should not include the domain to authenticate with.
* For example: "user" is correct whereas "DOMAIN\\user" is not.
* @param password The password.
- * @param workstation The workstation the authentication request is originating from.
+ * @param workstation The workstation the authentication request is originating from.
* Essentially, the computer name for this machine.
* @param domain The domain to authenticate within.
*/
public NTCredentials(
- final String userName,
- final String password,
+ final String userName,
+ final String password,
final String workstation,
final String domain) {
super();
@@ -117,11 +117,11 @@ public class NTCredentials implements Cr
public Principal getUserPrincipal() {
return this.principal;
}
-
+
public String getUserName() {
return this.principal.getUsername();
}
-
+
public String getPassword() {
return this.password;
}
@@ -143,7 +143,7 @@ public class NTCredentials implements Cr
public String getWorkstation() {
return this.workstation;
}
-
+
@Override
public int hashCode() {
int hash = LangUtils.HASH_SEED;
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/NTUserPrincipal.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/NTUserPrincipal.java?rev=937479&r1=937478&r2=937479&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/NTUserPrincipal.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/NTUserPrincipal.java Fri Apr 23 19:19:23 2010
@@ -34,16 +34,16 @@ import org.apache.http.annotation.Immuta
import org.apache.http.util.LangUtils;
-/**
+/**
* Microsoft Windows specific user principal implementation.
- *
+ *
* @since 4.0
*/
@Immutable
public class NTUserPrincipal implements Principal, Serializable {
private static final long serialVersionUID = -6870169797924406894L;
-
+
private final String username;
private final String domain;
private final String ntname;
@@ -75,7 +75,7 @@ public class NTUserPrincipal implements
public String getName() {
return this.ntname;
}
-
+
public String getDomain() {
return this.domain;
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/UsernamePasswordCredentials.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/UsernamePasswordCredentials.java?rev=937479&r1=937478&r2=937479&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/UsernamePasswordCredentials.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/UsernamePasswordCredentials.java Fri Apr 23 19:19:23 2010
@@ -34,7 +34,7 @@ import org.apache.http.annotation.Immuta
import org.apache.http.util.LangUtils;
/**
- * Simple {@link Credentials} implementation based on a user name / password
+ * Simple {@link Credentials} implementation based on a user name / password
* pair.
*
* @since 4.0
@@ -46,7 +46,7 @@ public class UsernamePasswordCredentials
private final BasicUserPrincipal principal;
private final String password;
-
+
/**
* The constructor with the username and password combined string argument.
*
@@ -56,7 +56,7 @@ public class UsernamePasswordCredentials
public UsernamePasswordCredentials(String usernamePassword) {
super();
if (usernamePassword == null) {
- throw new IllegalArgumentException("Username:password string may not be null");
+ throw new IllegalArgumentException("Username:password string may not be null");
}
int atColon = usernamePassword.indexOf(':');
if (atColon >= 0) {
@@ -78,7 +78,7 @@ public class UsernamePasswordCredentials
public UsernamePasswordCredentials(String userName, String password) {
super();
if (userName == null) {
- throw new IllegalArgumentException("Username may not be null");
+ throw new IllegalArgumentException("Username may not be null");
}
this.principal = new BasicUserPrincipal(userName);
this.password = password;
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/params/AuthPNames.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/params/AuthPNames.java?rev=937479&r1=937478&r2=937479&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/params/AuthPNames.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/params/AuthPNames.java Fri Apr 23 19:19:23 2010
@@ -31,39 +31,39 @@ import org.apache.http.auth.AuthScheme;
/**
* Parameter names for HTTP authentication classes.
- *
+ *
* @since 4.0
*/
public interface AuthPNames {
/**
- * Defines the charset to be used when encoding
+ * Defines the charset to be used when encoding
* {@link org.apache.http.auth.Credentials}.
* <p>
* This parameter expects a value of type {@link String}.
*/
- public static final String CREDENTIAL_CHARSET = "http.auth.credential-charset";
+ public static final String CREDENTIAL_CHARSET = "http.auth.credential-charset";
/**
- * Defines the order of preference for supported {@link AuthScheme}s when
- * authenticating with the target host.
+ * Defines the order of preference for supported {@link AuthScheme}s when
+ * authenticating with the target host.
* <p>
- * This parameter expects a value of type {@link java.util.Collection}. The
- * collection is expected to contain {@link String} instances representing
- * a name of an authentication scheme as returned by
- * {@link AuthScheme#getSchemeName()}.
+ * This parameter expects a value of type {@link java.util.Collection}. The
+ * collection is expected to contain {@link String} instances representing
+ * a name of an authentication scheme as returned by
+ * {@link AuthScheme#getSchemeName()}.
*/
- public static final String TARGET_AUTH_PREF = "http.auth.target-scheme-pref";
+ public static final String TARGET_AUTH_PREF = "http.auth.target-scheme-pref";
/**
- * Defines the order of preference for supported {@link AuthScheme}s when
- * authenticating with the proxy host.
+ * Defines the order of preference for supported {@link AuthScheme}s when
+ * authenticating with the proxy host.
* <p>
- * This parameter expects a value of type {@link java.util.Collection}. The
- * collection is expected to contain {@link String} instances representing
- * a name of an authentication scheme as returned by
- * {@link AuthScheme#getSchemeName()}.
+ * This parameter expects a value of type {@link java.util.Collection}. The
+ * collection is expected to contain {@link String} instances representing
+ * a name of an authentication scheme as returned by
+ * {@link AuthScheme#getSchemeName()}.
*/
- public static final String PROXY_AUTH_PREF = "http.auth.proxy-scheme-pref";
+ public static final String PROXY_AUTH_PREF = "http.auth.proxy-scheme-pref";
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/params/AuthParamBean.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/params/AuthParamBean.java?rev=937479&r1=937478&r2=937479&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/params/AuthParamBean.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/params/AuthParamBean.java Fri Apr 23 19:19:23 2010
@@ -31,8 +31,8 @@ import org.apache.http.params.HttpAbstra
import org.apache.http.params.HttpParams;
/**
- * This is a Java Bean class that can be used to wrap an instance of
- * {@link HttpParams} and manipulate HTTP authentication parameters
+ * This is a Java Bean class that can be used to wrap an instance of
+ * {@link HttpParams} and manipulate HTTP authentication parameters
* using Java Beans conventions.
*
* @since 4.0
@@ -46,5 +46,5 @@ public class AuthParamBean extends HttpA
public void setCredentialCharset (final String charset) {
AuthParams.setCredentialCharset(params, charset);
}
-
+
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/params/AuthParams.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/params/AuthParams.java?rev=937479&r1=937478&r2=937479&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/params/AuthParams.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/params/AuthParams.java Fri Apr 23 19:19:23 2010
@@ -33,9 +33,9 @@ import org.apache.http.params.HttpParams
import org.apache.http.protocol.HTTP;
/**
- * An adaptor for manipulating HTTP authentication parameters
+ * An adaptor for manipulating HTTP authentication parameters
* in {@link HttpParams}.
- *
+ *
* @since 4.0
*
* @see AuthPNames
@@ -48,10 +48,10 @@ public final class AuthParams {
}
/**
- * Obtains the charset for encoding
+ * Obtains the charset for encoding
* {@link org.apache.http.auth.Credentials}.If not configured,
* {@link HTTP#DEFAULT_PROTOCOL_CHARSET}is used instead.
- *
+ *
* @return The charset
*/
public static String getCredentialCharset(final HttpParams params) {
@@ -70,7 +70,7 @@ public final class AuthParams {
/**
* Sets the charset to be used when encoding
* {@link org.apache.http.auth.Credentials}.
- *
+ *
* @param charset The charset
*/
public static void setCredentialCharset(final HttpParams params, final String charset) {
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/AuthCache.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/AuthCache.java?rev=937479&r1=937478&r2=937479&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/AuthCache.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/AuthCache.java Fri Apr 23 19:19:23 2010
@@ -30,10 +30,10 @@ import org.apache.http.HttpHost;
import org.apache.http.auth.AuthScheme;
/**
- * Abstract {@link AuthScheme} cache. Initialized {@link AuthScheme} objects
- * from this cache can be used to preemptively authenticate against known
+ * Abstract {@link AuthScheme} cache. Initialized {@link AuthScheme} objects
+ * from this cache can be used to preemptively authenticate against known
* hosts.
- *
+ *
* @since 4.1
*/
public interface AuthCache {
@@ -45,5 +45,5 @@ public interface AuthCache {
void remove(HttpHost host);
void clear();
-
+
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/AuthenticationHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/AuthenticationHandler.java?rev=937479&r1=937478&r2=937479&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/AuthenticationHandler.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/AuthenticationHandler.java Fri Apr 23 19:19:23 2010
@@ -38,12 +38,12 @@ import org.apache.http.protocol.HttpCont
/**
/**
- * A handler for determining if an HTTP response represents an authentication
- * challenge that was sent back to the client as a result of authentication
+ * A handler for determining if an HTTP response represents an authentication
+ * challenge that was sent back to the client as a result of authentication
* failure.
* <p>
* Implementations of this interface must be thread-safe. Access to shared
- * data must be synchronized as methods of this interface may be executed
+ * data must be synchronized as methods of this interface may be executed
* from multiple threads.
*
* @since 4.0
@@ -51,8 +51,8 @@ import org.apache.http.protocol.HttpCont
public interface AuthenticationHandler {
/**
- * Determines if the given HTTP response response represents
- * an authentication challenge that was sent back as a result
+ * Determines if the given HTTP response response represents
+ * an authentication challenge that was sent back as a result
* of authentication failure
* @param response HTTP response.
* @param context HTTP context.
@@ -60,25 +60,25 @@ public interface AuthenticationHandler {
* <code>false</code> otherwise.
*/
boolean isAuthenticationRequested(
- HttpResponse response,
+ HttpResponse response,
HttpContext context);
/**
- * Extracts from the given HTTP response a collection of authentication
+ * Extracts from the given HTTP response a collection of authentication
* challenges, each of which represents an authentication scheme supported
- * by the authentication host.
- *
+ * by the authentication host.
+ *
* @param response HTTP response.
* @param context HTTP context.
- * @return a collection of challenges keyed by names of corresponding
- * authentication schemes.
- * @throws MalformedChallengeException if one of the authentication
+ * @return a collection of challenges keyed by names of corresponding
+ * authentication schemes.
+ * @throws MalformedChallengeException if one of the authentication
* challenges is not valid or malformed.
*/
Map<String, Header> getChallenges(
- HttpResponse response,
+ HttpResponse response,
HttpContext context) throws MalformedChallengeException;
-
+
/**
* Selects one authentication challenge out of all available and
* creates and generates {@link AuthScheme} instance capable of
@@ -91,8 +91,8 @@ public interface AuthenticationHandler {
* could not be selected.
*/
AuthScheme selectScheme(
- Map<String, Header> challenges,
- HttpResponse response,
+ Map<String, Header> challenges,
+ HttpResponse response,
HttpContext context) throws AuthenticationException;
-
+
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/CircularRedirectException.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/CircularRedirectException.java?rev=937479&r1=937478&r2=937479&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/CircularRedirectException.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/CircularRedirectException.java Fri Apr 23 19:19:23 2010
@@ -30,8 +30,8 @@ import org.apache.http.annotation.Immuta
/**
* Signals a circular redirect
- *
- *
+ *
+ *
* @since 4.0
*/
@Immutable
@@ -40,7 +40,7 @@ public class CircularRedirectException e
private static final long serialVersionUID = 6830063487001091803L;
/**
- * Creates a new CircularRedirectException with a <tt>null</tt> detail message.
+ * Creates a new CircularRedirectException with a <tt>null</tt> detail message.
*/
public CircularRedirectException() {
super();
@@ -48,7 +48,7 @@ public class CircularRedirectException e
/**
* Creates a new CircularRedirectException with the specified detail message.
- *
+ *
* @param message The exception detail message
*/
public CircularRedirectException(String message) {
@@ -57,7 +57,7 @@ public class CircularRedirectException e
/**
* Creates a new CircularRedirectException with the specified detail message and cause.
- *
+ *
* @param message the exception detail message
* @param cause the <tt>Throwable</tt> that caused this exception, or <tt>null</tt>
* if the cause is unavailable, unknown, or not a <tt>Throwable</tt>
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/ClientProtocolException.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/ClientProtocolException.java?rev=937479&r1=937478&r2=937479&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/ClientProtocolException.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/ClientProtocolException.java Fri Apr 23 19:19:23 2010
@@ -37,7 +37,7 @@ import org.apache.http.annotation.Immuta
*/
@Immutable
public class ClientProtocolException extends IOException {
-
+
private static final long serialVersionUID = -5596590843227115865L;
public ClientProtocolException() {
@@ -47,15 +47,15 @@ public class ClientProtocolException ext
public ClientProtocolException(String s) {
super(s);
}
-
+
public ClientProtocolException(Throwable cause) {
initCause(cause);
}
-
+
public ClientProtocolException(String message, Throwable cause) {
super(message);
initCause(cause);
}
-
+
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/CookieStore.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/CookieStore.java?rev=937479&r1=937478&r2=937479&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/CookieStore.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/CookieStore.java Fri Apr 23 19:19:23 2010
@@ -34,31 +34,31 @@ import org.apache.http.cookie.Cookie;
/**
* This interface represents an abstract store for {@link Cookie}
* objects.
- *
+ *
* @since 4.0
*/
public interface CookieStore {
/**
* Adds an {@link Cookie}, replacing any existing equivalent cookies.
- * If the given cookie has already expired it will not be added, but existing
+ * If the given cookie has already expired it will not be added, but existing
* values will still be removed.
- *
+ *
* @param cookie the {@link Cookie cookie} to be added
*/
void addCookie(Cookie cookie);
/**
* Returns all cookies contained in this store.
- *
+ *
* @return all cookies
*/
List<Cookie> getCookies();
/**
- * Removes all of {@link Cookie}s in this store that have expired by
- * the specified {@link java.util.Date}.
- *
+ * Removes all of {@link Cookie}s in this store that have expired by
+ * the specified {@link java.util.Date}.
+ *
* @return true if any cookies were purged.
*/
boolean clearExpired(Date date);
@@ -67,5 +67,5 @@ public interface CookieStore {
* Clears all cookies.
*/
void clear();
-
+
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/CredentialsProvider.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/CredentialsProvider.java?rev=937479&r1=937478&r2=937479&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/CredentialsProvider.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/CredentialsProvider.java Fri Apr 23 19:19:23 2010
@@ -30,25 +30,25 @@ import org.apache.http.auth.AuthScope;
import org.apache.http.auth.Credentials;
/**
- * Abstract credentials provider that maintains a collection of user
+ * Abstract credentials provider that maintains a collection of user
* credentials.
* <p>
* Implementations of this interface must be thread-safe. Access to shared
- * data must be synchronized as methods of this interface may be executed
+ * data must be synchronized as methods of this interface may be executed
* from multiple threads.
- *
+ *
* @since 4.0
*/
public interface CredentialsProvider {
- /**
- * Sets the {@link Credentials credentials} for the given authentication
+ /**
+ * Sets the {@link Credentials credentials} for the given authentication
* scope. Any previous credentials for the given scope will be overwritten.
- *
+ *
* @param authscope the {@link AuthScope authentication scope}
- * @param credentials the authentication {@link Credentials credentials}
+ * @param credentials the authentication {@link Credentials credentials}
* for the given scope.
- *
+ *
* @see #getCredentials(AuthScope)
*/
void setCredentials(AuthScope authscope, Credentials credentials);
@@ -57,8 +57,8 @@ public interface CredentialsProvider {
* Get the {@link Credentials credentials} for the given authentication scope.
*
* @param authscope the {@link AuthScope authentication scope}
- * @return the credentials
- *
+ * @return the credentials
+ *
* @see #setCredentials(AuthScope, Credentials)
*/
Credentials getCredentials(AuthScope authscope);
@@ -67,5 +67,5 @@ public interface CredentialsProvider {
* Clears all credentials.
*/
void clear();
-
+
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/HttpClient.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/HttpClient.java?rev=937479&r1=937478&r2=937479&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/HttpClient.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/HttpClient.java Fri Apr 23 19:19:23 2010
@@ -38,65 +38,65 @@ import org.apache.http.params.HttpParams
import org.apache.http.protocol.HttpContext;
/**
- * This interface represents only the most basic contract for HTTP request
- * execution. It imposes no restrictions or particular details on the request
- * execution process and leaves the specifics of state management,
- * authentication and redirect handling up to individual implementations.
- * This should make it easier to decorate the interface with additional
- * functionality such as response content caching.
+ * This interface represents only the most basic contract for HTTP request
+ * execution. It imposes no restrictions or particular details on the request
+ * execution process and leaves the specifics of state management,
+ * authentication and redirect handling up to individual implementations.
+ * This should make it easier to decorate the interface with additional
+ * functionality such as response content caching.
* <p/>
* The usual execution flow can be demonstrated by the code snippet below:
* <PRE>
* HttpClient httpclient = new DefaultHttpClient();
- *
+ *
* // Prepare a request object
- * HttpGet httpget = new HttpGet("http://www.apache.org/");
- *
+ * HttpGet httpget = new HttpGet("http://www.apache.org/");
+ *
* // Execute the request
* HttpResponse response = httpclient.execute(httpget);
- *
+ *
* // Examine the response status
* System.out.println(response.getStatusLine());
- *
+ *
* // Get hold of the response entity
* HttpEntity entity = response.getEntity();
- *
+ *
* // If the response does not enclose an entity, there is no need
* // to worry about connection release
* if (entity != null) {
* InputStream instream = entity.getContent();
* try {
- *
+ *
* BufferedReader reader = new BufferedReader(
* new InputStreamReader(instream));
* // do something useful with the response
* System.out.println(reader.readLine());
- *
+ *
* } catch (IOException ex) {
- *
+ *
* // In case of an IOException the connection will be released
* // back to the connection manager automatically
* throw ex;
- *
+ *
* } catch (RuntimeException ex) {
- *
+ *
* // In case of an unexpected exception you may want to abort
- * // the HTTP request in order to shut down the underlying
+ * // the HTTP request in order to shut down the underlying
* // connection and release it back to the connection manager.
* httpget.abort();
* throw ex;
- *
+ *
* } finally {
- *
+ *
* // Closing the input stream will trigger connection release
* instream.close();
- *
+ *
* }
- *
- * // When HttpClient instance is no longer needed,
+ *
+ * // When HttpClient instance is no longer needed,
* // shut down the connection manager to ensure
* // immediate deallocation of all system resources
- * httpclient.getConnectionManager().shutdown();
+ * httpclient.getConnectionManager().shutdown();
* }
* </PRE>
*
@@ -212,7 +212,7 @@ public interface HttpClient {
* @throws ClientProtocolException in case of an http protocol error
*/
<T> T execute(
- HttpUriRequest request,
+ HttpUriRequest request,
ResponseHandler<? extends T> responseHandler)
throws IOException, ClientProtocolException;
@@ -228,13 +228,13 @@ public interface HttpClient {
* @throws ClientProtocolException in case of an http protocol error
*/
<T> T execute(
- HttpUriRequest request,
+ HttpUriRequest request,
ResponseHandler<? extends T> responseHandler,
HttpContext context)
throws IOException, ClientProtocolException;
/**
- * Executes a request to the target using the default context and
+ * Executes a request to the target using the default context and
* processes the response using the given response handler.
*
* @param target the target host for the request.
@@ -249,13 +249,13 @@ public interface HttpClient {
* @throws ClientProtocolException in case of an http protocol error
*/
<T> T execute(
- HttpHost target,
+ HttpHost target,
HttpRequest request,
ResponseHandler<? extends T> responseHandler)
throws IOException, ClientProtocolException;
-
+
/**
- * Executes a request to the target using the given context and
+ * Executes a request to the target using the given context and
* processes the response using the given response handler.
*
* @param target the target host for the request.
@@ -272,10 +272,10 @@ public interface HttpClient {
* @throws ClientProtocolException in case of an http protocol error
*/
<T> T execute(
- HttpHost target,
+ HttpHost target,
HttpRequest request,
- ResponseHandler<? extends T> responseHandler,
+ ResponseHandler<? extends T> responseHandler,
HttpContext context)
throws IOException, ClientProtocolException;
-
+
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/HttpRequestRetryHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/HttpRequestRetryHandler.java?rev=937479&r1=937478&r2=937479&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/HttpRequestRetryHandler.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/HttpRequestRetryHandler.java Fri Apr 23 19:19:23 2010
@@ -32,11 +32,11 @@ import java.io.IOException;
import org.apache.http.protocol.HttpContext;
/**
- * A handler for determining if an HttpRequest should be retried after a
+ * A handler for determining if an HttpRequest should be retried after a
* recoverable exception during execution.
* <p>
* Implementations of this interface must be thread-safe. Access to shared
- * data must be synchronized as methods of this interface may be executed
+ * data must be synchronized as methods of this interface may be executed
* from multiple threads.
*
* @since 4.0
@@ -46,12 +46,12 @@ public interface HttpRequestRetryHandler
/**
* Determines if a method should be retried after an IOException
* occurs during execution.
- *
+ *
* @param exception the exception that occurred
- * @param executionCount the number of times this method has been
+ * @param executionCount the number of times this method has been
* unsuccessfully executed
* @param context the context for the request execution
- *
+ *
* @return <code>true</code> if the method should be retried, <code>false</code>
* otherwise
*/
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/HttpResponseException.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/HttpResponseException.java?rev=937479&r1=937478&r2=937479&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/HttpResponseException.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/HttpResponseException.java Fri Apr 23 19:19:23 2010
@@ -35,11 +35,11 @@ import org.apache.http.annotation.Immuta
*/
@Immutable
public class HttpResponseException extends ClientProtocolException {
-
+
private static final long serialVersionUID = -7186627969477257933L;
private final int statusCode;
-
+
public HttpResponseException(int statusCode, final String s) {
super(s);
this.statusCode = statusCode;
@@ -48,5 +48,5 @@ public class HttpResponseException exten
public int getStatusCode() {
return this.statusCode;
}
-
+
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/NonRepeatableRequestException.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/NonRepeatableRequestException.java?rev=937479&r1=937478&r2=937479&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/NonRepeatableRequestException.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/NonRepeatableRequestException.java Fri Apr 23 19:19:23 2010
@@ -31,10 +31,10 @@ import org.apache.http.annotation.Immuta
import org.apache.http.ProtocolException;
/**
- * Signals failure to retry the request due to non-repeatable request
+ * Signals failure to retry the request due to non-repeatable request
* entity.
- *
- *
+ *
+ *
* @since 4.0
*/
@Immutable
@@ -43,7 +43,7 @@ public class NonRepeatableRequestExcepti
private static final long serialVersionUID = 82685265288806048L;
/**
- * Creates a new NonRepeatableEntityException with a <tt>null</tt> detail message.
+ * Creates a new NonRepeatableEntityException with a <tt>null</tt> detail message.
*/
public NonRepeatableRequestException() {
super();
@@ -51,7 +51,7 @@ public class NonRepeatableRequestExcepti
/**
* Creates a new NonRepeatableEntityException with the specified detail message.
- *
+ *
* @param message The exception detail message
*/
public NonRepeatableRequestException(String message) {
@@ -60,14 +60,14 @@ public class NonRepeatableRequestExcepti
/**
* Creates a new NonRepeatableEntityException with the specified detail message.
- *
+ *
* @param message The exception detail message
* @param cause the cause
*/
public NonRepeatableRequestException(String message, Throwable cause) {
super(message, cause);
}
-
-
+
+
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/RedirectException.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/RedirectException.java?rev=937479&r1=937478&r2=937479&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/RedirectException.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/RedirectException.java Fri Apr 23 19:19:23 2010
@@ -32,8 +32,8 @@ import org.apache.http.ProtocolException
/**
* Signals violation of HTTP specification caused by an invalid redirect
- *
- *
+ *
+ *
* @since 4.0
*/
@Immutable
@@ -42,7 +42,7 @@ public class RedirectException extends P
private static final long serialVersionUID = 4418824536372559326L;
/**
- * Creates a new RedirectException with a <tt>null</tt> detail message.
+ * Creates a new RedirectException with a <tt>null</tt> detail message.
*/
public RedirectException() {
super();
@@ -50,7 +50,7 @@ public class RedirectException extends P
/**
* Creates a new RedirectException with the specified detail message.
- *
+ *
* @param message The exception detail message
*/
public RedirectException(String message) {
@@ -59,7 +59,7 @@ public class RedirectException extends P
/**
* Creates a new RedirectException with the specified detail message and cause.
- *
+ *
* @param message the exception detail message
* @param cause the <tt>Throwable</tt> that caused this exception, or <tt>null</tt>
* if the cause is unavailable, unknown, or not a <tt>Throwable</tt>
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/RedirectHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/RedirectHandler.java?rev=937479&r1=937478&r2=937479&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/RedirectHandler.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/RedirectHandler.java Fri Apr 23 19:19:23 2010
@@ -34,16 +34,16 @@ import org.apache.http.ProtocolException
import org.apache.http.protocol.HttpContext;
/**
- * A handler for determining if an HTTP request should be redirected to
+ * A handler for determining if an HTTP request should be redirected to
* a new location in response to an HTTP response received from the target
* server.
* <p>
* Implementations of this interface must be thread-safe. Access to shared
- * data must be synchronized as methods of this interface may be executed
+ * data must be synchronized as methods of this interface may be executed
* from multiple threads.
*
* @since 4.0
- *
+ *
* @deprecated use {@link RedirectStrategy}
*/
@Deprecated
@@ -52,24 +52,24 @@ public interface RedirectHandler {
/**
* Determines if a request should be redirected to a new location
* given the response from the target server.
- *
+ *
* @param response the response received from the target server
* @param context the context for the request execution
- *
+ *
* @return <code>true</code> if the request should be redirected, <code>false</code>
* otherwise
*/
boolean isRedirectRequested(HttpResponse response, HttpContext context);
-
+
/**
- * Determines the location request is expected to be redirected to
+ * Determines the location request is expected to be redirected to
* given the response from the target server and the current request
* execution context.
- *
+ *
* @param response the response received from the target server
* @param context the context for the request execution
- *
- * @return redirect URI
+ *
+ * @return redirect URI
*/
URI getLocationURI(HttpResponse response, HttpContext context)
throws ProtocolException;
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/RedirectStrategy.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/RedirectStrategy.java?rev=937479&r1=937478&r2=937479&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/RedirectStrategy.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/RedirectStrategy.java Fri Apr 23 19:19:23 2010
@@ -34,12 +34,12 @@ import org.apache.http.client.methods.Ht
import org.apache.http.protocol.HttpContext;
/**
- * A strategy for determining if an HTTP request should be redirected to
+ * A strategy for determining if an HTTP request should be redirected to
* a new location in response to an HTTP response received from the target
* server.
* <p>
* Implementations of this interface must be thread-safe. Access to shared
- * data must be synchronized as methods of this interface may be executed
+ * data must be synchronized as methods of this interface may be executed
* from multiple threads.
*
* @since 4.1
@@ -49,33 +49,33 @@ public interface RedirectStrategy {
/**
* Determines if a request should be redirected to a new location
* given the response from the target server.
- *
+ *
* @param request the executed request
* @param response the response received from the target server
* @param context the context for the request execution
- *
+ *
* @return <code>true</code> if the request should be redirected, <code>false</code>
* otherwise
*/
boolean isRedirected(
HttpRequest request,
- HttpResponse response,
+ HttpResponse response,
HttpContext context) throws ProtocolException;
-
+
/**
- * Determines the redirect location given the response from the target
- * server and the current request execution context and generates a new
+ * Determines the redirect location given the response from the target
+ * server and the current request execution context and generates a new
* request to be sent to the location.
- *
+ *
* @param request the executed request
* @param response the response received from the target server
* @param context the context for the request execution
- *
- * @return redirected request
+ *
+ * @return redirected request
*/
HttpUriRequest getRedirect(
HttpRequest request,
- HttpResponse response,
+ HttpResponse response,
HttpContext context) throws ProtocolException;
-
+
}
\ No newline at end of file
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/ResponseHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/ResponseHandler.java?rev=937479&r1=937478&r2=937479&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/ResponseHandler.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/ResponseHandler.java Fri Apr 23 19:19:23 2010
@@ -31,10 +31,10 @@ import java.io.IOException;
import org.apache.http.HttpResponse;
/**
- * Handler that encapsulates the process of generating a response object
+ * Handler that encapsulates the process of generating a response object
* from a {@link HttpResponse}.
- *
- *
+ *
+ *
* @since 4.0
*/
public interface ResponseHandler<T> {
@@ -42,13 +42,13 @@ public interface ResponseHandler<T> {
/**
* Processes an {@link HttpResponse} and returns some value
* corresponding to that response.
- *
+ *
* @param response The response to process
* @return A value determined by the response
- *
+ *
* @throws ClientProtocolException in case of an http protocol error
* @throws IOException in case of a problem or the connection was aborted
*/
T handleResponse(HttpResponse response) throws ClientProtocolException, IOException;
-
+
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/UserTokenHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/UserTokenHandler.java?rev=937479&r1=937478&r2=937479&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/UserTokenHandler.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/UserTokenHandler.java Fri Apr 23 19:19:23 2010
@@ -30,27 +30,27 @@ package org.apache.http.client;
import org.apache.http.protocol.HttpContext;
/**
- * A handler for determining if the given execution context is user specific
- * or not. The token object returned by this handler is expected to uniquely
- * identify the current user if the context is user specific or to be
- * <code>null</code> if the context does not contain any resources or details
+ * A handler for determining if the given execution context is user specific
+ * or not. The token object returned by this handler is expected to uniquely
+ * identify the current user if the context is user specific or to be
+ * <code>null</code> if the context does not contain any resources or details
* specific to the current user.
* <p/>
* The user token will be used to ensure that user specific resources will not
* be shared with or reused by other users.
- *
+ *
* @since 4.0
*/
public interface UserTokenHandler {
/**
- * The token object returned by this method is expected to uniquely
- * identify the current user if the context is user specific or to be
+ * The token object returned by this method is expected to uniquely
+ * identify the current user if the context is user specific or to be
* <code>null</code> if it is not.
- *
+ *
* @param context the execution context
- *
- * @return user token that uniquely identifies the user or
+ *
+ * @return user token that uniquely identifies the user or
* <code>null</null> if the context is not user specific.
*/
Object getUserToken(HttpContext context);
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/entity/DecompressingEntity.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/entity/DecompressingEntity.java?rev=937479&r1=937478&r2=937479&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/entity/DecompressingEntity.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/entity/DecompressingEntity.java Fri Apr 23 19:19:23 2010
@@ -34,7 +34,7 @@ import org.apache.http.entity.HttpEntity
/**
* Common base class for decompressing {@link HttpEntity} implementations.
- *
+ *
* @since 4.1
*/
abstract class DecompressingEntity extends HttpEntityWrapper {
@@ -46,7 +46,7 @@ abstract class DecompressingEntity exten
/**
* Creates a new {@link DecompressingEntity}.
- *
+ *
* @param wrapped
* the non-null {@link HttpEntity} to be wrapped
*/
@@ -64,9 +64,9 @@ abstract class DecompressingEntity exten
}
InputStream instream = getContent();
-
+
byte[] buffer = new byte[BUFFER_SIZE];
-
+
int l;
while ((l = instream.read(buffer)) != -1) {
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/entity/DeflateDecompressingEntity.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/entity/DeflateDecompressingEntity.java?rev=937479&r1=937478&r2=937479&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/entity/DeflateDecompressingEntity.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/entity/DeflateDecompressingEntity.java Fri Apr 23 19:19:23 2010
@@ -37,22 +37,22 @@ import org.apache.http.HttpEntity;
import org.apache.http.entity.HttpEntityWrapper;
/**
- * {@link HttpEntityWrapper} responsible for handling deflate Content Coded responses. In RFC2616
- * terms, <code>deflate</code> means a <code>zlib</code> stream as defined in RFC1950. Some server
- * implementations have misinterpreted RFC2616 to mean that a <code>deflate</code> stream as
- * defined in RFC1951 should be used (or maybe they did that since that's how IE behaves?). It's
- * confusing that <code>deflate</code> in HTTP 1.1 means <code>zlib</code> streams rather than
- * <code>deflate</code> streams. We handle both types in here, since that's what is seen on the
+ * {@link HttpEntityWrapper} responsible for handling deflate Content Coded responses. In RFC2616
+ * terms, <code>deflate</code> means a <code>zlib</code> stream as defined in RFC1950. Some server
+ * implementations have misinterpreted RFC2616 to mean that a <code>deflate</code> stream as
+ * defined in RFC1951 should be used (or maybe they did that since that's how IE behaves?). It's
+ * confusing that <code>deflate</code> in HTTP 1.1 means <code>zlib</code> streams rather than
+ * <code>deflate</code> streams. We handle both types in here, since that's what is seen on the
* internet. Moral - prefer <code>gzip</code>!
- *
+ *
* @see GzipDecompressingEntity
- *
+ *
* @since 4.1
*/
public class DeflateDecompressingEntity extends DecompressingEntity {
/**
- * Creates a new {@link DeflateDecompressingEntity} which will wrap the specified
+ * Creates a new {@link DeflateDecompressingEntity} which will wrap the specified
* {@link HttpEntity}.
*
* @param entity
@@ -80,17 +80,17 @@ public class DeflateDecompressingEntity
*
* * DICTID is four bytes, and only present if FLG.FDICT is set.
*
- * Sniff the content. Does it look like a zlib stream, with a CMF, etc? c.f. RFC1950,
+ * Sniff the content. Does it look like a zlib stream, with a CMF, etc? c.f. RFC1950,
* section 2.2. http://tools.ietf.org/html/rfc1950#page-4
*
- * We need to see if it looks like a proper zlib stream, or whether it is just a deflate
- * stream. RFC2616 calls zlib streams deflate. Confusing, isn't it? That's why some servers
+ * We need to see if it looks like a proper zlib stream, or whether it is just a deflate
+ * stream. RFC2616 calls zlib streams deflate. Confusing, isn't it? That's why some servers
* implement deflate Content-Encoding using deflate streams, rather than zlib streams.
*
- * We could start looking at the bytes, but to be honest, someone else has already read
- * the RFCs and implemented that for us. So we'll just use the JDK libraries and exception
- * handling to do this. If that proves slow, then we could potentially change this to check
- * the first byte - does it look like a CMF? What about the second byte - does it look like
+ * We could start looking at the bytes, but to be honest, someone else has already read
+ * the RFCs and implemented that for us. So we'll just use the JDK libraries and exception
+ * handling to do this. If that proves slow, then we could potentially change this to check
+ * the first byte - does it look like a CMF? What about the second byte - does it look like
* a FLG, etc.
*/
@@ -135,14 +135,14 @@ public class DeflateDecompressingEntity
}
/*
- * We read something without a problem, so it's a valid zlib stream. Just need to reset
+ * We read something without a problem, so it's a valid zlib stream. Just need to reset
* and return an unused InputStream now.
*/
pushback.unread(peeked, 0, headerLength);
return new InflaterInputStream(pushback);
} catch (DataFormatException e) {
- /* Presume that it's an RFC1951 deflate stream rather than RFC1950 zlib stream and try
+ /* Presume that it's an RFC1951 deflate stream rather than RFC1950 zlib stream and try
* again. */
pushback.unread(peeked, 0, headerLength);
return new InflaterInputStream(pushback, new Inflater(true));
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/entity/GzipDecompressingEntity.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/entity/GzipDecompressingEntity.java?rev=937479&r1=937478&r2=937479&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/entity/GzipDecompressingEntity.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/entity/GzipDecompressingEntity.java Fri Apr 23 19:19:23 2010
@@ -35,13 +35,13 @@ import org.apache.http.entity.HttpEntity
/**
* {@link HttpEntityWrapper} for handling gzip Content Coded responses.
- *
+ *
* @since 4.1
*/
public class GzipDecompressingEntity extends DecompressingEntity {
/**
- * Creates a new {@link GzipDecompressingEntity} which will wrap the specified
+ * Creates a new {@link GzipDecompressingEntity} which will wrap the specified
* {@link HttpEntity}.
*
* @param entity
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/entity/UrlEncodedFormEntity.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/entity/UrlEncodedFormEntity.java?rev=937479&r1=937478&r2=937479&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/entity/UrlEncodedFormEntity.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/entity/UrlEncodedFormEntity.java Fri Apr 23 19:19:23 2010
@@ -44,27 +44,27 @@ import org.apache.http.protocol.HTTP;
*/
@NotThreadSafe // AbstractHttpEntity is not thread-safe
public class UrlEncodedFormEntity extends StringEntity {
-
+
/**
* Constructs a new {@link UrlEncodedFormEntity} with the list
* of parameters in the specified encoding.
- *
+ *
* @param parameters list of name/value pairs
* @param encoding encoding the name/value pairs be encoded with
* @throws UnsupportedEncodingException if the encoding isn't supported
*/
public UrlEncodedFormEntity (
- final List <? extends NameValuePair> parameters,
+ final List <? extends NameValuePair> parameters,
final String encoding) throws UnsupportedEncodingException {
super(URLEncodedUtils.format(parameters, encoding), encoding);
- setContentType(URLEncodedUtils.CONTENT_TYPE + HTTP.CHARSET_PARAM +
+ setContentType(URLEncodedUtils.CONTENT_TYPE + HTTP.CHARSET_PARAM +
(encoding != null ? encoding : HTTP.DEFAULT_CONTENT_CHARSET));
}
/**
* Constructs a new {@link UrlEncodedFormEntity} with the list
* of parameters with the default encoding of {@link HTTP#DEFAULT_CONTENT_CHARSET}
- *
+ *
* @param parameters list of name/value pairs
* @throws UnsupportedEncodingException if the default encoding isn't supported
*/
@@ -72,5 +72,5 @@ public class UrlEncodedFormEntity extend
final List <? extends NameValuePair> parameters) throws UnsupportedEncodingException {
this(parameters, HTTP.DEFAULT_CONTENT_CHARSET);
}
-
+
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/methods/AbortableHttpRequest.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/methods/AbortableHttpRequest.java?rev=937479&r1=937478&r2=937479&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/methods/AbortableHttpRequest.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/methods/AbortableHttpRequest.java Fri Apr 23 19:19:23 2010
@@ -37,7 +37,7 @@ import org.apache.http.conn.ManagedClien
import org.apache.http.impl.conn.tsccm.ThreadSafeClientConnManager;
/**
- * Interface representing an HTTP request that can be aborted by shutting
+ * Interface representing an HTTP request that can be aborted by shutting
* down the underlying HTTP connection.
*
*
@@ -50,12 +50,12 @@ public interface AbortableHttpRequest {
* Sets the {@link ClientConnectionRequest} callback that can be
* used to abort a long-lived request for a connection.
* If the request is already aborted, throws an {@link IOException}.
- *
+ *
* @see ClientConnectionManager
* @see ThreadSafeClientConnManager
*/
void setConnectionRequest(ClientConnectionRequest connRequest) throws IOException;
-
+
/**
* Sets the {@link ConnectionReleaseTrigger} callback that can
* be used to abort an active connection.
@@ -69,7 +69,7 @@ public interface AbortableHttpRequest {
* return immediately. If the request has not started, it will abort after
* the next execution. Aborting this request will cause all subsequent
* executions with this request to fail.
- *
+ *
* @see HttpClient#execute(HttpUriRequest)
* @see HttpClient#execute(org.apache.http.HttpHost,
* org.apache.http.HttpRequest)
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/methods/HttpDelete.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/methods/HttpDelete.java?rev=937479&r1=937478&r2=937479&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/methods/HttpDelete.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/methods/HttpDelete.java Fri Apr 23 19:19:23 2010
@@ -51,7 +51,7 @@ public class HttpDelete extends HttpRequ
public final static String METHOD_NAME = "DELETE";
-
+
public HttpDelete() {
super();
}
@@ -62,7 +62,7 @@ public class HttpDelete extends HttpRequ
}
/**
- * @throws IllegalArgumentException if the uri is invalid.
+ * @throws IllegalArgumentException if the uri is invalid.
*/
public HttpDelete(final String uri) {
super();
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/methods/HttpEntityEnclosingRequestBase.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/methods/HttpEntityEnclosingRequestBase.java?rev=937479&r1=937478&r2=937479&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/methods/HttpEntityEnclosingRequestBase.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/methods/HttpEntityEnclosingRequestBase.java Fri Apr 23 19:19:23 2010
@@ -36,17 +36,17 @@ import org.apache.http.client.utils.Clon
import org.apache.http.protocol.HTTP;
/**
- * Basic implementation of an entity enclosing HTTP request
+ * Basic implementation of an entity enclosing HTTP request
* that can be modified
- *
+ *
* @since 4.0
*/
@NotThreadSafe // HttpRequestBase is @NotThreadSafe
-public abstract class HttpEntityEnclosingRequestBase
+public abstract class HttpEntityEnclosingRequestBase
extends HttpRequestBase implements HttpEntityEnclosingRequest {
-
+
private HttpEntity entity;
-
+
public HttpEntityEnclosingRequestBase() {
super();
}
@@ -58,7 +58,7 @@ public abstract class HttpEntityEnclosin
public void setEntity(final HttpEntity entity) {
this.entity = entity;
}
-
+
public boolean expectContinue() {
Header expect = getFirstHeader(HTTP.EXPECT_DIRECTIVE);
return expect != null && HTTP.EXPECT_CONTINUE.equalsIgnoreCase(expect.getValue());
@@ -66,7 +66,7 @@ public abstract class HttpEntityEnclosin
@Override
public Object clone() throws CloneNotSupportedException {
- HttpEntityEnclosingRequestBase clone =
+ HttpEntityEnclosingRequestBase clone =
(HttpEntityEnclosingRequestBase) super.clone();
if (this.entity != null) {
clone.entity = (HttpEntity) CloneUtils.clone(this.entity);
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/methods/HttpGet.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/methods/HttpGet.java?rev=937479&r1=937478&r2=937479&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/methods/HttpGet.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/methods/HttpGet.java Fri Apr 23 19:19:23 2010
@@ -44,14 +44,14 @@ import org.apache.http.annotation.NotThr
* process, unless that text happens to be the output of the process.
* </blockquote>
* </p>
- *
+ *
* @since 4.0
*/
@NotThreadSafe
public class HttpGet extends HttpRequestBase {
public final static String METHOD_NAME = "GET";
-
+
public HttpGet() {
super();
}
@@ -62,7 +62,7 @@ public class HttpGet extends HttpRequest
}
/**
- * @throws IllegalArgumentException if the uri is invalid.
+ * @throws IllegalArgumentException if the uri is invalid.
*/
public HttpGet(final String uri) {
super();
@@ -73,5 +73,5 @@ public class HttpGet extends HttpRequest
public String getMethod() {
return METHOD_NAME;
}
-
+
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/methods/HttpHead.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/methods/HttpHead.java?rev=937479&r1=937478&r2=937479&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/methods/HttpHead.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/methods/HttpHead.java Fri Apr 23 19:19:23 2010
@@ -34,7 +34,7 @@ import org.apache.http.annotation.NotThr
/**
* HTTP HEAD method.
* <p>
- * The HTTP HEAD method is defined in section 9.4 of
+ * The HTTP HEAD method is defined in section 9.4 of
* <a href="http://www.ietf.org/rfc/rfc2616.txt">RFC2616</a>:
* <blockquote>
* The HEAD method is identical to GET except that the server MUST NOT
@@ -54,7 +54,7 @@ import org.apache.http.annotation.NotThr
public class HttpHead extends HttpRequestBase {
public final static String METHOD_NAME = "HEAD";
-
+
public HttpHead() {
super();
}
@@ -65,7 +65,7 @@ public class HttpHead extends HttpReques
}
/**
- * @throws IllegalArgumentException if the uri is invalid.
+ * @throws IllegalArgumentException if the uri is invalid.
*/
public HttpHead(final String uri) {
super();
@@ -76,5 +76,5 @@ public class HttpHead extends HttpReques
public String getMethod() {
return METHOD_NAME;
}
-
+
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/methods/HttpOptions.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/methods/HttpOptions.java?rev=937479&r1=937478&r2=937479&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/methods/HttpOptions.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/methods/HttpOptions.java Fri Apr 23 19:19:23 2010
@@ -41,7 +41,7 @@ import org.apache.http.HttpResponse;
/**
* HTTP OPTIONS method.
* <p>
- * The HTTP OPTIONS method is defined in section 9.2 of
+ * The HTTP OPTIONS method is defined in section 9.2 of
* <a href="http://www.ietf.org/rfc/rfc2616.txt">RFC2616</a>:
* <blockquote>
* The OPTIONS method represents a request for information about the
@@ -52,14 +52,14 @@ import org.apache.http.HttpResponse;
* or initiating a resource retrieval.
* </blockquote>
* </p>
- *
+ *
* @since 4.0
*/
@NotThreadSafe
public class HttpOptions extends HttpRequestBase {
public final static String METHOD_NAME = "OPTIONS";
-
+
public HttpOptions() {
super();
}
@@ -70,7 +70,7 @@ public class HttpOptions extends HttpReq
}
/**
- * @throws IllegalArgumentException if the uri is invalid.
+ * @throws IllegalArgumentException if the uri is invalid.
*/
public HttpOptions(final String uri) {
super();
@@ -81,12 +81,12 @@ public class HttpOptions extends HttpReq
public String getMethod() {
return METHOD_NAME;
}
-
+
public Set<String> getAllowedMethods(final HttpResponse response) {
if (response == null) {
throw new IllegalArgumentException("HTTP response may not be null");
}
-
+
HeaderIterator it = response.headerIterator("Allow");
Set<String> methods = new HashSet<String>();
while (it.hasNext()) {
@@ -98,5 +98,5 @@ public class HttpOptions extends HttpReq
}
return methods;
}
-
+
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/methods/HttpPost.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/methods/HttpPost.java?rev=937479&r1=937478&r2=937479&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/methods/HttpPost.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/methods/HttpPost.java Fri Apr 23 19:19:23 2010
@@ -34,7 +34,7 @@ import org.apache.http.annotation.NotThr
/**
* HTTP POST method.
* <p>
- * The HTTP POST method is defined in section 9.5 of
+ * The HTTP POST method is defined in section 9.5 of
* <a href="http://www.ietf.org/rfc/rfc2616.txt">RFC2616</a>:
* <blockquote>
* The POST method is used to request that the origin server accept the entity
@@ -43,7 +43,7 @@ import org.apache.http.annotation.NotThr
* method to cover the following functions:
* <ul>
* <li>Annotation of existing resources</li>
- * <li>Posting a message to a bulletin board, newsgroup, mailing list, or
+ * <li>Posting a message to a bulletin board, newsgroup, mailing list, or
* similar group of articles</li>
* <li>Providing a block of data, such as the result of submitting a form,
* to a data-handling process</li>
@@ -58,18 +58,18 @@ import org.apache.http.annotation.NotThr
public class HttpPost extends HttpEntityEnclosingRequestBase {
public final static String METHOD_NAME = "POST";
-
+
public HttpPost() {
super();
}
-
+
public HttpPost(final URI uri) {
super();
setURI(uri);
}
-
+
/**
- * @throws IllegalArgumentException if the uri is invalid.
+ * @throws IllegalArgumentException if the uri is invalid.
*/
public HttpPost(final String uri) {
super();
@@ -80,5 +80,5 @@ public class HttpPost extends HttpEntity
public String getMethod() {
return METHOD_NAME;
}
-
+
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/methods/HttpPut.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/methods/HttpPut.java?rev=937479&r1=937478&r2=937479&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/methods/HttpPut.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/methods/HttpPut.java Fri Apr 23 19:19:23 2010
@@ -34,13 +34,13 @@ import org.apache.http.annotation.NotThr
/**
* HTTP PUT method.
* <p>
- * The HTTP PUT method is defined in section 9.6 of
+ * The HTTP PUT method is defined in section 9.6 of
* <a href="http://www.ietf.org/rfc/rfc2616.txt">RFC2616</a>:
* <blockquote>
* The PUT method requests that the enclosed entity be stored under the
* supplied Request-URI. If the Request-URI refers to an already
* existing resource, the enclosed entity SHOULD be considered as a
- * modified version of the one residing on the origin server.
+ * modified version of the one residing on the origin server.
* </blockquote>
* </p>
*
@@ -50,18 +50,18 @@ import org.apache.http.annotation.NotThr
public class HttpPut extends HttpEntityEnclosingRequestBase {
public final static String METHOD_NAME = "PUT";
-
+
public HttpPut() {
super();
}
-
+
public HttpPut(final URI uri) {
super();
setURI(uri);
}
/**
- * @throws IllegalArgumentException if the uri is invalid.
+ * @throws IllegalArgumentException if the uri is invalid.
*/
public HttpPut(final String uri) {
super();
@@ -72,5 +72,5 @@ public class HttpPut extends HttpEntityE
public String getMethod() {
return METHOD_NAME;
}
-
+
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/methods/HttpRequestBase.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/methods/HttpRequestBase.java?rev=937479&r1=937478&r2=937479&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/methods/HttpRequestBase.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/methods/HttpRequestBase.java Fri Apr 23 19:19:23 2010
@@ -52,17 +52,17 @@ import org.apache.http.params.HttpProtoc
* @since 4.0
*/
@NotThreadSafe
-public abstract class HttpRequestBase extends AbstractHttpMessage
+public abstract class HttpRequestBase extends AbstractHttpMessage
implements HttpUriRequest, AbortableHttpRequest, Cloneable {
private Lock abortLock;
private boolean aborted;
-
+
private URI uri;
private ClientConnectionRequest connRequest;
private ConnectionReleaseTrigger releaseTrigger;
-
+
public HttpRequestBase() {
super();
this.abortLock = new ReentrantLock();
@@ -75,15 +75,15 @@ public abstract class HttpRequestBase ex
}
/**
- * Returns the original request URI.
+ * Returns the original request URI.
* <p>
- * Please note URI remains unchanged in the course of request execution and
+ * Please note URI remains unchanged in the course of request execution and
* is not updated if the request is redirected to another location.
*/
public URI getURI() {
return this.uri;
}
-
+
public RequestLine getRequestLine() {
String method = getMethod();
ProtocolVersion ver = getProtocolVersion();
@@ -109,7 +109,7 @@ public abstract class HttpRequestBase ex
if (this.aborted) {
throw new IOException("Request already aborted");
}
-
+
this.releaseTrigger = null;
this.connRequest = connRequest;
} finally {
@@ -124,30 +124,30 @@ public abstract class HttpRequestBase ex
if (this.aborted) {
throw new IOException("Request already aborted");
}
-
+
this.connRequest = null;
this.releaseTrigger = releaseTrigger;
} finally {
this.abortLock.unlock();
}
}
-
+
public void abort() {
ClientConnectionRequest localRequest;
ConnectionReleaseTrigger localTrigger;
-
+
this.abortLock.lock();
try {
if (this.aborted) {
return;
- }
+ }
this.aborted = true;
-
+
localRequest = connRequest;
localTrigger = releaseTrigger;
} finally {
this.abortLock.unlock();
- }
+ }
// Trigger the callbacks outside of the lock, to prevent
// deadlocks in the scenario where the callbacks have
@@ -164,7 +164,7 @@ public abstract class HttpRequestBase ex
}
}
}
-
+
public boolean isAborted() {
return this.aborted;
}
@@ -180,5 +180,5 @@ public abstract class HttpRequestBase ex
clone.params = (HttpParams) CloneUtils.clone(this.params);
return clone;
}
-
+
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/methods/HttpTrace.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/methods/HttpTrace.java?rev=937479&r1=937478&r2=937479&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/methods/HttpTrace.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/methods/HttpTrace.java Fri Apr 23 19:19:23 2010
@@ -34,7 +34,7 @@ import org.apache.http.annotation.NotThr
/**
* HTTP TRACE method.
* <p>
- * The HTTP TRACE method is defined in section 9.6 of
+ * The HTTP TRACE method is defined in section 9.6 of
* <a href="http://www.ietf.org/rfc/rfc2616.txt">RFC2616</a>:
* <blockquote>
* The TRACE method is used to invoke a remote, application-layer loop-
@@ -46,14 +46,14 @@ import org.apache.http.annotation.NotThr
* MUST NOT include an entity.
* </blockquote>
* </p>
- *
+ *
* @since 4.0
*/
@NotThreadSafe
public class HttpTrace extends HttpRequestBase {
public final static String METHOD_NAME = "TRACE";
-
+
public HttpTrace() {
super();
}
@@ -62,9 +62,9 @@ public class HttpTrace extends HttpReque
super();
setURI(uri);
}
-
+
/**
- * @throws IllegalArgumentException if the uri is invalid.
+ * @throws IllegalArgumentException if the uri is invalid.
*/
public HttpTrace(final String uri) {
super();
@@ -75,5 +75,5 @@ public class HttpTrace extends HttpReque
public String getMethod() {
return METHOD_NAME;
}
-
+
}