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 [1/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...
Author: ggregory
Date: Thu Aug 21 14:56:49 2014
New Revision: 1619420
URL: http://svn.apache.org/r1619420
Log:
Javadoc 8 fixes.
Modified:
httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/client/ClientPreemptiveDigestAuthentication.java
httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/client/AuthenticationHandler.java
httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/client/RedirectHandler.java
httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/client/RequestDirector.java
httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/conn/ClientConnectionOperator.java
httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/conn/MultihomePlainSocketFactory.java
httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/conn/OperatedClientConnection.java
httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/conn/params/ConnRouteParams.java
httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/conn/scheme/PlainSocketFactory.java
httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/conn/ssl/SSLSocketFactory.java
httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/auth/NegotiateScheme.java
httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/client/AbstractHttpClient.java
httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/client/ClientParamsStack.java
httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/client/DecompressingHttpClient.java
httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/client/DefaultRequestDirector.java
httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/client/SystemDefaultHttpClient.java
httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/AbstractClientConnAdapter.java
httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/AbstractPoolEntry.java
httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/AbstractPooledConnAdapter.java
httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/DefaultClientConnectionOperator.java
httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/LoggingSessionInputBuffer.java
httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/LoggingSessionOutputBuffer.java
httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/ProxySelectorRoutePlanner.java
httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/SingleClientConnManager.java
httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/tsccm/AbstractConnPool.java
httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/tsccm/BasicPoolEntry.java
httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/tsccm/BasicPoolEntryRef.java
httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/tsccm/ConnPoolByRoute.java
httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/tsccm/PoolEntryRequest.java
httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/tsccm/RouteSpecificPool.java
httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/tsccm/ThreadSafeClientConnManager.java
httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/tsccm/WaitingThread.java
httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/cookie/DateUtils.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/AuthScheme.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/AuthState.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/AuthenticationStrategy.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/ConnectionBackoffStrategy.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/HttpClient.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/HttpRequestRetryHandler.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/RedirectStrategy.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/ServiceUnavailableRetryStrategy.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/UserTokenHandler.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/config/RequestConfig.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/entity/DeflateDecompressingEntity.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/entity/EntityBuilder.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/methods/HttpUriRequest.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/params/ClientPNames.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/RequestAddCookies.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/RequestClientConnControl.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/RequestExpectContinue.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/DateUtils.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/URIUtils.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/URLEncodedUtils.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ClientConnectionManager.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ClientConnectionRequest.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ConnectionKeepAliveStrategy.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ConnectionRequest.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/EofSensorInputStream.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/EofSensorWatcher.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/HttpClientConnectionManager.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/HttpRoutedConnection.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ManagedClientConnection.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ManagedHttpClientConnection.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/routing/BasicRouteDirector.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/routing/HttpRoute.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/routing/HttpRouteDirector.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/routing/HttpRoutePlanner.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/routing/RouteInfo.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/routing/RouteTracker.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/Scheme.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/SchemeRegistry.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/SchemeSocketFactory.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/SocketFactory.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/socket/ConnectionSocketFactory.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/SSLConnectionSocketFactory.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/SSLContexts.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/TrustStrategy.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/cookie/Cookie.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/cookie/CookieSpec.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/cookie/SetCookie.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/cookie/SetCookie2.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/cookie/params/CookieSpecPNames.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/AuthSchemeBase.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/BasicScheme.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/DigestScheme.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/KerberosScheme.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/NTLMEngine.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/SPNegoScheme.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/AIMDBackoffManager.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/AbstractResponseHandler.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/AuthenticationStrategyImpl.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/BasicResponseHandler.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/CloseableHttpClient.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultHttpRequestRetryHandler.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultServiceUnavailableRetryStrategy.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultUserTokenHandler.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/EntityEnclosingRequestWrapper.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/FutureRequestExecutionService.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/NoopUserTokenHandler.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/RequestWrapper.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/DefaultHttpResponseParser.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/PoolingHttpClientConnectionManager.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BasicClientCookie.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/NetscapeDraftSpec.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2965DomainAttributeHandler.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/execchain/RedirectExec.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/execchain/RetryExec.java
httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/conn/routing/TestRouteTracker.java
httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestConnectionManagement.java
httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestContentCodings.java
httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/localserver/RandomHandler.java
Modified: httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/client/ClientPreemptiveDigestAuthentication.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/client/ClientPreemptiveDigestAuthentication.java?rev=1619420&r1=1619419&r2=1619420&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/client/ClientPreemptiveDigestAuthentication.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/client/ClientPreemptiveDigestAuthentication.java Thu Aug 21 14:56:49 2014
@@ -44,10 +44,11 @@ import org.apache.http.util.EntityUtils;
/**
* An example of HttpClient can be customized to authenticate
* preemptively using DIGEST scheme.
- * <p/>
+ * <p>
* Generally, preemptive authentication can be considered less
* secure than a response to an authentication challenge
* and therefore discouraged.
+ * </p>
*/
public class ClientPreemptiveDigestAuthentication {
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/client/AuthenticationHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/client/AuthenticationHandler.java?rev=1619420&r1=1619419&r2=1619420&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/client/AuthenticationHandler.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/client/AuthenticationHandler.java Thu Aug 21 14:56:49 2014
@@ -59,8 +59,8 @@ public interface AuthenticationHandler {
* of authentication failure
* @param response HTTP response.
* @param context HTTP context.
- * @return <code>true</code> if user authentication is required,
- * <code>false</code> otherwise.
+ * @return {@code true} if user authentication is required,
+ * {@code false} otherwise.
*/
boolean isAuthenticationRequested(
HttpResponse response,
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/client/RedirectHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/client/RedirectHandler.java?rev=1619420&r1=1619419&r2=1619420&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/client/RedirectHandler.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/client/RedirectHandler.java Thu Aug 21 14:56:49 2014
@@ -56,7 +56,7 @@ public interface RedirectHandler {
* @param response the response received from the target server
* @param context the context for the request execution
*
- * @return <code>true</code> if the request should be redirected, <code>false</code>
+ * @return {@code true</code> if the request should be redirected, <code>false}
* otherwise
*/
boolean isRedirectRequested(HttpResponse response, HttpContext context);
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/client/RequestDirector.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/client/RequestDirector.java?rev=1619420&r1=1619419&r2=1619420&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/client/RequestDirector.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/client/RequestDirector.java Thu Aug 21 14:56:49 2014
@@ -54,12 +54,12 @@ public interface RequestDirector {
* Executes a request.
* <p>
* <b>Note:</b> For the time being, a new director is instantiated for each request.
- * This is the same behavior as for <code>HttpMethodDirector</code>
+ * This is the same behavior as for {@code HttpMethodDirector}
* in HttpClient 3.
* </p>
*
* @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
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/conn/ClientConnectionOperator.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/conn/ClientConnectionOperator.java?rev=1619420&r1=1619419&r2=1619420&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/conn/ClientConnectionOperator.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/conn/ClientConnectionOperator.java Thu Aug 21 14:56:49 2014
@@ -69,7 +69,7 @@ public interface ClientConnectionOperato
* @param conn the connection to open
* @param target the target host to connect to
* @param local the local address to route from, or
- * <code>null</code> for the default
+ * {@code null} for the default
* @param context the context for the connection
* @param params the parameters for the connection
*
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/conn/MultihomePlainSocketFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/conn/MultihomePlainSocketFactory.java?rev=1619420&r1=1619419&r2=1619420&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/conn/MultihomePlainSocketFactory.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/conn/MultihomePlainSocketFactory.java Thu Aug 21 14:56:49 2014
@@ -155,7 +155,7 @@ public final class MultihomePlainSocketF
*
* @param sock the connected socket
*
- * @return <code>false</code>
+ * @return {@code false}
*
* @throws IllegalArgumentException if the argument is invalid
*/
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/conn/OperatedClientConnection.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/conn/OperatedClientConnection.java?rev=1619420&r1=1619419&r2=1619420&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/conn/OperatedClientConnection.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/conn/OperatedClientConnection.java Thu Aug 21 14:56:49 2014
@@ -52,10 +52,11 @@ public interface OperatedClientConnectio
* If the connection is to a proxy but not tunnelled, this is
* the proxy. If the connection is tunnelled through a proxy,
* this is the target of the tunnel.
- * <br/>
+ * <p>
* The return value is well-defined only while the connection is open.
* It may change even while the connection is open,
* because of an {@link #update update}.
+ * </p>
*
* @return the host to which this connection is opened
*/
@@ -67,8 +68,8 @@ public interface OperatedClientConnectio
* It may change even while the connection is open,
* because of an {@link #update update}.
*
- * @return <code>true</code> if this connection is secure,
- * <code>false</code> otherwise
+ * @return {@code true} if this connection is secure,
+ * {@code false} otherwise
*/
boolean isSecure();
@@ -117,9 +118,9 @@ public interface OperatedClientConnectio
* An attempt to call this method on an open connection will cause
* an exception.
*
- * @param secure <code>true</code> if this connection is secure, for
- * example if an <code>SSLSocket</code> is used, or
- * <code>false</code> if it is not secure
+ * @param secure {@code true} if this connection is secure, for
+ * example if an {@code SSLSocket} is used, or
+ * {@code false} if it is not secure
* @param params parameters for this connection. The parameters will
* be used when creating dependent objects, for example
* to determine buffer sizes.
@@ -133,19 +134,20 @@ public interface OperatedClientConnectio
* Updates are used for example when a tunnel has been established,
* or when a TLS/SSL connection has been layered on top of a plain
* socket connection.
- * <br/>
+ * <p>
* <b>Note:</b> Updating the connection will <i>not</i> close the
* previously used socket. It is the caller's responsibility to close
* that socket if it is no longer required.
+ * </p>
*
* @param sock the new socket for communicating with the target host,
- * or <code>null</code> to continue using the old socket.
- * If <code>null</code> is passed, helper objects that
+ * or {@code null} to continue using the old socket.
+ * If {@code null} is passed, helper objects that
* depend on the socket should be re-used. In that case,
* some changes in the parameters will not take effect.
* @param target the new target host of this connection
- * @param secure <code>true</code> if this connection is now secure,
- * <code>false</code> if it is not secure
+ * @param secure {@code true} if this connection is now secure,
+ * {@code false} if it is not secure
* @param params new parameters for this connection
*/
void update(Socket sock, HttpHost target,
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/conn/params/ConnRouteParams.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/conn/params/ConnRouteParams.java?rev=1619420&r1=1619419&r2=1619420&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/conn/params/ConnRouteParams.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/conn/params/ConnRouteParams.java Thu Aug 21 14:56:49 2014
@@ -68,13 +68,13 @@ public class ConnRouteParams implements
/**
* Obtains the {@link ConnRoutePNames#DEFAULT_PROXY DEFAULT_PROXY}
* parameter value.
- * {@link #NO_HOST} will be mapped to <code>null</code>,
+ * {@link #NO_HOST} will be mapped to {@code null},
* to allow unsetting in a hierarchy.
*
* @param params the parameters in which to look up
*
* @return the default proxy set in the argument parameters, or
- * <code>null</code> if not set
+ * {@code null} if not set
*/
public static HttpHost getDefaultProxy(final HttpParams params) {
Args.notNull(params, "Parameters");
@@ -92,9 +92,9 @@ public class ConnRouteParams implements
* parameter value.
*
* @param params the parameters in which to set the value
- * @param proxy the value to set, may be <code>null</code>.
+ * @param proxy the value to set, may be {@code null}.
* Note that {@link #NO_HOST} will be mapped to
- * <code>null</code> by {@link #getDefaultProxy},
+ * {@code null} by {@link #getDefaultProxy},
* to allow for explicit unsetting in hierarchies.
*/
public static void setDefaultProxy(final HttpParams params,
@@ -106,13 +106,13 @@ public class ConnRouteParams implements
/**
* Obtains the {@link ConnRoutePNames#FORCED_ROUTE FORCED_ROUTE}
* parameter value.
- * {@link #NO_ROUTE} will be mapped to <code>null</code>,
+ * {@link #NO_ROUTE} will be mapped to {@code null},
* to allow unsetting in a hierarchy.
*
* @param params the parameters in which to look up
*
* @return the forced route set in the argument parameters, or
- * <code>null</code> if not set
+ * {@code null} if not set
*/
public static HttpRoute getForcedRoute(final HttpParams params) {
Args.notNull(params, "Parameters");
@@ -130,9 +130,9 @@ public class ConnRouteParams implements
* parameter value.
*
* @param params the parameters in which to set the value
- * @param route the value to set, may be <code>null</code>.
+ * @param route the value to set, may be {@code null}.
* Note that {@link #NO_ROUTE} will be mapped to
- * <code>null</code> by {@link #getForcedRoute},
+ * {@code null} by {@link #getForcedRoute},
* to allow for explicit unsetting in hierarchies.
*/
public static void setForcedRoute(final HttpParams params,
@@ -145,13 +145,13 @@ public class ConnRouteParams implements
* Obtains the {@link ConnRoutePNames#LOCAL_ADDRESS LOCAL_ADDRESS}
* parameter value.
* There is no special value that would automatically be mapped to
- * <code>null</code>. You can use the wildcard address (0.0.0.0 for IPv4,
+ * {@code null}. You can use the wildcard address (0.0.0.0 for IPv4,
* :: for IPv6) to override a specific local address in a hierarchy.
*
* @param params the parameters in which to look up
*
* @return the local address set in the argument parameters, or
- * <code>null</code> if not set
+ * {@code null} if not set
*/
public static InetAddress getLocalAddress(final HttpParams params) {
Args.notNull(params, "Parameters");
@@ -166,7 +166,7 @@ public class ConnRouteParams implements
* parameter value.
*
* @param params the parameters in which to set the value
- * @param local the value to set, may be <code>null</code>
+ * @param local the value to set, may be {@code null}
*/
public static void setLocalAddress(final HttpParams params,
final InetAddress local) {
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/conn/scheme/PlainSocketFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/conn/scheme/PlainSocketFactory.java?rev=1619420&r1=1619419&r2=1619420&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/conn/scheme/PlainSocketFactory.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/conn/scheme/PlainSocketFactory.java Thu Aug 21 14:56:49 2014
@@ -128,7 +128,7 @@ public class PlainSocketFactory implemen
*
* @param sock the connected socket
*
- * @return <code>false</code>
+ * @return {@code false}
*/
public final boolean isSecure(final Socket sock) {
return false;
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/conn/ssl/SSLSocketFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/conn/ssl/SSLSocketFactory.java?rev=1619420&r1=1619419&r2=1619420&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/conn/ssl/SSLSocketFactory.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/conn/ssl/SSLSocketFactory.java Thu Aug 21 14:56:49 2014
@@ -63,20 +63,23 @@ import org.apache.http.util.TextUtils;
* <p>
* SSLSocketFactory can be used to validate the identity of the HTTPS server against a list of
* trusted certificates and to authenticate to the HTTPS server using a private key.
+ * </p>
* <p>
* SSLSocketFactory will enable server authentication when supplied with
* a {@link KeyStore trust-store} file containing one or several trusted certificates. The client
* secure socket will reject the connection during the SSL session handshake if the target HTTPS
* server attempts to authenticate itself with a non-trusted certificate.
+ * </p>
* <p>
* Use JDK keytool utility to import a trusted certificate and generate a trust-store file:
- * <pre>
- * keytool -import -alias "my server cert" -file server.crt -keystore my.truststore
- * </pre>
+ * </p>
+ * <pre>keytool -import -alias "my server cert" -file server.crt -keystore my.truststore
+ * </pre>
* <p>
* In special cases the standard trust verification process can be bypassed by using a custom
* {@link TrustStrategy}. This interface is primarily intended for allowing self-signed
* certificates to be accepted as trusted without having to add them to the trust-store file.
+ * </p>
* <p>
* SSLSocketFactory will enable client authentication when supplied with
* a {@link KeyStore key-store} file containing a private key/public certificate
@@ -85,6 +88,7 @@ import org.apache.http.util.TextUtils;
* requested to do so by the server.
* The target HTTPS server will in its turn verify the certificate presented
* by the client in order to establish client's authenticity.
+ * </p>
* <p>
* Use the following sequence of actions to generate a key-store file
* </p>
@@ -92,15 +96,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)
- * <pre>keytool -certreq -alias "my client key" -file mycertreq.csr -keystore my.keystore</pre>
* </p>
+ * <pre>keytool -certreq -alias "my client key" -file mycertreq.csr -keystore my.keystore</pre>
* </li>
* <li>
* <p>
@@ -112,20 +118,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>
* Import the PKCS#7 file containg the complete certificate chain
- * <pre>keytool -import -alias "my client key" -file mycert.p7 -keystore my.keystore</pre>
* </p>
+ * <pre>keytool -import -alias "my client key" -file mycert.p7 -keystore my.keystore</pre>
* </li>
* <li>
* <p>
* Verify the content the resultant keystore file
- * <pre>keytool -list -v -keystore my.keystore</pre>
* </p>
+ * <pre>keytool -list -v -keystore my.keystore</pre>
* </li>
* </ul>
*
@@ -153,7 +159,7 @@ public class SSLSocketFactory implements
/**
* 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
@@ -407,13 +413,14 @@ public class SSLSocketFactory implements
* Checks whether a socket connection is secure.
* This factory creates TLS/SSL socket connections
* which, by default, are considered secure.
- * <br/>
+ * <p>
* Derived classes may override this method to perform
* runtime checks, for example based on the cypher suite.
+ * </p>
*
* @param sock the connected socket
*
- * @return <code>true</code>
+ * @return {@code true}
*
* @throws IllegalArgumentException if the argument is invalid
*/
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/auth/NegotiateScheme.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/auth/NegotiateScheme.java?rev=1619420&r1=1619419&r2=1619420&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/auth/NegotiateScheme.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/auth/NegotiateScheme.java Thu Aug 21 14:56:49 2014
@@ -77,7 +77,7 @@ public class NegotiateScheme extends GGS
/**
* Returns textual designation of the Negotiate authentication scheme.
*
- * @return <code>Negotiate</code>
+ * @return {@code Negotiate}
*/
public String getSchemeName() {
return "Negotiate";
@@ -183,9 +183,9 @@ public class NegotiateScheme extends GGS
/**
* 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}
*/
public String getRealm() {
return null;
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/client/AbstractHttpClient.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/client/AbstractHttpClient.java?rev=1619420&r1=1619419&r2=1619420&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/client/AbstractHttpClient.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/client/AbstractHttpClient.java Thu Aug 21 14:56:49 2014
@@ -971,11 +971,12 @@ public abstract class AbstractHttpClient
* The default implementation in this class creates a new
* {@link ClientParamsStack} from the request parameters
* and the client parameters.
- * <br/>
+ * <p>
* This method is called by the default implementation of
* {@link #execute(HttpHost,HttpRequest,HttpContext)}
* to obtain the parameters for the
* {@link DefaultRequestDirector}.
+ * </p>
*
* @param req the request that will be executed
*
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/client/ClientParamsStack.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/client/ClientParamsStack.java?rev=1619420&r1=1619419&r2=1619420&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/client/ClientParamsStack.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/client/ClientParamsStack.java Thu Aug 21 14:56:49 2014
@@ -60,7 +60,7 @@ import org.apache.http.util.Args;
* on a per-request basis.
* </li>
* </ol>
- * Each stack entry may be <code>null</code>. That is preferable over
+ * Each stack entry may be {@code null}. That is preferable over
* an empty params collection, since it avoids searching the empty collection
* when looking up parameters.
*
@@ -73,16 +73,16 @@ import org.apache.http.util.Args;
@Deprecated
public class ClientParamsStack extends AbstractHttpParams {
- /** The application parameter collection, or <code>null</code>. */
+ /** The application parameter collection, or {@code null}. */
protected final HttpParams applicationParams;
- /** The client parameter collection, or <code>null</code>. */
+ /** The client parameter collection, or {@code null}. */
protected final HttpParams clientParams;
- /** The request parameter collection, or <code>null</code>. */
+ /** The request parameter collection, or {@code null}. */
protected final HttpParams requestParams;
- /** The override parameter collection, or <code>null</code>. */
+ /** The override parameter collection, or {@code null}. */
protected final HttpParams overrideParams;
@@ -91,10 +91,10 @@ public class ClientParamsStack extends A
* The arguments will be stored as-is, there is no copying to
* prevent modification.
*
- * @param aparams application parameters, or <code>null</code>
- * @param cparams client parameters, or <code>null</code>
- * @param rparams request parameters, or <code>null</code>
- * @param oparams override parameters, or <code>null</code>
+ * @param aparams application parameters, or {@code null}
+ * @param cparams client parameters, or {@code null}
+ * @param rparams request parameters, or {@code null}
+ * @param oparams override parameters, or {@code null}
*/
public ClientParamsStack(final HttpParams aparams, final HttpParams cparams,
final HttpParams rparams, final HttpParams oparams) {
@@ -123,15 +123,15 @@ public class ClientParamsStack extends A
/**
* Creates a modified copy of a parameter stack.
* The new stack will contain the explicitly passed elements.
- * For elements where the explicit argument is <code>null</code>,
+ * For elements where the explicit argument is {@code null},
* the corresponding element from the argument stack is used.
* There is no copying of parameters.
*
* @param stack the stack to modify
- * @param aparams application parameters, or <code>null</code>
- * @param cparams client parameters, or <code>null</code>
- * @param rparams request parameters, or <code>null</code>
- * @param oparams override parameters, or <code>null</code>
+ * @param aparams application parameters, or {@code null}
+ * @param cparams client parameters, or {@code null}
+ * @param rparams request parameters, or {@code null}
+ * @param oparams override parameters, or {@code null}
*/
public ClientParamsStack(final ClientParamsStack stack,
final HttpParams aparams, final HttpParams cparams,
@@ -146,7 +146,7 @@ public class ClientParamsStack extends A
/**
* Obtains the application parameters of this stack.
*
- * @return the application parameters, or <code>null</code>
+ * @return the application parameters, or {@code null}
*/
public final HttpParams getApplicationParams() {
return applicationParams;
@@ -155,7 +155,7 @@ public class ClientParamsStack extends A
/**
* Obtains the client parameters of this stack.
*
- * @return the client parameters, or <code>null</code>
+ * @return the client parameters, or {@code null}
*/
public final HttpParams getClientParams() {
return clientParams;
@@ -164,7 +164,7 @@ public class ClientParamsStack extends A
/**
* Obtains the request parameters of this stack.
*
- * @return the request parameters, or <code>null</code>
+ * @return the request parameters, or {@code null}
*/
public final HttpParams getRequestParams() {
return requestParams;
@@ -173,7 +173,7 @@ public class ClientParamsStack extends A
/**
* Obtains the override parameters of this stack.
*
- * @return the override parameters, or <code>null</code>
+ * @return the override parameters, or {@code null}
*/
public final HttpParams getOverrideParams() {
return overrideParams;
@@ -187,7 +187,7 @@ public class ClientParamsStack extends A
* @param name the name of the parameter to obtain
*
* @return the highest-priority value for that parameter, or
- * <code>null</code> if it is not set anywhere in this stack
+ * {@code null} if it is not set anywhere in this stack
*/
public Object getParameter(final String name) {
Args.notNull(name, "Parameter name");
@@ -256,10 +256,11 @@ public class ClientParamsStack extends A
* accidental modification of parameters passed by the application to
* a framework object is therefore pointless and disabled.
* Create a new stack if you really need a copy.
- * <br/>
+ * <p>
* Derived classes may change this behavior.
+ * </p>
*
- * @return <code>this</code> parameter stack
+ * @return {@code this} parameter stack
*/
public HttpParams copy() {
return this;
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/client/DecompressingHttpClient.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/client/DecompressingHttpClient.java?rev=1619420&r1=1619419&r2=1619420&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/client/DecompressingHttpClient.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/client/DecompressingHttpClient.java Thu Aug 21 14:56:49 2014
@@ -52,22 +52,22 @@ import org.apache.http.util.EntityUtils;
/**
* <p>Decorator adding support for compressed responses. This class sets
- * the <code>Accept-Encoding</code> header on requests to indicate
- * support for the <code>gzip</code> and <code>deflate</code>
- * compression schemes; it then checks the <code>Content-Encoding</code>
+ * the {@code Accept-Encoding} header on requests to indicate
+ * support for the {@code gzip</code> and <code>deflate}
+ * compression schemes; it then checks the {@code Content-Encoding}
* header on the response to uncompress any compressed response bodies.
* The {@link java.io.InputStream} of the entity will contain the uncompressed
* content.</p>
*
* <p><b>N.B.</b> Any upstream clients of this class need to be aware that
* this effectively obscures visibility into the length of a server
- * response body, since the <code>Content-Length</code> header will
+ * response body, since the {@code Content-Length} header will
* correspond to the compressed entity length received from the server,
* but the content length experienced by reading the response body may
* be different (hopefully higher!).</p>
*
* <p>That said, this decorator is compatible with the
- * <code>CachingHttpClient</code> in that the two decorators can be added
+ * {@code CachingHttpClient} in that the two decorators can be added
* in either order and still have cacheable responses be cached.</p>
*
* @since 4.2
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/client/DefaultRequestDirector.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/client/DefaultRequestDirector.java?rev=1619420&r1=1619419&r2=1619420&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/client/DefaultRequestDirector.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/client/DefaultRequestDirector.java Thu Aug 21 14:56:49 2014
@@ -744,12 +744,12 @@ public class DefaultRequestDirector impl
* to determine the route for either the original or a followup request.
*
* @param targetHost 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 context the context to use for the execution,
- * never <code>null</code>
+ * never {@code null}
*
* @return the route the request should take
*
@@ -841,9 +841,9 @@ public class DefaultRequestDirector impl
* @param route the route to establish
* @param context the context for request execution
*
- * @return <code>true</code> if the tunnelled route is secure,
- * <code>false</code> otherwise.
- * The implementation here always returns <code>false</code>,
+ * @return {@code true} if the tunnelled route is secure,
+ * {@code false} otherwise.
+ * The implementation here always returns {@code false},
* but derived classes may override.
*
* @throws HttpException in case of a problem
@@ -942,12 +942,12 @@ public class DefaultRequestDirector impl
*
* @param route the route to establish
* @param hop the hop in the route to establish now.
- * <code>route.getHopTarget(hop)</code>
+ * {@code route.getHopTarget(hop)}
* will return the proxy to tunnel to.
* @param context the context for request execution
*
- * @return <code>true</code> if the partially tunnelled connection
- * is secure, <code>false</code> otherwise.
+ * @return {@code true} if the partially tunnelled connection
+ * is secure, {@code false} otherwise.
*
* @throws HttpException in case of a problem
* @throws IOException in case of an IO problem
@@ -1017,7 +1017,7 @@ public class DefaultRequestDirector impl
* @param context the context used for the current request execution
*
* @return the followup request and route if there is a followup, or
- * <code>null</code> if the response should be returned as is
+ * {@code null} if the response should be returned as is
*
* @throws HttpException in case of a problem
* @throws IOException in case of an IO problem
@@ -1121,7 +1121,7 @@ public class DefaultRequestDirector impl
/**
* Shuts down the connection.
- * This method is called from a <code>catch</code> block in
+ * This method is called from a {@code catch} block in
* {@link #execute execute} during exception handling.
*/
private void abortConnection() {
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/client/SystemDefaultHttpClient.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/client/SystemDefaultHttpClient.java?rev=1619420&r1=1619419&r2=1619420&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/client/SystemDefaultHttpClient.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/client/SystemDefaultHttpClient.java Thu Aug 21 14:56:49 2014
@@ -66,6 +66,7 @@ import org.apache.http.params.HttpParams
* <p>
* The following parameters can be used to customize the behavior of this
* class:
+ * </p>
* <ul>
* <li>{@link org.apache.http.params.CoreProtocolPNames#PROTOCOL_VERSION}</li>
* <li>{@link org.apache.http.params.CoreProtocolPNames#STRICT_TRANSFER_ENCODING}</li>
@@ -98,7 +99,6 @@ import org.apache.http.params.HttpParams
* <li>{@link org.apache.http.client.params.ClientPNames#DEFAULT_HEADERS}</li>
* <li>{@link org.apache.http.client.params.ClientPNames#CONN_MANAGER_TIMEOUT}</li>
* </ul>
- * </p>
*
* @since 4.2
*
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/AbstractClientConnAdapter.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/AbstractClientConnAdapter.java?rev=1619420&r1=1619419&r2=1619420&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/AbstractClientConnAdapter.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/AbstractClientConnAdapter.java Thu Aug 21 14:56:49 2014
@@ -95,8 +95,8 @@ public abstract class AbstractClientConn
* The adapter is initially <i>not</i>
* {@link #isMarkedReusable marked} as reusable.
*
- * @param mgr the connection manager, or <code>null</code>
- * @param conn the connection to wrap, or <code>null</code>
+ * @param mgr the connection manager, or {@code null}
+ * @param conn the connection to wrap, or {@code null}
*/
protected AbstractClientConnAdapter(final ClientConnectionManager mgr,
final OperatedClientConnection conn) {
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/AbstractPoolEntry.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/AbstractPoolEntry.java?rev=1619420&r1=1619419&r2=1619420&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/AbstractPoolEntry.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/AbstractPoolEntry.java Thu Aug 21 14:56:49 2014
@@ -75,7 +75,7 @@ public abstract class AbstractPoolEntry
/** Connection state object */
protected volatile Object state;
- /** The tracked route, or <code>null</code> before tracking starts. */
+ /** The tracked route, or {@code null} before tracking starts. */
protected volatile RouteTracker tracker;
@@ -84,7 +84,7 @@ public abstract class AbstractPoolEntry
*
* @param connOperator the Connection Operator for this entry
* @param route the planned route for the connection,
- * or <code>null</code>
+ * or {@code null}
*/
protected AbstractPoolEntry(final ClientConnectionOperator connOperator,
final HttpRoute route) {
@@ -168,8 +168,8 @@ public abstract class AbstractPoolEntry
* The tunnel has to be established outside by sending a CONNECT
* request to the (last) proxy.
*
- * @param secure <code>true</code> if the tunnel should be
- * considered secure, <code>false</code> otherwise
+ * @param secure {@code true} if the tunnel should be
+ * considered secure, {@code false} otherwise
* @param params the parameters for tunnelling the connection
*
* @throws IOException in case of a problem
@@ -196,8 +196,8 @@ public abstract class AbstractPoolEntry
* See {@link org.apache.http.conn.ManagedClientConnection#tunnelProxy
* ManagedClientConnection.tunnelProxy}
* for details.
- * @param secure <code>true</code> if the tunnel should be
- * considered secure, <code>false</code> otherwise
+ * @param secure {@code true} if the tunnel should be
+ * considered secure, {@code false} otherwise
* @param params the parameters for tunnelling the connection
*
* @throws IOException in case of a problem
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/AbstractPooledConnAdapter.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/AbstractPooledConnAdapter.java?rev=1619420&r1=1619419&r2=1619420&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/AbstractPooledConnAdapter.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/AbstractPooledConnAdapter.java Thu Aug 21 14:56:49 2014
@@ -74,7 +74,7 @@ public abstract class AbstractPooledConn
/**
* Obtains the pool entry.
*
- * @return the pool entry, or <code>null</code> if detached
+ * @return the pool entry, or {@code null} if detached
*
* @deprecated (4.0.1)
*/
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/DefaultClientConnectionOperator.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/DefaultClientConnectionOperator.java?rev=1619420&r1=1619419&r2=1619420&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/DefaultClientConnectionOperator.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/DefaultClientConnectionOperator.java Thu Aug 21 14:56:49 2014
@@ -63,7 +63,7 @@ import org.apache.http.util.Asserts;
* addresses fail to respond. Please note the same
* {@link org.apache.http.params.CoreConnectionPNames#CONNECTION_TIMEOUT} value will be used
* for each connection attempt, so in the worst case the total elapsed time before timeout
- * can be <code>CONNECTION_TIMEOUT * n</code> where <code>n</code> is the number of IP addresses
+ * can be {@code CONNECTION_TIMEOUT * n</code> where <code>n} is the number of IP addresses
* of the given host. One can disable multihome support by overriding
* the {@link #resolveHostname(String)} method and returning only one IP address for the given
* host name.
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/LoggingSessionInputBuffer.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/LoggingSessionInputBuffer.java?rev=1619420&r1=1619419&r2=1619420&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/LoggingSessionInputBuffer.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/LoggingSessionInputBuffer.java Thu Aug 21 14:56:49 2014
@@ -60,7 +60,7 @@ public class LoggingSessionInputBuffer i
* Create an instance that wraps the specified session input buffer.
* @param in The session input buffer.
* @param wire The wire log to use.
- * @param charset protocol charset, <code>ASCII</code> if <code>null</code>
+ * @param charset protocol charset, {@code ASCII</code> if <code>null}
*/
public LoggingSessionInputBuffer(
final SessionInputBuffer in, final Wire wire, final String charset) {
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/LoggingSessionOutputBuffer.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/LoggingSessionOutputBuffer.java?rev=1619420&r1=1619419&r2=1619420&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/LoggingSessionOutputBuffer.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/LoggingSessionOutputBuffer.java Thu Aug 21 14:56:49 2014
@@ -55,7 +55,7 @@ public class LoggingSessionOutputBuffer
* Create an instance that wraps the specified session output buffer.
* @param out The session output buffer.
* @param wire The Wire log to use.
- * @param charset protocol charset, <code>ASCII</code> if <code>null</code>
+ * @param charset protocol charset, {@code ASCII</code> if <code>null}
*/
public LoggingSessionOutputBuffer(
final SessionOutputBuffer out, final Wire wire, final String charset) {
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/ProxySelectorRoutePlanner.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/ProxySelectorRoutePlanner.java?rev=1619420&r1=1619419&r2=1619420&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/ProxySelectorRoutePlanner.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/ProxySelectorRoutePlanner.java Thu Aug 21 14:56:49 2014
@@ -78,7 +78,7 @@ public class ProxySelectorRoutePlanner i
/** The scheme registry. */
protected final SchemeRegistry schemeRegistry; // @ThreadSafe
- /** The proxy selector to use, or <code>null</code> for system default. */
+ /** The proxy selector to use, or {@code null} for system default. */
protected ProxySelector proxySelector;
/**
@@ -86,7 +86,7 @@ public class ProxySelectorRoutePlanner i
*
* @param schreg the scheme registry
* @param prosel the proxy selector, or
- * <code>null</code> for the system default
+ * {@code null} for the system default
*/
public ProxySelectorRoutePlanner(final SchemeRegistry schreg,
final ProxySelector prosel) {
@@ -98,7 +98,7 @@ public class ProxySelectorRoutePlanner i
/**
* Obtains the proxy selector to use.
*
- * @return the proxy selector, or <code>null</code> for the system default
+ * @return the proxy selector, or {@code null} for the system default
*/
public ProxySelector getProxySelector() {
return this.proxySelector;
@@ -108,7 +108,7 @@ public class ProxySelectorRoutePlanner i
* Sets the proxy selector to use.
*
* @param prosel the proxy selector, or
- * <code>null</code> to use the system default
+ * {@code null} to use the system default
*/
public void setProxySelector(final ProxySelector prosel) {
this.proxySelector = prosel;
@@ -154,11 +154,11 @@ public class ProxySelectorRoutePlanner i
/**
* Determines a proxy for the given target.
*
- * @param target the planned target, never <code>null</code>
- * @param request the request to be sent, never <code>null</code>
- * @param context the context, or <code>null</code>
+ * @param target the planned target, never {@code null}
+ * @param request the request to be sent, never {@code null}
+ * @param context the context, or {@code null}
*
- * @return the proxy to use, or <code>null</code> for a direct route
+ * @return the proxy to use, or {@code null} for a direct route
*
* @throws HttpException
* in case of system proxy settings that cannot be handled
@@ -210,8 +210,9 @@ public class ProxySelectorRoutePlanner i
*
* @return a host string, either as a symbolic name or
* as a literal IP address string
- * <br/>
+ * <p>
* (TODO: determine format for IPv6 addresses, with or without [brackets])
+ * </p>
*/
protected String getHost(final InetSocketAddress isa) {
@@ -232,10 +233,10 @@ public class ProxySelectorRoutePlanner i
* such as proxy rotation if there are multiple options.
*
* @param proxies the list of proxies to choose from,
- * never <code>null</code> or empty
- * @param target the planned target, never <code>null</code>
- * @param request the request to be sent, never <code>null</code>
- * @param context the context, or <code>null</code>
+ * never {@code null} or empty
+ * @param target the planned target, never {@code null}
+ * @param request the request to be sent, never {@code null}
+ * @param context the context, or {@code null}
*
* @return a proxy type
*/
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/SingleClientConnManager.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/SingleClientConnManager.java?rev=1619420&r1=1619419&r2=1619420&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/SingleClientConnManager.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/SingleClientConnManager.java Thu Aug 21 14:56:49 2014
@@ -157,7 +157,7 @@ public class SingleClientConnManager imp
* The default implementation here instantiates
* {@link DefaultClientConnectionOperator DefaultClientConnectionOperator}.
*
- * @param schreg the scheme registry to use, or <code>null</code>
+ * @param schreg the scheme registry to use, or {@code null}
*
* @return the connection operator to use
*/
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/tsccm/AbstractConnPool.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/tsccm/AbstractConnPool.java?rev=1619420&r1=1619419&r2=1619420&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/tsccm/AbstractConnPool.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/tsccm/AbstractConnPool.java Thu Aug 21 14:56:49 2014
@@ -50,7 +50,7 @@ import org.apache.http.util.Args;
* It is used by the {@link ThreadSafeClientConnManager}.
* The abstract pool includes a {@link #poolLock}, which is used to
* synchronize access to the internal pool datastructures.
- * Don't use <code>synchronized</code> for that purpose!
+ * Don't use {@code synchronized} for that purpose!
*
* @since 4.0
*
@@ -103,8 +103,8 @@ public abstract class AbstractConnPool {
*
* @param route the route for which to get the connection
* @param timeout the timeout, 0 or negative for no timeout
- * @param tunit the unit for the <code>timeout</code>,
- * may be <code>null</code> only if there is no timeout
+ * @param tunit the unit for the {@code timeout},
+ * may be {@code null} only if there is no timeout
*
* @return pool entry holding a connection for the route
*
@@ -137,8 +137,8 @@ public abstract class AbstractConnPool {
* attempt to determine whether it can be re-used or not.
*
* @param entry the entry for the connection to release
- * @param reusable <code>true</code> if the entry is deemed
- * reusable, <code>false</code> otherwise.
+ * @param reusable {@code true} if the entry is deemed
+ * reusable, {@code false} otherwise.
* @param validDuration The duration that the entry should remain free and reusable.
* @param timeUnit The unit of time the duration is measured in.
*/
@@ -155,7 +155,7 @@ public abstract class AbstractConnPool {
*
* @param idletime the time the connections should have been idle
* in order to be closed now
- * @param tunit the unit for the <code>idletime</code>
+ * @param tunit the unit for the {@code idletime}
*/
public void closeIdleConnections(final long idletime, final TimeUnit tunit) {
@@ -218,7 +218,7 @@ public abstract class AbstractConnPool {
/**
* Closes a connection from this pool.
*
- * @param conn the connection to close, or <code>null</code>
+ * @param conn the connection to close, or {@code null}
*/
protected void closeConnection(final OperatedClientConnection conn) {
if (conn != null) {
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/tsccm/BasicPoolEntry.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/tsccm/BasicPoolEntry.java?rev=1619420&r1=1619419&r2=1619420&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/tsccm/BasicPoolEntry.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/tsccm/BasicPoolEntry.java Thu Aug 21 14:56:49 2014
@@ -77,7 +77,7 @@ public class BasicPoolEntry extends Abst
*
* @param op the connection operator
* @param route the planned route for the connection
- * @param connTTL maximum lifetime of this entry, <=0 implies "infinity"
+ * @param connTTL maximum lifetime of this entry, <=0 implies "infinity"
* @param timeunit TimeUnit of connTTL
*
* @since 4.1
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/tsccm/BasicPoolEntryRef.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/tsccm/BasicPoolEntryRef.java?rev=1619420&r1=1619419&r2=1619420&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/tsccm/BasicPoolEntryRef.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/tsccm/BasicPoolEntryRef.java Thu Aug 21 14:56:49 2014
@@ -51,8 +51,8 @@ public class BasicPoolEntryRef extends W
/**
* Creates a new reference to a pool entry.
*
- * @param entry the pool entry, must not be <code>null</code>
- * @param queue the reference queue, or <code>null</code>
+ * @param entry the pool entry, must not be {@code null}
+ * @param queue the reference queue, or {@code null}
*/
public BasicPoolEntryRef(final BasicPoolEntry entry,
final ReferenceQueue<Object> queue) {
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/tsccm/ConnPoolByRoute.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/tsccm/ConnPoolByRoute.java?rev=1619420&r1=1619419&r2=1619420&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/tsccm/ConnPoolByRoute.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/tsccm/ConnPoolByRoute.java Thu Aug 21 14:56:49 2014
@@ -52,7 +52,7 @@ import org.apache.http.util.Asserts;
/**
* A connection pool that maintains connections by route.
- * This class is derived from <code>MultiThreadedHttpConnectionManager</code>
+ * This class is derived from {@code MultiThreadedHttpConnectionManager}
* in HttpClient 3.x, see there for original authors. It implements the same
* algorithm for connection re-use and connection-per-host enforcement:
* <ul>
@@ -61,7 +61,7 @@ import org.apache.http.util.Asserts;
* </ul>
* Note that access to the pool data structures is synchronized via the
* {@link AbstractConnPool#poolLock poolLock} in the base class,
- * not via <code>synchronized</code> methods.
+ * not via {@code synchronized} methods.
*
* @since 4.0
*
@@ -203,7 +203,7 @@ public class ConnPoolByRoute extends Abs
* Called by {@link #getRoutePool} when necessary.
*
* @param cond the condition to wait for
- * @param rospl the route specific pool, or <code>null</code>
+ * @param rospl the route specific pool, or {@code null}
*
* @return a waiting thread representation
*/
@@ -230,7 +230,7 @@ public class ConnPoolByRoute extends Abs
* @param create whether to create the pool if it doesn't exist
*
* @return the pool for the argument route,
- * never <code>null</code> if <code>create</code> is <code>true</code>
+ * never {@code null</code> if <code>create</code> is <code>true}
*/
protected RouteSpecificPool getRoutePool(final HttpRoute route,
final boolean create) {
@@ -308,8 +308,8 @@ public class ConnPoolByRoute extends Abs
*
* @param route the route for which to get the connection
* @param timeout the timeout, 0 or negative for no timeout
- * @param tunit the unit for the <code>timeout</code>,
- * may be <code>null</code> only if there is no timeout
+ * @param tunit the unit for the {@code timeout},
+ * may be {@code null} only if there is no timeout
* @param aborter an object which can abort a {@link WaitingThread}.
*
* @return pool entry holding a connection for the route
@@ -477,7 +477,7 @@ public class ConnPoolByRoute extends Abs
* @param rospl the route-specific pool from which to get an entry
*
* @return an available pool entry for the given route, or
- * <code>null</code> if none is available
+ * {@code null} if none is available
*/
protected BasicPoolEntry getFreeEntry(final RouteSpecificPool rospl, final Object state) {
@@ -647,7 +647,7 @@ public class ConnPoolByRoute extends Abs
* if there is one.
* Otherwise, a thread in the connection pool will be notified.
*
- * @param rospl the pool in which to notify, or <code>null</code>
+ * @param rospl the pool in which to notify, or {@code null}
*/
protected void notifyWaitingThread(final RouteSpecificPool rospl) {
@@ -708,7 +708,7 @@ public class ConnPoolByRoute extends Abs
*
* @param idletime the time the connections should have been idle
* in order to be closed now
- * @param tunit the unit for the <code>idletime</code>
+ * @param tunit the unit for the {@code idletime}
*/
@Override
public void closeIdleConnections(final long idletime, final TimeUnit tunit) {
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/tsccm/PoolEntryRequest.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/tsccm/PoolEntryRequest.java?rev=1619420&r1=1619419&r2=1619420&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/tsccm/PoolEntryRequest.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/tsccm/PoolEntryRequest.java Thu Aug 21 14:56:49 2014
@@ -46,8 +46,8 @@ public interface PoolEntryRequest {
* an {@link InterruptedException} is thrown.
*
* @param timeout the timeout, 0 or negative for no timeout
- * @param tunit the unit for the <code>timeout</code>,
- * may be <code>null</code> only if there is no timeout
+ * @param tunit the unit for the {@code timeout},
+ * may be {@code null} only if there is no timeout
*
* @return pool entry holding a connection for the route
*
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/tsccm/RouteSpecificPool.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/tsccm/RouteSpecificPool.java?rev=1619420&r1=1619419&r2=1619420&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/tsccm/RouteSpecificPool.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/tsccm/RouteSpecificPool.java Thu Aug 21 14:56:49 2014
@@ -135,8 +135,8 @@ public class RouteSpecificPool {
* A pool is unused if there is neither an entry nor a waiting thread.
* All entries count, not only the free but also the allocated ones.
*
- * @return <code>true</code> if this pool is unused,
- * <code>false</code> otherwise
+ * @return {@code true} if this pool is unused,
+ * {@code false} otherwise
*/
public boolean isUnused() {
return (numEntries < 1) && waitingThreads.isEmpty();
@@ -168,7 +168,7 @@ public class RouteSpecificPool {
/**
* Obtains a free entry from this pool, if one is available.
*
- * @return an available pool entry, or <code>null</code> if there is none
+ * @return an available pool entry, or {@code null} if there is none
*/
public BasicPoolEntry allocEntry(final Object state) {
if (!freeEntries.isEmpty()) {
@@ -236,8 +236,8 @@ public class RouteSpecificPool {
*
* @param entry the entry to delete from this pool
*
- * @return <code>true</code> if the entry was found and deleted, or
- * <code>false</code> if the entry was not found
+ * @return {@code true} if the entry was found and deleted, or
+ * {@code false} if the entry was not found
*/
public boolean deleteEntry(final BasicPoolEntry entry) {
@@ -278,8 +278,8 @@ public class RouteSpecificPool {
/**
* Checks whether there is a waiting thread in this pool.
*
- * @return <code>true</code> if there is a waiting thread,
- * <code>false</code> otherwise
+ * @return {@code true} if there is a waiting thread,
+ * {@code false} otherwise
*/
public boolean hasThread() {
return !this.waitingThreads.isEmpty();
@@ -289,7 +289,7 @@ public class RouteSpecificPool {
/**
* Returns the next thread in the queue.
*
- * @return a waiting thread, or <code>null</code> if there is none
+ * @return a waiting thread, or {@code null} if there is none
*/
public WaitingThread nextThread() {
return this.waitingThreads.peek();
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/tsccm/ThreadSafeClientConnManager.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/tsccm/ThreadSafeClientConnManager.java?rev=1619420&r1=1619419&r2=1619420&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/tsccm/ThreadSafeClientConnManager.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/tsccm/ThreadSafeClientConnManager.java Thu Aug 21 14:56:49 2014
@@ -105,7 +105,7 @@ public class ThreadSafeClientConnManager
* Creates a new thread safe connection manager.
*
* @param schreg the scheme registry.
- * @param connTTL max connection lifetime, <=0 implies "infinity"
+ * @param connTTL max connection lifetime, <=0 implies "infinity"
* @param connTTLTimeUnit TimeUnit of connTTL
*
* @since 4.1
@@ -119,7 +119,7 @@ public class ThreadSafeClientConnManager
* Creates a new thread safe connection manager.
*
* @param schreg the scheme registry.
- * @param connTTL max connection lifetime, <=0 implies "infinity"
+ * @param connTTL max connection lifetime, <=0 implies "infinity"
* @param connTTLTimeUnit TimeUnit of connTTL
* @param connPerRoute mapping of maximum connections per route,
* provided as a dependency so it can be managed externally, e.g.
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/tsccm/WaitingThread.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/tsccm/WaitingThread.java?rev=1619420&r1=1619419&r2=1619420&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/tsccm/WaitingThread.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/tsccm/WaitingThread.java Thu Aug 21 14:56:49 2014
@@ -34,18 +34,20 @@ import org.apache.http.util.Args;
/**
* Represents a thread waiting for a connection.
- * This class implements throwaway objects. It is instantiated whenever
+ * <p>
+ * This class implements throw away objects. It is instantiated whenever
* a thread needs to wait. Instances are not re-used, except if the
- * waiting thread experiences a spurious wakeup and continues to wait.
- * <br/>
+ * waiting thread experiences a spurious wake up and continues to wait.
+ * </p>
+ * <p>
* All methods assume external synchronization on the condition
* passed to the constructor.
* Instances of this class do <i>not</i> synchronize access!
- *
+ * </p>
*
* @since 4.0
*
- * @deprecated (4.2) do not use
+ * @deprecated (4.2) do not use
*/
@Deprecated
public class WaitingThread {
@@ -69,7 +71,7 @@ public class WaitingThread {
*
* @param cond the condition for which to wait
* @param pool the pool on which the thread will be waiting,
- * or <code>null</code>
+ * or {@code null}
*/
public WaitingThread(final Condition cond, final RouteSpecificPool pool) {
@@ -83,7 +85,7 @@ public class WaitingThread {
/**
* Obtains the condition.
*
- * @return the condition on which to wait, never <code>null</code>
+ * @return the condition on which to wait, never {@code null}
*/
public final Condition getCondition() {
// not synchronized
@@ -95,7 +97,7 @@ public class WaitingThread {
* Obtains the pool, if there is one.
*
* @return the pool on which a thread is or was waiting,
- * or <code>null</code>
+ * or {@code null}
*/
public final RouteSpecificPool getPool() {
// not synchronized
@@ -106,7 +108,7 @@ public class WaitingThread {
/**
* Obtains the thread, if there is one.
*
- * @return the thread which is waiting, or <code>null</code>
+ * @return the thread which is waiting, or {@code null}
*/
public final Thread getThread() {
// not synchronized
@@ -118,13 +120,14 @@ public class WaitingThread {
* Blocks the calling thread.
* This method returns when the thread is notified or interrupted,
* if a timeout occurrs, or if there is a spurious wakeup.
- * <br/>
+ * <p>
* This method assumes external synchronization.
+ * </p>
*
- * @param deadline when to time out, or <code>null</code> for no timeout
+ * @param deadline when to time out, or {@code null} for no timeout
*
- * @return <code>true</code> if the condition was satisfied,
- * <code>false</code> in case of a timeout.
+ * @return {@code true} if the condition was satisfied,
+ * {@code false} in case of a timeout.
* Typically, a call to {@link #wakeup} is used to indicate
* that the condition was satisfied. Since the condition is
* accessible outside, this cannot be guaranteed though.
@@ -172,8 +175,9 @@ public class WaitingThread {
/**
* Wakes up the waiting thread.
- * <br/>
+ * <p>
* This method assumes external synchronization.
+ * </p>
*/
public void wakeup() {
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/cookie/DateUtils.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/cookie/DateUtils.java?rev=1619420&r1=1619419&r2=1619420&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/cookie/DateUtils.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/cookie/DateUtils.java Thu Aug 21 14:56:49 2014
@@ -58,7 +58,7 @@ public final class DateUtils {
/**
* Date format pattern used to parse HTTP date headers in ANSI C
- * <code>asctime()</code> format.
+ * {@code asctime()} format.
*/
public static final String PATTERN_ASCTIME = org.apache.http.client.utils.DateUtils.PATTERN_ASCTIME;
@@ -100,9 +100,9 @@ public final class DateUtils {
* @param dateValue the date value to parse
* @param dateFormats the date formats to use
* @param startDate During parsing, two digit years will be placed in the range
- * <code>startDate</code> to <code>startDate + 100 years</code>. This value may
- * be <code>null</code>. When <code>null</code> is given as a parameter, year
- * <code>2000</code> will be used.
+ * {@code startDate</code> to <code>startDate + 100 years}. This value may
+ * be {@code null</code>. When <code>null} is given as a parameter, year
+ * {@code 2000} will be used.
*
* @return the parsed date
*
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/AuthScheme.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/AuthScheme.java?rev=1619420&r1=1619419&r2=1619420&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/AuthScheme.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/AuthScheme.java Thu Aug 21 14:56:49 2014
@@ -85,7 +85,7 @@ public interface AuthScheme {
/**
* Returns authentication realm. If the concept of an authentication
* realm is not applicable to the given authentication scheme, returns
- * <code>null</code>.
+ * {@code null}.
*
* @return the authentication realm
*/
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/AuthState.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/AuthState.java?rev=1619420&r1=1619419&r2=1619420&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/AuthState.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/AuthState.java Thu Aug 21 14:56:49 2014
@@ -126,7 +126,7 @@ public class AuthState {
}
/**
- * Returns <code>true</code> if {@link AuthOption}s are available, <code>false</code>
+ * Returns {@code true</code> if {@link AuthOption}s are available, <code>false}
* otherwise.
*
* @since 4.2
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/AuthenticationStrategy.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/AuthenticationStrategy.java?rev=1619420&r1=1619419&r2=1619420&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/AuthenticationStrategy.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/AuthenticationStrategy.java Thu Aug 21 14:56:49 2014
@@ -58,8 +58,8 @@ public interface AuthenticationStrategy
* @param authhost authentication host.
* @param response HTTP response.
* @param context HTTP context.
- * @return <code>true</code> if user authentication is required,
- * <code>false</code> otherwise.
+ * @return {@code true} if user authentication is required,
+ * {@code false} otherwise.
*/
boolean isAuthenticationRequested(
HttpHost authhost,