You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by gg...@apache.org on 2014/08/21 16:56:51 UTC
svn commit: r1619420 [3/3] - in
/httpcomponents/httpclient/trunk/httpclient/src:
examples/org/apache/http/examples/client/
main/java-deprecated/org/apache/http/client/
main/java-deprecated/org/apache/http/conn/
main/java-deprecated/org/apache/http/conn...
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/SSLConnectionSocketFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/SSLConnectionSocketFactory.java?rev=1619420&r1=1619419&r2=1619420&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/SSLConnectionSocketFactory.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/SSLConnectionSocketFactory.java Thu Aug 21 14:56:49 2014
@@ -84,15 +84,17 @@ import org.apache.http.util.TextUtils;
* <li>
* <p>
* Use JDK keytool utility to generate a new key
+ * </p>
* <pre>keytool -genkey -v -alias "my client key" -validity 365 -keystore my.keystore</pre>
+ * <p>
* For simplicity use the same password for the key as that of the key-store
* </p>
* </li>
* <li>
* <p>
* Issue a certificate signing request (CSR)
+ * </p>
* <pre>keytool -certreq -alias "my client key" -file mycertreq.csr -keystore my.keystore</pre>
- * </p>
* </li>
* <li>
* <p>
@@ -104,20 +106,20 @@ import org.apache.http.util.TextUtils;
* <li>
* <p>
* Import the trusted CA root certificate
- * <pre>keytool -import -alias "my trusted ca" -file caroot.crt -keystore my.keystore</pre>
* </p>
+ * <pre>keytool -import -alias "my trusted ca" -file caroot.crt -keystore my.keystore</pre>
* </li>
* <li>
- * <p>
+ * <p>
* Import the PKCS#7 file containg the complete certificate chain
+ * </p>
* <pre>keytool -import -alias "my client key" -file mycert.p7 -keystore my.keystore</pre>
- * </p>
* </li>
* <li>
- * <p>
+ * <p>
* Verify the content the resultant keystore file
+ * </p>
* <pre>keytool -list -v -keystore my.keystore</pre>
- * </p>
* </li>
* </ul>
*
@@ -151,7 +153,7 @@ public class SSLConnectionSocketFactory
/**
* Obtains default SSL socket factory with an SSL context based on the standard JSSE
- * trust material (<code>cacerts</code> file in the security properties directory).
+ * trust material ({@code cacerts} file in the security properties directory).
* System properties are not taken into consideration.
*
* @return default SSL socket factory
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/SSLContexts.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/SSLContexts.java?rev=1619420&r1=1619419&r2=1619420&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/SSLContexts.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/SSLContexts.java Thu Aug 21 14:56:49 2014
@@ -44,7 +44,7 @@ public class SSLContexts {
/**
* Creates default factory based on the standard JSSE trust material
- * (<code>cacerts</code> file in the security properties directory). System properties
+ * ({@code cacerts} file in the security properties directory). System properties
* are not taken into consideration.
*
* @return the default SSL socket factory
@@ -63,10 +63,10 @@ public class SSLContexts {
/**
* Creates default SSL context based on system properties. This method obtains
- * default SSL context by calling <code>SSLContext.getInstance("Default")</code>.
- * Please note that <code>Default</code> algorithm is supported as of Java 6.
+ * default SSL context by calling {@code SSLContext.getInstance("Default")}.
+ * Please note that {@code Default} algorithm is supported as of Java 6.
* This method will fall back onto {@link #createDefault()} when
- * <code>Default</code> algorithm is not available.
+ * {@code Default} algorithm is not available.
*
* @return default system SSL context
*/
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/TrustStrategy.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/TrustStrategy.java?rev=1619420&r1=1619419&r2=1619420&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/TrustStrategy.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/TrustStrategy.java Thu Aug 21 14:56:49 2014
@@ -43,13 +43,13 @@ public interface TrustStrategy {
* configured in the actual SSL context. This method can be used to override the standard JSSE
* certificate verification process.
* <p>
- * Please note that, if this method returns <code>false</code>, the trust manager configured
+ * Please note that, if this method returns {@code false}, the trust manager configured
* in the actual SSL context can still clear the certificate as trusted.
*
* @param chain the peer certificate chain
* @param authType the authentication type based on the client certificate
- * @return <code>true</code> if the certificate can be trusted without verification by
- * the trust manager, <code>false</code> otherwise.
+ * @return {@code true} if the certificate can be trusted without verification by
+ * the trust manager, {@code false} otherwise.
* @throws CertificateException thrown if the certificate is not trusted or invalid.
*/
boolean isTrusted(X509Certificate[] chain, String authType) throws CertificateException;
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/cookie/Cookie.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/cookie/Cookie.java?rev=1619420&r1=1619419&r2=1619420&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/cookie/Cookie.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/cookie/Cookie.java Thu Aug 21 14:56:49 2014
@@ -112,8 +112,8 @@ public interface Cookie {
/**
* Indicates whether this cookie requires a secure connection.
*
- * @return <code>true</code> if this cookie should only be sent
- * over secure connections, <code>false</code> otherwise.
+ * @return {@code true} if this cookie should only be sent
+ * over secure connections, {@code false} otherwise.
*/
boolean isSecure();
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/cookie/CookieSpec.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/cookie/CookieSpec.java?rev=1619420&r1=1619419&r2=1619420&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/cookie/CookieSpec.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/cookie/CookieSpec.java Thu Aug 21 14:56:49 2014
@@ -101,7 +101,7 @@ public interface CookieSpec {
/**
* Returns a request header identifying what version of the state management
- * specification is understood. May be <code>null</code> if the cookie
+ * specification is understood. May be {@code null} if the cookie
* specification does not support {@code Cookie2} header.
*/
Header getVersionHeader();
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/cookie/SetCookie.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/cookie/SetCookie.java?rev=1619420&r1=1619419&r2=1619420&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/cookie/SetCookie.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/cookie/SetCookie.java Thu Aug 21 14:56:49 2014
@@ -30,7 +30,7 @@ package org.apache.http.cookie;
import java.util.Date;
/**
- * This interface represents a <code>Set-Cookie</code> response header sent by the
+ * This interface represents a {@code Set-Cookie} response header sent by the
* origin server to the HTTP agent in order to maintain a conversational state.
*
* @since 4.0
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/cookie/SetCookie2.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/cookie/SetCookie2.java?rev=1619420&r1=1619419&r2=1619420&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/cookie/SetCookie2.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/cookie/SetCookie2.java Thu Aug 21 14:56:49 2014
@@ -28,7 +28,7 @@
package org.apache.http.cookie;
/**
- * This interface represents a <code>Set-Cookie2</code> response header sent by the
+ * This interface represents a {@code Set-Cookie2} response header sent by the
* origin server to the HTTP agent in order to maintain a conversational state.
*
* @since 4.0
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/cookie/params/CookieSpecPNames.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/cookie/params/CookieSpecPNames.java?rev=1619420&r1=1619419&r2=1619420&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/cookie/params/CookieSpecPNames.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/cookie/params/CookieSpecPNames.java Thu Aug 21 14:56:49 2014
@@ -40,10 +40,10 @@ public interface CookieSpecPNames {
/**
* Defines valid date patterns to be used for parsing non-standard
- * <code>expires</code> attribute. Only required for compatibility
- * with non-compliant servers that still use <code>expires</code>
+ * {@code expires} attribute. Only required for compatibility
+ * with non-compliant servers that still use {@code expires}
* defined in the Netscape draft instead of the standard
- * <code>max-age</code> attribute.
+ * {@code max-age} attribute.
* <p>
* This parameter expects a value of type {@link java.util.Collection}.
* The collection elements must be of type {@link String} compatible
@@ -54,8 +54,8 @@ public interface CookieSpecPNames {
/**
* Defines whether cookies should be forced into a single
- * <code>Cookie</code> request header. Otherwise, each cookie is formatted
- * as a separate <code>Cookie</code> header.
+ * {@code Cookie} request header. Otherwise, each cookie is formatted
+ * as a separate {@code Cookie} header.
* <p>
* This parameter expects a value of type {@link Boolean}.
* </p>
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/AuthSchemeBase.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/AuthSchemeBase.java?rev=1619420&r1=1619419&r2=1619420&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/AuthSchemeBase.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/AuthSchemeBase.java Thu Aug 21 14:56:49 2014
@@ -142,7 +142,7 @@ public abstract class AuthSchemeBase imp
CharArrayBuffer buffer, int beginIndex, int endIndex) throws MalformedChallengeException;
/**
- * Returns <code>true</code> if authenticating against a proxy, <code>false</code>
+ * Returns {@code true</code> if authenticating against a proxy, <code>false}
* otherwise.
*/
public boolean isProxy() {
@@ -150,7 +150,7 @@ public abstract class AuthSchemeBase imp
}
/**
- * Returns {@link ChallengeState} value or <code>null</code> if unchallenged.
+ * Returns {@link ChallengeState} value or {@code null} if unchallenged.
*
* @since 4.2
*/
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/BasicScheme.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/BasicScheme.java?rev=1619420&r1=1619419&r2=1619420&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/BasicScheme.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/BasicScheme.java Thu Aug 21 14:56:49 2014
@@ -86,7 +86,7 @@ public class BasicScheme extends RFC2617
/**
* Returns textual designation of the basic authentication scheme.
*
- * @return <code>basic</code>
+ * @return {@code basic}
*/
@Override
public String getSchemeName() {
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/DigestScheme.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/DigestScheme.java?rev=1619420&r1=1619419&r2=1619420&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/DigestScheme.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/DigestScheme.java Thu Aug 21 14:56:49 2014
@@ -161,7 +161,7 @@ public class DigestScheme extends RFC261
/**
* Returns textual designation of the digest authentication scheme.
*
- * @return <code>digest</code>
+ * @return {@code digest}
*/
@Override
public String getSchemeName() {
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/KerberosScheme.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/KerberosScheme.java?rev=1619420&r1=1619419&r2=1619420&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/KerberosScheme.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/KerberosScheme.java Thu Aug 21 14:56:49 2014
@@ -93,9 +93,9 @@ public class KerberosScheme extends GGSS
/**
* There are no valid parameters for KERBEROS authentication so this
- * method always returns <code>null</code>.
+ * method always returns {@code null}.
*
- * @return <code>null</code>
+ * @return {@code null}
*/
@Override
public String getParameter(final String name) {
@@ -105,9 +105,9 @@ public class KerberosScheme extends GGSS
/**
* The concept of an authentication realm is not supported by the Negotiate
- * authentication scheme. Always returns <code>null</code>.
+ * authentication scheme. Always returns {@code null}.
*
- * @return <code>null</code>
+ * @return {@code null}
*/
@Override
public String getRealm() {
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/NTLMEngine.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/NTLMEngine.java?rev=1619420&r1=1619419&r2=1619420&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/NTLMEngine.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/NTLMEngine.java Thu Aug 21 14:56:49 2014
@@ -38,9 +38,9 @@ public interface NTLMEngine {
/**
* Generates a Type1 message given the domain and workstation.
*
- * @param domain Optional Windows domain name. Can be <code>null</code>.
+ * @param domain Optional Windows domain name. Can be {@code null}.
* @param workstation Optional Windows workstation name. Can be
- * <code>null</code>.
+ * {@code null}.
* @return Type1 message
* @throws NTLMEngineException
*/
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/SPNegoScheme.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/SPNegoScheme.java?rev=1619420&r1=1619419&r2=1619420&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/SPNegoScheme.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/SPNegoScheme.java Thu Aug 21 14:56:49 2014
@@ -94,9 +94,9 @@ public class SPNegoScheme extends GGSSch
/**
* There are no valid parameters for SPNEGO authentication so this
- * method always returns <code>null</code>.
+ * method always returns {@code null}.
*
- * @return <code>null</code>
+ * @return {@code null}
*/
@Override
public String getParameter(final String name) {
@@ -106,9 +106,9 @@ public class SPNegoScheme extends GGSSch
/**
* The concept of an authentication realm is not supported by the Negotiate
- * authentication scheme. Always returns <code>null</code>.
+ * authentication scheme. Always returns {@code null}.
*
- * @return <code>null</code>
+ * @return {@code null}
*/
@Override
public String getRealm() {
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/AIMDBackoffManager.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/AIMDBackoffManager.java?rev=1619420&r1=1619419&r2=1619420&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/AIMDBackoffManager.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/AIMDBackoffManager.java Thu Aug 21 14:56:49 2014
@@ -35,7 +35,7 @@ import org.apache.http.pool.ConnPoolCont
import org.apache.http.util.Args;
/**
- * <p>The <code>AIMDBackoffManager</code> applies an additive increase,
+ * <p>The {@code AIMDBackoffManager} applies an additive increase,
* multiplicative decrease (AIMD) to managing a dynamic limit to
* the number of connections allowed to a given host. You may want
* to experiment with the settings for the cooldown periods and the
@@ -65,7 +65,7 @@ public class AIMDBackoffManager implemen
private int cap = 2; // Per RFC 2616 sec 8.1.4
/**
- * Creates an <code>AIMDBackoffManager</code> to manage
+ * Creates an {@code AIMDBackoffManager} to manage
* per-host connection pool sizes represented by the
* given {@link ConnPoolControl}.
* @param connPerRoute per-host routing maximums to
@@ -130,7 +130,7 @@ public class AIMDBackoffManager implemen
/**
* Sets the factor to use when backing off; the new
* per-host limit will be roughly the current max times
- * this factor. <code>Math.floor</code> is applied in the
+ * this factor. {@code Math.floor} is applied in the
* case of non-integer outcomes to ensure we actually
* decrease the pool size. Pool sizes are never decreased
* below 1, however. Defaults to 0.5.
@@ -156,7 +156,7 @@ public class AIMDBackoffManager implemen
/**
* Sets the absolute maximum per-host connection pool size to
* probe up to; defaults to 2 (the default per-host max).
- * @param cap must be >= 1
+ * @param cap must be >= 1
*/
public void setPerHostConnectionCap(final int cap) {
Args.positive(cap, "Per host connection cap");
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/AbstractResponseHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/AbstractResponseHandler.java?rev=1619420&r1=1619419&r2=1619420&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/AbstractResponseHandler.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/AbstractResponseHandler.java Thu Aug 21 14:56:49 2014
@@ -39,7 +39,7 @@ import org.apache.http.util.EntityUtils;
/**
* A generic {@link ResponseHandler} that works with the response entity
- * for successful (2xx) responses. If the response code was >= 300, the response
+ * for successful (2xx) responses. If the response code was >= 300, the response
* body is consumed and an {@link HttpResponseException} is thrown.
* <p>
* If this is used with
@@ -56,7 +56,7 @@ public abstract class AbstractResponseHa
/**
* Read the entity from the response body and pass it to the entity handler
* method if the response was successful (a 2xx status code). If no response
- * body exists, this returns null. If the response was unsuccessful (>= 300
+ * body exists, this returns null. If the response was unsuccessful (>= 300
* status code), throws an {@link HttpResponseException}.
*/
@Override
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/AuthenticationStrategyImpl.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/AuthenticationStrategyImpl.java?rev=1619420&r1=1619419&r2=1619420&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/AuthenticationStrategyImpl.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/AuthenticationStrategyImpl.java Thu Aug 21 14:56:49 2014
@@ -99,7 +99,8 @@ abstract class AuthenticationStrategyImp
}
/**
- * Generates a map of challenge auth-scheme => Header entries
+ * Generates a map of challenge auth-scheme => Header entries.
+ *
* @return map: key=lower-cased auth-scheme name, value=Header that contains the challenge
*/
@Override
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/BasicResponseHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/BasicResponseHandler.java?rev=1619420&r1=1619419&r2=1619420&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/BasicResponseHandler.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/BasicResponseHandler.java Thu Aug 21 14:56:49 2014
@@ -37,7 +37,7 @@ import org.apache.http.util.EntityUtils;
/**
* A {@link org.apache.http.client.ResponseHandler} that returns the response body as a String
- * for successful (2xx) responses. If the response code was >= 300, the response
+ * for successful (2xx) responses. If the response code was >= 300, the response
* body is consumed and an {@link org.apache.http.client.HttpResponseException} is thrown.
* <p>
* If this is used with
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/CloseableHttpClient.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/CloseableHttpClient.java?rev=1619420&r1=1619419&r2=1619420&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/CloseableHttpClient.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/CloseableHttpClient.java Thu Aug 21 14:56:49 2014
@@ -152,7 +152,7 @@ public abstract class CloseableHttpClien
* @param request the request to execute
* @param responseHandler the response handler
* @param context the context to use for the execution, or
- * <code>null</code> to use the default context
+ * {@code null} to use the default context
*
* @return the response object as generated by the response handler.
* @throws IOException in case of a problem or the connection was aborted
@@ -175,7 +175,7 @@ public abstract class CloseableHttpClien
* resource deallocation internally.
*
* @param target the target host for the request.
- * Implementations may accept <code>null</code>
+ * Implementations may accept {@code null}
* if they can still determine a route, for example
* to a default target or by inspecting the request.
* @param request the request to execute
@@ -201,13 +201,13 @@ public abstract class CloseableHttpClien
* resource deallocation internally.
*
* @param target the target host for the request.
- * Implementations may accept <code>null</code>
+ * Implementations may accept {@code null}
* if they can still determine a route, for example
* to a default target or by inspecting the request.
* @param request the request to execute
* @param responseHandler the response handler
* @param context the context to use for the execution, or
- * <code>null</code> to use the default context
+ * {@code null} to use the default context
*
* @return the response object as generated by the response handler.
* @throws IOException in case of a problem or the connection was aborted
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultHttpRequestRetryHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultHttpRequestRetryHandler.java?rev=1619420&r1=1619419&r2=1619420&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultHttpRequestRetryHandler.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultHttpRequestRetryHandler.java Thu Aug 21 14:56:49 2014
@@ -121,7 +121,7 @@ public class DefaultHttpRequestRetryHand
this(3, false);
}
/**
- * Used <code>retryCount</code> and <code>requestSentRetryEnabled</code> to determine
+ * Used {@code retryCount</code> and <code>requestSentRetryEnabled} to determine
* if the given method should be retried.
*/
@Override
@@ -166,8 +166,8 @@ public class DefaultHttpRequestRetryHand
}
/**
- * @return <code>true</code> if this handler will retry methods that have
- * successfully sent their request, <code>false</code> otherwise
+ * @return {@code true} if this handler will retry methods that have
+ * successfully sent their request, {@code false} otherwise
*/
public boolean isRequestSentRetryEnabled() {
return requestSentRetryEnabled;
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultServiceUnavailableRetryStrategy.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultServiceUnavailableRetryStrategy.java?rev=1619420&r1=1619419&r2=1619420&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultServiceUnavailableRetryStrategy.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultServiceUnavailableRetryStrategy.java Thu Aug 21 14:56:49 2014
@@ -36,7 +36,7 @@ import org.apache.http.util.Args;
/**
* Default implementation of the {@link ServiceUnavailableRetryStrategy} interface.
- * that retries <code>503</code> (Service Unavailable) responses for a fixed number of times
+ * that retries {@code 503} (Service Unavailable) responses for a fixed number of times
* at a fixed interval.
*
* @since 4.2
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultUserTokenHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultUserTokenHandler.java?rev=1619420&r1=1619419&r2=1619420&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultUserTokenHandler.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultUserTokenHandler.java Thu Aug 21 14:56:49 2014
@@ -50,7 +50,7 @@ import org.apache.http.protocol.HttpCont
* DefaultUserTokenHandler will use the user principle of connection
* based authentication schemes such as NTLM or that of the SSL session
* with the client authentication turned on. If both are unavailable,
- * <code>null</code> token will be returned.
+ * {@code null} token will be returned.
*
* @since 4.0
*/
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/EntityEnclosingRequestWrapper.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/EntityEnclosingRequestWrapper.java?rev=1619420&r1=1619419&r2=1619420&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/EntityEnclosingRequestWrapper.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/EntityEnclosingRequestWrapper.java Thu Aug 21 14:56:49 2014
@@ -43,9 +43,10 @@ import org.apache.http.protocol.HTTP;
* A wrapper class for {@link HttpEntityEnclosingRequest}s that can
* be used to change properties of the current request without
* modifying the original object.
- * </p>
+ * <p>
* This class is also capable of resetting the request headers to
* the state of the original request.
+ * </p>
*
* @since 4.0
*
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/FutureRequestExecutionService.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/FutureRequestExecutionService.java?rev=1619420&r1=1619419&r2=1619420&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/FutureRequestExecutionService.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/FutureRequestExecutionService.java Thu Aug 21 14:56:49 2014
@@ -80,7 +80,6 @@ public class FutureRequestExecutionServi
* @param responseHandler
* handler that will process the response.
* @return HttpAsyncClientFutureTask for the scheduled request.
- * @throws InterruptedException
*/
public <T> HttpRequestFutureTask<T> execute(
final HttpUriRequest request,
@@ -104,7 +103,6 @@ public class FutureRequestExecutionServi
* callback handler that will be called when the request is scheduled,
* started, completed, failed, or cancelled.
* @return HttpAsyncClientFutureTask for the scheduled request.
- * @throws InterruptedException
*/
public <T> HttpRequestFutureTask<T> execute(
final HttpUriRequest request,
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/NoopUserTokenHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/NoopUserTokenHandler.java?rev=1619420&r1=1619419&r2=1619420&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/NoopUserTokenHandler.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/NoopUserTokenHandler.java Thu Aug 21 14:56:49 2014
@@ -31,7 +31,7 @@ import org.apache.http.client.UserTokenH
import org.apache.http.protocol.HttpContext;
/**
- * Noop implementation of {@link UserTokenHandler} that always returns <code>null</code>.
+ * Noop implementation of {@link UserTokenHandler} that always returns {@code null}.
*
* @since 4.3
*/
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/RequestWrapper.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/RequestWrapper.java?rev=1619420&r1=1619419&r2=1619420&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/RequestWrapper.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/RequestWrapper.java Thu Aug 21 14:56:49 2014
@@ -45,9 +45,10 @@ import org.apache.http.util.Args;
* A wrapper class for {@link HttpRequest}s that can be used to change
* properties of the current request without modifying the original
* object.
- * </p>
+ * <p>
* This class is also capable of resetting the request headers to
* the state of the original request.
+ * </p>
*
* @since 4.0
*
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/DefaultHttpResponseParser.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/DefaultHttpResponseParser.java?rev=1619420&r1=1619419&r2=1619420&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/DefaultHttpResponseParser.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/DefaultHttpResponseParser.java Thu Aug 21 14:56:49 2014
@@ -83,11 +83,11 @@ public class DefaultHttpResponseParser e
* Creates new instance of DefaultHttpResponseParser.
*
* @param buffer the session input buffer.
- * @param lineParser the line parser. If <code>null</code>
+ * @param lineParser the line parser. If {@code null}
* {@link org.apache.http.message.BasicLineParser#INSTANCE} will be used.
- * @param responseFactory HTTP response factory. If <code>null</code>
+ * @param responseFactory HTTP response factory. If {@code null}
* {@link DefaultHttpResponseFactory#INSTANCE} will be used.
- * @param constraints the message constraints. If <code>null</code>
+ * @param constraints the message constraints. If {@code null}
* {@link MessageConstraints#DEFAULT} will be used.
*
* @since 4.3
@@ -107,7 +107,7 @@ public class DefaultHttpResponseParser e
* Creates new instance of DefaultHttpResponseParser.
*
* @param buffer the session input buffer.
- * @param constraints the message constraints. If <code>null</code>
+ * @param constraints the message constraints. If {@code null}
* {@link MessageConstraints#DEFAULT} will be used.
*
* @since 4.3
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/PoolingHttpClientConnectionManager.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/PoolingHttpClientConnectionManager.java?rev=1619420&r1=1619419&r2=1619420&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/PoolingHttpClientConnectionManager.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/PoolingHttpClientConnectionManager.java Thu Aug 21 14:56:49 2014
@@ -89,7 +89,7 @@ import org.apache.http.util.Asserts;
* The code now only checks the connection if the elapsed time since
* the last use of the connection exceeds the timeout that has been set.
* The default timeout is set to 5000ms - see
- * {@link #PoolingHttpClientConnectionManager(HttpClientConnectionOperator, HttpConnectionFactory, long, TimeUnit))}
+ * {@link #PoolingHttpClientConnectionManager(HttpClientConnectionOperator, HttpConnectionFactory, long, TimeUnit)}
* </p>
*
* @since 4.3
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BasicClientCookie.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BasicClientCookie.java?rev=1619420&r1=1619419&r2=1619420&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BasicClientCookie.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BasicClientCookie.java Thu Aug 21 14:56:49 2014
@@ -229,7 +229,7 @@ public class BasicClientCookie implement
}
/**
- * @return <code>true</code> if this cookie should only be sent over secure connections.
+ * @return {@code true} if this cookie should only be sent over secure connections.
* @see #setSecure(boolean)
*/
@Override
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/NetscapeDraftSpec.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/NetscapeDraftSpec.java?rev=1619420&r1=1619419&r2=1619420&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/NetscapeDraftSpec.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/NetscapeDraftSpec.java Thu Aug 21 14:56:49 2014
@@ -94,7 +94,7 @@ public class NetscapeDraftSpec extends C
* </PRE>
*
* <p>Please note that the Netscape draft specification does not fully conform to the HTTP
- * header format. Comma character if present in <code>Set-Cookie</code> will not be treated
+ * header format. Comma character if present in {@code Set-Cookie} will not be treated
* as a header element separator</p>
*
* @see <a href="http://web.archive.org/web/20020803110822/http://wp.netscape.com/newsref/std/cookie_spec.html">
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2965DomainAttributeHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2965DomainAttributeHandler.java?rev=1619420&r1=1619419&r2=1619420&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2965DomainAttributeHandler.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2965DomainAttributeHandler.java Thu Aug 21 14:56:49 2014
@@ -84,6 +84,7 @@ public class RFC2965DomainAttributeHandl
* Performs domain-match as defined by the RFC2965.
* <p>
* Host A's name domain-matches host B's if
+ * </p>
* <ol>
* <ul>their host name strings string-compare equal; or</ul>
* <ul>A is a HDN string and has the form NB, where N is a non-empty
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/execchain/RedirectExec.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/execchain/RedirectExec.java?rev=1619420&r1=1619419&r2=1619420&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/execchain/RedirectExec.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/execchain/RedirectExec.java Thu Aug 21 14:56:49 2014
@@ -57,10 +57,11 @@ import org.apache.http.util.EntityUtils;
/**
* Request executor in the request execution chain that is responsible
* for handling of request redirects.
- * <p/>
+ * <p>
* Further responsibilities such as communication with the opposite
* endpoint is delegated to the next executor in the request execution
* chain.
+ * </p>
*
* @since 4.3
*/
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/execchain/RetryExec.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/execchain/RetryExec.java?rev=1619420&r1=1619419&r2=1619420&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/execchain/RetryExec.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/execchain/RetryExec.java Thu Aug 21 14:56:49 2014
@@ -48,10 +48,11 @@ import org.apache.http.util.Args;
* Request executor in the request execution chain that is responsible
* for making a decision whether a request failed due to an I/O error
* should be re-executed.
- * <p/>
+ * <p>
* Further responsibilities such as communication with the opposite
* endpoint is delegated to the next executor in the request execution
* chain.
+ * </p>
*
* @since 4.3
*/
Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/conn/routing/TestRouteTracker.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/conn/routing/TestRouteTracker.java?rev=1619420&r1=1619419&r2=1619420&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/conn/routing/TestRouteTracker.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/conn/routing/TestRouteTracker.java Thu Aug 21 14:56:49 2014
@@ -584,7 +584,7 @@ public class TestRouteTracker {
* @param rd the director to check with
* @param steps the step count for this invocation
*
- * @return <code>true</code> iff the route is complete
+ * @return {@code true} iff the route is complete
*/
public final static boolean checkVia(final RouteTracker rt, final HttpRoute r,
final HttpRouteDirector rd, final int steps) {
@@ -688,11 +688,11 @@ public class TestRouteTracker {
/**
- * Checks the output of <code>toString</code>.
+ * Checks the output of {@code toString}.
*
* @param rt the tracker for which to check the output
*
- * @return the result of <code>rt.toString()</code>
+ * @return the result of {@code rt.toString()}
*/
public final static String checkToString(final RouteTracker rt) {
if (rt == null) {
Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestConnectionManagement.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestConnectionManagement.java?rev=1619420&r1=1619419&r2=1619420&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestConnectionManagement.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestConnectionManagement.java Thu Aug 21 14:56:49 2014
@@ -69,7 +69,7 @@ import org.junit.Assert;
import org.junit.Test;
/**
- * Tests for <code>PoolingHttpClientConnectionManager</code> that do require a server
+ * Tests for {@code PoolingHttpClientConnectionManager} that do require a server
* to communicate with.
*/
public class TestConnectionManagement extends LocalServerTestBase {
Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestContentCodings.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestContentCodings.java?rev=1619420&r1=1619419&r2=1619420&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestContentCodings.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestContentCodings.java Thu Aug 21 14:56:49 2014
@@ -99,7 +99,7 @@ public class TestContentCodings extends
/**
* Test for when we are handling content from a server that has correctly interpreted RFC2616
- * to return RFC1950 streams for <code>deflate</code> content coding.
+ * to return RFC1950 streams for {@code deflate} content coding.
*
* @throws Exception
*/
@@ -119,7 +119,7 @@ public class TestContentCodings extends
/**
* Test for when we are handling content from a server that has incorrectly interpreted RFC2616
- * to return RFC1951 streams for <code>deflate</code> content coding.
+ * to return RFC1951 streams for {@code deflate} content coding.
*
* @throws Exception
*/
Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/localserver/RandomHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/localserver/RandomHandler.java?rev=1619420&r1=1619419&r2=1619420&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/localserver/RandomHandler.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/localserver/RandomHandler.java Thu Aug 21 14:56:49 2014
@@ -154,7 +154,7 @@ public class RandomHandler implements Ht
* Repetitions will generate different random data,
* unless perchance the same random data is generated twice.
*
- * @return <code>true</code>
+ * @return {@code true}
*/
@Override
public boolean isRepeatable() {