hc-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject svn commit: r1491505 [2/2] - in /httpcomponents/httpcore/trunk: ./ httpcore-nio/src/main/java/org/apache/http/impl/nio/ httpcore-nio/src/main/java/org/apache/http/impl/nio/codecs/ httpcore-nio/src/main/java/org/apache/http/impl/nio/pool/ httpcore-nio/s...
Date Mon, 10 Jun 2013 15:44:41 GMT
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/HttpAsyncService.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/HttpAsyncService.java?rev=1491505&r1=1491504&r2=1491505&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/HttpAsyncService.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/HttpAsyncService.java Mon Jun 10 15:44:38 2013
@@ -27,12 +27,10 @@
 
 package org.apache.http.nio.protocol;
 
-import java.io.Closeable;
 import java.io.IOException;
 import java.net.SocketTimeoutException;
 
 import org.apache.http.ConnectionReuseStrategy;
-import org.apache.http.HttpConnection;
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpEntityEnclosingRequest;
 import org.apache.http.HttpException;
@@ -432,10 +430,11 @@ public class HttpAsyncService implements
     }
 
     /**
-     * This method can be used to log I/O exception thrown while closing {@link Closeable}
-     * objects (such as {@link HttpConnection}).
+     * This method can be used to log I/O exception thrown while closing
+     * {@link java.io.Closeable} objects (such as
+     * {@link org.apache.http.HttpConnection}).
      *
-     * @param ex I/O exception thrown by {@link Closeable#close()}
+     * @param ex I/O exception thrown by {@link java.io.Closeable#close()}
      */
     protected void log(final Exception ex) {
     }

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/HttpRequestExecutionHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/HttpRequestExecutionHandler.java?rev=1491505&r1=1491504&r2=1491505&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/HttpRequestExecutionHandler.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/HttpRequestExecutionHandler.java Mon Jun 10 15:44:38 2013
@@ -31,7 +31,6 @@ import java.io.IOException;
 
 import org.apache.http.HttpRequest;
 import org.apache.http.HttpResponse;
-import org.apache.http.nio.reactor.ConnectingIOReactor;
 import org.apache.http.protocol.HttpContext;
 
 /**
@@ -55,7 +54,7 @@ public interface HttpRequestExecutionHan
      * made. The attachment may optionally contain some state information
      * required in order to correctly initialize the HTTP context.
      *
-     * @see ConnectingIOReactor#connect
+     * @see org.apache.http.nio.reactor.ConnectingIOReactor#connect
      *
      * @param context the actual HTTP context
      * @param attachment the object passed to the connecting I/O reactor

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/NHttpRequestExecutionHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/NHttpRequestExecutionHandler.java?rev=1491505&r1=1491504&r2=1491505&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/NHttpRequestExecutionHandler.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/main/java/org/apache/http/nio/protocol/NHttpRequestExecutionHandler.java Mon Jun 10 15:44:38 2013
@@ -32,8 +32,6 @@ import java.io.IOException;
 import org.apache.http.HttpRequest;
 import org.apache.http.HttpResponse;
 import org.apache.http.nio.entity.ConsumingNHttpEntity;
-import org.apache.http.nio.entity.ProducingNHttpEntity;
-import org.apache.http.nio.reactor.ConnectingIOReactor;
 import org.apache.http.protocol.HttpContext;
 
 /**
@@ -61,7 +59,7 @@ public interface NHttpRequestExecutionHa
      * made. The attachment may optionally contain some state information
      * required in order to correctly initalize the HTTP context.
      *
-     * @see ConnectingIOReactor#connect
+     * @see org.apache.http.nio.reactor.ConnectingIOReactor#connect
      *
      * @param context the actual HTTP context
      * @param attachment the object passed to the connecting I/O reactor
@@ -77,7 +75,7 @@ public interface NHttpRequestExecutionHa
      * can be activated at a later point.
      * <p>
      * If the request has an entity, the entity <b>must</b> be an
-     * instance of {@link ProducingNHttpEntity}.
+     * instance of {@link org.apache.http.nio.entity.ProducingNHttpEntity}.
      *
      * @param context the actual HTTP context
      * @return an HTTP request to be sent or <code>null</null> if no

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/util/TestBuffers.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/util/TestBuffers.java?rev=1491505&r1=1491504&r2=1491505&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/util/TestBuffers.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/util/TestBuffers.java Mon Jun 10 15:44:38 2013
@@ -38,7 +38,6 @@ import org.apache.http.Consts;
 import org.apache.http.ReadableByteChannelMock;
 import org.apache.http.impl.io.HttpTransportMetricsImpl;
 import org.apache.http.impl.nio.reactor.SessionOutputBufferImpl;
-import org.apache.http.io.BufferInfo;
 import org.apache.http.nio.ContentDecoder;
 import org.apache.http.nio.ContentEncoder;
 import org.apache.http.nio.reactor.SessionOutputBuffer;

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/HttpResponse.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/HttpResponse.java?rev=1491505&r1=1491504&r2=1491505&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/HttpResponse.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/HttpResponse.java Mon Jun 10 15:44:38 2013
@@ -29,8 +29,6 @@ package org.apache.http;
 
 import java.util.Locale;
 
-import org.apache.http.impl.DefaultHttpRequestFactory;
-
 /**
  * After receiving and interpreting a request message, a server responds
  * with an HTTP response message.
@@ -153,7 +151,7 @@ public interface HttpResponse extends Ht
      *
      * @return  the locale of this response, never <code>null</code>
      *
-     * @deprecated (4.3) use {@link DefaultHttpRequestFactory}
+     * @deprecated (4.3) use {@link org.apache.http.impl.DefaultHttpRequestFactory}
      */
     @Deprecated
     Locale getLocale();
@@ -165,7 +163,7 @@ public interface HttpResponse extends Ht
      *
      * @param loc       the new locale
      *
-     * @deprecated (4.3) use {@link DefaultHttpRequestFactory}
+     * @deprecated (4.3) use {@link org.apache.http.impl.DefaultHttpRequestFactory}
      */
     @Deprecated
     void setLocale(Locale loc);

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/concurrent/FutureCallback.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/concurrent/FutureCallback.java?rev=1491505&r1=1491504&r2=1491505&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/concurrent/FutureCallback.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/concurrent/FutureCallback.java Mon Jun 10 15:44:38 2013
@@ -26,10 +26,9 @@
  */
 package org.apache.http.concurrent;
 
-import java.util.concurrent.Future;
-
 /**
- * A callback interface that gets invoked upon completion of a {@link Future}.
+ * A callback interface that gets invoked upon completion of
+ * a {@link java.util.concurrent.Future}.
  *
  * @param <T> the future result type returned by this callback.
  * @since 4.2

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/config/SocketConfig.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/config/SocketConfig.java?rev=1491505&r1=1491504&r2=1491505&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/config/SocketConfig.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/config/SocketConfig.java Mon Jun 10 15:44:38 2013
@@ -27,8 +27,6 @@
 
 package org.apache.http.config;
 
-import java.net.SocketOptions;
-
 import org.apache.http.annotation.Immutable;
 import org.apache.http.util.Args;
 
@@ -67,55 +65,55 @@ public class SocketConfig implements Clo
      * <p/>
      * Default: <code>0</code> (no timeout)
      *
-     * @see SocketOptions#SO_TIMEOUT
+     * @see java.net.SocketOptions#SO_TIMEOUT
      */
     public int getSoTimeout() {
         return soTimeout;
     }
 
     /**
-     * Determines the default value of the {@link SocketOptions#SO_REUSEADDR} parameter
+     * Determines the default value of the {@link java.net.SocketOptions#SO_REUSEADDR} parameter
      * for newly created sockets.
      * <p/>
      * Default: <code>false</code>
      *
-     * @see SocketOptions#SO_REUSEADDR
+     * @see java.net.SocketOptions#SO_REUSEADDR
      */
     public boolean isSoReuseAddress() {
         return soReuseAddress;
     }
 
     /**
-     * Determines the default value of the {@link SocketOptions#SO_LINGER} parameter
+     * Determines the default value of the {@link java.net.SocketOptions#SO_LINGER} parameter
      * for newly created sockets.
      * <p/>
      * Default: <code>-1</code>
      *
-     * @see SocketOptions#SO_LINGER
+     * @see java.net.SocketOptions#SO_LINGER
      */
     public int getSoLinger() {
         return soLinger;
     }
 
     /**
-     * Determines the default value of the {@link SocketOptions#SO_KEEPALIVE} parameter
+     * Determines the default value of the {@link java.net.SocketOptions#SO_KEEPALIVE} parameter
      * for newly created sockets.
      * <p/>
      * Default: <code>-1</code>
      *
-     * @see SocketOptions#SO_KEEPALIVE
+     * @see java.net.SocketOptions#SO_KEEPALIVE
      */
     public boolean isSoKeepAlive() {
         return this.soKeepAlive;
     }
 
     /**
-     * Determines the default value of the {@link SocketOptions#TCP_NODELAY} parameter
+     * Determines the default value of the {@link java.net.SocketOptions#TCP_NODELAY} parameter
      * for newly created sockets.
      * <p/>
      * Default: <code>false</code>
      *
-     * @see SocketOptions#TCP_NODELAY
+     * @see java.net.SocketOptions#TCP_NODELAY
      */
     public boolean isTcpNoDelay() {
         return tcpNoDelay;

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/entity/AbstractHttpEntity.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/entity/AbstractHttpEntity.java?rev=1491505&r1=1491504&r2=1491505&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/entity/AbstractHttpEntity.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/entity/AbstractHttpEntity.java Mon Jun 10 15:44:38 2013
@@ -28,7 +28,6 @@
 package org.apache.http.entity;
 
 import java.io.IOException;
-import java.io.OutputStream;
 
 import org.apache.http.Header;
 import org.apache.http.HttpEntity;
@@ -183,7 +182,7 @@ public abstract class AbstractHttpEntity
      * The default implementation does not consume anything.
      *
      * @deprecated (4.1) Either use {@link #getContent()} and call {@link java.io.InputStream#close()} on that;
-     * otherwise call {@link #writeTo(OutputStream)} which is required to free the resources.
+     * otherwise call {@link #writeTo(java.io.OutputStream)} which is required to free the resources.
      */
     @Deprecated
     public void consumeContent() throws IOException {

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/AbstractHttpClientConnection.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/AbstractHttpClientConnection.java?rev=1491505&r1=1491504&r2=1491505&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/AbstractHttpClientConnection.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/AbstractHttpClientConnection.java Mon Jun 10 15:44:38 2013
@@ -40,7 +40,6 @@ import org.apache.http.HttpResponse;
 import org.apache.http.HttpResponseFactory;
 import org.apache.http.HttpStatus;
 import org.apache.http.annotation.NotThreadSafe;
-import org.apache.http.entity.ContentLengthStrategy;
 import org.apache.http.impl.entity.EntityDeserializer;
 import org.apache.http.impl.entity.EntitySerializer;
 import org.apache.http.impl.entity.LaxContentLengthStrategy;
@@ -53,8 +52,6 @@ import org.apache.http.io.HttpMessageWri
 import org.apache.http.io.HttpTransportMetrics;
 import org.apache.http.io.SessionInputBuffer;
 import org.apache.http.io.SessionOutputBuffer;
-import org.apache.http.message.LineFormatter;
-import org.apache.http.message.LineParser;
 import org.apache.http.params.HttpParams;
 import org.apache.http.util.Args;
 
@@ -117,7 +114,7 @@ public abstract class AbstractHttpClient
      * <p>
      * This method can be overridden in a super class in order to create
      * instances of {@link EntityDeserializer} using a custom
-     * {@link ContentLengthStrategy}.
+     * {@link org.apache.http.entity.ContentLengthStrategy}.
      *
      * @return HTTP entity deserializer
      */
@@ -132,7 +129,7 @@ public abstract class AbstractHttpClient
      * <p>
      * This method can be overridden in a super class in order to create
      * instances of {@link EntitySerializer} using a custom
-     * {@link ContentLengthStrategy}.
+     * {@link org.apache.http.entity.ContentLengthStrategy}.
      *
      * @return HTTP entity serialzier.
      */
@@ -160,8 +157,9 @@ public abstract class AbstractHttpClient
      * <p>
      * This method can be overridden in a super class in order to provide
      * a different implementation of the {@link HttpMessageParser} interface or
-     * to pass a different implementation of the {@link LineParser} to the
-     * the {@link DefaultHttpResponseParser} constructor.
+     * to pass a different implementation of the
+     * {@link org.apache.http.message.LineParser} to the the
+     * {@link DefaultHttpResponseParser} constructor.
      *
      * @param buffer the session input buffer.
      * @param responseFactory the HTTP response factory.
@@ -181,8 +179,9 @@ public abstract class AbstractHttpClient
      * <p>
      * This method can be overridden in a super class in order to provide
      * a different implementation of the {@link HttpMessageWriter} interface or
-     * to pass a different implementation of {@link LineFormatter} to the
-     * the default implementation {@link HttpRequestWriter}.
+     * to pass a different implementation of
+     * {@link org.apache.http.message.LineFormatter} to the the default implementation
+     * {@link HttpRequestWriter}.
      *
      * @param buffer the session output buffer
      * @param params HTTP parameters

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/AbstractHttpServerConnection.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/AbstractHttpServerConnection.java?rev=1491505&r1=1491504&r2=1491505&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/AbstractHttpServerConnection.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/AbstractHttpServerConnection.java Mon Jun 10 15:44:38 2013
@@ -38,7 +38,6 @@ import org.apache.http.HttpRequestFactor
 import org.apache.http.HttpResponse;
 import org.apache.http.HttpServerConnection;
 import org.apache.http.annotation.NotThreadSafe;
-import org.apache.http.entity.ContentLengthStrategy;
 import org.apache.http.impl.entity.DisallowIdentityContentLengthStrategy;
 import org.apache.http.impl.entity.EntityDeserializer;
 import org.apache.http.impl.entity.EntitySerializer;
@@ -52,8 +51,6 @@ import org.apache.http.io.HttpMessageWri
 import org.apache.http.io.HttpTransportMetrics;
 import org.apache.http.io.SessionInputBuffer;
 import org.apache.http.io.SessionOutputBuffer;
-import org.apache.http.message.LineFormatter;
-import org.apache.http.message.LineParser;
 import org.apache.http.params.HttpParams;
 import org.apache.http.util.Args;
 
@@ -116,7 +113,7 @@ public abstract class AbstractHttpServer
      * <p>
      * This method can be overridden in a super class in order to create
      * instances of {@link EntityDeserializer} using a custom
-     * {@link ContentLengthStrategy}.
+     * {@link org.apache.http.entity.ContentLengthStrategy}.
      *
      * @return HTTP entity deserializer
      */
@@ -132,7 +129,7 @@ public abstract class AbstractHttpServer
      * <p>
      * This method can be overridden in a super class in order to create
      * instances of {@link EntitySerializer} using a custom
-     * {@link ContentLengthStrategy}.
+     * {@link org.apache.http.entity.ContentLengthStrategy}.
      *
      * @return HTTP entity serialzier.
      */
@@ -160,8 +157,9 @@ public abstract class AbstractHttpServer
      * <p>
      * This method can be overridden in a super class in order to provide
      * a different implementation of the {@link HttpMessageParser} interface or
-     * to pass a different implementation of the {@link LineParser} to the
-     * the {@link DefaultHttpRequestParser} constructor.
+     * to pass a different implementation of the
+     * {@link org.apache.http.message.LineParser} to the
+     * {@link DefaultHttpRequestParser} constructor.
      *
      * @param buffer the session input buffer.
      * @param requestFactory the HTTP request factory.
@@ -181,8 +179,9 @@ public abstract class AbstractHttpServer
      * <p>
      * This method can be overridden in a super class in order to provide
      * a different implementation of the {@link HttpMessageWriter} interface or
-     * to pass a different implementation of {@link LineFormatter} to the
-     * the default implementation {@link HttpResponseWriter}.
+     * to pass a different implementation of
+     * {@link org.apache.http.message.LineFormatter} to the the default
+     * implementation {@link HttpResponseWriter}.
      *
      * @param buffer the session output buffer
      * @param params HTTP parameters

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/DefaultBHttpClientConnection.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/DefaultBHttpClientConnection.java?rev=1491505&r1=1491504&r2=1491505&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/DefaultBHttpClientConnection.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/DefaultBHttpClientConnection.java Mon Jun 10 15:44:38 2013
@@ -44,8 +44,6 @@ import org.apache.http.HttpStatus;
 import org.apache.http.annotation.NotThreadSafe;
 import org.apache.http.config.MessageConstraints;
 import org.apache.http.entity.ContentLengthStrategy;
-import org.apache.http.impl.entity.LaxContentLengthStrategy;
-import org.apache.http.impl.entity.StrictContentLengthStrategy;
 import org.apache.http.impl.io.DefaultHttpRequestWriterFactory;
 import org.apache.http.impl.io.DefaultHttpResponseParserFactory;
 import org.apache.http.io.HttpMessageParser;
@@ -78,9 +76,9 @@ public class DefaultBHttpClientConnectio
      * @param constraints Message constraints. If <code>null</code>
      *   {@link MessageConstraints#DEFAULT} will be used.
      * @param incomingContentStrategy incoming content length strategy. If <code>null</code>
-     *   {@link LaxContentLengthStrategy#INSTANCE} will be used.
+     *   {@link org.apache.http.impl.entity.LaxContentLengthStrategy#INSTANCE} will be used.
      * @param outgoingContentStrategy outgoing content length strategy. If <code>null</code>
-     *   {@link StrictContentLengthStrategy#INSTANCE} will be used.
+     *   {@link org.apache.http.impl.entity.StrictContentLengthStrategy#INSTANCE} will be used.
      * @param requestWriterFactory request writer factory. If <code>null</code>
      *   {@link DefaultHttpRequestWriterFactory#INSTANCE} will be used.
      * @param responseParserFactory response parser factory. If <code>null</code>

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/DefaultBHttpServerConnection.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/DefaultBHttpServerConnection.java?rev=1491505&r1=1491504&r2=1491505&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/DefaultBHttpServerConnection.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/DefaultBHttpServerConnection.java Mon Jun 10 15:44:38 2013
@@ -43,7 +43,6 @@ import org.apache.http.annotation.NotThr
 import org.apache.http.config.MessageConstraints;
 import org.apache.http.entity.ContentLengthStrategy;
 import org.apache.http.impl.entity.DisallowIdentityContentLengthStrategy;
-import org.apache.http.impl.entity.StrictContentLengthStrategy;
 import org.apache.http.impl.io.DefaultHttpRequestParserFactory;
 import org.apache.http.impl.io.DefaultHttpResponseWriterFactory;
 import org.apache.http.io.HttpMessageParser;
@@ -78,7 +77,7 @@ public class DefaultBHttpServerConnectio
      * @param incomingContentStrategy incoming content length strategy. If <code>null</code>
      *   {@link DisallowIdentityContentLengthStrategy#INSTANCE} will be used.
      * @param outgoingContentStrategy outgoing content length strategy. If <code>null</code>
-     *   {@link StrictContentLengthStrategy#INSTANCE} will be used.
+     *   {@link org.apache.http.impl.entity.StrictContentLengthStrategy#INSTANCE} will be used.
      * @param requestParserFactory request parser factory. If <code>null</code>
      *   {@link DefaultHttpRequestParserFactory#INSTANCE} will be used.
      * @param responseWriterFactory response writer factory. If <code>null</code>

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/SocketHttpServerConnection.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/SocketHttpServerConnection.java?rev=1491505&r1=1491504&r2=1491505&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/SocketHttpServerConnection.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/SocketHttpServerConnection.java Mon Jun 10 15:44:38 2013
@@ -35,7 +35,6 @@ import java.net.SocketAddress;
 import java.net.SocketException;
 
 import org.apache.http.HttpInetConnection;
-import org.apache.http.annotation.NotThreadSafe;
 import org.apache.http.impl.io.SocketInputBuffer;
 import org.apache.http.impl.io.SocketOutputBuffer;
 import org.apache.http.io.SessionInputBuffer;

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/entity/EntityDeserializer.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/entity/EntityDeserializer.java?rev=1491505&r1=1491504&r2=1491505&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/entity/EntityDeserializer.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/entity/EntityDeserializer.java Mon Jun 10 15:44:38 2013
@@ -36,7 +36,6 @@ import org.apache.http.HttpMessage;
 import org.apache.http.annotation.Immutable;
 import org.apache.http.entity.BasicHttpEntity;
 import org.apache.http.entity.ContentLengthStrategy;
-import org.apache.http.impl.BHttpConnectionBase;
 import org.apache.http.impl.io.ChunkedInputStream;
 import org.apache.http.impl.io.ContentLengthInputStream;
 import org.apache.http.impl.io.IdentityInputStream;
@@ -60,7 +59,7 @@ import org.apache.http.util.Args;
  *
  * @since 4.0
  *
- * @deprecated (4.3) use {@link BHttpConnectionBase}
+ * @deprecated (4.3) use {@link org.apache.http.impl.BHttpConnectionBase}
  */
 @Immutable // assuming injected dependencies are immutable
 @Deprecated

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/entity/EntitySerializer.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/entity/EntitySerializer.java?rev=1491505&r1=1491504&r2=1491505&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/entity/EntitySerializer.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/entity/EntitySerializer.java Mon Jun 10 15:44:38 2013
@@ -35,7 +35,6 @@ import org.apache.http.HttpException;
 import org.apache.http.HttpMessage;
 import org.apache.http.annotation.Immutable;
 import org.apache.http.entity.ContentLengthStrategy;
-import org.apache.http.impl.BHttpConnectionBase;
 import org.apache.http.impl.io.ChunkedOutputStream;
 import org.apache.http.impl.io.ContentLengthOutputStream;
 import org.apache.http.impl.io.IdentityOutputStream;
@@ -57,7 +56,7 @@ import org.apache.http.util.Args;
  *
  * @since 4.0
  *
- * @deprecated (4.3) use {@link BHttpConnectionBase}
+ * @deprecated (4.3) use {@link org.apache.http.impl.BHttpConnectionBase}
  */
 @Immutable // assuming injected dependencies are immutable
 @Deprecated

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/DefaultHttpRequestParser.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/DefaultHttpRequestParser.java?rev=1491505&r1=1491504&r2=1491505&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/DefaultHttpRequestParser.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/DefaultHttpRequestParser.java Mon Jun 10 15:44:38 2013
@@ -39,7 +39,6 @@ import org.apache.http.annotation.NotThr
 import org.apache.http.config.MessageConstraints;
 import org.apache.http.impl.DefaultHttpRequestFactory;
 import org.apache.http.io.SessionInputBuffer;
-import org.apache.http.message.BasicLineParser;
 import org.apache.http.message.LineParser;
 import org.apache.http.message.ParserCursor;
 import org.apache.http.params.HttpParams;
@@ -87,8 +86,8 @@ public class DefaultHttpRequestParser ex
      * Creates new instance of DefaultHttpRequestParser.
      *
      * @param buffer the session input buffer.
-     * @param lineParser the line parser. If <code>null</code> {@link BasicLineParser#INSTANCE} will
-     *   be used.
+     * @param lineParser the line parser. If <code>null</code>
+     *   {@link org.apache.http.message.BasicLineParser#INSTANCE} will be used.
      * @param requestFactory the response factory. If <code>null</code>
      *   {@link DefaultHttpRequestFactory#INSTANCE} will be used.
      * @param constraints the message constraints. If <code>null</code>

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/DefaultHttpRequestWriter.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/DefaultHttpRequestWriter.java?rev=1491505&r1=1491504&r2=1491505&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/DefaultHttpRequestWriter.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/DefaultHttpRequestWriter.java Mon Jun 10 15:44:38 2013
@@ -32,7 +32,6 @@ import java.io.IOException;
 import org.apache.http.HttpRequest;
 import org.apache.http.annotation.NotThreadSafe;
 import org.apache.http.io.SessionOutputBuffer;
-import org.apache.http.message.BasicLineFormatter;
 import org.apache.http.message.LineFormatter;
 
 /**
@@ -47,7 +46,8 @@ public class DefaultHttpRequestWriter ex
      * Creates an instance of DefaultHttpRequestWriter.
      *
      * @param buffer the session output buffer.
-     * @param formatter the line formatter If <code>null</code> {@link BasicLineFormatter#INSTANCE}
+     * @param formatter the line formatter If <code>null</code>
+     *   {@link org.apache.http.message.BasicLineFormatter#INSTANCE}
      *   will be used.
      */
     public DefaultHttpRequestWriter(

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/DefaultHttpResponseParser.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/DefaultHttpResponseParser.java?rev=1491505&r1=1491504&r2=1491505&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/DefaultHttpResponseParser.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/DefaultHttpResponseParser.java Mon Jun 10 15:44:38 2013
@@ -39,7 +39,6 @@ import org.apache.http.annotation.NotThr
 import org.apache.http.config.MessageConstraints;
 import org.apache.http.impl.DefaultHttpResponseFactory;
 import org.apache.http.io.SessionInputBuffer;
-import org.apache.http.message.BasicLineParser;
 import org.apache.http.message.LineParser;
 import org.apache.http.message.ParserCursor;
 import org.apache.http.params.HttpParams;
@@ -87,8 +86,8 @@ public class DefaultHttpResponseParser e
      * Creates new instance of DefaultHttpResponseParser.
      *
      * @param buffer the session input buffer.
-     * @param lineParser the line parser. If <code>null</code> {@link BasicLineParser#INSTANCE}
-     *   will be used
+     * @param lineParser the line parser. If <code>null</code>
+     *   {@link org.apache.http.message.BasicLineParser#INSTANCE} will be used
      * @param responseFactory the response factory. If <code>null</code>
      *   {@link DefaultHttpResponseFactory#INSTANCE} will be used.
      * @param constraints the message constraints. If <code>null</code>

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/DefaultHttpResponseWriter.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/DefaultHttpResponseWriter.java?rev=1491505&r1=1491504&r2=1491505&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/DefaultHttpResponseWriter.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/DefaultHttpResponseWriter.java Mon Jun 10 15:44:38 2013
@@ -32,7 +32,6 @@ import java.io.IOException;
 import org.apache.http.HttpResponse;
 import org.apache.http.annotation.NotThreadSafe;
 import org.apache.http.io.SessionOutputBuffer;
-import org.apache.http.message.BasicLineFormatter;
 import org.apache.http.message.LineFormatter;
 
 /**
@@ -47,7 +46,8 @@ public class DefaultHttpResponseWriter e
      * Creates an instance of DefaultHttpResponseWriter.
      *
      * @param buffer the session output buffer.
-     * @param formatter the line formatter If <code>null</code> {@link BasicLineFormatter#INSTANCE}
+     * @param formatter the line formatter If <code>null</code>
+     *  {@link org.apache.http.message.BasicLineFormatter#INSTANCE}
      *   will be used.
      */
     public DefaultHttpResponseWriter(

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/HttpRequestParser.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/HttpRequestParser.java?rev=1491505&r1=1491504&r2=1491505&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/HttpRequestParser.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/HttpRequestParser.java Mon Jun 10 15:44:38 2013
@@ -32,7 +32,6 @@ import java.io.IOException;
 import org.apache.http.ConnectionClosedException;
 import org.apache.http.HttpException;
 import org.apache.http.HttpMessage;
-import org.apache.http.HttpRequest;
 import org.apache.http.HttpRequestFactory;
 import org.apache.http.ParseException;
 import org.apache.http.RequestLine;
@@ -72,7 +71,7 @@ public class HttpRequestParser extends A
      * @param buffer the session input buffer.
      * @param parser the line parser.
      * @param requestFactory the factory to use to create
-     *    {@link HttpRequest}s.
+     *    {@link org.apache.http.HttpRequest}s.
      * @param params HTTP parameters.
      */
     public HttpRequestParser(

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/HttpResponseParser.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/HttpResponseParser.java?rev=1491505&r1=1491504&r2=1491505&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/HttpResponseParser.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/HttpResponseParser.java Mon Jun 10 15:44:38 2013
@@ -31,7 +31,6 @@ import java.io.IOException;
 
 import org.apache.http.HttpException;
 import org.apache.http.HttpMessage;
-import org.apache.http.HttpResponse;
 import org.apache.http.HttpResponseFactory;
 import org.apache.http.NoHttpResponseException;
 import org.apache.http.ParseException;
@@ -72,7 +71,7 @@ public class HttpResponseParser extends 
      * @param buffer the session input buffer.
      * @param parser the line parser.
      * @param responseFactory the factory to use to create
-     *    {@link HttpResponse}s.
+     *    {@link org.apache.http.HttpResponse}s.
      * @param params HTTP parameters.
      */
     public HttpResponseParser(

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/SocketInputBuffer.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/SocketInputBuffer.java?rev=1491505&r1=1491504&r2=1491505&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/SocketInputBuffer.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/SocketInputBuffer.java Mon Jun 10 15:44:38 2013
@@ -29,16 +29,15 @@ package org.apache.http.impl.io;
 
 import java.io.IOException;
 import java.net.Socket;
-import java.net.SocketTimeoutException;
 
 import org.apache.http.annotation.NotThreadSafe;
 import org.apache.http.io.EofSensor;
-import org.apache.http.io.SessionInputBuffer;
 import org.apache.http.params.HttpParams;
 import org.apache.http.util.Args;
 
 /**
- * {@link SessionInputBuffer} implementation bound to a {@link Socket}.
+ * {@link org.apache.http.io.SessionInputBuffer} implementation
+ * bound to a {@link Socket}.
  *
  * @since 4.0
  *

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/SocketOutputBuffer.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/SocketOutputBuffer.java?rev=1491505&r1=1491504&r2=1491505&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/SocketOutputBuffer.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/SocketOutputBuffer.java Mon Jun 10 15:44:38 2013
@@ -31,12 +31,12 @@ import java.io.IOException;
 import java.net.Socket;
 
 import org.apache.http.annotation.NotThreadSafe;
-import org.apache.http.io.SessionOutputBuffer;
 import org.apache.http.params.HttpParams;
 import org.apache.http.util.Args;
 
 /**
- * {@link SessionOutputBuffer} implementation bound to a {@link Socket}.
+ * {@link org.apache.http.io.SessionOutputBuffer} implementation
+ * bound to a {@link Socket}.
  *
  * @since 4.0
  *

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/pool/BasicConnPool.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/pool/BasicConnPool.java?rev=1491505&r1=1491504&r2=1491505&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/pool/BasicConnPool.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/pool/BasicConnPool.java Mon Jun 10 15:44:38 2013
@@ -36,14 +36,13 @@ import org.apache.http.config.SocketConf
 import org.apache.http.params.HttpParams;
 import org.apache.http.pool.AbstractConnPool;
 import org.apache.http.pool.ConnFactory;
-import org.apache.http.pool.ConnPool;
 
 /**
- * A very basic {@link ConnPool} implementation that represents a pool
- * of blocking {@link HttpClientConnection} connections identified by
- * an {@link HttpHost} instance. Please note this pool implementation
- * does not support complex routes via a proxy cannot differentiate between
- * direct and proxied connections.
+ * A very basic {@link org.apache.http.pool.ConnPool} implementation that
+ * represents a pool of blocking {@link HttpClientConnection} connections
+ * identified by an {@link HttpHost} instance. Please note this pool
+ * implementation does not support complex routes via a proxy cannot
+ * differentiate between direct and proxied connections.
  *
  * @see HttpHost
  * @since 4.2

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicHttpResponse.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicHttpResponse.java?rev=1491505&r1=1491504&r2=1491505&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicHttpResponse.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicHttpResponse.java Mon Jun 10 15:44:38 2013
@@ -36,14 +36,12 @@ import org.apache.http.ProtocolVersion;
 import org.apache.http.ReasonPhraseCatalog;
 import org.apache.http.StatusLine;
 import org.apache.http.annotation.NotThreadSafe;
-import org.apache.http.impl.DefaultHttpRequestFactory;
-import org.apache.http.impl.DefaultHttpResponseFactory;
 import org.apache.http.util.Args;
 
 /**
  * Basic implementation of {@link HttpResponse}.
  *
- * @see DefaultHttpResponseFactory
+ * @see org.apache.http.impl.DefaultHttpResponseFactory
  *
  * @since 4.0
  */
@@ -69,7 +67,7 @@ public class BasicHttpResponse extends A
      * @param locale            the locale for looking up reason phrases, or
      *                          <code>null</code> for the system locale
      *
-     * @deprecated (4.3) use {@link DefaultHttpRequestFactory}
+     * @deprecated (4.3) use {@link org.apache.http.impl.DefaultHttpRequestFactory}
      */
     @Deprecated
     public BasicHttpResponse(final StatusLine statusline,
@@ -147,7 +145,7 @@ public class BasicHttpResponse extends A
     }
 
     /**
-     * @deprecated (4.3) use {@link DefaultHttpRequestFactory}
+     * @deprecated (4.3) use {@link org.apache.http.impl.DefaultHttpRequestFactory}
      */
     @Deprecated
     public Locale getLocale() {
@@ -200,7 +198,7 @@ public class BasicHttpResponse extends A
     }
 
     /**
-     * @deprecated (4.3) use {@link DefaultHttpRequestFactory}
+     * @deprecated (4.3) use {@link org.apache.http.impl.DefaultHttpRequestFactory}
      */
     @Deprecated
     public void setLocale(final Locale locale) {
@@ -217,7 +215,7 @@ public class BasicHttpResponse extends A
      *
      * @return  the reason phrase, or <code>null</code> if there is none
      *
-     * @deprecated (4.3) use {@link DefaultHttpRequestFactory}
+     * @deprecated (4.3) use {@link org.apache.http.impl.DefaultHttpRequestFactory}
      */
     @Deprecated
     protected String getReason(final int code) {

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/params/CoreProtocolPNames.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/params/CoreProtocolPNames.java?rev=1491505&r1=1491504&r2=1491505&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/params/CoreProtocolPNames.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/params/CoreProtocolPNames.java Mon Jun 10 15:44:38 2013
@@ -27,8 +27,6 @@
 
 package org.apache.http.params;
 
-import org.apache.http.ProtocolVersion;
-
 /**
  * Defines parameter names for protocol execution in HttpCore.
  *
@@ -41,9 +39,9 @@ import org.apache.http.ProtocolVersion;
 public interface CoreProtocolPNames {
 
     /**
-     * Defines the {@link ProtocolVersion} used per default.
+     * Defines the {@link org.apache.http.ProtocolVersion} used per default.
      * <p>
-     * This parameter expects a value of type {@link ProtocolVersion}.
+     * This parameter expects a value of type {@link org.apache.http.ProtocolVersion}.
      * </p>
      */
     public static final String PROTOCOL_VERSION = "http.protocol.version";

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/pool/PoolEntryCallback.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/pool/PoolEntryCallback.java?rev=1491505&r1=1491504&r2=1491505&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/pool/PoolEntryCallback.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/pool/PoolEntryCallback.java Mon Jun 10 15:44:38 2013
@@ -26,8 +26,6 @@
  */
 package org.apache.http.pool;
 
-import java.io.IOException;
-
 /**
  * Pool entry callabck.
  *

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/HttpRequestExecutor.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/HttpRequestExecutor.java?rev=1491505&r1=1491504&r2=1491505&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/HttpRequestExecutor.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/protocol/HttpRequestExecutor.java Mon Jun 10 15:44:38 2013
@@ -30,7 +30,6 @@ package org.apache.http.protocol;
 import java.io.IOException;
 
 import org.apache.http.HttpClientConnection;
-import org.apache.http.HttpEntity;
 import org.apache.http.HttpEntityEnclosingRequest;
 import org.apache.http.HttpException;
 import org.apache.http.HttpRequest;
@@ -287,7 +286,7 @@ public class HttpRequestExecutor {
      * This method does <i>not</i> read the response entity, if any.
      * The connection over which content of the response entity is being
      * streamed from cannot be reused until
-     * {@link org.apache.http.util.EntityUtils#consume(HttpEntity)}
+     * {@link org.apache.http.util.EntityUtils#consume(org.apache.http.HttpEntity)}
      * has been invoked.
      *
      * @param response  the response object to post-process

Modified: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/entity/TestInputStreamEntity.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/entity/TestInputStreamEntity.java?rev=1491505&r1=1491504&r2=1491505&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/entity/TestInputStreamEntity.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/entity/TestInputStreamEntity.java Mon Jun 10 15:44:38 2013
@@ -61,8 +61,8 @@ public class TestInputStreamEntity {
 
     @Test
     public void testUnknownLengthConstructor() throws Exception {
-        InputStream instream = new ByteArrayInputStream(new byte[0]);
-        InputStreamEntity httpentity = new InputStreamEntity(instream);
+        final InputStream instream = new ByteArrayInputStream(new byte[0]);
+        final InputStreamEntity httpentity = new InputStreamEntity(instream);
         Assert.assertEquals(-1, httpentity.getContentLength());
     }
 
@@ -70,10 +70,10 @@ public class TestInputStreamEntity {
     public void testWriteTo() throws Exception {
         final String message = "Message content";
         final byte[] bytes = message.getBytes(Consts.ISO_8859_1.name());
-        InputStream instream = new ByteArrayInputStream(bytes);
-        InputStreamEntity httpentity = new InputStreamEntity(instream, bytes.length);
+        final InputStream instream = new ByteArrayInputStream(bytes);
+        final InputStreamEntity httpentity = new InputStreamEntity(instream, bytes.length);
 
-        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        final ByteArrayOutputStream out = new ByteArrayOutputStream();
         httpentity.writeTo(out);
         final byte[] writtenBytes = out.toByteArray();
         Assert.assertNotNull(writtenBytes);
@@ -87,11 +87,11 @@ public class TestInputStreamEntity {
     public void testWriteToPartialContent() throws Exception {
         final String message = "Message content";
         final byte[] bytes = message.getBytes(Consts.ISO_8859_1.name());
-        InputStream instream = new ByteArrayInputStream(bytes);
+        final InputStream instream = new ByteArrayInputStream(bytes);
         final int contentLength = 7;
-        InputStreamEntity httpentity = new InputStreamEntity(instream, contentLength);
+        final InputStreamEntity httpentity = new InputStreamEntity(instream, contentLength);
 
-        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        final ByteArrayOutputStream out = new ByteArrayOutputStream();
         httpentity.writeTo(out);
         final byte[] writtenBytes = out.toByteArray();
         Assert.assertNotNull(writtenBytes);
@@ -105,10 +105,10 @@ public class TestInputStreamEntity {
     public void testWriteToUnknownLength() throws Exception {
         final String message = "Message content";
         final byte[] bytes = message.getBytes(Consts.ISO_8859_1.name());
-        InputStream instream = new ByteArrayInputStream(bytes);
-        InputStreamEntity httpentity = new InputStreamEntity(instream);
+        final InputStream instream = new ByteArrayInputStream(bytes);
+        final InputStreamEntity httpentity = new InputStreamEntity(instream);
 
-        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        final ByteArrayOutputStream out = new ByteArrayOutputStream();
         httpentity.writeTo(out);
         final byte[] writtenBytes = out.toByteArray();
         Assert.assertNotNull(writtenBytes);
@@ -120,8 +120,8 @@ public class TestInputStreamEntity {
 
     @Test(expected = IllegalArgumentException.class)
     public void testWriteToNull() throws Exception {
-        InputStream instream = new ByteArrayInputStream(new byte[0]);
-        InputStreamEntity httpentity = new InputStreamEntity(instream, 0);
+        final InputStream instream = new ByteArrayInputStream(new byte[0]);
+        final InputStreamEntity httpentity = new InputStreamEntity(instream, 0);
         httpentity.writeTo(null);
     }
 }

Modified: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/io/TimeoutByteArrayInputStream.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/io/TimeoutByteArrayInputStream.java?rev=1491505&r1=1491504&r2=1491505&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/io/TimeoutByteArrayInputStream.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/io/TimeoutByteArrayInputStream.java Mon Jun 10 15:44:38 2013
@@ -67,7 +67,7 @@ class TimeoutByteArrayInputStream extend
     }
 
     @Override
-    public int read(final byte b[], final int off, int len) throws IOException {
+    public int read(final byte b[], final int off, final int len) throws IOException {
         if (b == null) {
             throw new NullPointerException();
         } else if ((off < 0) || (off > b.length) || (len < 0) ||
@@ -77,17 +77,18 @@ class TimeoutByteArrayInputStream extend
         if (this.pos >= this.count) {
             return -1;
         }
+        int chunk = len;
         if (this.pos + len > this.count) {
-            len = this.count - this.pos;
+            chunk = this.count - this.pos;
         }
-        if (len <= 0) {
+        if (chunk <= 0) {
             return 0;
         }
         if ((this.buf[this.pos] & 0xff) == 0) {
             this.pos++;
             throw new InterruptedIOException("Timeout");
         }
-        for (int i = 0; i < len; i++) {
+        for (int i = 0; i < chunk; i++) {
             final int v = this.buf[this.pos] & 0xff;
             if (v == 0) {
                 return i;
@@ -96,19 +97,20 @@ class TimeoutByteArrayInputStream extend
                 this.pos++;
             }
         }
-        return len;
+        return chunk;
     }
 
     @Override
-    public long skip(long n) {
+    public long skip(final long n) {
+        long chunk = n;
         if (this.pos + n > this.count) {
-            n = this.count - this.pos;
+            chunk = this.count - this.pos;
         }
-        if (n < 0) {
+        if (chunk < 0) {
             return 0;
         }
-        this.pos += n;
-        return n;
+        this.pos += chunk;
+        return chunk;
     }
 
     @Override

Modified: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/integration/TestSyncHttp.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/integration/TestSyncHttp.java?rev=1491505&r1=1491504&r2=1491505&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/integration/TestSyncHttp.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/integration/TestSyncHttp.java Mon Jun 10 15:44:38 2013
@@ -603,17 +603,15 @@ public class TestSyncHttp {
         private final byte[] raw;
         private final int n;
 
-        public RepeatingEntity(final String content, Charset charset, final int n) {
+        public RepeatingEntity(final String content, final Charset charset, final int n) {
             super();
-            if (charset == null) {
-                charset = Charset.forName("US-ASCII"); // US-ASCII is built-in
-            }
+            final Charset cs = charset != null ? charset : Charset.forName("US-ASCII");
             byte[] b;
             // Java 6 only:
             // b = content.getBytes(charset);
             // Java 5 OK:
             try {
-                b = content.getBytes(charset.name());
+                b = content.getBytes(cs.name());
             } catch (final UnsupportedEncodingException ex) {
                 b = content.getBytes();
             }

Modified: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/message/TestBasicMessages.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/message/TestBasicMessages.java?rev=1491505&r1=1491504&r2=1491505&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/message/TestBasicMessages.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/message/TestBasicMessages.java Mon Jun 10 15:44:38 2013
@@ -27,7 +27,6 @@
 
 package org.apache.http.message;
 
-import org.apache.http.Header;
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpRequest;
 import org.apache.http.HttpResponse;
@@ -38,7 +37,7 @@ import org.junit.Assert;
 import org.junit.Test;
 
 /**
- * Unit tests for {@link Header}.
+ * Unit tests for {@link org.apache.http.HttpMessage}.
  *
  */
 public class TestBasicMessages {



Mime
View raw message