hc-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject svn commit: r1558077 [3/4] - in /httpcomponents/httpcore/trunk: httpcore-ab/src/main/java/org/apache/http/benchmark/ httpcore-ab/src/test/java/org/apache/http/benchmark/ httpcore-nio/src/main/java/org/apache/http/impl/nio/ httpcore-nio/src/main/java/or...
Date Tue, 14 Jan 2014 15:22:34 GMT
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/testserver/LoggingSSLClientConnectionFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/testserver/LoggingSSLClientConnectionFactory.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/testserver/LoggingSSLClientConnectionFactory.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/testserver/LoggingSSLClientConnectionFactory.java Tue Jan 14 15:22:31 2014
@@ -51,6 +51,7 @@ public class LoggingSSLClientConnectionF
         this(sslcontext, null);
     }
 
+    @Override
     public DefaultNHttpClientConnection createConnection(final IOSession iosession) {
         final SSLIOSession ssliosession = new SSLIOSession(
                 iosession, SSLMode.CLIENT, this.sslcontext, this.setupHandler);

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/testserver/LoggingSSLServerConnectionFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/testserver/LoggingSSLServerConnectionFactory.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/testserver/LoggingSSLServerConnectionFactory.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/testserver/LoggingSSLServerConnectionFactory.java Tue Jan 14 15:22:31 2014
@@ -51,6 +51,7 @@ public class LoggingSSLServerConnectionF
         this(sslcontext, null);
     }
 
+    @Override
     public DefaultNHttpServerConnection createConnection(final IOSession iosession) {
         final SSLIOSession ssliosession = new SSLIOSession(
                 iosession, SSLMode.SERVER, this.sslcontext, this.setupHandler);

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/testserver/LoggingServerConnectionFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/testserver/LoggingServerConnectionFactory.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/testserver/LoggingServerConnectionFactory.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/testserver/LoggingServerConnectionFactory.java Tue Jan 14 15:22:31 2014
@@ -36,6 +36,7 @@ public class LoggingServerConnectionFact
         super();
     }
 
+    @Override
     public DefaultNHttpServerConnection createConnection(final IOSession session) {
         return new LoggingNHttpServerConnection(session);
     }

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/testserver/SimpleIOReactorExceptionHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/testserver/SimpleIOReactorExceptionHandler.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/testserver/SimpleIOReactorExceptionHandler.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/testserver/SimpleIOReactorExceptionHandler.java Tue Jan 14 15:22:31 2014
@@ -33,6 +33,7 @@ import org.apache.http.nio.reactor.IORea
 
 public class SimpleIOReactorExceptionHandler implements IOReactorExceptionHandler {
 
+    @Override
     public boolean handle(final RuntimeException ex) {
         if (!(ex instanceof OoopsieRuntimeException)) {
             ex.printStackTrace(System.out);
@@ -40,6 +41,7 @@ public class SimpleIOReactorExceptionHan
         return false;
     }
 
+    @Override
     public boolean handle(final IOException ex) {
         ex.printStackTrace(System.out);
         return false;

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/util/ContentDecoderMock.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/util/ContentDecoderMock.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/util/ContentDecoderMock.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/util/ContentDecoderMock.java Tue Jan 14 15:22:31 2014
@@ -43,6 +43,7 @@ public class ContentDecoderMock implemen
         this.channel = channel;
     }
 
+    @Override
     public int read(final ByteBuffer dst) throws IOException {
         if (this.completed) {
             return -1;
@@ -54,6 +55,7 @@ public class ContentDecoderMock implemen
         return bytesRead;
     }
 
+    @Override
     public boolean isCompleted() {
         return this.completed;
     }

Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/util/ContentEncoderMock.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/util/ContentEncoderMock.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/util/ContentEncoderMock.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/util/ContentEncoderMock.java Tue Jan 14 15:22:31 2014
@@ -45,6 +45,7 @@ public class ContentEncoderMock extends 
         super(channel, buffer, metrics);
     }
 
+    @Override
     public int write(final ByteBuffer src) throws IOException {
         if (src == null) {
             return 0;

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/HeaderElementIterator.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/HeaderElementIterator.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/HeaderElementIterator.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/HeaderElementIterator.java Tue Jan 14 15:22:31 2014
@@ -43,6 +43,7 @@ public interface HeaderElementIterator e
      * @return  <code>true</code> if there is another header element,
      *          <code>false</code> otherwise
      */
+    @Override
     boolean hasNext();
 
     /**

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/HeaderIterator.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/HeaderIterator.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/HeaderIterator.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/HeaderIterator.java Tue Jan 14 15:22:31 2014
@@ -42,6 +42,7 @@ public interface HeaderIterator extends 
      * @return  <code>true</code> if there is another header,
      *          <code>false</code> otherwise
      */
+    @Override
     boolean hasNext();
 
     /**

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/HttpConnection.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/HttpConnection.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/HttpConnection.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/HttpConnection.java Tue Jan 14 15:22:31 2014
@@ -44,6 +44,7 @@ public interface HttpConnection extends 
      * This method MUST NOT be called from a different thread to force
      * shutdown of the connection. Use {@link #shutdown shutdown} instead.
      */
+    @Override
     void close() throws IOException;
 
     /**

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/TokenIterator.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/TokenIterator.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/TokenIterator.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/TokenIterator.java Tue Jan 14 15:22:31 2014
@@ -45,6 +45,7 @@ public interface TokenIterator extends I
      * @return  <code>true</code> if there is another token,
      *          <code>false</code> otherwise
      */
+    @Override
     boolean hasNext();
 
     /**

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/concurrent/BasicFuture.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/concurrent/BasicFuture.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/concurrent/BasicFuture.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/concurrent/BasicFuture.java Tue Jan 14 15:22:31 2014
@@ -55,10 +55,12 @@ public class BasicFuture<T> implements F
         this.callback = callback;
     }
 
+    @Override
     public boolean isCancelled() {
         return this.cancelled;
     }
 
+    @Override
     public boolean isDone() {
         return this.completed;
     }
@@ -70,6 +72,7 @@ public class BasicFuture<T> implements F
         return this.result;
     }
 
+    @Override
     public synchronized T get() throws InterruptedException, ExecutionException {
         while (!this.completed) {
             wait();
@@ -77,6 +80,7 @@ public class BasicFuture<T> implements F
         return getResult();
     }
 
+    @Override
     public synchronized T get(final long timeout, final TimeUnit unit)
             throws InterruptedException, ExecutionException, TimeoutException {
         Args.notNull(unit, "Time unit");
@@ -132,6 +136,7 @@ public class BasicFuture<T> implements F
         return true;
     }
 
+    @Override
     public boolean cancel(final boolean mayInterruptIfRunning) {
         synchronized(this) {
             if (this.completed) {
@@ -147,6 +152,7 @@ public class BasicFuture<T> implements F
         return true;
     }
 
+    @Override
     public boolean cancel() {
         return cancel(true);
     }

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/config/Registry.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/config/Registry.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/config/Registry.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/config/Registry.java Tue Jan 14 15:22:31 2014
@@ -48,6 +48,7 @@ public final class Registry<I> implement
         this.map = new ConcurrentHashMap<String, I>(map);
     }
 
+    @Override
     public I lookup(final String key) {
         if (key == null) {
             return null;

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=1558077&r1=1558076&r2=1558077&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 Tue Jan 14 15:22:31 2014
@@ -73,6 +73,7 @@ public abstract class AbstractHttpEntity
      *
      * @return  the Content-Type header, or <code>null</code>
      */
+    @Override
     public Header getContentType() {
         return this.contentType;
     }
@@ -85,6 +86,7 @@ public abstract class AbstractHttpEntity
      *
      * @return  the Content-Encoding header, or <code>null</code>
      */
+    @Override
     public Header getContentEncoding() {
         return this.contentEncoding;
     }
@@ -96,6 +98,7 @@ public abstract class AbstractHttpEntity
      *
      * @return  the 'chunked' flag
      */
+    @Override
     public boolean isChunked() {
         return this.chunked;
     }
@@ -184,6 +187,7 @@ public abstract class AbstractHttpEntity
      * @deprecated (4.1) Either use {@link #getContent()} and call {@link java.io.InputStream#close()} on that;
      * otherwise call {@link #writeTo(java.io.OutputStream)} which is required to free the resources.
      */
+    @Override
     @Deprecated
     public void consumeContent() throws IOException {
     }

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/entity/BasicHttpEntity.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/entity/BasicHttpEntity.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/entity/BasicHttpEntity.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/entity/BasicHttpEntity.java Tue Jan 14 15:22:31 2014
@@ -57,6 +57,7 @@ public class BasicHttpEntity extends Abs
         this.length = -1;
     }
 
+    @Override
     public long getContentLength() {
         return this.length;
     }
@@ -70,6 +71,7 @@ public class BasicHttpEntity extends Abs
      * @throws IllegalStateException
      *          if the content has not been provided
      */
+    @Override
     public InputStream getContent() throws IllegalStateException {
         Asserts.check(this.content != null, "Content has not been provided");
         return this.content;
@@ -80,6 +82,7 @@ public class BasicHttpEntity extends Abs
      *
      * @return <code>false</code>
      */
+    @Override
     public boolean isRepeatable() {
         return false;
     }
@@ -104,6 +107,7 @@ public class BasicHttpEntity extends Abs
         this.content = instream;
     }
 
+    @Override
     public void writeTo(final OutputStream outstream) throws IOException {
         Args.notNull(outstream, "Output stream");
         final InputStream instream = getContent();
@@ -118,6 +122,7 @@ public class BasicHttpEntity extends Abs
         }
     }
 
+    @Override
     public boolean isStreaming() {
         return this.content != null;
     }

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/entity/ByteArrayEntity.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/entity/ByteArrayEntity.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/entity/ByteArrayEntity.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/entity/ByteArrayEntity.java Tue Jan 14 15:22:31 2014
@@ -95,18 +95,22 @@ public class ByteArrayEntity extends Abs
         this(b, off, len, null);
     }
 
+    @Override
     public boolean isRepeatable() {
         return true;
     }
 
+    @Override
     public long getContentLength() {
         return this.len;
     }
 
+    @Override
     public InputStream getContent() {
         return new ByteArrayInputStream(this.b, this.off, this.len);
     }
 
+    @Override
     public void writeTo(final OutputStream outstream) throws IOException {
         Args.notNull(outstream, "Output stream");
         outstream.write(this.b, this.off, this.len);
@@ -119,6 +123,7 @@ public class ByteArrayEntity extends Abs
      *
      * @return <code>false</code>
      */
+    @Override
     public boolean isStreaming() {
         return false;
     }

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/entity/EntityTemplate.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/entity/EntityTemplate.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/entity/EntityTemplate.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/entity/EntityTemplate.java Tue Jan 14 15:22:31 2014
@@ -50,25 +50,30 @@ public class EntityTemplate extends Abst
         this.contentproducer = Args.notNull(contentproducer, "Content producer");
     }
 
+    @Override
     public long getContentLength() {
         return -1;
     }
 
+    @Override
     public InputStream getContent() throws IOException {
         final ByteArrayOutputStream buf = new ByteArrayOutputStream();
         writeTo(buf);
         return new ByteArrayInputStream(buf.toByteArray());
     }
 
+    @Override
     public boolean isRepeatable() {
         return true;
     }
 
+    @Override
     public void writeTo(final OutputStream outstream) throws IOException {
         Args.notNull(outstream, "Output stream");
         this.contentproducer.writeTo(outstream);
     }
 
+    @Override
     public boolean isStreaming() {
         return false;
     }

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/entity/FileEntity.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/entity/FileEntity.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/entity/FileEntity.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/entity/FileEntity.java Tue Jan 14 15:22:31 2014
@@ -75,18 +75,22 @@ public class FileEntity extends Abstract
         this.file = Args.notNull(file, "File");
     }
 
+    @Override
     public boolean isRepeatable() {
         return true;
     }
 
+    @Override
     public long getContentLength() {
         return this.file.length();
     }
 
+    @Override
     public InputStream getContent() throws IOException {
         return new FileInputStream(this.file);
     }
 
+    @Override
     public void writeTo(final OutputStream outstream) throws IOException {
         Args.notNull(outstream, "Output stream");
         final InputStream instream = new FileInputStream(this.file);
@@ -107,6 +111,7 @@ public class FileEntity extends Abstract
      *
      * @return <code>false</code>
      */
+    @Override
     public boolean isStreaming() {
         return false;
     }

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/entity/HttpEntityWrapper.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/entity/HttpEntityWrapper.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/entity/HttpEntityWrapper.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/entity/HttpEntityWrapper.java Tue Jan 14 15:22:31 2014
@@ -59,36 +59,44 @@ public class HttpEntityWrapper implement
         this.wrappedEntity = Args.notNull(wrappedEntity, "Wrapped entity");
     } // constructor
 
+    @Override
     public boolean isRepeatable() {
         return wrappedEntity.isRepeatable();
     }
 
+    @Override
     public boolean isChunked() {
         return wrappedEntity.isChunked();
     }
 
+    @Override
     public long getContentLength() {
         return wrappedEntity.getContentLength();
     }
 
+    @Override
     public Header getContentType() {
         return wrappedEntity.getContentType();
     }
 
+    @Override
     public Header getContentEncoding() {
         return wrappedEntity.getContentEncoding();
     }
 
+    @Override
     public InputStream getContent()
         throws IOException {
         return wrappedEntity.getContent();
     }
 
+    @Override
     public void writeTo(final OutputStream outstream)
         throws IOException {
         wrappedEntity.writeTo(outstream);
     }
 
+    @Override
     public boolean isStreaming() {
         return wrappedEntity.isStreaming();
     }
@@ -97,6 +105,7 @@ public class HttpEntityWrapper implement
      * @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.
      */
+    @Override
     @Deprecated
     public void consumeContent() throws IOException {
         wrappedEntity.consumeContent();

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/entity/InputStreamEntity.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/entity/InputStreamEntity.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/entity/InputStreamEntity.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/entity/InputStreamEntity.java Tue Jan 14 15:22:31 2014
@@ -98,6 +98,7 @@ public class InputStreamEntity extends A
         }
     }
 
+    @Override
     public boolean isRepeatable() {
         return false;
     }
@@ -105,10 +106,12 @@ public class InputStreamEntity extends A
     /**
      * @return the content length or {@code -1} if unknown
      */
+    @Override
     public long getContentLength() {
         return this.length;
     }
 
+    @Override
     public InputStream getContent() throws IOException {
         return this.content;
     }
@@ -120,6 +123,7 @@ public class InputStreamEntity extends A
      * stream will be completely consumed (to the end of the stream).
      *
      */
+    @Override
     public void writeTo(final OutputStream outstream) throws IOException {
         Args.notNull(outstream, "Output stream");
         final InputStream instream = this.content;
@@ -148,6 +152,7 @@ public class InputStreamEntity extends A
         }
     }
 
+    @Override
     public boolean isStreaming() {
         return true;
     }

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/entity/SerializableEntity.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/entity/SerializableEntity.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/entity/SerializableEntity.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/entity/SerializableEntity.java Tue Jan 14 15:22:31 2014
@@ -88,6 +88,7 @@ public class SerializableEntity extends 
         this.objSer = baos.toByteArray();
     }
 
+    @Override
     public InputStream getContent() throws IOException, IllegalStateException {
         if (this.objSer == null) {
             createBytes(this.objRef);
@@ -95,6 +96,7 @@ public class SerializableEntity extends 
         return new ByteArrayInputStream(this.objSer);
     }
 
+    @Override
     public long getContentLength() {
         if (this.objSer ==  null) {
             return -1;
@@ -103,14 +105,17 @@ public class SerializableEntity extends 
         }
     }
 
+    @Override
     public boolean isRepeatable() {
         return true;
     }
 
+    @Override
     public boolean isStreaming() {
         return this.objSer == null;
     }
 
+    @Override
     public void writeTo(final OutputStream outstream) throws IOException {
         Args.notNull(outstream, "Output stream");
         if (this.objSer == null) {

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/entity/StringEntity.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/entity/StringEntity.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/entity/StringEntity.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/entity/StringEntity.java Tue Jan 14 15:22:31 2014
@@ -153,18 +153,22 @@ public class StringEntity extends Abstra
         this(string, ContentType.DEFAULT_TEXT);
     }
 
+    @Override
     public boolean isRepeatable() {
         return true;
     }
 
+    @Override
     public long getContentLength() {
         return this.content.length;
     }
 
+    @Override
     public InputStream getContent() throws IOException {
         return new ByteArrayInputStream(this.content);
     }
 
+    @Override
     public void writeTo(final OutputStream outstream) throws IOException {
         Args.notNull(outstream, "Output stream");
         outstream.write(this.content);
@@ -176,6 +180,7 @@ public class StringEntity extends Abstra
      *
      * @return <code>false</code>
      */
+    @Override
     public boolean isStreaming() {
         return false;
     }

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/BHttpConnectionBase.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/BHttpConnectionBase.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/BHttpConnectionBase.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/BHttpConnectionBase.java Tue Jan 14 15:22:31 2014
@@ -172,6 +172,7 @@ public class BHttpConnectionBase impleme
         this.outbuffer.flush();
     }
 
+    @Override
     public boolean isOpen() {
         return this.open;
     }
@@ -239,6 +240,7 @@ public class BHttpConnectionBase impleme
         return entity;
     }
 
+    @Override
     public InetAddress getLocalAddress() {
         if (this.socket != null) {
             return this.socket.getLocalAddress();
@@ -247,6 +249,7 @@ public class BHttpConnectionBase impleme
         }
     }
 
+    @Override
     public int getLocalPort() {
         if (this.socket != null) {
             return this.socket.getLocalPort();
@@ -255,6 +258,7 @@ public class BHttpConnectionBase impleme
         }
     }
 
+    @Override
     public InetAddress getRemoteAddress() {
         if (this.socket != null) {
             return this.socket.getInetAddress();
@@ -263,6 +267,7 @@ public class BHttpConnectionBase impleme
         }
     }
 
+    @Override
     public int getRemotePort() {
         if (this.socket != null) {
             return this.socket.getPort();
@@ -271,6 +276,7 @@ public class BHttpConnectionBase impleme
         }
     }
 
+    @Override
     public void setSocketTimeout(final int timeout) {
         if (this.socket != null) {
             try {
@@ -283,6 +289,7 @@ public class BHttpConnectionBase impleme
         }
     }
 
+    @Override
     public int getSocketTimeout() {
         if (this.socket != null) {
             try {
@@ -295,6 +302,7 @@ public class BHttpConnectionBase impleme
         }
     }
 
+    @Override
     public void shutdown() throws IOException {
         this.open = false;
         final Socket tmpsocket = this.socket;
@@ -303,6 +311,7 @@ public class BHttpConnectionBase impleme
         }
     }
 
+    @Override
     public void close() throws IOException {
         if (!this.open) {
             return;
@@ -347,6 +356,7 @@ public class BHttpConnectionBase impleme
         return this.inbuffer.hasBufferedData();
     }
 
+    @Override
     public boolean isStale() {
         if (!isOpen()) {
             return true;
@@ -369,6 +379,7 @@ public class BHttpConnectionBase impleme
         this.connMetrics.incrementResponseCount();
     }
 
+    @Override
     public HttpConnectionMetrics getMetrics() {
         return this.connMetrics;
     }

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=1558077&r1=1558076&r2=1558077&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 Tue Jan 14 15:22:31 2014
@@ -125,6 +125,7 @@ public class DefaultBHttpClientConnectio
         super.bind(socket);
     }
 
+    @Override
     public boolean isResponseAvailable(final int timeout) throws IOException {
         ensureOpen();
         try {
@@ -134,6 +135,7 @@ public class DefaultBHttpClientConnectio
         }
     }
 
+    @Override
     public void sendRequestHeader(final HttpRequest request)
             throws HttpException, IOException {
         Args.notNull(request, "HTTP request");
@@ -143,6 +145,7 @@ public class DefaultBHttpClientConnectio
         incrementRequestCount();
     }
 
+    @Override
     public void sendRequestEntity(final HttpEntityEnclosingRequest request)
             throws HttpException, IOException {
         Args.notNull(request, "HTTP request");
@@ -156,6 +159,7 @@ public class DefaultBHttpClientConnectio
         outstream.close();
     }
 
+    @Override
     public HttpResponse receiveResponseHeader() throws HttpException, IOException {
         ensureOpen();
         final HttpResponse response = this.responseParser.parse();
@@ -166,6 +170,7 @@ public class DefaultBHttpClientConnectio
         return response;
     }
 
+    @Override
     public void receiveResponseEntity(
             final HttpResponse response) throws HttpException, IOException {
         Args.notNull(response, "HTTP response");
@@ -174,6 +179,7 @@ public class DefaultBHttpClientConnectio
         response.setEntity(entity);
     }
 
+    @Override
     public void flush() throws IOException {
         ensureOpen();
         doFlush();

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/DefaultBHttpClientConnectionFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/DefaultBHttpClientConnectionFactory.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/DefaultBHttpClientConnectionFactory.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/DefaultBHttpClientConnectionFactory.java Tue Jan 14 15:22:31 2014
@@ -85,6 +85,7 @@ public class DefaultBHttpClientConnectio
         this(null, null, null, null, null);
     }
 
+    @Override
     public DefaultBHttpClientConnection createConnection(final Socket socket) throws IOException {
         final DefaultBHttpClientConnection conn = new DefaultBHttpClientConnection(
                 this.cconfig.getBufferSize(),

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=1558077&r1=1558076&r2=1558077&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 Tue Jan 14 15:22:31 2014
@@ -125,6 +125,7 @@ public class DefaultBHttpServerConnectio
         super.bind(socket);
     }
 
+    @Override
     public HttpRequest receiveRequestHeader()
             throws HttpException, IOException {
         ensureOpen();
@@ -134,6 +135,7 @@ public class DefaultBHttpServerConnectio
         return request;
     }
 
+    @Override
     public void receiveRequestEntity(final HttpEntityEnclosingRequest request)
             throws HttpException, IOException {
         Args.notNull(request, "HTTP request");
@@ -142,6 +144,7 @@ public class DefaultBHttpServerConnectio
         request.setEntity(entity);
     }
 
+    @Override
     public void sendResponseHeader(final HttpResponse response)
             throws HttpException, IOException {
         Args.notNull(response, "HTTP response");
@@ -153,6 +156,7 @@ public class DefaultBHttpServerConnectio
         }
     }
 
+    @Override
     public void sendResponseEntity(final HttpResponse response)
             throws HttpException, IOException {
         Args.notNull(response, "HTTP response");
@@ -166,6 +170,7 @@ public class DefaultBHttpServerConnectio
         outstream.close();
     }
 
+    @Override
     public void flush() throws IOException {
         ensureOpen();
         doFlush();

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/DefaultBHttpServerConnectionFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/DefaultBHttpServerConnectionFactory.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/DefaultBHttpServerConnectionFactory.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/DefaultBHttpServerConnectionFactory.java Tue Jan 14 15:22:31 2014
@@ -85,6 +85,7 @@ public class DefaultBHttpServerConnectio
         this(null, null, null, null, null);
     }
 
+    @Override
     public DefaultBHttpServerConnection createConnection(final Socket socket) throws IOException {
         final DefaultBHttpServerConnection conn = new DefaultBHttpServerConnection(
                 this.cconfig.getBufferSize(),

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/DefaultConnectionReuseStrategy.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/DefaultConnectionReuseStrategy.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/DefaultConnectionReuseStrategy.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/DefaultConnectionReuseStrategy.java Tue Jan 14 15:22:31 2014
@@ -70,6 +70,7 @@ public class DefaultConnectionReuseStrat
     }
 
     // see interface ConnectionReuseStrategy
+    @Override
     public boolean keepAlive(final HttpResponse response,
                              final HttpContext context) {
         Args.notNull(response, "HTTP response");

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/DefaultHttpRequestFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/DefaultHttpRequestFactory.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/DefaultHttpRequestFactory.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/DefaultHttpRequestFactory.java Tue Jan 14 15:22:31 2014
@@ -77,6 +77,7 @@ public class DefaultHttpRequestFactory i
         return false;
     }
 
+    @Override
     public HttpRequest newHttpRequest(final RequestLine requestline)
             throws MethodNotSupportedException {
         Args.notNull(requestline, "Request line");
@@ -92,6 +93,7 @@ public class DefaultHttpRequestFactory i
         }
     }
 
+    @Override
     public HttpRequest newHttpRequest(final String method, final String uri)
             throws MethodNotSupportedException {
         if (isOneOf(RFC2616_COMMON_METHODS, method)) {

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/DefaultHttpResponseFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/DefaultHttpResponseFactory.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/DefaultHttpResponseFactory.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/DefaultHttpResponseFactory.java Tue Jan 14 15:22:31 2014
@@ -73,6 +73,7 @@ public class DefaultHttpResponseFactory 
 
 
     // non-javadoc, see interface HttpResponseFactory
+    @Override
     public HttpResponse newHttpResponse(
             final ProtocolVersion ver,
             final int status,
@@ -86,6 +87,7 @@ public class DefaultHttpResponseFactory 
 
 
     // non-javadoc, see interface HttpResponseFactory
+    @Override
     public HttpResponse newHttpResponse(
             final StatusLine statusline,
             final HttpContext context) {

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/EnglishReasonPhraseCatalog.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/EnglishReasonPhraseCatalog.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/EnglishReasonPhraseCatalog.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/EnglishReasonPhraseCatalog.java Tue Jan 14 15:22:31 2014
@@ -72,6 +72,7 @@ public class EnglishReasonPhraseCatalog 
      *
      * @return  the reason phrase, or <code>null</code>
      */
+    @Override
     public String getReason(final int status, final Locale loc) {
         Args.check(status >= 100 && status < 600, "Unknown category for status code " + status);
         final int category = status / 100;

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/HttpConnectionMetricsImpl.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/HttpConnectionMetricsImpl.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/HttpConnectionMetricsImpl.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/HttpConnectionMetricsImpl.java Tue Jan 14 15:22:31 2014
@@ -67,6 +67,7 @@ public class HttpConnectionMetricsImpl i
 
     /* ------------------  Public interface method -------------------------- */
 
+    @Override
     public long getReceivedBytesCount() {
         if (this.inTransportMetric != null) {
             return this.inTransportMetric.getBytesTransferred();
@@ -75,6 +76,7 @@ public class HttpConnectionMetricsImpl i
         }
     }
 
+    @Override
     public long getSentBytesCount() {
         if (this.outTransportMetric != null) {
             return this.outTransportMetric.getBytesTransferred();
@@ -83,6 +85,7 @@ public class HttpConnectionMetricsImpl i
         }
     }
 
+    @Override
     public long getRequestCount() {
         return this.requestCount;
     }
@@ -91,6 +94,7 @@ public class HttpConnectionMetricsImpl i
         this.requestCount++;
     }
 
+    @Override
     public long getResponseCount() {
         return this.responseCount;
     }
@@ -99,6 +103,7 @@ public class HttpConnectionMetricsImpl i
         this.responseCount++;
     }
 
+    @Override
     public Object getMetric(final String metricName) {
         Object value = null;
         if (this.metricsCache != null) {
@@ -133,6 +138,7 @@ public class HttpConnectionMetricsImpl i
         this.metricsCache.put(metricName, obj);
     }
 
+    @Override
     public void reset() {
         if (this.outTransportMetric != null) {
             this.outTransportMetric.reset();

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/NoConnectionReuseStrategy.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/NoConnectionReuseStrategy.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/NoConnectionReuseStrategy.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/NoConnectionReuseStrategy.java Tue Jan 14 15:22:31 2014
@@ -46,6 +46,7 @@ public class NoConnectionReuseStrategy i
         super();
     }
 
+    @Override
     public boolean keepAlive(final HttpResponse response, final HttpContext context) {
         return false;
     }

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/entity/DisallowIdentityContentLengthStrategy.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/entity/DisallowIdentityContentLengthStrategy.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/entity/DisallowIdentityContentLengthStrategy.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/entity/DisallowIdentityContentLengthStrategy.java Tue Jan 14 15:22:31 2014
@@ -52,6 +52,7 @@ public class DisallowIdentityContentLeng
         this.contentLengthStrategy = contentLengthStrategy;
     }
 
+    @Override
     public long determineLength(final HttpMessage message) throws HttpException {
         final long result = this.contentLengthStrategy.determineLength(message);
         if (result == ContentLengthStrategy.IDENTITY) {

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/entity/LaxContentLengthStrategy.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/entity/LaxContentLengthStrategy.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/entity/LaxContentLengthStrategy.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/entity/LaxContentLengthStrategy.java Tue Jan 14 15:22:31 2014
@@ -75,6 +75,7 @@ public class LaxContentLengthStrategy im
         this(IDENTITY);
     }
 
+    @Override
     public long determineLength(final HttpMessage message) throws HttpException {
         Args.notNull(message, "HTTP message");
 

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/entity/StrictContentLengthStrategy.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/entity/StrictContentLengthStrategy.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/entity/StrictContentLengthStrategy.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/entity/StrictContentLengthStrategy.java Tue Jan 14 15:22:31 2014
@@ -75,6 +75,7 @@ public class StrictContentLengthStrategy
         this(IDENTITY);
     }
 
+    @Override
     public long determineLength(final HttpMessage message) throws HttpException {
         Args.notNull(message, "HTTP message");
         // Although Transfer-Encoding is specified as a list, in practice

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/AbstractMessageParser.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/AbstractMessageParser.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/AbstractMessageParser.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/AbstractMessageParser.java Tue Jan 14 15:22:31 2014
@@ -252,6 +252,7 @@ public abstract class AbstractMessagePar
     protected abstract T parseHead(SessionInputBuffer sessionBuffer)
         throws IOException, HttpException, ParseException;
 
+    @Override
     public T parse() throws IOException, HttpException {
         final int st = this.state;
         switch (st) {

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/AbstractMessageWriter.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/AbstractMessageWriter.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/AbstractMessageWriter.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/AbstractMessageWriter.java Tue Jan 14 15:22:31 2014
@@ -104,6 +104,7 @@ public abstract class AbstractMessageWri
      */
     protected abstract void writeHeadLine(T message) throws IOException;
 
+    @Override
     public void write(final T message) throws IOException, HttpException {
         Args.notNull(message, "HTTP message");
         writeHeadLine(message);

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/DefaultHttpRequestParserFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/DefaultHttpRequestParserFactory.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/DefaultHttpRequestParserFactory.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/DefaultHttpRequestParserFactory.java Tue Jan 14 15:22:31 2014
@@ -63,6 +63,7 @@ public class DefaultHttpRequestParserFac
         this(null, null);
     }
 
+    @Override
     public HttpMessageParser<HttpRequest> create(final SessionInputBuffer buffer,
             final MessageConstraints constraints) {
         return new DefaultHttpRequestParser(buffer, lineParser, requestFactory, constraints);

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/DefaultHttpRequestWriterFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/DefaultHttpRequestWriterFactory.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/DefaultHttpRequestWriterFactory.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/DefaultHttpRequestWriterFactory.java Tue Jan 14 15:22:31 2014
@@ -56,6 +56,7 @@ public class DefaultHttpRequestWriterFac
         this(null);
     }
 
+    @Override
     public HttpMessageWriter<HttpRequest> create(final SessionOutputBuffer buffer) {
         return new DefaultHttpRequestWriter(buffer, lineFormatter);
     }

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/DefaultHttpResponseParserFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/DefaultHttpResponseParserFactory.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/DefaultHttpResponseParserFactory.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/DefaultHttpResponseParserFactory.java Tue Jan 14 15:22:31 2014
@@ -63,6 +63,7 @@ public class DefaultHttpResponseParserFa
         this(null, null);
     }
 
+    @Override
     public HttpMessageParser<HttpResponse> create(final SessionInputBuffer buffer,
             final MessageConstraints constraints) {
         return new DefaultHttpResponseParser(buffer, lineParser, responseFactory, constraints);

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/DefaultHttpResponseWriterFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/DefaultHttpResponseWriterFactory.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/DefaultHttpResponseWriterFactory.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/DefaultHttpResponseWriterFactory.java Tue Jan 14 15:22:31 2014
@@ -56,6 +56,7 @@ public class DefaultHttpResponseWriterFa
         this(null);
     }
 
+    @Override
     public HttpMessageWriter<HttpResponse> create(final SessionOutputBuffer buffer) {
         return new DefaultHttpResponseWriter(buffer, lineFormatter);
     }

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/HttpTransportMetricsImpl.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/HttpTransportMetricsImpl.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/HttpTransportMetricsImpl.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/HttpTransportMetricsImpl.java Tue Jan 14 15:22:31 2014
@@ -44,6 +44,7 @@ public class HttpTransportMetricsImpl im
         super();
     }
 
+    @Override
     public long getBytesTransferred() {
         return this.bytesTransferred;
     }
@@ -56,6 +57,7 @@ public class HttpTransportMetricsImpl im
         this.bytesTransferred += count;
     }
 
+    @Override
     public void reset() {
         this.bytesTransferred = 0;
     }

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/SessionInputBufferImpl.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/SessionInputBufferImpl.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/SessionInputBufferImpl.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/SessionInputBufferImpl.java Tue Jan 14 15:22:31 2014
@@ -119,14 +119,17 @@ public class SessionInputBufferImpl impl
         return this.instream != null;
     }
 
+    @Override
     public int capacity() {
         return this.buffer.length;
     }
 
+    @Override
     public int length() {
         return this.bufferlen - this.bufferpos;
     }
 
+    @Override
     public int available() {
         return capacity() - length();
     }
@@ -168,6 +171,7 @@ public class SessionInputBufferImpl impl
         this.bufferlen = 0;
     }
 
+    @Override
     public int read() throws IOException {
         int noRead;
         while (!hasBufferedData()) {
@@ -179,6 +183,7 @@ public class SessionInputBufferImpl impl
         return this.buffer[this.bufferpos++] & 0xff;
     }
 
+    @Override
     public int read(final byte[] b, final int off, final int len) throws IOException {
         if (b == null) {
             return 0;
@@ -212,6 +217,7 @@ public class SessionInputBufferImpl impl
         }
     }
 
+    @Override
     public int read(final byte[] b) throws IOException {
         if (b == null) {
             return 0;
@@ -243,6 +249,7 @@ public class SessionInputBufferImpl impl
      * @return     one line of characters
      * @exception  IOException  if an I/O error occurs.
      */
+    @Override
     public int readLine(final CharArrayBuffer charbuffer) throws IOException {
         Args.notNull(charbuffer, "Char array buffer");
         int noRead = 0;
@@ -378,6 +385,7 @@ public class SessionInputBufferImpl impl
         return len;
     }
 
+    @Override
     public String readLine() throws IOException {
         final CharArrayBuffer charbuffer = new CharArrayBuffer(64);
         final int l = readLine(charbuffer);
@@ -388,10 +396,12 @@ public class SessionInputBufferImpl impl
         }
     }
 
+    @Override
     public boolean isDataAvailable(final int timeout) throws IOException {
         return hasBufferedData();
     }
 
+    @Override
     public HttpTransportMetrics getMetrics() {
         return this.metrics;
     }

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/SessionOutputBufferImpl.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/SessionOutputBufferImpl.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/SessionOutputBufferImpl.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/io/SessionOutputBufferImpl.java Tue Jan 14 15:22:31 2014
@@ -106,14 +106,17 @@ public class SessionOutputBufferImpl imp
         return this.outstream != null;
     }
 
+    @Override
     public int capacity() {
         return this.buffer.capacity();
     }
 
+    @Override
     public int length() {
         return this.buffer.length();
     }
 
+    @Override
     public int available() {
         return capacity() - length();
     }
@@ -138,11 +141,13 @@ public class SessionOutputBufferImpl imp
         }
     }
 
+    @Override
     public void flush() throws IOException {
         flushBuffer();
         flushStream();
     }
 
+    @Override
     public void write(final byte[] b, final int off, final int len) throws IOException {
         if (b == null) {
             return;
@@ -168,6 +173,7 @@ public class SessionOutputBufferImpl imp
         }
     }
 
+    @Override
     public void write(final byte[] b) throws IOException {
         if (b == null) {
             return;
@@ -175,6 +181,7 @@ public class SessionOutputBufferImpl imp
         write(b, 0, b.length);
     }
 
+    @Override
     public void write(final int b) throws IOException {
         if (this.fragementSizeHint > 0) {
             if (this.buffer.isFull()) {
@@ -196,6 +203,7 @@ public class SessionOutputBufferImpl imp
      * @param      s   the line.
      * @exception  IOException  if an I/O error occurs.
      */
+    @Override
     public void writeLine(final String s) throws IOException {
         if (s == null) {
             return;
@@ -222,6 +230,7 @@ public class SessionOutputBufferImpl imp
      * @param      charbuffer the buffer containing chars of the line.
      * @exception  IOException  if an I/O error occurs.
      */
+    @Override
     public void writeLine(final CharArrayBuffer charbuffer) throws IOException {
         if (charbuffer == null) {
             return;
@@ -276,6 +285,7 @@ public class SessionOutputBufferImpl imp
         this.bbuf.compact();
     }
 
+    @Override
     public HttpTransportMetrics getMetrics() {
         return this.metrics;
     }

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/pool/BasicConnFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/pool/BasicConnFactory.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/pool/BasicConnFactory.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/impl/pool/BasicConnFactory.java Tue Jan 14 15:22:31 2014
@@ -141,6 +141,7 @@ public class BasicConnFactory implements
         return conn;
     }
 
+    @Override
     public HttpClientConnection create(final HttpHost host) throws IOException {
         final String scheme = host.getSchemeName();
         Socket socket = null;

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/AbstractHttpMessage.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/AbstractHttpMessage.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/AbstractHttpMessage.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/AbstractHttpMessage.java Tue Jan 14 15:22:31 2014
@@ -64,63 +64,75 @@ public abstract class AbstractHttpMessag
     }
 
     // non-javadoc, see interface HttpMessage
+    @Override
     public boolean containsHeader(final String name) {
         return this.headergroup.containsHeader(name);
     }
 
     // non-javadoc, see interface HttpMessage
+    @Override
     public Header[] getHeaders(final String name) {
         return this.headergroup.getHeaders(name);
     }
 
     // non-javadoc, see interface HttpMessage
+    @Override
     public Header getFirstHeader(final String name) {
         return this.headergroup.getFirstHeader(name);
     }
 
     // non-javadoc, see interface HttpMessage
+    @Override
     public Header getLastHeader(final String name) {
         return this.headergroup.getLastHeader(name);
     }
 
     // non-javadoc, see interface HttpMessage
+    @Override
     public Header[] getAllHeaders() {
         return this.headergroup.getAllHeaders();
     }
 
     // non-javadoc, see interface HttpMessage
+    @Override
     public void addHeader(final Header header) {
         this.headergroup.addHeader(header);
     }
 
     // non-javadoc, see interface HttpMessage
+    @Override
     public void addHeader(final String name, final String value) {
         Args.notNull(name, "Header name");
         this.headergroup.addHeader(new BasicHeader(name, value));
     }
 
     // non-javadoc, see interface HttpMessage
+    @Override
     public void setHeader(final Header header) {
         this.headergroup.updateHeader(header);
     }
 
     // non-javadoc, see interface HttpMessage
+    @Override
     public void setHeader(final String name, final String value) {
         Args.notNull(name, "Header name");
         this.headergroup.updateHeader(new BasicHeader(name, value));
     }
 
     // non-javadoc, see interface HttpMessage
+    @Override
     public void setHeaders(final Header[] headers) {
         this.headergroup.setHeaders(headers);
     }
 
     // non-javadoc, see interface HttpMessage
+    @Override
     public void removeHeader(final Header header) {
         this.headergroup.removeHeader(header);
     }
 
     // non-javadoc, see interface HttpMessage
+    @Override
     public void removeHeaders(final String name) {
         if (name == null) {
             return;
@@ -134,11 +146,13 @@ public abstract class AbstractHttpMessag
     }
 
     // non-javadoc, see interface HttpMessage
+    @Override
     public HeaderIterator headerIterator() {
         return this.headergroup.iterator();
     }
 
     // non-javadoc, see interface HttpMessage
+    @Override
     public HeaderIterator headerIterator(final String name) {
         return this.headergroup.iterator(name);
     }
@@ -146,6 +160,7 @@ public abstract class AbstractHttpMessag
     /**
      * @deprecated (4.3) use constructor parameters of configuration API provided by HttpClient
      */
+    @Override
     @Deprecated
     public HttpParams getParams() {
         if (this.params == null) {
@@ -157,6 +172,7 @@ public abstract class AbstractHttpMessag
     /**
      * @deprecated (4.3) use constructor parameters of configuration API provided by HttpClient
      */
+    @Override
     @Deprecated
     public void setParams(final HttpParams params) {
         this.params = Args.notNull(params, "HTTP parameters");

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicHeader.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicHeader.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicHeader.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicHeader.java Tue Jan 14 15:22:31 2014
@@ -60,10 +60,12 @@ public class BasicHeader implements Head
         this.value = value;
     }
 
+    @Override
     public String getName() {
         return this.name;
     }
 
+    @Override
     public String getValue() {
         return this.value;
     }
@@ -74,6 +76,7 @@ public class BasicHeader implements Head
         return BasicLineFormatter.INSTANCE.formatHeader(null, this).toString();
     }
 
+    @Override
     public HeaderElement[] getElements() throws ParseException {
         if (this.value != null) {
             // result intentionally not cached, it's probably not used again

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicHeaderElement.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicHeaderElement.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicHeaderElement.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicHeaderElement.java Tue Jan 14 15:22:31 2014
@@ -77,27 +77,33 @@ public class BasicHeaderElement implemen
        this(name, value, null);
     }
 
+    @Override
     public String getName() {
         return this.name;
     }
 
+    @Override
     public String getValue() {
         return this.value;
     }
 
+    @Override
     public NameValuePair[] getParameters() {
         return this.parameters.clone();
     }
 
+    @Override
     public int getParameterCount() {
         return this.parameters.length;
     }
 
+    @Override
     public NameValuePair getParameter(final int index) {
         // ArrayIndexOutOfBoundsException is appropriate
         return this.parameters[index];
     }
 
+    @Override
     public NameValuePair getParameterByName(final String name) {
         Args.notNull(name, "Name");
         NameValuePair found = null;

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicHeaderElementIterator.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicHeaderElementIterator.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicHeaderElementIterator.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicHeaderElementIterator.java Tue Jan 14 15:22:31 2014
@@ -119,6 +119,7 @@ public class BasicHeaderElementIterator 
         }
     }
 
+    @Override
     public boolean hasNext() {
         if (this.currentElement == null) {
             parseNextElement();
@@ -126,6 +127,7 @@ public class BasicHeaderElementIterator 
         return this.currentElement != null;
     }
 
+    @Override
     public HeaderElement nextElement() throws NoSuchElementException {
         if (this.currentElement == null) {
             parseNextElement();
@@ -140,10 +142,12 @@ public class BasicHeaderElementIterator 
         return element;
     }
 
+    @Override
     public final Object next() throws NoSuchElementException {
         return nextElement();
     }
 
+    @Override
     public void remove() throws UnsupportedOperationException {
         throw new UnsupportedOperationException("Remove not supported");
     }

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicHeaderIterator.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicHeaderIterator.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicHeaderIterator.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicHeaderIterator.java Tue Jan 14 15:22:31 2014
@@ -121,6 +121,7 @@ public class BasicHeaderIterator impleme
 
 
     // non-javadoc, see interface HeaderIterator
+    @Override
     public boolean hasNext() {
         return (this.currentIndex >= 0);
     }
@@ -133,6 +134,7 @@ public class BasicHeaderIterator impleme
      *
      * @throws NoSuchElementException   if there are no more headers
      */
+    @Override
     public Header nextHeader()
         throws NoSuchElementException {
 
@@ -155,6 +157,7 @@ public class BasicHeaderIterator impleme
      *
      * @throws NoSuchElementException   if there are no more headers
      */
+    @Override
     public final Object next()
         throws NoSuchElementException {
         return nextHeader();
@@ -166,6 +169,7 @@ public class BasicHeaderIterator impleme
      *
      * @throws UnsupportedOperationException    always
      */
+    @Override
     public void remove()
         throws UnsupportedOperationException {
 

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicHeaderValueFormatter.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicHeaderValueFormatter.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicHeaderValueFormatter.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicHeaderValueFormatter.java Tue Jan 14 15:22:31 2014
@@ -95,6 +95,7 @@ public class BasicHeaderValueFormatter i
 
 
     // non-javadoc, see interface HeaderValueFormatter
+    @Override
     public CharArrayBuffer formatElements(final CharArrayBuffer charBuffer,
                                           final HeaderElement[] elems,
                                           final boolean quote) {
@@ -161,6 +162,7 @@ public class BasicHeaderValueFormatter i
 
 
     // non-javadoc, see interface HeaderValueFormatter
+    @Override
     public CharArrayBuffer formatHeaderElement(final CharArrayBuffer charBuffer,
                                                final HeaderElement elem,
                                                final boolean quote) {
@@ -246,6 +248,7 @@ public class BasicHeaderValueFormatter i
 
 
     // non-javadoc, see interface HeaderValueFormatter
+    @Override
     public CharArrayBuffer formatParameters(final CharArrayBuffer charBuffer,
                                             final NameValuePair[] nvps,
                                             final boolean quote) {
@@ -311,6 +314,7 @@ public class BasicHeaderValueFormatter i
 
 
     // non-javadoc, see interface HeaderValueFormatter
+    @Override
     public CharArrayBuffer formatNameValuePair(final CharArrayBuffer charBuffer,
                                                final NameValuePair nvp,
                                                final boolean quote) {

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicHeaderValueParser.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicHeaderValueParser.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicHeaderValueParser.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicHeaderValueParser.java Tue Jan 14 15:22:31 2014
@@ -95,6 +95,7 @@ public class BasicHeaderValueParser impl
 
 
     // non-javadoc, see interface HeaderValueParser
+    @Override
     public HeaderElement[] parseElements(final CharArrayBuffer buffer,
                                          final ParserCursor cursor) {
         Args.notNull(buffer, "Char array buffer");
@@ -132,6 +133,7 @@ public class BasicHeaderValueParser impl
 
 
     // non-javadoc, see interface HeaderValueParser
+    @Override
     public HeaderElement parseHeaderElement(final CharArrayBuffer buffer,
                                             final ParserCursor cursor) {
         Args.notNull(buffer, "Char array buffer");
@@ -185,6 +187,7 @@ public class BasicHeaderValueParser impl
 
 
     // non-javadoc, see interface HeaderValueParser
+    @Override
     public NameValuePair[] parseParameters(final CharArrayBuffer buffer,
                                            final ParserCursor cursor) {
         Args.notNull(buffer, "Char array buffer");
@@ -240,6 +243,7 @@ public class BasicHeaderValueParser impl
 
 
     // non-javadoc, see interface HeaderValueParser
+    @Override
     public NameValuePair parseNameValuePair(final CharArrayBuffer buffer,
                                             final ParserCursor cursor) {
         return parseNameValuePair(buffer, cursor, ALL_DELIMITERS);

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicHttpEntityEnclosingRequest.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicHttpEntityEnclosingRequest.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicHttpEntityEnclosingRequest.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicHttpEntityEnclosingRequest.java Tue Jan 14 15:22:31 2014
@@ -59,14 +59,17 @@ public class BasicHttpEntityEnclosingReq
         super(requestline);
     }
 
+    @Override
     public HttpEntity getEntity() {
         return this.entity;
     }
 
+    @Override
     public void setEntity(final HttpEntity entity) {
         this.entity = entity;
     }
 
+    @Override
     public boolean expectContinue() {
         final Header expect = getFirstHeader(HTTP.EXPECT_DIRECTIVE);
         return expect != null && HTTP.EXPECT_CONTINUE.equalsIgnoreCase(expect.getValue());

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicHttpRequest.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicHttpRequest.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicHttpRequest.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicHttpRequest.java Tue Jan 14 15:22:31 2014
@@ -90,6 +90,7 @@ public class BasicHttpRequest extends Ab
      *
      * @see #BasicHttpRequest(String, String)
      */
+    @Override
     public ProtocolVersion getProtocolVersion() {
         return getRequestLine().getProtocolVersion();
     }
@@ -99,6 +100,7 @@ public class BasicHttpRequest extends Ab
      *
      * @see #BasicHttpRequest(String, String)
      */
+    @Override
     public RequestLine getRequestLine() {
         if (this.requestline == null) {
             this.requestline = new BasicRequestLine(this.method, this.uri, HttpVersion.HTTP_1_1);

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=1558077&r1=1558076&r2=1558077&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 Tue Jan 14 15:22:31 2014
@@ -121,11 +121,13 @@ public class BasicHttpResponse extends A
 
 
     // non-javadoc, see interface HttpMessage
+    @Override
     public ProtocolVersion getProtocolVersion() {
         return this.ver;
     }
 
     // non-javadoc, see interface HttpResponse
+    @Override
     public StatusLine getStatusLine() {
         if (this.statusline == null) {
             this.statusline = new BasicStatusLine(
@@ -137,15 +139,18 @@ public class BasicHttpResponse extends A
     }
 
     // non-javadoc, see interface HttpResponse
+    @Override
     public HttpEntity getEntity() {
         return this.entity;
     }
 
+    @Override
     public Locale getLocale() {
         return this.locale;
     }
 
     // non-javadoc, see interface HttpResponse
+    @Override
     public void setStatusLine(final StatusLine statusline) {
         this.statusline = Args.notNull(statusline, "Status line");
         this.ver = statusline.getProtocolVersion();
@@ -154,6 +159,7 @@ public class BasicHttpResponse extends A
     }
 
     // non-javadoc, see interface HttpResponse
+    @Override
     public void setStatusLine(final ProtocolVersion ver, final int code) {
         Args.notNegative(code, "Status code");
         this.statusline = null;
@@ -163,6 +169,7 @@ public class BasicHttpResponse extends A
     }
 
     // non-javadoc, see interface HttpResponse
+    @Override
     public void setStatusLine(
             final ProtocolVersion ver, final int code, final String reason) {
         Args.notNegative(code, "Status code");
@@ -173,6 +180,7 @@ public class BasicHttpResponse extends A
     }
 
     // non-javadoc, see interface HttpResponse
+    @Override
     public void setStatusCode(final int code) {
         Args.notNegative(code, "Status code");
         this.statusline = null;
@@ -181,16 +189,19 @@ public class BasicHttpResponse extends A
     }
 
     // non-javadoc, see interface HttpResponse
+    @Override
     public void setReasonPhrase(final String reason) {
         this.statusline = null;
         this.reasonPhrase = reason;
     }
 
     // non-javadoc, see interface HttpResponse
+    @Override
     public void setEntity(final HttpEntity entity) {
         this.entity = entity;
     }
 
+    @Override
     public void setLocale(final Locale locale) {
         this.locale =  Args.notNull(locale, "Locale");
         this.statusline = null;

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicLineFormatter.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicLineFormatter.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicLineFormatter.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicLineFormatter.java Tue Jan 14 15:22:31 2014
@@ -106,6 +106,7 @@ public class BasicLineFormatter implemen
 
 
     // non-javadoc, see interface LineFormatter
+    @Override
     public CharArrayBuffer appendProtocolVersion(final CharArrayBuffer buffer,
                                                  final ProtocolVersion version) {
         Args.notNull(version, "Protocol version");
@@ -160,6 +161,7 @@ public class BasicLineFormatter implemen
 
 
     // non-javadoc, see interface LineFormatter
+    @Override
     public CharArrayBuffer formatRequestLine(final CharArrayBuffer buffer,
                                              final RequestLine reqline) {
         Args.notNull(reqline, "Request line");
@@ -215,6 +217,7 @@ public class BasicLineFormatter implemen
 
 
     // non-javadoc, see interface LineFormatter
+    @Override
     public CharArrayBuffer formatStatusLine(final CharArrayBuffer buffer,
                                             final StatusLine statline) {
         Args.notNull(statline, "Status line");
@@ -272,6 +275,7 @@ public class BasicLineFormatter implemen
 
 
     // non-javadoc, see interface LineFormatter
+    @Override
     public CharArrayBuffer formatHeader(final CharArrayBuffer buffer,
                                         final Header header) {
         Args.notNull(header, "Header");

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicLineParser.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicLineParser.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicLineParser.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicLineParser.java Tue Jan 14 15:22:31 2014
@@ -113,6 +113,7 @@ public class BasicLineParser implements 
 
 
     // non-javadoc, see interface LineParser
+    @Override
     public ProtocolVersion parseProtocolVersion(final CharArrayBuffer buffer,
                                                 final ParserCursor cursor) throws ParseException {
         Args.notNull(buffer, "Char array buffer");
@@ -202,6 +203,7 @@ public class BasicLineParser implements 
 
 
     // non-javadoc, see interface LineParser
+    @Override
     public boolean hasProtocolVersion(final CharArrayBuffer buffer,
                                       final ParserCursor cursor) {
         Args.notNull(buffer, "Char array buffer");
@@ -270,6 +272,7 @@ public class BasicLineParser implements 
      *
      * @throws ParseException        in case of a parse error
      */
+    @Override
     public RequestLine parseRequestLine(final CharArrayBuffer buffer,
                                         final ParserCursor cursor) throws ParseException {
 
@@ -349,6 +352,7 @@ public class BasicLineParser implements 
 
 
     // non-javadoc, see interface LineParser
+    @Override
     public StatusLine parseStatusLine(final CharArrayBuffer buffer,
                                       final ParserCursor cursor) throws ParseException {
         Args.notNull(buffer, "Char array buffer");
@@ -432,6 +436,7 @@ public class BasicLineParser implements 
 
 
     // non-javadoc, see interface LineParser
+    @Override
     public Header parseHeader(final CharArrayBuffer buffer)
         throws ParseException {
 

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicListHeaderIterator.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicListHeaderIterator.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicListHeaderIterator.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicListHeaderIterator.java Tue Jan 14 15:22:31 2014
@@ -136,6 +136,7 @@ public class BasicListHeaderIterator imp
 
 
     // non-javadoc, see interface HeaderIterator
+    @Override
     public boolean hasNext() {
         return (this.currentIndex >= 0);
     }
@@ -148,6 +149,7 @@ public class BasicListHeaderIterator imp
      *
      * @throws NoSuchElementException   if there are no more headers
      */
+    @Override
     public Header nextHeader()
         throws NoSuchElementException {
 
@@ -171,6 +173,7 @@ public class BasicListHeaderIterator imp
      *
      * @throws NoSuchElementException   if there are no more headers
      */
+    @Override
     public final Object next()
         throws NoSuchElementException {
         return nextHeader();
@@ -180,6 +183,7 @@ public class BasicListHeaderIterator imp
     /**
      * Removes the header that was returned last.
      */
+    @Override
     public void remove()
         throws UnsupportedOperationException {
         Asserts.check(this.lastIndex >= 0, "No header to remove");

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicNameValuePair.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicNameValuePair.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicNameValuePair.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicNameValuePair.java Tue Jan 14 15:22:31 2014
@@ -59,10 +59,12 @@ public class BasicNameValuePair implemen
         this.value = value;
     }
 
+    @Override
     public String getName() {
         return this.name;
     }
 
+    @Override
     public String getValue() {
         return this.value;
     }

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicRequestLine.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicRequestLine.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicRequestLine.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicRequestLine.java Tue Jan 14 15:22:31 2014
@@ -57,14 +57,17 @@ public class BasicRequestLine implements
         this.protoversion = Args.notNull(version, "Version");
     }
 
+    @Override
     public String getMethod() {
         return this.method;
     }
 
+    @Override
     public ProtocolVersion getProtocolVersion() {
         return this.protoversion;
     }
 
+    @Override
     public String getUri() {
         return this.uri;
     }

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicStatusLine.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicStatusLine.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicStatusLine.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicStatusLine.java Tue Jan 14 15:22:31 2014
@@ -74,14 +74,17 @@ public class BasicStatusLine implements 
 
     // --------------------------------------------------------- Public Methods
 
+    @Override
     public int getStatusCode() {
         return this.statusCode;
     }
 
+    @Override
     public ProtocolVersion getProtocolVersion() {
         return this.protoVersion;
     }
 
+    @Override
     public String getReasonPhrase() {
         return this.reasonPhrase;
     }

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicTokenIterator.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicTokenIterator.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicTokenIterator.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BasicTokenIterator.java Tue Jan 14 15:22:31 2014
@@ -88,6 +88,7 @@ public class BasicTokenIterator implemen
 
 
     // non-javadoc, see interface TokenIterator
+    @Override
     public boolean hasNext() {
         return (this.currentToken != null);
     }
@@ -101,6 +102,7 @@ public class BasicTokenIterator implemen
      * @throws NoSuchElementException   if the iteration is already over
      * @throws ParseException   if an invalid header value is encountered
      */
+    @Override
     public String nextToken()
         throws NoSuchElementException, ParseException {
 
@@ -125,6 +127,7 @@ public class BasicTokenIterator implemen
      * @throws NoSuchElementException   if there are no more tokens
      * @throws ParseException   if an invalid header value is encountered
      */
+    @Override
     public final Object next()
         throws NoSuchElementException, ParseException {
         return nextToken();
@@ -136,6 +139,7 @@ public class BasicTokenIterator implemen
      *
      * @throws UnsupportedOperationException    always
      */
+    @Override
     public final void remove()
         throws UnsupportedOperationException {
 

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BufferedHeader.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BufferedHeader.java?rev=1558077&r1=1558076&r2=1558077&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BufferedHeader.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/message/BufferedHeader.java Tue Jan 14 15:22:31 2014
@@ -93,24 +93,29 @@ public class BufferedHeader implements F
     }
 
 
+    @Override
     public String getName() {
         return this.name;
     }
 
+    @Override
     public String getValue() {
         return this.buffer.substringTrimmed(this.valuePos, this.buffer.length());
     }
 
+    @Override
     public HeaderElement[] getElements() throws ParseException {
         final ParserCursor cursor = new ParserCursor(0, this.buffer.length());
         cursor.updatePos(this.valuePos);
         return BasicHeaderValueParser.INSTANCE.parseElements(this.buffer, cursor);
     }
 
+    @Override
     public int getValuePos() {
         return this.valuePos;
     }
 
+    @Override
     public CharArrayBuffer getBuffer() {
         return this.buffer;
     }



Mime
View raw message