You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by se...@apache.org on 2009/03/18 04:37:11 UTC
svn commit: r755466 - in
/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http:
client/ client/params/ client/protocol/ client/utils/ conn/ conn/routing/
conn/scheme/ conn/ssl/ conn/util/ cookie/ impl/auth/ impl/client/
impl/conn/ i...
Author: sebb
Date: Wed Mar 18 03:37:07 2009
New Revision: 755466
URL: http://svn.apache.org/viewvc?rev=755466&view=rev
Log:
Add JCIP annotations
Modified:
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/CircularRedirectException.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/ClientProtocolException.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/HttpResponseException.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/NonRepeatableRequestException.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/RedirectException.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/params/AuthPolicy.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/params/CookiePolicy.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/params/HttpClientParams.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/RequestAddCookies.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/RequestDefaultHeaders.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/RequestProxyAuthentication.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/RequestTargetAuthentication.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/ResponseProcessCookies.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/CloneUtils.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/JdkIdn.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/Rfc3492Idn.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/URIUtils.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/URLEncodedUtils.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ConnectTimeoutException.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ConnectionPoolTimeoutException.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/HttpHostConnectException.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/MultihomePlainSocketFactory.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/routing/HttpRoute.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/PlainSocketFactory.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/Scheme.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/SchemeRegistry.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/AbstractVerifier.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/AllowAllHostnameVerifier.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/BrowserCompatHostnameVerifier.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/StrictHostnameVerifier.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/util/InetAddressUtils.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/cookie/CookieIdentityComparator.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/cookie/CookieOrigin.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/cookie/CookiePathComparator.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/cookie/CookieSpecRegistry.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/cookie/MalformedCookieException.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/BasicSchemeFactory.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/DigestSchemeFactory.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/NTLMEngineException.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/UnsupportedDigestAlgorithmException.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/BasicCookieStore.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/BasicCredentialsProvider.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/BasicResponseHandler.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultConnectionKeepAliveStrategy.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultHttpRequestRetryHandler.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultRedirectHandler.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultUserTokenHandler.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/TunnelRefusedException.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/Wire.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/AbstractCookieAttributeHandler.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BasicCommentHandler.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BasicDomainHandler.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BasicExpiresHandler.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BasicMaxAgeHandler.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BasicPathHandler.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BasicSecureHandler.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BestMatchSpecFactory.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BrowserCompatSpecFactory.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/DateParseException.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/NetscapeDomainHandler.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/NetscapeDraftHeaderParser.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/NetscapeDraftSpec.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/NetscapeDraftSpecFactory.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/PublicSuffixListParser.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2109DomainHandler.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2109SpecFactory.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2109VersionHandler.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2965CommentUrlAttributeHandler.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2965DiscardAttributeHandler.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2965DomainAttributeHandler.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2965PortAttributeHandler.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2965SpecFactory.java
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=755466&r1=755465&r2=755466&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 Wed Mar 18 03:37:07 2009
@@ -30,12 +30,15 @@
package org.apache.http.client;
+import net.jcip.annotations.Immutable;
+
/**
* Signals a circular redirect
*
*
* @since 4.0
*/
+@Immutable
public class CircularRedirectException extends RedirectException {
private static final long serialVersionUID = 6830063487001091803L;
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=755466&r1=755465&r2=755466&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 Wed Mar 18 03:37:07 2009
@@ -32,11 +32,14 @@
import java.io.IOException;
+import net.jcip.annotations.Immutable;
+
/**
* Signals an error in the HTTP protocol.
*
* @since 4.0
*/
+@Immutable
public class ClientProtocolException extends IOException {
private static final long serialVersionUID = -5596590843227115865L;
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=755466&r1=755465&r2=755466&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 Wed Mar 18 03:37:07 2009
@@ -30,11 +30,14 @@
package org.apache.http.client;
+import net.jcip.annotations.Immutable;
+
/**
* Signals a non 2xx HTTP response.
*
* @since 4.0
*/
+@Immutable
public class HttpResponseException extends ClientProtocolException {
private static final long serialVersionUID = -7186627969477257933L;
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=755466&r1=755465&r2=755466&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 Wed Mar 18 03:37:07 2009
@@ -30,6 +30,8 @@
package org.apache.http.client;
+import net.jcip.annotations.Immutable;
+
import org.apache.http.ProtocolException;
/**
@@ -39,6 +41,7 @@
*
* @since 4.0
*/
+@Immutable
public class NonRepeatableRequestException extends ProtocolException {
private static final long serialVersionUID = 82685265288806048L;
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=755466&r1=755465&r2=755466&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 Wed Mar 18 03:37:07 2009
@@ -30,6 +30,8 @@
package org.apache.http.client;
+import net.jcip.annotations.Immutable;
+
import org.apache.http.ProtocolException;
/**
@@ -38,6 +40,7 @@
*
* @since 4.0
*/
+@Immutable
public class RedirectException extends ProtocolException {
private static final long serialVersionUID = 4418824536372559326L;
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/params/AuthPolicy.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/params/AuthPolicy.java?rev=755466&r1=755465&r2=755466&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/params/AuthPolicy.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/params/AuthPolicy.java Wed Mar 18 03:37:07 2009
@@ -31,10 +31,13 @@
package org.apache.http.client.params;
+import net.jcip.annotations.Immutable;
+
/**
*
* @since 4.0
*/
+@Immutable
public final class AuthPolicy {
private AuthPolicy() {
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/params/CookiePolicy.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/params/CookiePolicy.java?rev=755466&r1=755465&r2=755466&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/params/CookiePolicy.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/params/CookiePolicy.java Wed Mar 18 03:37:07 2009
@@ -31,10 +31,13 @@
package org.apache.http.client.params;
+import net.jcip.annotations.Immutable;
+
/**
*
* @since 4.0
*/
+@Immutable
public final class CookiePolicy {
/**
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/params/HttpClientParams.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/params/HttpClientParams.java?rev=755466&r1=755465&r2=755466&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/params/HttpClientParams.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/params/HttpClientParams.java Wed Mar 18 03:37:07 2009
@@ -30,6 +30,8 @@
package org.apache.http.client.params;
+import net.jcip.annotations.Immutable;
+
import org.apache.http.params.HttpParams;
/**
@@ -40,6 +42,7 @@
*
* @since 4.0
*/
+@Immutable
public class HttpClientParams {
private HttpClientParams() {
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/RequestAddCookies.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/RequestAddCookies.java?rev=755466&r1=755465&r2=755466&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/RequestAddCookies.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/RequestAddCookies.java Wed Mar 18 03:37:07 2009
@@ -37,6 +37,8 @@
import java.util.ArrayList;
import java.util.List;
+import net.jcip.annotations.Immutable;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.http.Header;
@@ -67,6 +69,7 @@
*
* @since 4.0
*/
+@Immutable
public class RequestAddCookies implements HttpRequestInterceptor {
private final Log log = LogFactory.getLog(getClass());
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/RequestDefaultHeaders.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/RequestDefaultHeaders.java?rev=755466&r1=755465&r2=755466&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/RequestDefaultHeaders.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/RequestDefaultHeaders.java Wed Mar 18 03:37:07 2009
@@ -34,6 +34,8 @@
import java.io.IOException;
import java.util.Collection;
+import net.jcip.annotations.Immutable;
+
import org.apache.http.Header;
import org.apache.http.HttpException;
import org.apache.http.HttpRequest;
@@ -49,6 +51,7 @@
*
* @since 4.0
*/
+@Immutable
public class RequestDefaultHeaders implements HttpRequestInterceptor {
public RequestDefaultHeaders() {
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/RequestProxyAuthentication.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/RequestProxyAuthentication.java?rev=755466&r1=755465&r2=755466&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/RequestProxyAuthentication.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/RequestProxyAuthentication.java Wed Mar 18 03:37:07 2009
@@ -33,6 +33,8 @@
import java.io.IOException;
+import net.jcip.annotations.Immutable;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.http.HttpException;
@@ -51,6 +53,7 @@
*
* @since 4.0
*/
+@Immutable
public class RequestProxyAuthentication implements HttpRequestInterceptor {
private final Log log = LogFactory.getLog(getClass());
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/RequestTargetAuthentication.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/RequestTargetAuthentication.java?rev=755466&r1=755465&r2=755466&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/RequestTargetAuthentication.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/RequestTargetAuthentication.java Wed Mar 18 03:37:07 2009
@@ -33,6 +33,8 @@
import java.io.IOException;
+import net.jcip.annotations.Immutable;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.http.HttpException;
@@ -51,6 +53,7 @@
*
* @since 4.0
*/
+@Immutable
public class RequestTargetAuthentication implements HttpRequestInterceptor {
private final Log log = LogFactory.getLog(getClass());
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/ResponseProcessCookies.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/ResponseProcessCookies.java?rev=755466&r1=755465&r2=755466&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/ResponseProcessCookies.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/ResponseProcessCookies.java Wed Mar 18 03:37:07 2009
@@ -34,6 +34,8 @@
import java.io.IOException;
import java.util.List;
+import net.jcip.annotations.Immutable;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.http.Header;
@@ -58,6 +60,7 @@
*
* @since 4.0
*/
+@Immutable
public class ResponseProcessCookies implements HttpResponseInterceptor {
private final Log log = LogFactory.getLog(getClass());
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/CloneUtils.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/CloneUtils.java?rev=755466&r1=755465&r2=755466&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/CloneUtils.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/CloneUtils.java Wed Mar 18 03:37:07 2009
@@ -32,12 +32,14 @@
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
+import net.jcip.annotations.Immutable;
/**
* A collection of utilities to workaround limitations of Java clone framework.
*
* @since 4.0
*/
+@Immutable
public class CloneUtils {
public static Object clone(final Object obj) throws CloneNotSupportedException {
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/JdkIdn.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/JdkIdn.java?rev=755466&r1=755465&r2=755466&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/JdkIdn.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/JdkIdn.java Wed Mar 18 03:37:07 2009
@@ -33,13 +33,16 @@
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
+import net.jcip.annotations.Immutable;
+
/**
* Uses the java.net.IDN class through reflection.
*
* @since 4.0
*/
+@Immutable
public class JdkIdn implements Idn {
- private Method toUnicode;
+ private final Method toUnicode;
/**
*
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/Rfc3492Idn.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/Rfc3492Idn.java?rev=755466&r1=755465&r2=755466&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/Rfc3492Idn.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/Rfc3492Idn.java Wed Mar 18 03:37:07 2009
@@ -32,11 +32,14 @@
import java.util.StringTokenizer;
+import net.jcip.annotations.Immutable;
+
/**
* Implementation from pseudo code in RFC 3492.
*
* @since 4.0
*/
+@Immutable
public class Rfc3492Idn implements Idn {
private static final int base = 36;
private static final int tmin = 1;
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/URIUtils.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/URIUtils.java?rev=755466&r1=755465&r2=755466&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/URIUtils.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/URIUtils.java Wed Mar 18 03:37:07 2009
@@ -33,6 +33,8 @@
import java.net.URI;
import java.net.URISyntaxException;
+import net.jcip.annotations.Immutable;
+
import org.apache.http.HttpHost;
/**
@@ -41,6 +43,7 @@
*
* @since 4.0
*/
+@Immutable
public class URIUtils {
/**
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/URLEncodedUtils.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/URLEncodedUtils.java?rev=755466&r1=755465&r2=755466&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/URLEncodedUtils.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/URLEncodedUtils.java Wed Mar 18 03:37:07 2009
@@ -39,6 +39,9 @@
import java.util.Collections;
import java.util.List;
import java.util.Scanner;
+
+import net.jcip.annotations.Immutable;
+
import org.apache.http.Header;
import org.apache.http.HttpEntity;
import org.apache.http.NameValuePair;
@@ -51,6 +54,7 @@
*
* @since 4.0
*/
+@Immutable
public class URLEncodedUtils {
public static final String CONTENT_TYPE = "application/x-www-form-urlencoded";
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ConnectTimeoutException.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ConnectTimeoutException.java?rev=755466&r1=755465&r2=755466&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ConnectTimeoutException.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ConnectTimeoutException.java Wed Mar 18 03:37:07 2009
@@ -33,6 +33,8 @@
import java.io.InterruptedIOException;
+import net.jcip.annotations.Immutable;
+
/**
* A timeout while connecting to an HTTP server or waiting for an
* available connection from an HttpConnectionManager.
@@ -40,6 +42,7 @@
*
* @since 4.0
*/
+@Immutable
public class ConnectTimeoutException extends InterruptedIOException {
private static final long serialVersionUID = -4816682903149535989L;
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ConnectionPoolTimeoutException.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ConnectionPoolTimeoutException.java?rev=755466&r1=755465&r2=755466&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ConnectionPoolTimeoutException.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ConnectionPoolTimeoutException.java Wed Mar 18 03:37:07 2009
@@ -31,6 +31,8 @@
package org.apache.http.conn;
+import net.jcip.annotations.Immutable;
+
/**
* A timeout while waiting for an available connection
* from a connection manager.
@@ -38,6 +40,7 @@
*
* @since 4.0
*/
+@Immutable
public class ConnectionPoolTimeoutException extends ConnectTimeoutException {
private static final long serialVersionUID = -7898874842020245128L;
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/HttpHostConnectException.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/HttpHostConnectException.java?rev=755466&r1=755465&r2=755466&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/HttpHostConnectException.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/HttpHostConnectException.java Wed Mar 18 03:37:07 2009
@@ -32,6 +32,8 @@
import java.net.ConnectException;
+import net.jcip.annotations.Immutable;
+
import org.apache.http.HttpHost;
/**
@@ -40,6 +42,7 @@
*
* @since 4.0
*/
+@Immutable
public class HttpHostConnectException extends ConnectException {
private static final long serialVersionUID = -3194482710275220224L;
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/MultihomePlainSocketFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/MultihomePlainSocketFactory.java?rev=755466&r1=755465&r2=755466&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/MultihomePlainSocketFactory.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/MultihomePlainSocketFactory.java Wed Mar 18 03:37:07 2009
@@ -41,6 +41,8 @@
import java.util.List;
import java.util.Arrays;
+import net.jcip.annotations.Immutable;
+
import org.apache.http.conn.scheme.SocketFactory;
import org.apache.http.params.HttpConnectionParams;
import org.apache.http.params.HttpParams;
@@ -54,6 +56,7 @@
*
* @since 4.0
*/
+@Immutable
public final class MultihomePlainSocketFactory implements SocketFactory {
/**
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/routing/HttpRoute.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/routing/HttpRoute.java?rev=755466&r1=755465&r2=755466&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/routing/HttpRoute.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/routing/HttpRoute.java Wed Mar 18 03:37:07 2009
@@ -33,6 +33,8 @@
import java.net.InetAddress;
+import net.jcip.annotations.Immutable;
+
import org.apache.http.HttpHost;
/**
@@ -47,6 +49,7 @@
*
* @since 4.0
*/
+@Immutable
public final class HttpRoute implements RouteInfo, Cloneable {
private static final HttpHost[] EMPTY_HTTP_HOST_ARRAY = new HttpHost[]{};
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/PlainSocketFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/PlainSocketFactory.java?rev=755466&r1=755465&r2=755466&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/PlainSocketFactory.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/PlainSocketFactory.java Wed Mar 18 03:37:07 2009
@@ -37,6 +37,8 @@
import java.net.Socket;
import java.net.SocketTimeoutException;
+import net.jcip.annotations.Immutable;
+
import org.apache.http.conn.ConnectTimeoutException;
import org.apache.http.params.HttpConnectionParams;
import org.apache.http.params.HttpParams;
@@ -47,6 +49,7 @@
*
* @since 4.0
*/
+@Immutable
public final class PlainSocketFactory implements SocketFactory {
/**
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/Scheme.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/Scheme.java?rev=755466&r1=755465&r2=755466&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/Scheme.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/Scheme.java Wed Mar 18 03:37:07 2009
@@ -32,6 +32,8 @@
import java.util.Locale;
+import net.jcip.annotations.Immutable;
+
import org.apache.http.util.LangUtils;
/**
@@ -52,6 +54,7 @@
*
* @since 4.0
*/
+@Immutable
public final class Scheme {
/** The name of this scheme, in lowercase. (e.g. http, https) */
@@ -69,6 +72,11 @@
/** A string representation, for {@link #toString toString}. */
private String stringRep;
+ /*
+ * This is used to cache the result of the toString() method
+ * Since the method always generates the same value, there's no
+ * need to synchronize.
+ */
/**
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/SchemeRegistry.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/SchemeRegistry.java?rev=755466&r1=755465&r2=755466&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/SchemeRegistry.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/SchemeRegistry.java Wed Mar 18 03:37:07 2009
@@ -35,6 +35,9 @@
import java.util.List;
import java.util.Map;
+import net.jcip.annotations.GuardedBy;
+import net.jcip.annotations.ThreadSafe;
+
import org.apache.http.HttpHost;
/**
@@ -48,9 +51,11 @@
*
* @since 4.0
*/
+@ThreadSafe
public final class SchemeRegistry {
/** The available schemes in this registry. */
+ @GuardedBy("this")
private final Map<String,Scheme> registeredSchemes;
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/AbstractVerifier.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/AbstractVerifier.java?rev=755466&r1=755465&r2=755466&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/AbstractVerifier.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/AbstractVerifier.java Wed Mar 18 03:37:07 2009
@@ -31,6 +31,8 @@
package org.apache.http.conn.ssl;
+import net.jcip.annotations.Immutable;
+
import org.apache.http.conn.util.InetAddressUtils;
import java.io.IOException;
@@ -59,6 +61,7 @@
*
* @since 4.0
*/
+@Immutable
public abstract class AbstractVerifier implements X509HostnameVerifier {
/**
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/AllowAllHostnameVerifier.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/AllowAllHostnameVerifier.java?rev=755466&r1=755465&r2=755466&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/AllowAllHostnameVerifier.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/AllowAllHostnameVerifier.java Wed Mar 18 03:37:07 2009
@@ -31,6 +31,8 @@
package org.apache.http.conn.ssl;
+import net.jcip.annotations.Immutable;
+
/**
* The ALLOW_ALL HostnameVerifier essentially turns hostname verification
* off. This implementation is a no-op, and never throws the SSLException.
@@ -38,6 +40,7 @@
*
* @since 4.0
*/
+@Immutable
public class AllowAllHostnameVerifier extends AbstractVerifier {
public final void verify(
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/BrowserCompatHostnameVerifier.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/BrowserCompatHostnameVerifier.java?rev=755466&r1=755465&r2=755466&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/BrowserCompatHostnameVerifier.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/BrowserCompatHostnameVerifier.java Wed Mar 18 03:37:07 2009
@@ -33,6 +33,8 @@
import javax.net.ssl.SSLException;
+import net.jcip.annotations.Immutable;
+
/**
* The HostnameVerifier that works the same way as Curl and Firefox.
* <p/>
@@ -46,6 +48,7 @@
*
* @since 4.0
*/
+@Immutable
public class BrowserCompatHostnameVerifier extends AbstractVerifier {
public final void verify(
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/StrictHostnameVerifier.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/StrictHostnameVerifier.java?rev=755466&r1=755465&r2=755466&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/StrictHostnameVerifier.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/StrictHostnameVerifier.java Wed Mar 18 03:37:07 2009
@@ -33,6 +33,8 @@
import javax.net.ssl.SSLException;
+import net.jcip.annotations.Immutable;
+
/**
* The Strict HostnameVerifier works the same way as Sun Java 1.4, Sun
* Java 5, Sun Java 6-rc. It's also pretty close to IE6. This
@@ -53,6 +55,7 @@
*
* @since 4.0
*/
+@Immutable
public class StrictHostnameVerifier extends AbstractVerifier {
public final void verify(
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/util/InetAddressUtils.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/util/InetAddressUtils.java?rev=755466&r1=755465&r2=755466&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/util/InetAddressUtils.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/util/InetAddressUtils.java Wed Mar 18 03:37:07 2009
@@ -33,11 +33,14 @@
import java.util.regex.Pattern;
+import net.jcip.annotations.Immutable;
+
/**
* A collection of utilities relating to InetAddresses.
*
* @since 4.0
*/
+@Immutable
public class InetAddressUtils {
private InetAddressUtils() {
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/cookie/CookieIdentityComparator.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/cookie/CookieIdentityComparator.java?rev=755466&r1=755465&r2=755466&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/cookie/CookieIdentityComparator.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/cookie/CookieIdentityComparator.java Wed Mar 18 03:37:07 2009
@@ -34,6 +34,8 @@
import java.io.Serializable;
import java.util.Comparator;
+import net.jcip.annotations.Immutable;
+
/**
* This cookie comparator can be used to compare identity of cookies.
*
@@ -45,6 +47,7 @@
*
* @since 4.0
*/
+@Immutable
public class CookieIdentityComparator implements Serializable, Comparator<Cookie> {
private static final long serialVersionUID = 4466565437490631532L;
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/cookie/CookieOrigin.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/cookie/CookieOrigin.java?rev=755466&r1=755465&r2=755466&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/cookie/CookieOrigin.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/cookie/CookieOrigin.java Wed Mar 18 03:37:07 2009
@@ -32,6 +32,8 @@
import java.util.Locale;
+import net.jcip.annotations.Immutable;
+
/**
* CookieOrigin class incapsulates details of an origin server that
* are relevant when parsing, validating or matching HTTP cookies.
@@ -39,6 +41,7 @@
*
* @since 4.0
*/
+@Immutable
public final class CookieOrigin {
private final String host;
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/cookie/CookiePathComparator.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/cookie/CookiePathComparator.java?rev=755466&r1=755465&r2=755466&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/cookie/CookiePathComparator.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/cookie/CookiePathComparator.java Wed Mar 18 03:37:07 2009
@@ -34,6 +34,8 @@
import java.io.Serializable;
import java.util.Comparator;
+import net.jcip.annotations.Immutable;
+
/**
* This cookie comparator ensures that multiple cookies satisfying
* a common criteria are ordered in the <tt>Cookie</tt> header such
@@ -49,6 +51,7 @@
*
* @since 4.0
*/
+@Immutable
public class CookiePathComparator implements Serializable, Comparator<Cookie> {
private static final long serialVersionUID = 7523645369616405818L;
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/cookie/CookieSpecRegistry.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/cookie/CookieSpecRegistry.java?rev=755466&r1=755465&r2=755466&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/cookie/CookieSpecRegistry.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/cookie/CookieSpecRegistry.java Wed Mar 18 03:37:07 2009
@@ -37,6 +37,9 @@
import java.util.Locale;
import java.util.Map;
+import net.jcip.annotations.GuardedBy;
+import net.jcip.annotations.ThreadSafe;
+
import org.apache.http.params.HttpParams;
/**
@@ -47,8 +50,10 @@
*
* @since 4.0
*/
+@ThreadSafe
public final class CookieSpecRegistry {
+ @GuardedBy("this")
private final Map<String,CookieSpecFactory> registeredSpecs;
public CookieSpecRegistry() {
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/cookie/MalformedCookieException.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/cookie/MalformedCookieException.java?rev=755466&r1=755465&r2=755466&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/cookie/MalformedCookieException.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/cookie/MalformedCookieException.java Wed Mar 18 03:37:07 2009
@@ -31,6 +31,8 @@
package org.apache.http.cookie;
+import net.jcip.annotations.Immutable;
+
import org.apache.http.ProtocolException;
/**
@@ -40,6 +42,7 @@
*
* @since 4.0
*/
+@Immutable
public class MalformedCookieException extends ProtocolException {
private static final long serialVersionUID = -6695462944287282185L;
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/BasicSchemeFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/BasicSchemeFactory.java?rev=755466&r1=755465&r2=755466&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/BasicSchemeFactory.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/BasicSchemeFactory.java Wed Mar 18 03:37:07 2009
@@ -31,6 +31,8 @@
package org.apache.http.impl.auth;
+import net.jcip.annotations.Immutable;
+
import org.apache.http.auth.AuthScheme;
import org.apache.http.auth.AuthSchemeFactory;
import org.apache.http.params.HttpParams;
@@ -40,6 +42,7 @@
*
* @since 4.0
*/
+@Immutable
public class BasicSchemeFactory implements AuthSchemeFactory {
public AuthScheme newInstance(final HttpParams params) {
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/DigestSchemeFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/DigestSchemeFactory.java?rev=755466&r1=755465&r2=755466&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/DigestSchemeFactory.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/DigestSchemeFactory.java Wed Mar 18 03:37:07 2009
@@ -31,6 +31,8 @@
package org.apache.http.impl.auth;
+import net.jcip.annotations.Immutable;
+
import org.apache.http.auth.AuthScheme;
import org.apache.http.auth.AuthSchemeFactory;
import org.apache.http.params.HttpParams;
@@ -40,6 +42,7 @@
*
* @since 4.0
*/
+@Immutable
public class DigestSchemeFactory implements AuthSchemeFactory {
public AuthScheme newInstance(final HttpParams params) {
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/NTLMEngineException.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/NTLMEngineException.java?rev=755466&r1=755465&r2=755466&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/NTLMEngineException.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/NTLMEngineException.java Wed Mar 18 03:37:07 2009
@@ -30,6 +30,8 @@
package org.apache.http.impl.auth;
+import net.jcip.annotations.Immutable;
+
import org.apache.http.auth.AuthenticationException;
/**
@@ -38,6 +40,7 @@
*
* @since 4.0
*/
+@Immutable
public class NTLMEngineException extends AuthenticationException {
private static final long serialVersionUID = 6027981323731768824L;
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/UnsupportedDigestAlgorithmException.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/UnsupportedDigestAlgorithmException.java?rev=755466&r1=755465&r2=755466&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/UnsupportedDigestAlgorithmException.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/UnsupportedDigestAlgorithmException.java Wed Mar 18 03:37:07 2009
@@ -30,6 +30,8 @@
package org.apache.http.impl.auth;
+import net.jcip.annotations.Immutable;
+
/**
* Authentication credentials required to respond to a authentication
* challenge are invalid
@@ -37,6 +39,7 @@
*
* @since 4.0
*/
+@Immutable
public class UnsupportedDigestAlgorithmException extends RuntimeException {
private static final long serialVersionUID = 319558534317118022L;
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/BasicCookieStore.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/BasicCookieStore.java?rev=755466&r1=755465&r2=755466&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/BasicCookieStore.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/BasicCookieStore.java Wed Mar 18 03:37:07 2009
@@ -37,6 +37,9 @@
import java.util.Iterator;
import java.util.List;
+import net.jcip.annotations.GuardedBy;
+import net.jcip.annotations.ThreadSafe;
+
import org.apache.http.client.CookieStore;
import org.apache.http.cookie.Cookie;
import org.apache.http.cookie.CookieIdentityComparator;
@@ -47,10 +50,13 @@
*
* @since 4.0
*/
+@ThreadSafe
public class BasicCookieStore implements CookieStore {
+ @GuardedBy("this")
private final ArrayList<Cookie> cookies;
+ @GuardedBy("this")
private final Comparator<Cookie> cookieComparator;
// -------------------------------------------------------- Class Variables
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/BasicCredentialsProvider.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/BasicCredentialsProvider.java?rev=755466&r1=755465&r2=755466&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/BasicCredentialsProvider.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/BasicCredentialsProvider.java Wed Mar 18 03:37:07 2009
@@ -32,6 +32,9 @@
import java.util.HashMap;
+import net.jcip.annotations.GuardedBy;
+import net.jcip.annotations.ThreadSafe;
+
import org.apache.http.auth.AuthScope;
import org.apache.http.auth.Credentials;
import org.apache.http.client.CredentialsProvider;
@@ -42,8 +45,10 @@
*
* @since 4.0
*/
+@ThreadSafe
public class BasicCredentialsProvider implements CredentialsProvider {
+ @GuardedBy("this")
private final HashMap<AuthScope, Credentials> credMap;
/**
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/BasicResponseHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/BasicResponseHandler.java?rev=755466&r1=755465&r2=755466&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/BasicResponseHandler.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/BasicResponseHandler.java Wed Mar 18 03:37:07 2009
@@ -33,6 +33,8 @@
import java.io.IOException;
+import net.jcip.annotations.Immutable;
+
import org.apache.http.HttpEntity;
import org.apache.http.HttpResponse;
import org.apache.http.StatusLine;
@@ -55,6 +57,7 @@
*
* @since 4.0
*/
+@Immutable
public class BasicResponseHandler implements ResponseHandler<String> {
/**
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultConnectionKeepAliveStrategy.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultConnectionKeepAliveStrategy.java?rev=755466&r1=755465&r2=755466&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultConnectionKeepAliveStrategy.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultConnectionKeepAliveStrategy.java Wed Mar 18 03:37:07 2009
@@ -30,6 +30,8 @@
*/
package org.apache.http.impl.client;
+import net.jcip.annotations.Immutable;
+
import org.apache.http.HeaderElement;
import org.apache.http.HeaderElementIterator;
import org.apache.http.HttpResponse;
@@ -50,6 +52,7 @@
*
* @since 4.0
*/
+@Immutable
public class DefaultConnectionKeepAliveStrategy implements ConnectionKeepAliveStrategy {
public long getKeepAliveDuration(HttpResponse response, HttpContext context) {
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultHttpRequestRetryHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultHttpRequestRetryHandler.java?rev=755466&r1=755465&r2=755466&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultHttpRequestRetryHandler.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultHttpRequestRetryHandler.java Wed Mar 18 03:37:07 2009
@@ -38,6 +38,8 @@
import javax.net.ssl.SSLHandshakeException;
+import net.jcip.annotations.Immutable;
+
import org.apache.http.HttpEntityEnclosingRequest;
import org.apache.http.HttpRequest;
import org.apache.http.NoHttpResponseException;
@@ -51,6 +53,7 @@
*
* @since 4.0
*/
+@Immutable
public class DefaultHttpRequestRetryHandler implements HttpRequestRetryHandler {
/** the number of times a method will be retried */
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultRedirectHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultRedirectHandler.java?rev=755466&r1=755465&r2=755466&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultRedirectHandler.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultRedirectHandler.java Wed Mar 18 03:37:07 2009
@@ -34,6 +34,8 @@
import java.net.URI;
import java.net.URISyntaxException;
+import net.jcip.annotations.Immutable;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.http.Header;
@@ -61,6 +63,7 @@
*
* @since 4.0
*/
+@Immutable
public class DefaultRedirectHandler implements RedirectHandler {
private final Log log = LogFactory.getLog(getClass());
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultUserTokenHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultUserTokenHandler.java?rev=755466&r1=755465&r2=755466&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultUserTokenHandler.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultUserTokenHandler.java Wed Mar 18 03:37:07 2009
@@ -34,6 +34,8 @@
import javax.net.ssl.SSLSession;
+import net.jcip.annotations.Immutable;
+
import org.apache.http.auth.AuthScheme;
import org.apache.http.auth.AuthState;
import org.apache.http.auth.Credentials;
@@ -47,6 +49,7 @@
*
* @since 4.0
*/
+@Immutable
public class DefaultUserTokenHandler implements UserTokenHandler {
public Object getUserToken(final HttpContext context) {
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/TunnelRefusedException.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/TunnelRefusedException.java?rev=755466&r1=755465&r2=755466&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/TunnelRefusedException.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/TunnelRefusedException.java Wed Mar 18 03:37:07 2009
@@ -31,6 +31,8 @@
package org.apache.http.impl.client;
+import net.jcip.annotations.Immutable;
+
import org.apache.http.HttpException;
import org.apache.http.HttpResponse;
@@ -38,6 +40,7 @@
*
* @since 4.0
*/
+@Immutable
public class TunnelRefusedException extends HttpException {
private static final long serialVersionUID = -8646722842745617323L;
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/Wire.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/Wire.java?rev=755466&r1=755465&r2=755466&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/Wire.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/Wire.java Wed Mar 18 03:37:07 2009
@@ -33,6 +33,9 @@
import java.io.IOException;
import java.io.InputStream;
import java.io.ByteArrayInputStream;
+
+import net.jcip.annotations.Immutable;
+
import org.apache.commons.logging.Log;
/**
@@ -41,6 +44,7 @@
*
* @since 4.0
*/
+@Immutable
public class Wire {
private final Log log;
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/AbstractCookieAttributeHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/AbstractCookieAttributeHandler.java?rev=755466&r1=755465&r2=755466&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/AbstractCookieAttributeHandler.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/AbstractCookieAttributeHandler.java Wed Mar 18 03:37:07 2009
@@ -30,6 +30,8 @@
*/
package org.apache.http.impl.cookie;
+import net.jcip.annotations.Immutable;
+
import org.apache.http.cookie.Cookie;
import org.apache.http.cookie.CookieAttributeHandler;
import org.apache.http.cookie.CookieOrigin;
@@ -39,6 +41,7 @@
*
* @since 4.0
*/
+@Immutable
public abstract class AbstractCookieAttributeHandler implements CookieAttributeHandler {
public void validate(final Cookie cookie, final CookieOrigin origin)
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BasicCommentHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BasicCommentHandler.java?rev=755466&r1=755465&r2=755466&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BasicCommentHandler.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BasicCommentHandler.java Wed Mar 18 03:37:07 2009
@@ -30,6 +30,8 @@
*/
package org.apache.http.impl.cookie;
+import net.jcip.annotations.Immutable;
+
import org.apache.http.cookie.MalformedCookieException;
import org.apache.http.cookie.SetCookie;
@@ -37,6 +39,7 @@
*
* @since 4.0
*/
+@Immutable
public class BasicCommentHandler extends AbstractCookieAttributeHandler {
public BasicCommentHandler() {
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BasicDomainHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BasicDomainHandler.java?rev=755466&r1=755465&r2=755466&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BasicDomainHandler.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BasicDomainHandler.java Wed Mar 18 03:37:07 2009
@@ -30,6 +30,8 @@
*/
package org.apache.http.impl.cookie;
+import net.jcip.annotations.Immutable;
+
import org.apache.http.cookie.Cookie;
import org.apache.http.cookie.CookieAttributeHandler;
import org.apache.http.cookie.CookieOrigin;
@@ -40,6 +42,7 @@
*
* @since 4.0
*/
+@Immutable
public class BasicDomainHandler implements CookieAttributeHandler {
public BasicDomainHandler() {
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BasicExpiresHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BasicExpiresHandler.java?rev=755466&r1=755465&r2=755466&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BasicExpiresHandler.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BasicExpiresHandler.java Wed Mar 18 03:37:07 2009
@@ -30,6 +30,8 @@
*/
package org.apache.http.impl.cookie;
+import net.jcip.annotations.Immutable;
+
import org.apache.http.cookie.MalformedCookieException;
import org.apache.http.cookie.SetCookie;
@@ -38,6 +40,7 @@
*
* @since 4.0
*/
+@Immutable
public class BasicExpiresHandler extends AbstractCookieAttributeHandler {
/** Valid date patterns */
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BasicMaxAgeHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BasicMaxAgeHandler.java?rev=755466&r1=755465&r2=755466&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BasicMaxAgeHandler.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BasicMaxAgeHandler.java Wed Mar 18 03:37:07 2009
@@ -32,6 +32,8 @@
import java.util.Date;
+import net.jcip.annotations.Immutable;
+
import org.apache.http.cookie.MalformedCookieException;
import org.apache.http.cookie.SetCookie;
@@ -39,6 +41,7 @@
*
* @since 4.0
*/
+@Immutable
public class BasicMaxAgeHandler extends AbstractCookieAttributeHandler {
public BasicMaxAgeHandler() {
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BasicPathHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BasicPathHandler.java?rev=755466&r1=755465&r2=755466&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BasicPathHandler.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BasicPathHandler.java Wed Mar 18 03:37:07 2009
@@ -30,6 +30,8 @@
*/
package org.apache.http.impl.cookie;
+import net.jcip.annotations.Immutable;
+
import org.apache.http.cookie.Cookie;
import org.apache.http.cookie.CookieAttributeHandler;
import org.apache.http.cookie.CookieOrigin;
@@ -40,6 +42,7 @@
*
* @since 4.0
*/
+@Immutable
public class BasicPathHandler implements CookieAttributeHandler {
public BasicPathHandler() {
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BasicSecureHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BasicSecureHandler.java?rev=755466&r1=755465&r2=755466&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BasicSecureHandler.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BasicSecureHandler.java Wed Mar 18 03:37:07 2009
@@ -30,6 +30,8 @@
*/
package org.apache.http.impl.cookie;
+import net.jcip.annotations.Immutable;
+
import org.apache.http.cookie.Cookie;
import org.apache.http.cookie.CookieOrigin;
import org.apache.http.cookie.MalformedCookieException;
@@ -39,6 +41,7 @@
*
* @since 4.0
*/
+@Immutable
public class BasicSecureHandler extends AbstractCookieAttributeHandler {
public BasicSecureHandler() {
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BestMatchSpecFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BestMatchSpecFactory.java?rev=755466&r1=755465&r2=755466&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BestMatchSpecFactory.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BestMatchSpecFactory.java Wed Mar 18 03:37:07 2009
@@ -31,6 +31,8 @@
package org.apache.http.impl.cookie;
+import net.jcip.annotations.Immutable;
+
import org.apache.http.cookie.CookieSpec;
import org.apache.http.cookie.CookieSpecFactory;
import org.apache.http.cookie.params.CookieSpecPNames;
@@ -41,6 +43,7 @@
*
* @since 4.0
*/
+@Immutable
public class BestMatchSpecFactory implements CookieSpecFactory {
public CookieSpec newInstance(final HttpParams params) {
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BrowserCompatSpecFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BrowserCompatSpecFactory.java?rev=755466&r1=755465&r2=755466&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BrowserCompatSpecFactory.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BrowserCompatSpecFactory.java Wed Mar 18 03:37:07 2009
@@ -31,6 +31,8 @@
package org.apache.http.impl.cookie;
+import net.jcip.annotations.Immutable;
+
import org.apache.http.cookie.CookieSpec;
import org.apache.http.cookie.CookieSpecFactory;
import org.apache.http.cookie.params.CookieSpecPNames;
@@ -41,6 +43,7 @@
*
* @since 4.0
*/
+@Immutable
public class BrowserCompatSpecFactory implements CookieSpecFactory {
public CookieSpec newInstance(final HttpParams params) {
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/DateParseException.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/DateParseException.java?rev=755466&r1=755465&r2=755466&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/DateParseException.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/DateParseException.java Wed Mar 18 03:37:07 2009
@@ -31,6 +31,7 @@
package org.apache.http.impl.cookie;
+import net.jcip.annotations.Immutable;
/**
* An exception to indicate an error parsing a date string.
@@ -40,6 +41,7 @@
*
* @since 4.0
*/
+@Immutable
public class DateParseException extends Exception {
private static final long serialVersionUID = 4417696455000643370L;
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/NetscapeDomainHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/NetscapeDomainHandler.java?rev=755466&r1=755465&r2=755466&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/NetscapeDomainHandler.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/NetscapeDomainHandler.java Wed Mar 18 03:37:07 2009
@@ -33,6 +33,8 @@
import java.util.Locale;
import java.util.StringTokenizer;
+import net.jcip.annotations.Immutable;
+
import org.apache.http.cookie.Cookie;
import org.apache.http.cookie.CookieOrigin;
import org.apache.http.cookie.MalformedCookieException;
@@ -41,6 +43,7 @@
*
* @since 4.0
*/
+@Immutable
public class NetscapeDomainHandler extends BasicDomainHandler {
public NetscapeDomainHandler() {
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/NetscapeDraftHeaderParser.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/NetscapeDraftHeaderParser.java?rev=755466&r1=755465&r2=755466&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/NetscapeDraftHeaderParser.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/NetscapeDraftHeaderParser.java Wed Mar 18 03:37:07 2009
@@ -34,6 +34,8 @@
import java.util.ArrayList;
import java.util.List;
+import net.jcip.annotations.Immutable;
+
import org.apache.http.HeaderElement;
import org.apache.http.NameValuePair;
import org.apache.http.ParseException;
@@ -46,6 +48,7 @@
*
* @since 4.0
*/
+@Immutable
public class NetscapeDraftHeaderParser {
public final static NetscapeDraftHeaderParser DEFAULT = new NetscapeDraftHeaderParser();
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/NetscapeDraftSpec.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/NetscapeDraftSpec.java?rev=755466&r1=755465&r2=755466&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/NetscapeDraftSpec.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/NetscapeDraftSpec.java Wed Mar 18 03:37:07 2009
@@ -34,6 +34,8 @@
import java.util.ArrayList;
import java.util.List;
+import net.jcip.annotations.Immutable;
+
import org.apache.http.FormattedHeader;
import org.apache.http.Header;
import org.apache.http.HeaderElement;
@@ -52,6 +54,7 @@
*
* @since 4.0
*/
+@Immutable
public class NetscapeDraftSpec extends CookieSpecBase {
protected static final String EXPIRES_PATTERN = "EEE, dd-MMM-yyyy HH:mm:ss z";
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/NetscapeDraftSpecFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/NetscapeDraftSpecFactory.java?rev=755466&r1=755465&r2=755466&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/NetscapeDraftSpecFactory.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/NetscapeDraftSpecFactory.java Wed Mar 18 03:37:07 2009
@@ -31,6 +31,8 @@
package org.apache.http.impl.cookie;
+import net.jcip.annotations.Immutable;
+
import org.apache.http.cookie.CookieSpec;
import org.apache.http.cookie.CookieSpecFactory;
import org.apache.http.cookie.params.CookieSpecPNames;
@@ -41,6 +43,7 @@
*
* @since 4.0
*/
+@Immutable
public class NetscapeDraftSpecFactory implements CookieSpecFactory {
public CookieSpec newInstance(final HttpParams params) {
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/PublicSuffixListParser.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/PublicSuffixListParser.java?rev=755466&r1=755465&r2=755466&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/PublicSuffixListParser.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/PublicSuffixListParser.java Wed Mar 18 03:37:07 2009
@@ -37,15 +37,18 @@
import java.util.ArrayList;
import java.util.Collection;
+import net.jcip.annotations.Immutable;
+
/**
* Parses the list from <a href="http://publicsuffix.org/">publicsuffix.org</a>
* and configures a PublicSuffixFilter.
*
* @since 4.0
*/
+@Immutable
public class PublicSuffixListParser {
private static final int MAX_LINE_LEN = 256;
- private PublicSuffixFilter filter;
+ private final PublicSuffixFilter filter;
PublicSuffixListParser(PublicSuffixFilter filter) {
this.filter = filter;
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2109DomainHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2109DomainHandler.java?rev=755466&r1=755465&r2=755466&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2109DomainHandler.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2109DomainHandler.java Wed Mar 18 03:37:07 2009
@@ -32,6 +32,8 @@
import java.util.Locale;
+import net.jcip.annotations.Immutable;
+
import org.apache.http.cookie.Cookie;
import org.apache.http.cookie.CookieAttributeHandler;
import org.apache.http.cookie.CookieOrigin;
@@ -42,6 +44,7 @@
*
* @since 4.0
*/
+@Immutable
public class RFC2109DomainHandler implements CookieAttributeHandler {
public RFC2109DomainHandler() {
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2109SpecFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2109SpecFactory.java?rev=755466&r1=755465&r2=755466&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2109SpecFactory.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2109SpecFactory.java Wed Mar 18 03:37:07 2009
@@ -31,6 +31,8 @@
package org.apache.http.impl.cookie;
+import net.jcip.annotations.Immutable;
+
import org.apache.http.cookie.CookieSpec;
import org.apache.http.cookie.CookieSpecFactory;
import org.apache.http.cookie.params.CookieSpecPNames;
@@ -41,6 +43,7 @@
*
* @since 4.0
*/
+@Immutable
public class RFC2109SpecFactory implements CookieSpecFactory {
public CookieSpec newInstance(final HttpParams params) {
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2109VersionHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2109VersionHandler.java?rev=755466&r1=755465&r2=755466&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2109VersionHandler.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2109VersionHandler.java Wed Mar 18 03:37:07 2009
@@ -30,6 +30,8 @@
*/
package org.apache.http.impl.cookie;
+import net.jcip.annotations.Immutable;
+
import org.apache.http.cookie.Cookie;
import org.apache.http.cookie.CookieOrigin;
import org.apache.http.cookie.MalformedCookieException;
@@ -39,6 +41,7 @@
*
* @since 4.0
*/
+@Immutable
public class RFC2109VersionHandler extends AbstractCookieAttributeHandler {
public RFC2109VersionHandler() {
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2965CommentUrlAttributeHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2965CommentUrlAttributeHandler.java?rev=755466&r1=755465&r2=755466&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2965CommentUrlAttributeHandler.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2965CommentUrlAttributeHandler.java Wed Mar 18 03:37:07 2009
@@ -31,6 +31,8 @@
package org.apache.http.impl.cookie;
+import net.jcip.annotations.Immutable;
+
import org.apache.http.cookie.Cookie;
import org.apache.http.cookie.CookieAttributeHandler;
import org.apache.http.cookie.CookieOrigin;
@@ -43,7 +45,8 @@
*
* @since 4.0
*/
- public class RFC2965CommentUrlAttributeHandler implements CookieAttributeHandler {
+@Immutable
+public class RFC2965CommentUrlAttributeHandler implements CookieAttributeHandler {
public RFC2965CommentUrlAttributeHandler() {
super();
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2965DiscardAttributeHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2965DiscardAttributeHandler.java?rev=755466&r1=755465&r2=755466&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2965DiscardAttributeHandler.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2965DiscardAttributeHandler.java Wed Mar 18 03:37:07 2009
@@ -31,6 +31,8 @@
package org.apache.http.impl.cookie;
+import net.jcip.annotations.Immutable;
+
import org.apache.http.cookie.Cookie;
import org.apache.http.cookie.CookieAttributeHandler;
import org.apache.http.cookie.CookieOrigin;
@@ -43,7 +45,8 @@
*
* @since 4.0
*/
- public class RFC2965DiscardAttributeHandler implements CookieAttributeHandler {
+@Immutable
+public class RFC2965DiscardAttributeHandler implements CookieAttributeHandler {
public RFC2965DiscardAttributeHandler() {
super();
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2965DomainAttributeHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2965DomainAttributeHandler.java?rev=755466&r1=755465&r2=755466&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2965DomainAttributeHandler.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2965DomainAttributeHandler.java Wed Mar 18 03:37:07 2009
@@ -33,6 +33,8 @@
import java.util.Locale;
+import net.jcip.annotations.Immutable;
+
import org.apache.http.cookie.ClientCookie;
import org.apache.http.cookie.Cookie;
import org.apache.http.cookie.CookieAttributeHandler;
@@ -46,6 +48,7 @@
*
* @since 3.1
*/
+@Immutable
public class RFC2965DomainAttributeHandler implements CookieAttributeHandler {
public RFC2965DomainAttributeHandler() {
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2965PortAttributeHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2965PortAttributeHandler.java?rev=755466&r1=755465&r2=755466&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2965PortAttributeHandler.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2965PortAttributeHandler.java Wed Mar 18 03:37:07 2009
@@ -33,6 +33,8 @@
import java.util.StringTokenizer;
+import net.jcip.annotations.Immutable;
+
import org.apache.http.cookie.ClientCookie;
import org.apache.http.cookie.Cookie;
import org.apache.http.cookie.CookieAttributeHandler;
@@ -46,6 +48,7 @@
*
* @since 4.0
*/
+@Immutable
public class RFC2965PortAttributeHandler implements CookieAttributeHandler {
public RFC2965PortAttributeHandler() {
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2965SpecFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2965SpecFactory.java?rev=755466&r1=755465&r2=755466&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2965SpecFactory.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2965SpecFactory.java Wed Mar 18 03:37:07 2009
@@ -31,6 +31,8 @@
package org.apache.http.impl.cookie;
+import net.jcip.annotations.Immutable;
+
import org.apache.http.cookie.CookieSpec;
import org.apache.http.cookie.CookieSpecFactory;
import org.apache.http.cookie.params.CookieSpecPNames;
@@ -41,6 +43,7 @@
*
* @since 4.0
*/
+@Immutable
public class RFC2965SpecFactory implements CookieSpecFactory {
public CookieSpec newInstance(final HttpParams params) {