hc-commits mailing list archives

Site index · List index

Message view	« Date » · « Thread »
Top	« Date » · « Thread »
From	ol...@apache.org
Subject	svn commit: r1770506 [2/6] - in /httpcomponents/httpclient/branches/4.5.x: ./ fluent-hc/src/main/java/org/apache/http/client/fluent/ httpclient-cache/src/main/java-deprecated/org/apache/http/impl/client/cache/ httpclient-cache/src/main/java/org/apache/...
Date	Sat, 19 Nov 2016 16:40:56 GMT
Modified: httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/ResponseProtocolCompliance.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/ResponseProtocolCompliance.java?rev=1770506&r1=1770505&r2=1770506&view=diff ============================================================================== --- httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/ResponseProtocolCompliance.java (original) +++ httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/ResponseProtocolCompliance.java Sat Nov 19 16:40:54 2016 @@ -39,7 +39,8 @@ import org.apache.http.HttpRequest; import org.apache.http.HttpResponse; import org.apache.http.HttpStatus; import org.apache.http.HttpVersion; -import org.apache.http.annotation.Immutable; +import org.apache.http.annotation.Contract; +import org.apache.http.annotation.ThreadingBehavior; import org.apache.http.client.ClientProtocolException; import org.apache.http.client.cache.HeaderConstants; import org.apache.http.client.methods.HttpRequestWrapper; @@ -50,7 +51,7 @@ import org.apache.http.protocol.HTTP; /** * @since 4.1 / -@Immutable +@Contract(threading = ThreadingBehavior.IMMUTABLE) class ResponseProtocolCompliance { private static final String UNEXPECTED_100_CONTINUE = "The incoming request did not contain a " Modified: httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/ResponseProxyHandler.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/ResponseProxyHandler.java?rev=1770506&r1=1770505&r2=1770506&view=diff ============================================================================== --- httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/ResponseProxyHandler.java (original) +++ httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/ResponseProxyHandler.java Sat Nov 19 16:40:54 2016 @@ -34,7 +34,6 @@ import java.lang.reflect.InvocationTarge import java.lang.reflect.Method; import org.apache.http.HttpResponse; -import org.apache.http.annotation.NotThreadSafe; /* * A proxy class that can enhance an arbitrary {@link HttpResponse} with @@ -42,7 +41,6 @@ import org.apache.http.annotation.NotThr * * @since 4.3 / -@NotThreadSafe class ResponseProxyHandler implements InvocationHandler { private static final Method CLOSE_METHOD; Modified: httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/SizeLimitedResponseReader.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/SizeLimitedResponseReader.java?rev=1770506&r1=1770505&r2=1770506&view=diff ============================================================================== --- httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/SizeLimitedResponseReader.java (original) +++ httpcomponents/httpclient/branches/4.5.x/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/SizeLimitedResponseReader.java Sat Nov 19 16:40:54 2016 @@ -33,7 +33,6 @@ import java.lang.reflect.Proxy; import org.apache.http.HttpEntity; import org.apache.http.HttpRequest; import org.apache.http.HttpResponse; -import org.apache.http.annotation.NotThreadSafe; import org.apache.http.client.cache.InputLimit; import org.apache.http.client.cache.Resource; import org.apache.http.client.cache.ResourceFactory; @@ -43,7 +42,6 @@ import org.apache.http.message.BasicHttp /* * @since 4.1 / -@NotThreadSafe class SizeLimitedResponseReader { private final ResourceFactory resourceFactory; Modified: httpcomponents/httpclient/branches/4.5.x/httpclient-win/src/main/java/org/apache/http/impl/auth/win/CurrentWindowsCredentials.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient-win/src/main/java/org/apache/http/impl/auth/win/CurrentWindowsCredentials.java?rev=1770506&r1=1770505&r2=1770506&view=diff ============================================================================== --- httpcomponents/httpclient/branches/4.5.x/httpclient-win/src/main/java/org/apache/http/impl/auth/win/CurrentWindowsCredentials.java (original) +++ httpcomponents/httpclient/branches/4.5.x/httpclient-win/src/main/java/org/apache/http/impl/auth/win/CurrentWindowsCredentials.java Sat Nov 19 16:40:54 2016 @@ -30,7 +30,8 @@ package org.apache.http.impl.auth.win; import java.io.Serializable; import java.security.Principal; -import org.apache.http.annotation.Immutable; +import org.apache.http.annotation.Contract; +import org.apache.http.annotation.ThreadingBehavior; import org.apache.http.auth.Credentials; import com.sun.jna.platform.win32.Secur32.EXTENDED_NAME_FORMAT; @@ -44,7 +45,7 @@ import com.sun.jna.platform.win32.Secur3 * @since 4.4 / -@Immutable +@Contract(threading = ThreadingBehavior.IMMUTABLE) public final class CurrentWindowsCredentials implements Credentials, Serializable, Principal { private static final long serialVersionUID = 4361166468529298169L; Modified: httpcomponents/httpclient/branches/4.5.x/httpclient-win/src/main/java/org/apache/http/impl/auth/win/WindowsCredentialsProvider.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient-win/src/main/java/org/apache/http/impl/auth/win/WindowsCredentialsProvider.java?rev=1770506&r1=1770505&r2=1770506&view=diff ============================================================================== --- httpcomponents/httpclient/branches/4.5.x/httpclient-win/src/main/java/org/apache/http/impl/auth/win/WindowsCredentialsProvider.java (original) +++ httpcomponents/httpclient/branches/4.5.x/httpclient-win/src/main/java/org/apache/http/impl/auth/win/WindowsCredentialsProvider.java Sat Nov 19 16:40:54 2016 @@ -26,7 +26,8 @@ / package org.apache.http.impl.auth.win; -import org.apache.http.annotation.ThreadSafe; +import org.apache.http.annotation.Contract; +import org.apache.http.annotation.ThreadingBehavior; import org.apache.http.auth.AuthScope; import org.apache.http.auth.Credentials; import org.apache.http.client.CredentialsProvider; @@ -43,7 +44,7 @@ import org.apache.http.util.Args; * * @since 4.4 / -@ThreadSafe +@Contract(threading = ThreadingBehavior.SAFE) public class WindowsCredentialsProvider implements CredentialsProvider { private final CredentialsProvider provider; Modified: httpcomponents/httpclient/branches/4.5.x/httpclient-win/src/main/java/org/apache/http/impl/auth/win/WindowsNTLMSchemeFactory.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient-win/src/main/java/org/apache/http/impl/auth/win/WindowsNTLMSchemeFactory.java?rev=1770506&r1=1770505&r2=1770506&view=diff ============================================================================== --- httpcomponents/httpclient/branches/4.5.x/httpclient-win/src/main/java/org/apache/http/impl/auth/win/WindowsNTLMSchemeFactory.java (original) +++ httpcomponents/httpclient/branches/4.5.x/httpclient-win/src/main/java/org/apache/http/impl/auth/win/WindowsNTLMSchemeFactory.java Sat Nov 19 16:40:54 2016 @@ -27,7 +27,8 @@ package org.apache.http.impl.auth.win; -import org.apache.http.annotation.Immutable; +import org.apache.http.annotation.Contract; +import org.apache.http.annotation.ThreadingBehavior; import org.apache.http.auth.AuthScheme; import org.apache.http.auth.AuthSchemeProvider; import org.apache.http.client.config.AuthSchemes; @@ -42,7 +43,7 @@ import org.apache.http.protocol.HttpCont * @since 4.4 / -@Immutable +@Contract(threading = ThreadingBehavior.IMMUTABLE) public class WindowsNTLMSchemeFactory implements AuthSchemeProvider { private final String servicePrincipalName; Modified: httpcomponents/httpclient/branches/4.5.x/httpclient-win/src/main/java/org/apache/http/impl/auth/win/WindowsNegotiateScheme.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient-win/src/main/java/org/apache/http/impl/auth/win/WindowsNegotiateScheme.java?rev=1770506&r1=1770505&r2=1770506&view=diff ============================================================================== --- httpcomponents/httpclient/branches/4.5.x/httpclient-win/src/main/java/org/apache/http/impl/auth/win/WindowsNegotiateScheme.java (original) +++ httpcomponents/httpclient/branches/4.5.x/httpclient-win/src/main/java/org/apache/http/impl/auth/win/WindowsNegotiateScheme.java Sat Nov 19 16:40:54 2016 @@ -32,7 +32,6 @@ import org.apache.commons.logging.LogFac import org.apache.http.Header; import org.apache.http.HttpHost; import org.apache.http.HttpRequest; -import org.apache.http.annotation.NotThreadSafe; import org.apache.http.auth.AUTH; import org.apache.http.auth.AuthenticationException; import org.apache.http.auth.Credentials; @@ -67,7 +66,6 @@ import com.sun.jna.ptr.IntByReference; * @since 4.4 / -@NotThreadSafe public class WindowsNegotiateScheme extends AuthSchemeBase { private final Log log = LogFactory.getLog(getClass()); Modified: httpcomponents/httpclient/branches/4.5.x/httpclient-win/src/main/java/org/apache/http/impl/auth/win/WindowsNegotiateSchemeFactory.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient-win/src/main/java/org/apache/http/impl/auth/win/WindowsNegotiateSchemeFactory.java?rev=1770506&r1=1770505&r2=1770506&view=diff ============================================================================== --- httpcomponents/httpclient/branches/4.5.x/httpclient-win/src/main/java/org/apache/http/impl/auth/win/WindowsNegotiateSchemeFactory.java (original) +++ httpcomponents/httpclient/branches/4.5.x/httpclient-win/src/main/java/org/apache/http/impl/auth/win/WindowsNegotiateSchemeFactory.java Sat Nov 19 16:40:54 2016 @@ -27,7 +27,8 @@ package org.apache.http.impl.auth.win; -import org.apache.http.annotation.Immutable; +import org.apache.http.annotation.Contract; +import org.apache.http.annotation.ThreadingBehavior; import org.apache.http.auth.AuthScheme; import org.apache.http.auth.AuthSchemeProvider; import org.apache.http.client.config.AuthSchemes; @@ -42,7 +43,7 @@ import org.apache.http.protocol.HttpCont * @since 4.4 / -@Immutable +@Contract(threading = ThreadingBehavior.IMMUTABLE) public class WindowsNegotiateSchemeFactory implements AuthSchemeProvider { private final String servicePrincipalName; Modified: httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/auth/params/AuthParams.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/auth/params/AuthParams.java?rev=1770506&r1=1770505&r2=1770506&view=diff ============================================================================== --- httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/auth/params/AuthParams.java (original) +++ httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/auth/params/AuthParams.java Sat Nov 19 16:40:54 2016 @@ -27,7 +27,8 @@ package org.apache.http.auth.params; -import org.apache.http.annotation.Immutable; +import org.apache.http.annotation.Contract; +import org.apache.http.annotation.ThreadingBehavior; import org.apache.http.params.HttpParams; import org.apache.http.protocol.HTTP; import org.apache.http.util.Args; @@ -42,7 +43,7 @@ import org.apache.http.util.Args; and constructor parameters of * {@link org.apache.http.auth.AuthSchemeProvider}s. / -@Immutable +@Contract(threading = ThreadingBehavior.IMMUTABLE) @Deprecated public final class AuthParams { Modified: httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/client/params/AuthPolicy.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/client/params/AuthPolicy.java?rev=1770506&r1=1770505&r2=1770506&view=diff ============================================================================== --- httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/client/params/AuthPolicy.java (original) +++ httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/client/params/AuthPolicy.java Sat Nov 19 16:40:54 2016 @@ -27,8 +27,6 @@ package org.apache.http.client.params; -import org.apache.http.annotation.Immutable; - /* * Standard authentication schemes supported by HttpClient. * @@ -37,7 +35,6 @@ import org.apache.http.annotation.Immuta * @deprecated (4.3) use {@link org.apache.http.client.config.AuthSchemes}. / @Deprecated -@Immutable public final class AuthPolicy { private AuthPolicy() { Modified: httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/client/params/ClientParamBean.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/client/params/ClientParamBean.java?rev=1770506&r1=1770505&r2=1770506&view=diff ============================================================================== --- httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/client/params/ClientParamBean.java (original) +++ httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/client/params/ClientParamBean.java Sat Nov 19 16:40:54 2016 @@ -31,7 +31,6 @@ import java.util.Collection; import org.apache.http.Header; import org.apache.http.HttpHost; -import org.apache.http.annotation.NotThreadSafe; import org.apache.http.params.HttpAbstractParamBean; import org.apache.http.params.HttpParams; @@ -45,7 +44,6 @@ import org.apache.http.params.HttpParams @deprecated (4.3) use {@link org.apache.http.client.config.RequestConfig}. / @Deprecated -@NotThreadSafe public class ClientParamBean extends HttpAbstractParamBean { public ClientParamBean (final HttpParams params) { Modified: httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/client/params/CookiePolicy.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/client/params/CookiePolicy.java?rev=1770506&r1=1770505&r2=1770506&view=diff ============================================================================== --- httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/client/params/CookiePolicy.java (original) +++ httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/client/params/CookiePolicy.java Sat Nov 19 16:40:54 2016 @@ -27,8 +27,6 @@ package org.apache.http.client.params; -import org.apache.http.annotation.Immutable; - /* * Standard cookie specifications supported by HttpClient. * @@ -37,7 +35,6 @@ import org.apache.http.annotation.Immuta * @deprecated (4.3) use {@link org.apache.http.client.config.CookieSpecs}. / @Deprecated -@Immutable public final class CookiePolicy { /* Modified: httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/client/params/HttpClientParams.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/client/params/HttpClientParams.java?rev=1770506&r1=1770505&r2=1770506&view=diff ============================================================================== --- httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/client/params/HttpClientParams.java (original) +++ httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/client/params/HttpClientParams.java Sat Nov 19 16:40:54 2016 @@ -26,7 +26,6 @@ / package org.apache.http.client.params; -import org.apache.http.annotation.Immutable; import org.apache.http.params.HttpConnectionParams; import org.apache.http.params.HttpParams; import org.apache.http.util.Args; @@ -39,7 +38,6 @@ import org.apache.http.util.Args; @deprecated (4.3) use {@link org.apache.http.client.config.RequestConfig} / @Deprecated -@Immutable public class HttpClientParams { private HttpClientParams() { Modified: httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/client/protocol/ClientContextConfigurer.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/client/protocol/ClientContextConfigurer.java?rev=1770506&r1=1770505&r2=1770506&view=diff ============================================================================== --- httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/client/protocol/ClientContextConfigurer.java (original) +++ httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/client/protocol/ClientContextConfigurer.java Sat Nov 19 16:40:54 2016 @@ -27,7 +27,6 @@ package org.apache.http.client.protocol; -import org.apache.http.annotation.NotThreadSafe; import org.apache.http.auth.AuthSchemeRegistry; import org.apache.http.client.CookieStore; import org.apache.http.client.CredentialsProvider; @@ -42,7 +41,6 @@ import org.apache.http.util.Args; * @deprecated (4.3) use {@link HttpClientContext} / -@NotThreadSafe @Deprecated public class ClientContextConfigurer implements ClientContext { Modified: httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/client/protocol/RequestProxyAuthentication.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/client/protocol/RequestProxyAuthentication.java?rev=1770506&r1=1770505&r2=1770506&view=diff ============================================================================== --- httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/client/protocol/RequestProxyAuthentication.java (original) +++ httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/client/protocol/RequestProxyAuthentication.java Sat Nov 19 16:40:54 2016 @@ -31,7 +31,8 @@ import java.io.IOException; import org.apache.http.HttpException; import org.apache.http.HttpRequest; -import org.apache.http.annotation.Immutable; +import org.apache.http.annotation.Contract; +import org.apache.http.annotation.ThreadingBehavior; import org.apache.http.auth.AUTH; import org.apache.http.auth.AuthState; import org.apache.http.conn.HttpRoutedConnection; @@ -49,7 +50,7 @@ import org.apache.http.util.Args; @deprecated (4.3) use {@link org.apache.http.impl.auth.HttpAuthenticator}. / @Deprecated -@Immutable +@Contract(threading = ThreadingBehavior.IMMUTABLE) public class RequestProxyAuthentication extends RequestAuthenticationBase { public RequestProxyAuthentication() { Modified: httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/client/protocol/RequestTargetAuthentication.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/client/protocol/RequestTargetAuthentication.java?rev=1770506&r1=1770505&r2=1770506&view=diff ============================================================================== --- httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/client/protocol/RequestTargetAuthentication.java (original) +++ httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/client/protocol/RequestTargetAuthentication.java Sat Nov 19 16:40:54 2016 @@ -31,7 +31,8 @@ import java.io.IOException; import org.apache.http.HttpException; import org.apache.http.HttpRequest; -import org.apache.http.annotation.Immutable; +import org.apache.http.annotation.Contract; +import org.apache.http.annotation.ThreadingBehavior; import org.apache.http.auth.AUTH; import org.apache.http.auth.AuthState; import org.apache.http.protocol.HttpContext; @@ -46,7 +47,7 @@ import org.apache.http.util.Args; @deprecated (4.3) use {@link org.apache.http.impl.auth.HttpAuthenticator}. / @Deprecated -@Immutable +@Contract(threading = ThreadingBehavior.IMMUTABLE) public class RequestTargetAuthentication extends RequestAuthenticationBase { public RequestTargetAuthentication() { Modified: httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/client/protocol/ResponseAuthCache.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/client/protocol/ResponseAuthCache.java?rev=1770506&r1=1770505&r2=1770506&view=diff ============================================================================== --- httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/client/protocol/ResponseAuthCache.java (original) +++ httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/client/protocol/ResponseAuthCache.java Sat Nov 19 16:40:54 2016 @@ -35,7 +35,8 @@ import org.apache.http.HttpException; import org.apache.http.HttpHost; import org.apache.http.HttpResponse; import org.apache.http.HttpResponseInterceptor; -import org.apache.http.annotation.Immutable; +import org.apache.http.annotation.Contract; +import org.apache.http.annotation.ThreadingBehavior; import org.apache.http.auth.AuthScheme; import org.apache.http.auth.AuthState; import org.apache.http.client.AuthCache; @@ -57,7 +58,7 @@ import org.apache.http.util.Args; * @deprecated (4.2) use {@link org.apache.http.client.AuthenticationStrategy} / -@Immutable +@Contract(threading = ThreadingBehavior.IMMUTABLE) @Deprecated public class ResponseAuthCache implements HttpResponseInterceptor { Modified: httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/client/utils/JdkIdn.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/client/utils/JdkIdn.java?rev=1770506&r1=1770505&r2=1770506&view=diff ============================================================================== --- httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/client/utils/JdkIdn.java (original) +++ httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/client/utils/JdkIdn.java Sat Nov 19 16:40:54 2016 @@ -29,7 +29,8 @@ package org.apache.http.client.utils; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; -import org.apache.http.annotation.Immutable; +import org.apache.http.annotation.Contract; +import org.apache.http.annotation.ThreadingBehavior; /* * Uses the java.net.IDN class through reflection. @@ -38,7 +39,7 @@ import org.apache.http.annotation.Immuta * * @since 4.0 / -@Immutable +@Contract(threading = ThreadingBehavior.IMMUTABLE) @Deprecated public class JdkIdn implements Idn { private final Method toUnicode; Modified: httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/client/utils/Punycode.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/client/utils/Punycode.java?rev=1770506&r1=1770505&r2=1770506&view=diff ============================================================================== --- httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/client/utils/Punycode.java (original) +++ httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/client/utils/Punycode.java Sat Nov 19 16:40:54 2016 @@ -26,7 +26,8 @@ / package org.apache.http.client.utils; -import org.apache.http.annotation.Immutable; +import org.apache.http.annotation.Contract; +import org.apache.http.annotation.ThreadingBehavior; /** * Facade that provides conversion between Unicode and Punycode domain names. @@ -36,7 +37,7 @@ import org.apache.http.annotation.Immuta * * @since 4.0 / -@Immutable +@Contract(threading = ThreadingBehavior.IMMUTABLE) @Deprecated public class Punycode { private static final Idn impl; Modified: httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/client/utils/Rfc3492Idn.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/client/utils/Rfc3492Idn.java?rev=1770506&r1=1770505&r2=1770506&view=diff ============================================================================== --- httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/client/utils/Rfc3492Idn.java (original) +++ httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/client/utils/Rfc3492Idn.java Sat Nov 19 16:40:54 2016 @@ -28,7 +28,8 @@ package org.apache.http.client.utils; import java.util.StringTokenizer; -import org.apache.http.annotation.Immutable; +import org.apache.http.annotation.Contract; +import org.apache.http.annotation.ThreadingBehavior; /* * Implementation from pseudo code in RFC 3492. @@ -37,7 +38,7 @@ import org.apache.http.annotation.Immuta * * @since 4.0 / -@Immutable +@Contract(threading = ThreadingBehavior.IMMUTABLE) @Deprecated public class Rfc3492Idn implements Idn { private static final int base = 36; Modified: httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/conn/BasicEofSensorWatcher.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/conn/BasicEofSensorWatcher.java?rev=1770506&r1=1770505&r2=1770506&view=diff ============================================================================== --- httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/conn/BasicEofSensorWatcher.java (original) +++ httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/conn/BasicEofSensorWatcher.java Sat Nov 19 16:40:54 2016 @@ -29,7 +29,6 @@ package org.apache.http.conn; import java.io.IOException; import java.io.InputStream; -import org.apache.http.annotation.NotThreadSafe; import org.apache.http.util.Args; /* @@ -41,7 +40,6 @@ import org.apache.http.util.Args; * @deprecated (4.3) do not use. / @Deprecated -@NotThreadSafe public class BasicEofSensorWatcher implements EofSensorWatcher { /* The connection to auto-release. / Modified: httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/conn/BasicManagedEntity.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/conn/BasicManagedEntity.java?rev=1770506&r1=1770505&r2=1770506&view=diff ============================================================================== --- httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/conn/BasicManagedEntity.java (original) +++ httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/conn/BasicManagedEntity.java Sat Nov 19 16:40:54 2016 @@ -32,7 +32,6 @@ import java.io.OutputStream; import java.net.SocketException; import org.apache.http.HttpEntity; -import org.apache.http.annotation.NotThreadSafe; import org.apache.http.entity.HttpEntityWrapper; import org.apache.http.util.Args; import org.apache.http.util.EntityUtils; @@ -48,7 +47,6 @@ import org.apache.http.util.EntityUtils; @deprecated (4.3) do not use. / @Deprecated -@NotThreadSafe public class BasicManagedEntity extends HttpEntityWrapper implements ConnectionReleaseTrigger, EofSensorWatcher { Modified: httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/conn/MultihomePlainSocketFactory.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/conn/MultihomePlainSocketFactory.java?rev=1770506&r1=1770505&r2=1770506&view=diff ============================================================================== --- httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/conn/MultihomePlainSocketFactory.java (original) +++ httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/conn/MultihomePlainSocketFactory.java Sat Nov 19 16:40:54 2016 @@ -37,7 +37,8 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; -import org.apache.http.annotation.Immutable; +import org.apache.http.annotation.Contract; +import org.apache.http.annotation.ThreadingBehavior; import org.apache.http.conn.scheme.SocketFactory; import org.apache.http.params.HttpConnectionParams; import org.apache.http.params.HttpParams; @@ -57,7 +58,7 @@ import org.apache.http.util.Asserts; {@link org.apache.http.conn.scheme.SchemeSocketFactory} interface. / @Deprecated -@Immutable +@Contract(threading = ThreadingBehavior.IMMUTABLE) public final class MultihomePlainSocketFactory implements SocketFactory { /* Modified: httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/conn/params/ConnManagerParamBean.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/conn/params/ConnManagerParamBean.java?rev=1770506&r1=1770505&r2=1770506&view=diff ============================================================================== --- httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/conn/params/ConnManagerParamBean.java (original) +++ httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/conn/params/ConnManagerParamBean.java Sat Nov 19 16:40:54 2016 @@ -27,7 +27,6 @@ package org.apache.http.conn.params; -import org.apache.http.annotation.NotThreadSafe; import org.apache.http.params.HttpAbstractParamBean; import org.apache.http.params.HttpParams; @@ -40,7 +39,6 @@ import org.apache.http.params.HttpParams * * @deprecated (4.1) use configuration methods of the specific connection manager implementation. / -@NotThreadSafe @Deprecated public class ConnManagerParamBean extends HttpAbstractParamBean { Modified: httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/conn/params/ConnManagerParams.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/conn/params/ConnManagerParams.java?rev=1770506&r1=1770505&r2=1770506&view=diff ============================================================================== --- httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/conn/params/ConnManagerParams.java (original) +++ httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/conn/params/ConnManagerParams.java Sat Nov 19 16:40:54 2016 @@ -26,7 +26,8 @@ / package org.apache.http.conn.params; -import org.apache.http.annotation.Immutable; +import org.apache.http.annotation.Contract; +import org.apache.http.annotation.ThreadingBehavior; import org.apache.http.conn.routing.HttpRoute; import org.apache.http.params.HttpParams; import org.apache.http.util.Args; @@ -42,7 +43,7 @@ import org.apache.http.util.Args; * @deprecated (4.1) use configuration methods of the specific connection manager implementation. / @Deprecated -@Immutable +@Contract(threading = ThreadingBehavior.IMMUTABLE) public final class ConnManagerParams implements ConnManagerPNames { /* The default maximum number of connections allowed overall / Modified: httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/conn/params/ConnPerRouteBean.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/conn/params/ConnPerRouteBean.java?rev=1770506&r1=1770505&r2=1770506&view=diff ============================================================================== --- httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/conn/params/ConnPerRouteBean.java (original) +++ httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/conn/params/ConnPerRouteBean.java Sat Nov 19 16:40:54 2016 @@ -29,7 +29,8 @@ package org.apache.http.conn.params; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import org.apache.http.annotation.ThreadSafe; +import org.apache.http.annotation.Contract; +import org.apache.http.annotation.ThreadingBehavior; import org.apache.http.conn.routing.HttpRoute; import org.apache.http.util.Args; @@ -44,7 +45,7 @@ import org.apache.http.util.Args; @deprecated (4.2) use {@link org.apache.http.pool.ConnPoolControl} / @Deprecated -@ThreadSafe +@Contract(threading = ThreadingBehavior.SAFE) public final class ConnPerRouteBean implements ConnPerRoute { /* The default maximum number of connections allowed per host / Modified: httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/conn/params/ConnRouteParamBean.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/conn/params/ConnRouteParamBean.java?rev=1770506&r1=1770505&r2=1770506&view=diff ============================================================================== --- httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/conn/params/ConnRouteParamBean.java (original) +++ httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/conn/params/ConnRouteParamBean.java Sat Nov 19 16:40:54 2016 @@ -30,7 +30,6 @@ package org.apache.http.conn.params; import java.net.InetAddress; import org.apache.http.HttpHost; -import org.apache.http.annotation.NotThreadSafe; import org.apache.http.conn.routing.HttpRoute; import org.apache.http.params.HttpAbstractParamBean; import org.apache.http.params.HttpParams; @@ -45,7 +44,6 @@ import org.apache.http.params.HttpParams @deprecated (4.3) use {@link org.apache.http.client.config.RequestConfig}. / @Deprecated -@NotThreadSafe public class ConnRouteParamBean extends HttpAbstractParamBean { public ConnRouteParamBean (final HttpParams params) { Modified: httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/conn/params/ConnRouteParams.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/conn/params/ConnRouteParams.java?rev=1770506&r1=1770505&r2=1770506&view=diff ============================================================================== --- httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/conn/params/ConnRouteParams.java (original) +++ httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/conn/params/ConnRouteParams.java Sat Nov 19 16:40:54 2016 @@ -29,7 +29,8 @@ package org.apache.http.conn.params; import java.net.InetAddress; import org.apache.http.HttpHost; -import org.apache.http.annotation.Immutable; +import org.apache.http.annotation.Contract; +import org.apache.http.annotation.ThreadingBehavior; import org.apache.http.conn.routing.HttpRoute; import org.apache.http.params.HttpParams; import org.apache.http.util.Args; @@ -43,7 +44,7 @@ import org.apache.http.util.Args; @deprecated (4.3) use {@link org.apache.http.client.config.RequestConfig}. / @Deprecated -@Immutable +@Contract(threading = ThreadingBehavior.IMMUTABLE) public class ConnRouteParams implements ConnRoutePNames { /* Modified: httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/conn/scheme/PlainSocketFactory.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/conn/scheme/PlainSocketFactory.java?rev=1770506&r1=1770505&r2=1770506&view=diff ============================================================================== --- httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/conn/scheme/PlainSocketFactory.java (original) +++ httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/conn/scheme/PlainSocketFactory.java Sat Nov 19 16:40:54 2016 @@ -34,7 +34,8 @@ import java.net.Socket; import java.net.SocketTimeoutException; import java.net.UnknownHostException; -import org.apache.http.annotation.Immutable; +import org.apache.http.annotation.Contract; +import org.apache.http.annotation.ThreadingBehavior; import org.apache.http.conn.ConnectTimeoutException; import org.apache.http.params.HttpConnectionParams; import org.apache.http.params.HttpParams; @@ -47,7 +48,7 @@ import org.apache.http.util.Args; * * @deprecated (4.3) use {@link org.apache.http.conn.socket.PlainConnectionSocketFactory} / -@Immutable +@Contract(threading = ThreadingBehavior.IMMUTABLE) @Deprecated public class PlainSocketFactory implements SocketFactory, SchemeSocketFactory { Modified: httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/conn/ssl/SSLContextBuilder.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/conn/ssl/SSLContextBuilder.java?rev=1770506&r1=1770505&r2=1770506&view=diff ============================================================================== --- httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/conn/ssl/SSLContextBuilder.java (original) +++ httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/conn/ssl/SSLContextBuilder.java Sat Nov 19 16:40:54 2016 @@ -51,8 +51,6 @@ import javax.net.ssl.TrustManagerFactory import javax.net.ssl.X509KeyManager; import javax.net.ssl.X509TrustManager; -import org.apache.http.annotation.NotThreadSafe; - /* * Builder for {@link SSLContext} instances. * @@ -60,7 +58,6 @@ import org.apache.http.annotation.NotThr * * @deprecated (4.4) use {@link org.apache.http.ssl.SSLContextBuilder}. / -@NotThreadSafe @Deprecated public class SSLContextBuilder { Modified: httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/conn/ssl/SSLContexts.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/conn/ssl/SSLContexts.java?rev=1770506&r1=1770505&r2=1770506&view=diff ============================================================================== --- httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/conn/ssl/SSLContexts.java (original) +++ httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/conn/ssl/SSLContexts.java Sat Nov 19 16:40:54 2016 @@ -32,7 +32,8 @@ import java.security.NoSuchAlgorithmExce import javax.net.ssl.SSLContext; -import org.apache.http.annotation.Immutable; +import org.apache.http.annotation.Contract; +import org.apache.http.annotation.ThreadingBehavior; /* * {@link SSLContext} factory methods. @@ -41,7 +42,7 @@ import org.apache.http.annotation.Immuta * * @deprecated (4.4) use {@link org.apache.http.ssl.SSLContexts}. / -@Immutable +@Contract(threading = ThreadingBehavior.IMMUTABLE) @Deprecated public class SSLContexts { Modified: httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/conn/ssl/SSLSocketFactory.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/conn/ssl/SSLSocketFactory.java?rev=1770506&r1=1770505&r2=1770506&view=diff ============================================================================== --- httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/conn/ssl/SSLSocketFactory.java (original) +++ httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/conn/ssl/SSLSocketFactory.java Sat Nov 19 16:40:54 2016 @@ -44,7 +44,8 @@ import javax.net.ssl.SSLContext; import javax.net.ssl.SSLSocket; import org.apache.http.HttpHost; -import org.apache.http.annotation.ThreadSafe; +import org.apache.http.annotation.Contract; +import org.apache.http.annotation.ThreadingBehavior; import org.apache.http.conn.ConnectTimeoutException; import org.apache.http.conn.HttpInetSocketAddress; import org.apache.http.conn.scheme.HostNameResolver; @@ -140,7 +141,7 @@ import org.apache.http.util.TextUtils; * @deprecated (4.3) use {@link SSLConnectionSocketFactory}. / -@ThreadSafe +@Contract(threading = ThreadingBehavior.SAFE_CONDITIONAL) @Deprecated public class SSLSocketFactory implements LayeredConnectionSocketFactory, SchemeLayeredSocketFactory, LayeredSchemeSocketFactory, LayeredSocketFactory { Modified: httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/cookie/params/CookieSpecParamBean.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/cookie/params/CookieSpecParamBean.java?rev=1770506&r1=1770505&r2=1770506&view=diff ============================================================================== --- httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/cookie/params/CookieSpecParamBean.java (original) +++ httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/cookie/params/CookieSpecParamBean.java Sat Nov 19 16:40:54 2016 @@ -29,7 +29,6 @@ package org.apache.http.cookie.params; import java.util.Collection; -import org.apache.http.annotation.NotThreadSafe; import org.apache.http.params.HttpAbstractParamBean; import org.apache.http.params.HttpParams; @@ -44,7 +43,6 @@ import org.apache.http.params.HttpParams org.apache.http.cookie.CookieSpecProvider}s. / @Deprecated -@NotThreadSafe public class CookieSpecParamBean extends HttpAbstractParamBean { public CookieSpecParamBean (final HttpParams params) { Modified: httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/client/AbstractAuthenticationHandler.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/client/AbstractAuthenticationHandler.java?rev=1770506&r1=1770505&r2=1770506&view=diff ============================================================================== --- httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/client/AbstractAuthenticationHandler.java (original) +++ httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/client/AbstractAuthenticationHandler.java Sat Nov 19 16:40:54 2016 @@ -40,7 +40,8 @@ import org.apache.commons.logging.LogFac import org.apache.http.FormattedHeader; import org.apache.http.Header; import org.apache.http.HttpResponse; -import org.apache.http.annotation.Immutable; +import org.apache.http.annotation.Contract; +import org.apache.http.annotation.ThreadingBehavior; import org.apache.http.auth.AuthScheme; import org.apache.http.auth.AuthSchemeRegistry; import org.apache.http.auth.AuthenticationException; @@ -61,7 +62,7 @@ import org.apache.http.util.CharArrayBuf @deprecated (4.2) use {@link org.apache.http.client.AuthenticationStrategy} / @Deprecated -@Immutable +@Contract(threading = ThreadingBehavior.IMMUTABLE) public abstract class AbstractAuthenticationHandler implements AuthenticationHandler { private final Log log = LogFactory.getLog(getClass()); Modified: httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/client/AbstractHttpClient.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/client/AbstractHttpClient.java?rev=1770506&r1=1770505&r2=1770506&view=diff ============================================================================== --- httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/client/AbstractHttpClient.java (original) +++ httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/client/AbstractHttpClient.java Sat Nov 19 16:40:54 2016 @@ -38,8 +38,8 @@ import org.apache.http.HttpHost; import org.apache.http.HttpRequest; import org.apache.http.HttpRequestInterceptor; import org.apache.http.HttpResponseInterceptor; -import org.apache.http.annotation.GuardedBy; -import org.apache.http.annotation.ThreadSafe; +import org.apache.http.annotation.Contract; +import org.apache.http.annotation.ThreadingBehavior; import org.apache.http.auth.AuthSchemeRegistry; import org.apache.http.client.AuthenticationHandler; import org.apache.http.client.AuthenticationStrategy; @@ -194,85 +194,30 @@ import org.apache.http.util.Args; * @deprecated (4.3) use {@link HttpClientBuilder}. / -@ThreadSafe +@Contract(threading = ThreadingBehavior.SAFE_CONDITIONAL) @Deprecated public abstract class AbstractHttpClient extends CloseableHttpClient { private final Log log = LogFactory.getLog(getClass()); - /* The parameters. / - @GuardedBy("this") private HttpParams defaultParams; - - /* The request executor. / - @GuardedBy("this") private HttpRequestExecutor requestExec; - - /* The connection manager. / - @GuardedBy("this") private ClientConnectionManager connManager; - - /* The connection re-use strategy. / - @GuardedBy("this") private ConnectionReuseStrategy reuseStrategy; - - /* The connection keep-alive strategy. / - @GuardedBy("this") private ConnectionKeepAliveStrategy keepAliveStrategy; - - /* The cookie spec registry. / - @GuardedBy("this") private CookieSpecRegistry supportedCookieSpecs; - - /* The authentication scheme registry. / - @GuardedBy("this") private AuthSchemeRegistry supportedAuthSchemes; - - /* The HTTP protocol processor and its immutable copy. / - @GuardedBy("this") private BasicHttpProcessor mutableProcessor; - - @GuardedBy("this") private ImmutableHttpProcessor protocolProcessor; - - /* The request retry handler. / - @GuardedBy("this") private HttpRequestRetryHandler retryHandler; - - /* The redirect handler. / - @GuardedBy("this") private RedirectStrategy redirectStrategy; - - /* The target authentication handler. / - @GuardedBy("this") private AuthenticationStrategy targetAuthStrategy; - - /* The proxy authentication handler. / - @GuardedBy("this") private AuthenticationStrategy proxyAuthStrategy; - - /* The cookie store. / - @GuardedBy("this") private CookieStore cookieStore; - - /* The credentials provider. / - @GuardedBy("this") private CredentialsProvider credsProvider; - - /* The route planner. / - @GuardedBy("this") private HttpRoutePlanner routePlanner; - - /* The user token handler. / - @GuardedBy("this") private UserTokenHandler userTokenHandler; - - /* The connection backoff strategy. / - @GuardedBy("this") private ConnectionBackoffStrategy connectionBackoffStrategy; - - /* The backoff manager. / - @GuardedBy("this") private BackoffManager backoffManager; /* Modified: httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/client/AuthenticationStrategyAdaptor.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/client/AuthenticationStrategyAdaptor.java?rev=1770506&r1=1770505&r2=1770506&view=diff ============================================================================== --- httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/client/AuthenticationStrategyAdaptor.java (original) +++ httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/client/AuthenticationStrategyAdaptor.java Sat Nov 19 16:40:54 2016 @@ -37,7 +37,8 @@ import org.apache.commons.logging.LogFac import org.apache.http.Header; import org.apache.http.HttpHost; import org.apache.http.HttpResponse; -import org.apache.http.annotation.Immutable; +import org.apache.http.annotation.Contract; +import org.apache.http.annotation.ThreadingBehavior; import org.apache.http.auth.AuthOption; import org.apache.http.auth.AuthScheme; import org.apache.http.auth.AuthScope; @@ -56,7 +57,7 @@ import org.apache.http.util.Args; /** * @deprecated (4.2) do not use / -@Immutable +@Contract(threading = ThreadingBehavior.IMMUTABLE) @Deprecated class AuthenticationStrategyAdaptor implements AuthenticationStrategy { Modified: httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/client/AutoRetryHttpClient.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/client/AutoRetryHttpClient.java?rev=1770506&r1=1770505&r2=1770506&view=diff ============================================================================== --- httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/client/AutoRetryHttpClient.java (original) +++ httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/client/AutoRetryHttpClient.java Sat Nov 19 16:40:54 2016 @@ -36,7 +36,8 @@ import org.apache.commons.logging.LogFac import org.apache.http.HttpHost; import org.apache.http.HttpRequest; import org.apache.http.HttpResponse; -import org.apache.http.annotation.ThreadSafe; +import org.apache.http.annotation.Contract; +import org.apache.http.annotation.ThreadingBehavior; import org.apache.http.client.HttpClient; import org.apache.http.client.ResponseHandler; import org.apache.http.client.ServiceUnavailableRetryStrategy; @@ -56,7 +57,7 @@ import org.apache.http.util.EntityUtils; @deprecated (4.3) use {@link HttpClientBuilder}. / @Deprecated -@ThreadSafe +@Contract(threading = ThreadingBehavior.SAFE_CONDITIONAL) public class AutoRetryHttpClient implements HttpClient { private final HttpClient backend; Modified: httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/client/ClientParamsStack.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/client/ClientParamsStack.java?rev=1770506&r1=1770505&r2=1770506&view=diff ============================================================================== --- httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/client/ClientParamsStack.java (original) +++ httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/client/ClientParamsStack.java Sat Nov 19 16:40:54 2016 @@ -27,7 +27,6 @@ package org.apache.http.impl.client; -import org.apache.http.annotation.NotThreadSafe; import org.apache.http.params.AbstractHttpParams; import org.apache.http.params.HttpParams; import org.apache.http.util.Args; @@ -69,7 +68,6 @@ import org.apache.http.util.Args; @deprecated (4.3) use configuration classes provided 'org.apache.http.config' * and 'org.apache.http.client.config' / -@NotThreadSafe @Deprecated public class ClientParamsStack extends AbstractHttpParams { Modified: httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/client/CloseableHttpResponseProxy.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/client/CloseableHttpResponseProxy.java?rev=1770506&r1=1770505&r2=1770506&view=diff ============================================================================== --- httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/client/CloseableHttpResponseProxy.java (original) +++ httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/client/CloseableHttpResponseProxy.java Sat Nov 19 16:40:54 2016 @@ -36,7 +36,6 @@ import java.lang.reflect.Proxy; import org.apache.http.HttpEntity; import org.apache.http.HttpResponse; -import org.apache.http.annotation.NotThreadSafe; import org.apache.http.client.methods.CloseableHttpResponse; import org.apache.http.util.EntityUtils; @@ -44,7 +43,6 @@ import org.apache.http.util.EntityUtils; @since 4.3 / @Deprecated -@NotThreadSafe class CloseableHttpResponseProxy implements InvocationHandler { private final static Constructor<?> CONSTRUCTOR; Modified: httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/client/ContentEncodingHttpClient.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/client/ContentEncodingHttpClient.java?rev=1770506&r1=1770505&r2=1770506&view=diff ============================================================================== --- httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/client/ContentEncodingHttpClient.java (original) +++ httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/client/ContentEncodingHttpClient.java Sat Nov 19 16:40:54 2016 @@ -26,7 +26,8 @@ / package org.apache.http.impl.client; -import org.apache.http.annotation.ThreadSafe; +import org.apache.http.annotation.Contract; +import org.apache.http.annotation.ThreadingBehavior; import org.apache.http.client.protocol.RequestAcceptEncoding; import org.apache.http.client.protocol.ResponseContentEncoding; import org.apache.http.conn.ClientConnectionManager; @@ -50,7 +51,7 @@ import org.apache.http.protocol.BasicHtt * @deprecated (4.2) use {@link HttpClientBuilder} / @Deprecated -@ThreadSafe // since DefaultHttpClient is +@Contract(threading = ThreadingBehavior.SAFE_CONDITIONAL) // since DefaultHttpClient is public class ContentEncodingHttpClient extends DefaultHttpClient { /* Modified: httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/client/DefaultHttpClient.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/client/DefaultHttpClient.java?rev=1770506&r1=1770505&r2=1770506&view=diff ============================================================================== --- httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/client/DefaultHttpClient.java (original) +++ httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/client/DefaultHttpClient.java Sat Nov 19 16:40:54 2016 @@ -28,7 +28,8 @@ package org.apache.http.impl.client; import org.apache.http.HttpVersion; -import org.apache.http.annotation.ThreadSafe; +import org.apache.http.annotation.Contract; +import org.apache.http.annotation.ThreadingBehavior; import org.apache.http.client.protocol.RequestAddCookies; import org.apache.http.client.protocol.RequestAuthCache; import org.apache.http.client.protocol.RequestClientConnControl; @@ -112,7 +113,7 @@ import org.apache.http.util.VersionInfo; * * @deprecated (4.3) use {@link HttpClientBuilder} see also {@link CloseableHttpClient}. / -@ThreadSafe +@Contract(threading = ThreadingBehavior.SAFE_CONDITIONAL) @Deprecated public class DefaultHttpClient extends AbstractHttpClient { Modified: httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/client/DefaultProxyAuthenticationHandler.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/client/DefaultProxyAuthenticationHandler.java?rev=1770506&r1=1770505&r2=1770506&view=diff ============================================================================== --- httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/client/DefaultProxyAuthenticationHandler.java (original) +++ httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/client/DefaultProxyAuthenticationHandler.java Sat Nov 19 16:40:54 2016 @@ -33,7 +33,8 @@ import java.util.Map; import org.apache.http.Header; import org.apache.http.HttpResponse; import org.apache.http.HttpStatus; -import org.apache.http.annotation.Immutable; +import org.apache.http.annotation.Contract; +import org.apache.http.annotation.ThreadingBehavior; import org.apache.http.auth.AUTH; import org.apache.http.auth.MalformedChallengeException; import org.apache.http.auth.params.AuthPNames; @@ -49,7 +50,7 @@ import org.apache.http.util.Args; @deprecated (4.2) use {@link ProxyAuthenticationStrategy} / @Deprecated -@Immutable +@Contract(threading = ThreadingBehavior.IMMUTABLE) public class DefaultProxyAuthenticationHandler extends AbstractAuthenticationHandler { public DefaultProxyAuthenticationHandler() { Modified: httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/client/DefaultRedirectHandler.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/client/DefaultRedirectHandler.java?rev=1770506&r1=1770505&r2=1770506&view=diff ============================================================================== --- httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/client/DefaultRedirectHandler.java (original) +++ httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/client/DefaultRedirectHandler.java Sat Nov 19 16:40:54 2016 @@ -38,7 +38,8 @@ import org.apache.http.HttpRequest; import org.apache.http.HttpResponse; import org.apache.http.HttpStatus; import org.apache.http.ProtocolException; -import org.apache.http.annotation.Immutable; +import org.apache.http.annotation.Contract; +import org.apache.http.annotation.ThreadingBehavior; import org.apache.http.client.CircularRedirectException; import org.apache.http.client.RedirectHandler; import org.apache.http.client.methods.HttpGet; @@ -58,7 +59,7 @@ import org.apache.http.util.Asserts; * @deprecated (4.1) use {@link DefaultRedirectStrategy}. / -@Immutable +@Contract(threading = ThreadingBehavior.IMMUTABLE) @Deprecated public class DefaultRedirectHandler implements RedirectHandler { Modified: httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/client/DefaultRedirectStrategyAdaptor.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/client/DefaultRedirectStrategyAdaptor.java?rev=1770506&r1=1770505&r2=1770506&view=diff ============================================================================== --- httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/client/DefaultRedirectStrategyAdaptor.java (original) +++ httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/client/DefaultRedirectStrategyAdaptor.java Sat Nov 19 16:40:54 2016 @@ -32,7 +32,8 @@ import java.net.URI; import org.apache.http.HttpRequest; import org.apache.http.HttpResponse; import org.apache.http.ProtocolException; -import org.apache.http.annotation.Immutable; +import org.apache.http.annotation.Contract; +import org.apache.http.annotation.ThreadingBehavior; import org.apache.http.client.RedirectHandler; import org.apache.http.client.RedirectStrategy; import org.apache.http.client.methods.HttpGet; @@ -43,7 +44,7 @@ import org.apache.http.protocol.HttpCont /* * @deprecated (4.1) do not use / -@Immutable +@Contract(threading = ThreadingBehavior.IMMUTABLE) @Deprecated class DefaultRedirectStrategyAdaptor implements RedirectStrategy { Modified: httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/client/DefaultRequestDirector.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/client/DefaultRequestDirector.java?rev=1770506&r1=1770505&r2=1770506&view=diff ============================================================================== --- httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/client/DefaultRequestDirector.java (original) +++ httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/client/DefaultRequestDirector.java Sat Nov 19 16:40:54 2016 @@ -45,7 +45,6 @@ import org.apache.http.HttpResponse; import org.apache.http.NoHttpResponseException; import org.apache.http.ProtocolException; import org.apache.http.ProtocolVersion; -import org.apache.http.annotation.NotThreadSafe; import org.apache.http.auth.AuthProtocolState; import org.apache.http.auth.AuthScheme; import org.apache.http.auth.AuthState; @@ -132,7 +131,6 @@ import org.apache.http.util.EntityUtils; @deprecated (4.3) / @Deprecated -@NotThreadSafe // e.g. managedConn public class DefaultRequestDirector implements RequestDirector { private final Log log; Modified: httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/client/DefaultTargetAuthenticationHandler.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/client/DefaultTargetAuthenticationHandler.java?rev=1770506&r1=1770505&r2=1770506&view=diff ============================================================================== --- httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/client/DefaultTargetAuthenticationHandler.java (original) +++ httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/client/DefaultTargetAuthenticationHandler.java Sat Nov 19 16:40:54 2016 @@ -33,7 +33,8 @@ import java.util.Map; import org.apache.http.Header; import org.apache.http.HttpResponse; import org.apache.http.HttpStatus; -import org.apache.http.annotation.Immutable; +import org.apache.http.annotation.Contract; +import org.apache.http.annotation.ThreadingBehavior; import org.apache.http.auth.AUTH; import org.apache.http.auth.MalformedChallengeException; import org.apache.http.auth.params.AuthPNames; @@ -49,7 +50,7 @@ import org.apache.http.util.Args; @deprecated (4.2) use {@link TargetAuthenticationStrategy} / @Deprecated -@Immutable +@Contract(threading = ThreadingBehavior.IMMUTABLE) public class DefaultTargetAuthenticationHandler extends AbstractAuthenticationHandler { public DefaultTargetAuthenticationHandler() { Modified: httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/client/RoutedRequest.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/client/RoutedRequest.java?rev=1770506&r1=1770505&r2=1770506&view=diff ============================================================================== --- httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/client/RoutedRequest.java (original) +++ httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/client/RoutedRequest.java Sat Nov 19 16:40:54 2016 @@ -27,7 +27,6 @@ package org.apache.http.impl.client; -import org.apache.http.annotation.NotThreadSafe; import org.apache.http.conn.routing.HttpRoute; /* @@ -38,11 +37,10 @@ import org.apache.http.conn.routing.Http * @deprecated (4.3) do not use. / @Deprecated -@NotThreadSafe // RequestWrapper is @NotThreadSafe public class RoutedRequest { protected final RequestWrapper request; // @NotThreadSafe - protected final HttpRoute route; // @Immutable + protected final HttpRoute route; // @Contract(threading = ThreadingBehavior.IMMUTABLE) /* * Creates a new routed request. Modified: httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/client/SystemDefaultHttpClient.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/client/SystemDefaultHttpClient.java?rev=1770506&r1=1770505&r2=1770506&view=diff ============================================================================== --- httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/client/SystemDefaultHttpClient.java (original) +++ httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/client/SystemDefaultHttpClient.java Sat Nov 19 16:40:54 2016 @@ -30,7 +30,8 @@ package org.apache.http.impl.client; import java.net.ProxySelector; import org.apache.http.ConnectionReuseStrategy; -import org.apache.http.annotation.ThreadSafe; +import org.apache.http.annotation.Contract; +import org.apache.http.annotation.ThreadingBehavior; import org.apache.http.conn.ClientConnectionManager; import org.apache.http.conn.routing.HttpRoutePlanner; import org.apache.http.impl.DefaultConnectionReuseStrategy; @@ -104,7 +105,7 @@ import org.apache.http.params.HttpParams * * @deprecated (4.3) use {@link HttpClientBuilder} / -@ThreadSafe +@Contract(threading = ThreadingBehavior.SAFE_CONDITIONAL) @Deprecated public class SystemDefaultHttpClient extends DefaultHttpClient { Modified: httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/client/TunnelRefusedException.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/client/TunnelRefusedException.java?rev=1770506&r1=1770505&r2=1770506&view=diff ============================================================================== --- httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/client/TunnelRefusedException.java (original) +++ httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/client/TunnelRefusedException.java Sat Nov 19 16:40:54 2016 @@ -29,7 +29,6 @@ package org.apache.http.impl.client; import org.apache.http.HttpException; import org.apache.http.HttpResponse; -import org.apache.http.annotation.Immutable; /* * Signals that the tunnel request was rejected by the proxy host. @@ -39,7 +38,6 @@ import org.apache.http.annotation.Immuta * @deprecated (4.3) reserved for internal use. / @Deprecated -@Immutable public class TunnelRefusedException extends HttpException { private static final long serialVersionUID = -8646722842745617323L; Modified: httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/AbstractClientConnAdapter.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/AbstractClientConnAdapter.java?rev=1770506&r1=1770505&r2=1770506&view=diff ============================================================================== --- httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/AbstractClientConnAdapter.java (original) +++ httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/AbstractClientConnAdapter.java Sat Nov 19 16:40:54 2016 @@ -40,7 +40,6 @@ import org.apache.http.HttpEntityEnclosi import org.apache.http.HttpException; import org.apache.http.HttpRequest; import org.apache.http.HttpResponse; -import org.apache.http.annotation.NotThreadSafe; import org.apache.http.conn.ClientConnectionManager; import org.apache.http.conn.ManagedClientConnection; import org.apache.http.conn.OperatedClientConnection; @@ -70,7 +69,6 @@ import org.apache.http.protocol.HttpCont @deprecated (4.2) do not use / @Deprecated -@NotThreadSafe public abstract class AbstractClientConnAdapter implements ManagedClientConnection, HttpContext { /* Modified: httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/BasicClientConnectionManager.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/BasicClientConnectionManager.java?rev=1770506&r1=1770505&r2=1770506&view=diff ============================================================================== --- httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/BasicClientConnectionManager.java (original) +++ httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/BasicClientConnectionManager.java Sat Nov 19 16:40:54 2016 @@ -34,8 +34,8 @@ import java.util.concurrent.atomic.Atomi import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.http.HttpClientConnection; -import org.apache.http.annotation.GuardedBy; -import org.apache.http.annotation.ThreadSafe; +import org.apache.http.annotation.Contract; +import org.apache.http.annotation.ThreadingBehavior; import org.apache.http.conn.ClientConnectionManager; import org.apache.http.conn.ClientConnectionOperator; import org.apache.http.conn.ClientConnectionRequest; @@ -66,7 +66,7 @@ import org.apache.http.util.Asserts; * * @deprecated (4.3) use {@link BasicHttpClientConnectionManager}. / -@ThreadSafe +@Contract(threading = ThreadingBehavior.SAFE) @Deprecated public class BasicClientConnectionManager implements ClientConnectionManager { @@ -86,15 +86,12 @@ public class BasicClientConnectionManage private final ClientConnectionOperator connOperator; /* The one and only entry in this pool. / - @GuardedBy("this") private HttpPoolEntry poolEntry; /* The currently issued managed connection, if any. / - @GuardedBy("this") private ManagedClientConnectionImpl conn; /* Indicates whether this connection manager is shut down. / - @GuardedBy("this") private volatile boolean shutdown; /* Modified: httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/DefaultClientConnection.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/DefaultClientConnection.java?rev=1770506&r1=1770505&r2=1770506&view=diff ============================================================================== --- httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/DefaultClientConnection.java (original) +++ httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/DefaultClientConnection.java Sat Nov 19 16:40:54 2016 @@ -44,9 +44,8 @@ import org.apache.http.HttpHost; import org.apache.http.HttpRequest; import org.apache.http.HttpResponse; import org.apache.http.HttpResponseFactory; -import org.apache.http.annotation.NotThreadSafe; -import org.apache.http.conn.OperatedClientConnection; import org.apache.http.conn.ManagedHttpClientConnection; +import org.apache.http.conn.OperatedClientConnection; import org.apache.http.impl.SocketHttpClientConnection; import org.apache.http.io.HttpMessageParser; import org.apache.http.io.SessionInputBuffer; @@ -64,7 +63,6 @@ import org.apache.http.util.Args; * * @deprecated (4.3) use {@link ManagedHttpClientConnectionFactory}. / -@NotThreadSafe // connSecure, targetHost @Deprecated public class DefaultClientConnection extends SocketHttpClientConnection implements OperatedClientConnection, ManagedHttpClientConnection, HttpContext { Modified: httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/DefaultClientConnectionOperator.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/DefaultClientConnectionOperator.java?rev=1770506&r1=1770505&r2=1770506&view=diff ============================================================================== --- httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/DefaultClientConnectionOperator.java (original) +++ httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/DefaultClientConnectionOperator.java Sat Nov 19 16:40:54 2016 @@ -37,7 +37,8 @@ import java.net.UnknownHostException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.http.HttpHost; -import org.apache.http.annotation.ThreadSafe; +import org.apache.http.annotation.Contract; +import org.apache.http.annotation.ThreadingBehavior; import org.apache.http.client.protocol.ClientContext; import org.apache.http.conn.ClientConnectionOperator; import org.apache.http.conn.ConnectTimeoutException; @@ -86,13 +87,13 @@ import org.apache.http.util.Asserts; @deprecated (4.3) use {@link PoolingHttpClientConnectionManager}. / @Deprecated -@ThreadSafe +@Contract(threading = ThreadingBehavior.SAFE_CONDITIONAL) public class DefaultClientConnectionOperator implements ClientConnectionOperator { private final Log log = LogFactory.getLog(getClass()); /* The scheme registry for looking up socket factories. / - protected final SchemeRegistry schemeRegistry; // @ThreadSafe + protected final SchemeRegistry schemeRegistry; // @Contract(threading = ThreadingBehavior.SAFE) /* the custom-configured DNS lookup mechanism. / protected final DnsResolver dnsResolver; Modified: httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/DefaultHttpRoutePlanner.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/DefaultHttpRoutePlanner.java?rev=1770506&r1=1770505&r2=1770506&view=diff ============================================================================== --- httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/DefaultHttpRoutePlanner.java (original) +++ httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/DefaultHttpRoutePlanner.java Sat Nov 19 16:40:54 2016 @@ -33,7 +33,8 @@ import java.net.InetAddress; import org.apache.http.HttpException; import org.apache.http.HttpHost; import org.apache.http.HttpRequest; -import org.apache.http.annotation.ThreadSafe; +import org.apache.http.annotation.Contract; +import org.apache.http.annotation.ThreadingBehavior; import org.apache.http.conn.params.ConnRouteParams; import org.apache.http.conn.routing.HttpRoute; import org.apache.http.conn.routing.HttpRoutePlanner; @@ -61,12 +62,12 @@ import org.apache.http.util.Asserts; * @deprecated (4.3) use {@link DefaultRoutePlanner} / -@ThreadSafe +@Contract(threading = ThreadingBehavior.SAFE) @Deprecated public class DefaultHttpRoutePlanner implements HttpRoutePlanner { /* The scheme registry. / - protected final SchemeRegistry schemeRegistry; // class is @ThreadSafe + protected final SchemeRegistry schemeRegistry; // class is @Contract(threading = ThreadingBehavior.SAFE) /* * Creates a new default route planner. Modified: httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/DefaultResponseParser.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/DefaultResponseParser.java?rev=1770506&r1=1770505&r2=1770506&view=diff ============================================================================== --- httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/DefaultResponseParser.java (original) +++ httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/DefaultResponseParser.java Sat Nov 19 16:40:54 2016 @@ -37,7 +37,8 @@ import org.apache.http.HttpResponseFacto import org.apache.http.NoHttpResponseException; import org.apache.http.ProtocolException; import org.apache.http.StatusLine; -import org.apache.http.annotation.ThreadSafe; +import org.apache.http.annotation.Contract; +import org.apache.http.annotation.ThreadingBehavior; import org.apache.http.impl.io.AbstractMessageParser; import org.apache.http.io.SessionInputBuffer; import org.apache.http.message.LineParser; @@ -62,7 +63,7 @@ import org.apache.http.util.CharArrayBuf * @deprecated (4.2) use {@link DefaultHttpResponseParser} / @Deprecated -@ThreadSafe // no public methods +@Contract(threading = ThreadingBehavior.SAFE_CONDITIONAL) public class DefaultResponseParser extends AbstractMessageParser<HttpMessage> { private final Log log = LogFactory.getLog(getClass()); Modified: httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/LoggingSessionInputBuffer.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/LoggingSessionInputBuffer.java?rev=1770506&r1=1770505&r2=1770506&view=diff ============================================================================== --- httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/LoggingSessionInputBuffer.java (original) +++ httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/LoggingSessionInputBuffer.java Sat Nov 19 16:40:54 2016 @@ -29,7 +29,8 @@ package org.apache.http.impl.conn; import java.io.IOException; import org.apache.http.Consts; -import org.apache.http.annotation.Immutable; +import org.apache.http.annotation.Contract; +import org.apache.http.annotation.ThreadingBehavior; import org.apache.http.io.EofSensor; import org.apache.http.io.HttpTransportMetrics; import org.apache.http.io.SessionInputBuffer; @@ -42,7 +43,7 @@ import org.apache.http.util.CharArrayBuf * @deprecated (4.3) no longer used. / -@Immutable +@Contract(threading = ThreadingBehavior.IMMUTABLE) @Deprecated public class LoggingSessionInputBuffer implements SessionInputBuffer, EofSensor { Modified: httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/LoggingSessionOutputBuffer.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/LoggingSessionOutputBuffer.java?rev=1770506&r1=1770505&r2=1770506&view=diff ============================================================================== --- httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/LoggingSessionOutputBuffer.java (original) +++ httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/LoggingSessionOutputBuffer.java Sat Nov 19 16:40:54 2016 @@ -29,7 +29,8 @@ package org.apache.http.impl.conn; import java.io.IOException; import org.apache.http.Consts; -import org.apache.http.annotation.Immutable; +import org.apache.http.annotation.Contract; +import org.apache.http.annotation.ThreadingBehavior; import org.apache.http.io.HttpTransportMetrics; import org.apache.http.io.SessionOutputBuffer; import org.apache.http.util.CharArrayBuffer; @@ -39,7 +40,7 @@ import org.apache.http.util.CharArrayBuf @since 4.0 * @deprecated (4.3) no longer used. / -@Immutable +@Contract(threading = ThreadingBehavior.IMMUTABLE) @Deprecated public class LoggingSessionOutputBuffer implements SessionOutputBuffer { Modified: httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/ManagedClientConnectionImpl.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/ManagedClientConnectionImpl.java?rev=1770506&r1=1770505&r2=1770506&view=diff ============================================================================== --- httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/ManagedClientConnectionImpl.java (original) +++ httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/ManagedClientConnectionImpl.java Sat Nov 19 16:40:54 2016 @@ -41,7 +41,6 @@ import org.apache.http.HttpException; import org.apache.http.HttpHost; import org.apache.http.HttpRequest; import org.apache.http.HttpResponse; -import org.apache.http.annotation.NotThreadSafe; import org.apache.http.conn.ClientConnectionManager; import org.apache.http.conn.ClientConnectionOperator; import org.apache.http.conn.ManagedClientConnection; @@ -59,7 +58,6 @@ import org.apache.http.util.Asserts; @deprecated (4.3) use {@link ManagedHttpClientConnectionFactory}. / @Deprecated -@NotThreadSafe class ManagedClientConnectionImpl implements ManagedClientConnection { private final ClientConnectionManager manager; Modified: httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/PoolingClientConnectionManager.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/PoolingClientConnectionManager.java?rev=1770506&r1=1770505&r2=1770506&view=diff ============================================================================== --- httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/PoolingClientConnectionManager.java (original) +++ httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/PoolingClientConnectionManager.java Sat Nov 19 16:40:54 2016 @@ -34,7 +34,8 @@ import java.util.concurrent.TimeoutExcep import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.http.annotation.ThreadSafe; +import org.apache.http.annotation.Contract; +import org.apache.http.annotation.ThreadingBehavior; import org.apache.http.conn.ClientConnectionManager; import org.apache.http.conn.ClientConnectionOperator; import org.apache.http.conn.ClientConnectionRequest; @@ -69,7 +70,7 @@ import org.apache.http.util.Asserts; @deprecated (4.3) use {@link PoolingHttpClientConnectionManager}. / @Deprecated -@ThreadSafe +@Contract(threading = ThreadingBehavior.SAFE_CONDITIONAL) public class PoolingClientConnectionManager implements ClientConnectionManager, ConnPoolControl<HttpRoute> { private final Log log = LogFactory.getLog(getClass()); Modified: httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/ProxySelectorRoutePlanner.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/ProxySelectorRoutePlanner.java?rev=1770506&r1=1770505&r2=1770506&view=diff ============================================================================== --- httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/ProxySelectorRoutePlanner.java (original) +++ httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/ProxySelectorRoutePlanner.java Sat Nov 19 16:40:54 2016 @@ -39,7 +39,6 @@ import java.util.List; import org.apache.http.HttpException; import org.apache.http.HttpHost; import org.apache.http.HttpRequest; -import org.apache.http.annotation.NotThreadSafe; import org.apache.http.conn.params.ConnRouteParams; import org.apache.http.conn.routing.HttpRoute; import org.apache.http.conn.routing.HttpRoutePlanner; @@ -71,12 +70,11 @@ import org.apache.http.util.Asserts; * @deprecated (4.3) use {@link SystemDefaultRoutePlanner} / -@NotThreadSafe // e.g [gs]etProxySelector() @Deprecated public class ProxySelectorRoutePlanner implements HttpRoutePlanner { /* The scheme registry. / - protected final SchemeRegistry schemeRegistry; // @ThreadSafe + protected final SchemeRegistry schemeRegistry; // @Contract(threading = ThreadingBehavior.SAFE) /* The proxy selector to use, or {@code null} for system default. / protected ProxySelector proxySelector; Modified: httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/SchemeRegistryFactory.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/SchemeRegistryFactory.java?rev=1770506&r1=1770505&r2=1770506&view=diff ============================================================================== --- httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/SchemeRegistryFactory.java (original) +++ httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/SchemeRegistryFactory.java Sat Nov 19 16:40:54 2016 @@ -26,7 +26,8 @@ / package org.apache.http.impl.conn; -import org.apache.http.annotation.ThreadSafe; +import org.apache.http.annotation.Contract; +import org.apache.http.annotation.ThreadingBehavior; import org.apache.http.conn.scheme.PlainSocketFactory; import org.apache.http.conn.scheme.Scheme; import org.apache.http.conn.scheme.SchemeRegistry; @@ -37,7 +38,7 @@ import org.apache.http.conn.ssl.SSLSocke * * @deprecated (4.3) use {@link org.apache.http.impl.client.HttpClientBuilder}. */ -@ThreadSafe +@Contract(threading = ThreadingBehavior.SAFE) @Deprecated public final class SchemeRegistryFactory {
Mime	Unnamed text/plain (inline, 7-Bit, 88057 bytes)
	View raw message