From 2046a83cb3c9be19a97d5d3ca00cabd54ca61002 Mon Sep 17 00:00:00 2001 From: Roland Weber Date: Wed, 11 Jul 2007 11:14:49 +0000 Subject: [PATCH] changed @since tags, nothing in these packages is older than 4.0 git-svn-id: https://svn.apache.org/repos/asf/jakarta/httpcomponents/httpclient/trunk@555245 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/http/auth/AuthSchemeRegistry.java | 3 ++- .../java/org/apache/http/auth/AuthScope.java | 20 +------------------ .../org/apache/http/client/AuthState.java | 3 ++- .../client/CircularRedirectException.java | 2 +- .../org/apache/http/client/HttpState.java | 4 ---- .../apache/http/client/RedirectException.java | 2 +- .../http/client/params/HttpClientParams.java | 2 +- .../apache/http/client/utils/URLUtils.java | 6 +----- .../http/conn/ssl/HostnameVerifier.java | 3 ++- .../apache/http/impl/auth/BasicScheme.java | 14 ++----------- .../apache/http/impl/auth/DigestScheme.java | 12 ++--------- .../apache/http/impl/auth/RFC2617Scheme.java | 4 ---- .../LoggingHttpDataReceiverDecorator.java | 2 +- .../LoggingHttpDataTransmitterDecorator.java | 2 +- .../java/org/apache/http/impl/conn/Wire.java | 2 +- 15 files changed, 18 insertions(+), 63 deletions(-) diff --git a/module-client/src/main/java/org/apache/http/auth/AuthSchemeRegistry.java b/module-client/src/main/java/org/apache/http/auth/AuthSchemeRegistry.java index 2abd51e4a..69a37df8e 100644 --- a/module-client/src/main/java/org/apache/http/auth/AuthSchemeRegistry.java +++ b/module-client/src/main/java/org/apache/http/auth/AuthSchemeRegistry.java @@ -43,8 +43,9 @@ import org.apache.http.params.HttpParams; * * @author Oleg Kalnichevski * + * * @version $Revision$ - * @since 3.0 + * @since 4.0 */ public final class AuthSchemeRegistry { diff --git a/module-client/src/main/java/org/apache/http/auth/AuthScope.java b/module-client/src/main/java/org/apache/http/auth/AuthScope.java index 9042cfa4f..da4f1925b 100644 --- a/module-client/src/main/java/org/apache/http/auth/AuthScope.java +++ b/module-client/src/main/java/org/apache/http/auth/AuthScope.java @@ -40,7 +40,7 @@ import org.apache.http.util.LangUtils; * @author Oleg Kalnichevski * @author Adrian Sutton * - * @since 3.0 + * @since 4.0 */ public class AuthScope { @@ -100,8 +100,6 @@ public class AuthScope { * @param scheme the authentication scheme the credentials apply to. * May be set to null if credenticals are applicable to * any authentication scheme. - * - * @since 3.0 */ public AuthScope(final String host, int port, final String realm, final String scheme) @@ -125,8 +123,6 @@ public class AuthScope { * @param realm the realm the credentials apply to. May be set * to null if credenticals are applicable to * any realm. - * - * @since 3.0 */ public AuthScope(final String host, int port, final String realm) { this(host, port, realm, ANY_SCHEME); @@ -142,8 +138,6 @@ public class AuthScope { * @param port the port the credentials apply to. May be set * to negative value if credenticals are applicable to * any port. - * - * @since 3.0 */ public AuthScope(final String host, int port) { this(host, port, ANY_REALM, ANY_SCHEME); @@ -151,8 +145,6 @@ public class AuthScope { /** * Creates a copy of the given credentials scope. - * - * @since 3.0 */ public AuthScope(final AuthScope authscope) { super(); @@ -167,8 +159,6 @@ public class AuthScope { /** * @return the host - * - * @since 3.0 */ public String getHost() { return this.host; @@ -176,8 +166,6 @@ public class AuthScope { /** * @return the port - * - * @since 3.0 */ public int getPort() { return this.port; @@ -185,8 +173,6 @@ public class AuthScope { /** * @return the realm name - * - * @since 3.0 */ public String getRealm() { return this.realm; @@ -194,8 +180,6 @@ public class AuthScope { /** * @return the scheme type - * - * @since 3.0 */ public String getScheme() { return this.scheme; @@ -207,8 +191,6 @@ public class AuthScope { * @return the match factor. Negative value signifies no match. * Non-negative signifies a match. The greater the returned value * the closer the match. - * - * @since 3.0 */ public int match(final AuthScope that) { int factor = 0; diff --git a/module-client/src/main/java/org/apache/http/client/AuthState.java b/module-client/src/main/java/org/apache/http/client/AuthState.java index 585e8768b..96234a85f 100644 --- a/module-client/src/main/java/org/apache/http/client/AuthState.java +++ b/module-client/src/main/java/org/apache/http/client/AuthState.java @@ -40,7 +40,8 @@ import org.apache.http.util.CharArrayBuffer; * authentication process. * * @author Oleg Kalnichevski - * @since 3.0 + * + * @since 4.0 */ public class AuthState { diff --git a/module-client/src/main/java/org/apache/http/client/CircularRedirectException.java b/module-client/src/main/java/org/apache/http/client/CircularRedirectException.java index d7f67f103..18668117d 100644 --- a/module-client/src/main/java/org/apache/http/client/CircularRedirectException.java +++ b/module-client/src/main/java/org/apache/http/client/CircularRedirectException.java @@ -35,7 +35,7 @@ package org.apache.http.client; * * @author Oleg Kalnichevski * - * @since 3.0 + * @since 4.0 */ public class CircularRedirectException extends RedirectException { diff --git a/module-client/src/main/java/org/apache/http/client/HttpState.java b/module-client/src/main/java/org/apache/http/client/HttpState.java index 8de2466e3..45eb45dd7 100644 --- a/module-client/src/main/java/org/apache/http/client/HttpState.java +++ b/module-client/src/main/java/org/apache/http/client/HttpState.java @@ -175,8 +175,6 @@ public class HttpState { * for the given scope. * * @see #getCredentials(AuthScope) - * - * @since 3.0 */ public synchronized void setCredentials(final AuthScope authscope, final Credentials credentials) { if (authscope == null) { @@ -224,8 +222,6 @@ public class HttpState { * @return the credentials * * @see #setCredentials(AuthScope, Credentials) - * - * @since 3.0 */ public synchronized Credentials getCredentials(final AuthScope authscope) { if (authscope == null) { diff --git a/module-client/src/main/java/org/apache/http/client/RedirectException.java b/module-client/src/main/java/org/apache/http/client/RedirectException.java index 63b18e67a..590606643 100644 --- a/module-client/src/main/java/org/apache/http/client/RedirectException.java +++ b/module-client/src/main/java/org/apache/http/client/RedirectException.java @@ -37,7 +37,7 @@ import org.apache.http.ProtocolException; * * @author Oleg Kalnichevski * - * @since 3.0 + * @since 4.0 */ public class RedirectException extends ProtocolException { diff --git a/module-client/src/main/java/org/apache/http/client/params/HttpClientParams.java b/module-client/src/main/java/org/apache/http/client/params/HttpClientParams.java index 3db318370..e1d5cc53f 100644 --- a/module-client/src/main/java/org/apache/http/client/params/HttpClientParams.java +++ b/module-client/src/main/java/org/apache/http/client/params/HttpClientParams.java @@ -39,7 +39,7 @@ import org.apache.http.params.HttpParams; * * @version $Revision$ * - * @since 3.0 + * @since 4.0 */ public class HttpClientParams { diff --git a/module-client/src/main/java/org/apache/http/client/utils/URLUtils.java b/module-client/src/main/java/org/apache/http/client/utils/URLUtils.java index ec4b1e14d..97111f76f 100644 --- a/module-client/src/main/java/org/apache/http/client/utils/URLUtils.java +++ b/module-client/src/main/java/org/apache/http/client/utils/URLUtils.java @@ -41,7 +41,7 @@ import org.apache.http.util.CharArrayBuffer; * @author Michael Becke * @author Oleg Kalnichevski * - * @since 2.0 final + * @since 4.0 */ public class URLUtils { @@ -68,8 +68,6 @@ public class URLUtils { * @param charset the character set of pairs to be encoded * * @return the urlencoded pairs - * - * @since 4.0 */ public static String simpleFormUrlEncode( final NameValuePair[] pairs, @@ -103,8 +101,6 @@ public class URLUtils { * * @return the urlencoded pairs * @throws UnsupportedEncodingException if charset is not supported - * - * @since 2.0 final */ public static String formUrlEncode( final NameValuePair[] pairs, diff --git a/module-client/src/main/java/org/apache/http/conn/ssl/HostnameVerifier.java b/module-client/src/main/java/org/apache/http/conn/ssl/HostnameVerifier.java index fcdb341cf..38adb2d42 100644 --- a/module-client/src/main/java/org/apache/http/conn/ssl/HostnameVerifier.java +++ b/module-client/src/main/java/org/apache/http/conn/ssl/HostnameVerifier.java @@ -53,7 +53,8 @@ import java.security.cert.X509Certificate; * * @author Julius Davies * @author Sebastian Hauer - * @since 8-Dec-2006 + * + * @since 4.0 (8-Dec-2006) */ public interface HostnameVerifier extends javax.net.ssl.HostnameVerifier { diff --git a/module-client/src/main/java/org/apache/http/impl/auth/BasicScheme.java b/module-client/src/main/java/org/apache/http/impl/auth/BasicScheme.java index 2113d5935..762f75b15 100644 --- a/module-client/src/main/java/org/apache/http/impl/auth/BasicScheme.java +++ b/module-client/src/main/java/org/apache/http/impl/auth/BasicScheme.java @@ -55,6 +55,8 @@ import org.apache.http.util.EncodingUtils; * @author Adrian Sutton * @author Mike Bowler * @author Oleg Kalnichevski + * + * @since 4.0 */ public class BasicScheme extends RFC2617Scheme { @@ -64,8 +66,6 @@ public class BasicScheme extends RFC2617Scheme { /** * Default constructor for the basic authetication scheme. - * - * @since 3.0 */ public BasicScheme() { super(); @@ -88,8 +88,6 @@ public class BasicScheme extends RFC2617Scheme { * * @throws MalformedChallengeException is thrown if the authentication challenge * is malformed - * - * @since 4.0 */ public void processChallenge( final Header header) throws MalformedChallengeException { @@ -102,8 +100,6 @@ public class BasicScheme extends RFC2617Scheme { * * @return true if Basic authorization has been processed, * false otherwise. - * - * @since 3.0 */ public boolean isComplete() { return this.complete; @@ -113,8 +109,6 @@ public class BasicScheme extends RFC2617Scheme { * Returns false. Basic authentication scheme is request based. * * @return false. - * - * @since 3.0 */ public boolean isConnectionBased() { return false; @@ -131,8 +125,6 @@ public class BasicScheme extends RFC2617Scheme { * be generated due to an authentication failure * * @return a basic authorization string - * - * @since 4.0 */ public Header authenticate( final Credentials credentials, @@ -157,8 +149,6 @@ public class BasicScheme extends RFC2617Scheme { * @param charset The charset to use for encoding the credentials * * @return a basic authorization header - * - * @since 4.0 */ public static Header authenticate( final Credentials credentials, diff --git a/module-client/src/main/java/org/apache/http/impl/auth/DigestScheme.java b/module-client/src/main/java/org/apache/http/impl/auth/DigestScheme.java index 2e098c2b2..aa60931b4 100644 --- a/module-client/src/main/java/org/apache/http/impl/auth/DigestScheme.java +++ b/module-client/src/main/java/org/apache/http/impl/auth/DigestScheme.java @@ -73,6 +73,8 @@ import org.apache.http.util.EncodingUtils; * @author Adrian Sutton * @author Mike Bowler * @author Oleg Kalnichevski + * + * @since 4.0 */ public class DigestScheme extends RFC2617Scheme { @@ -102,8 +104,6 @@ public class DigestScheme extends RFC2617Scheme { /** * Default constructor for the digest authetication scheme. - * - * @since 3.0 */ public DigestScheme() { super(); @@ -117,8 +117,6 @@ public class DigestScheme extends RFC2617Scheme { * * @throws MalformedChallengeException is thrown if the authentication challenge * is malformed - * - * @since 4.0 */ public void processChallenge( final Header header) throws MalformedChallengeException { @@ -162,8 +160,6 @@ public class DigestScheme extends RFC2617Scheme { * * @return true if Digest authorization has been processed, * false otherwise. - * - * @since 3.0 */ public boolean isComplete() { String s = getParameter("stale"); @@ -187,8 +183,6 @@ public class DigestScheme extends RFC2617Scheme { * Returns false. Digest authentication scheme is request based. * * @return false. - * - * @since 3.0 */ public boolean isConnectionBased() { return false; @@ -207,8 +201,6 @@ public class DigestScheme extends RFC2617Scheme { * be generated due to an authentication failure * * @return a digest authorization string - * - * @since 4.0 */ public Header authenticate( final Credentials credentials, diff --git a/module-client/src/main/java/org/apache/http/impl/auth/RFC2617Scheme.java b/module-client/src/main/java/org/apache/http/impl/auth/RFC2617Scheme.java index b2f826791..355385a05 100644 --- a/module-client/src/main/java/org/apache/http/impl/auth/RFC2617Scheme.java +++ b/module-client/src/main/java/org/apache/http/impl/auth/RFC2617Scheme.java @@ -66,8 +66,6 @@ public abstract class RFC2617Scheme implements AuthScheme { /** * Default constructor for RFC2617 compliant authetication schemes. - * - * @since 3.0 */ public RFC2617Scheme() { super(); @@ -82,8 +80,6 @@ public abstract class RFC2617Scheme implements AuthScheme { * * @throws MalformedChallengeException is thrown if the authentication challenge * is malformed - * - * @since 3.0 */ public void processChallenge(final Header header) throws MalformedChallengeException { if (header == null) { diff --git a/module-client/src/main/java/org/apache/http/impl/conn/LoggingHttpDataReceiverDecorator.java b/module-client/src/main/java/org/apache/http/impl/conn/LoggingHttpDataReceiverDecorator.java index 930038832..f8c965f66 100644 --- a/module-client/src/main/java/org/apache/http/impl/conn/LoggingHttpDataReceiverDecorator.java +++ b/module-client/src/main/java/org/apache/http/impl/conn/LoggingHttpDataReceiverDecorator.java @@ -43,7 +43,7 @@ import org.apache.http.util.CharArrayBuffer; * @author Mike Bowler * @author Oleg Kalnichevski * - * @since 2.0 + * @since 4.0 */ class LoggingHttpDataReceiverDecorator implements HttpDataReceiver { diff --git a/module-client/src/main/java/org/apache/http/impl/conn/LoggingHttpDataTransmitterDecorator.java b/module-client/src/main/java/org/apache/http/impl/conn/LoggingHttpDataTransmitterDecorator.java index bf55ee5da..122022707 100644 --- a/module-client/src/main/java/org/apache/http/impl/conn/LoggingHttpDataTransmitterDecorator.java +++ b/module-client/src/main/java/org/apache/http/impl/conn/LoggingHttpDataTransmitterDecorator.java @@ -41,7 +41,7 @@ import org.apache.http.util.CharArrayBuffer; * * @author Oleg Kalnichevski * - * @since 2.0beta1 + * @since 4.0 */ class LoggingHttpDataTransmitterDecorator implements HttpDataTransmitter { diff --git a/module-client/src/main/java/org/apache/http/impl/conn/Wire.java b/module-client/src/main/java/org/apache/http/impl/conn/Wire.java index 3f486e963..167701e27 100644 --- a/module-client/src/main/java/org/apache/http/impl/conn/Wire.java +++ b/module-client/src/main/java/org/apache/http/impl/conn/Wire.java @@ -40,7 +40,7 @@ import org.apache.commons.logging.Log; * * @author Oleg Kalnichevski * - * @since 2.0beta1 + * @since 4.0 */ public class Wire {