You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by gg...@apache.org on 2016/10/31 23:28:42 UTC
svn commit: r1767392 - in /httpcomponents/httpcore/trunk:
httpcore5-h2/src/main/java/org/apache/hc/core5/http2/frame/
httpcore5-h2/src/main/java/org/apache/hc/core5/http2/hpack/
httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/http/ http...
Author: ggregory
Date: Mon Oct 31 23:28:42 2016
New Revision: 1767392
URL: http://svn.apache.org/viewvc?rev=1767392&view=rev
Log:
Add missing @Override annotations.
Modified:
httpcomponents/httpcore/trunk/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/frame/DefaultFrameFactory.java
httpcomponents/httpcore/trunk/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/hpack/FifoLinkedList.java
httpcomponents/httpcore/trunk/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/http/Http1IntegrationTest.java
httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/message/HeaderGroup.java
httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/nio/entity/AbstractCharAsyncEntityConsumer.java
httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/protocol/BasicHttpContext.java
httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/reactor/AbstractIOReactor.java
Modified: httpcomponents/httpcore/trunk/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/frame/DefaultFrameFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/frame/DefaultFrameFactory.java?rev=1767392&r1=1767391&r2=1767392&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/frame/DefaultFrameFactory.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/frame/DefaultFrameFactory.java Mon Oct 31 23:28:42 2016
@@ -35,12 +35,14 @@ public class DefaultFrameFactory extends
public static final FrameFactory INSTANCE = new DefaultFrameFactory();
+ @Override
public RawFrame createHeaders(final int streamId, final ByteBuffer payload, final boolean endHeaders, final boolean endStream) {
Args.positive(streamId, "Stream id");
final int flags = (endHeaders ? FrameFlag.END_HEADERS.value : 0) | (endStream ? FrameFlag.END_STREAM.value : 0);
return new RawFrame(FrameType.HEADERS.getValue(), flags, streamId, payload);
}
+ @Override
public RawFrame createContinuation(final int streamId, final ByteBuffer payload, final boolean endHeaders) {
Args.positive(streamId, "Stream id");
final int flags = (endHeaders ? FrameFlag.END_HEADERS.value : 0);
@@ -54,6 +56,7 @@ public class DefaultFrameFactory extends
return new RawFrame(FrameType.PUSH_PROMISE.getValue(), flags, streamId, payload);
}
+ @Override
public RawFrame createData(final int streamId, final ByteBuffer payload, final boolean endStream) {
Args.positive(streamId, "Stream id");
final int flags = (endStream ? FrameFlag.END_STREAM.value : 0);
Modified: httpcomponents/httpcore/trunk/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/hpack/FifoLinkedList.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/hpack/FifoLinkedList.java?rev=1767392&r1=1767391&r2=1767392&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/hpack/FifoLinkedList.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5-h2/src/main/java/org/apache/hc/core5/http2/hpack/FifoLinkedList.java Mon Oct 31 23:28:42 2016
@@ -126,6 +126,7 @@ final class FifoLinkedList {
this.header = header;
}
+ @Override
public HPackHeader getHeader() {
return header;
}
Modified: httpcomponents/httpcore/trunk/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/http/Http1IntegrationTest.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/http/Http1IntegrationTest.java?rev=1767392&r1=1767391&r2=1767392&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/http/Http1IntegrationTest.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5-testing/src/test/java/org/apache/hc/core5/testing/nio/http/Http1IntegrationTest.java Mon Oct 31 23:28:42 2016
@@ -663,6 +663,7 @@ public class Http1IntegrationTest extend
}
}
+ @Override
protected void handle(
final Message<HttpRequest, String> request,
final ResponseTrigger responseTrigger,
Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/message/HeaderGroup.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/message/HeaderGroup.java?rev=1767392&r1=1767391&r2=1767392&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/message/HeaderGroup.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/message/HeaderGroup.java Mon Oct 31 23:28:42 2016
@@ -177,6 +177,7 @@ public class HeaderGroup implements Mess
*
* @return an array of length ≥ 0
*/
+ @Override
public Header[] getHeaders(final String name) {
List<Header> headersFound = null;
for (int i = 0; i < this.headers.size(); i++) {
@@ -199,6 +200,7 @@ public class HeaderGroup implements Mess
* @param name the name of the header to get
* @return the first header or {@code null}
*/
+ @Override
public Header getFirstHeader(final String name) {
for (int i = 0; i < this.headers.size(); i++) {
final Header header = this.headers.get(i);
@@ -218,6 +220,7 @@ public class HeaderGroup implements Mess
* @return the first header or {@code null}
* @throws ProtocolException in case multiple headers with the given name are found.
*/
+ @Override
public Header getSingleHeader(final String name) throws ProtocolException {
int count = 0;
Header singleHeader = null;
@@ -242,6 +245,7 @@ public class HeaderGroup implements Mess
* @param name the name of the header to get
* @return the last header or {@code null}
*/
+ @Override
public Header getLastHeader(final String name) {
// start at the end of the list and work backwards
for (int i = headers.size() - 1; i >= 0; i--) {
@@ -259,6 +263,7 @@ public class HeaderGroup implements Mess
*
* @return an array of length ≥ 0
*/
+ @Override
public Header[] getAllHeaders() {
return headers.toArray(new Header[headers.size()]);
}
@@ -272,6 +277,7 @@ public class HeaderGroup implements Mess
* @return {@code true} if at least one header with the name is
* contained, {@code false} otherwise
*/
+ @Override
public boolean containsHeader(final String name) {
// HTTPCORE-361 : we don't use the for-each syntax, i.e.
// for (Header header : headers)
@@ -293,6 +299,7 @@ public class HeaderGroup implements Mess
* @param name the header name to check for.
* @return number of occurrences of the header in the message.
*/
+ @Override
public int containsHeaders(final String name) {
// HTTPCORE-361 : we don't use the for-each syntax, i.e.
// for (Header header : headers)
@@ -314,6 +321,7 @@ public class HeaderGroup implements Mess
*
* @since 5.0
*/
+ @Override
public Iterator<Header> headerIterator() {
return new BasicListHeaderIterator(this.headers, null);
}
@@ -328,6 +336,7 @@ public class HeaderGroup implements Mess
*
* @since 5.0
*/
+ @Override
public Iterator<Header> headerIterator(final String name) {
return new BasicListHeaderIterator(this.headers, name);
}
Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/nio/entity/AbstractCharAsyncEntityConsumer.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/nio/entity/AbstractCharAsyncEntityConsumer.java?rev=1767392&r1=1767391&r2=1767392&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/nio/entity/AbstractCharAsyncEntityConsumer.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/nio/entity/AbstractCharAsyncEntityConsumer.java Mon Oct 31 23:28:42 2016
@@ -90,6 +90,7 @@ public abstract class AbstractCharAsyncE
charbuf.compact();
}
+ @Override
public final int consume(final ByteBuffer src) throws IOException {
Args.notNull(src, "ByteBuffer");
if (charsetDecoder == null) {
Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/protocol/BasicHttpContext.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/protocol/BasicHttpContext.java?rev=1767392&r1=1767391&r2=1767392&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/protocol/BasicHttpContext.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/protocol/BasicHttpContext.java Mon Oct 31 23:28:42 2016
@@ -99,6 +99,7 @@ public class BasicHttpContext implements
/**
* @since 5.0
*/
+ @Override
public void setProtocolVersion(final ProtocolVersion version) {
this.version = version;
}
Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/reactor/AbstractIOReactor.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/reactor/AbstractIOReactor.java?rev=1767392&r1=1767391&r2=1767392&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/reactor/AbstractIOReactor.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/reactor/AbstractIOReactor.java Mon Oct 31 23:28:42 2016
@@ -218,6 +218,7 @@ abstract class AbstractIOReactor impleme
* @throws IOReactorException in case if a non-recoverable I/O error.
*/
+ @Override
public void execute() throws InterruptedIOException, IOReactorException {
if (this.status.compareAndSet(IOReactorStatus.INACTIVE, IOReactorStatus.ACTIVE)) {
doExecute();