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/01/27 09:51:44 UTC
svn commit: r1726963 - in /httpcomponents:
benchmark/httpcore/trunk/src/main/java/org/apache/http/benchmark/jetty/
benchmark/httpcore/trunk/src/main/java/org/apache/http/benchmark/netty/
contrib/httpcore/trunk/src/main/java/org/apache/http/contrib/comp...
Author: ggregory
Date: Wed Jan 27 08:51:43 2016
New Revision: 1726963
URL: http://svn.apache.org/viewvc?rev=1726963&view=rev
Log:
Add missing @Override annotations.
Modified:
httpcomponents/benchmark/httpcore/trunk/src/main/java/org/apache/http/benchmark/jetty/JettyNIOServer.java
httpcomponents/benchmark/httpcore/trunk/src/main/java/org/apache/http/benchmark/netty/HttpServerPipelineFactory.java
httpcomponents/contrib/httpcore/trunk/src/main/java/org/apache/http/contrib/compress/RequestAcceptEncoding.java
httpcomponents/contrib/httpcore/trunk/src/main/java/org/apache/http/contrib/compress/ResponseGzipCompress.java
httpcomponents/contrib/httpcore/trunk/src/main/java/org/apache/http/contrib/compress/ResponseGzipUncompress.java
httpcomponents/contrib/httpcore/trunk/src/main/java/org/apache/http/contrib/logging/LoggingIOSession.java
httpcomponents/contrib/httpcore/trunk/src/main/java/org/apache/http/contrib/logging/LoggingNHttpClientHandler.java
httpcomponents/contrib/httpcore/trunk/src/main/java/org/apache/http/contrib/logging/LoggingNHttpServiceHandler.java
httpcomponents/contrib/httpcore/trunk/src/main/java/org/apache/http/contrib/sip/BasicCompactHeader.java
httpcomponents/contrib/httpcore/trunk/src/main/java/org/apache/http/contrib/sip/BasicCompactHeaderMapper.java
httpcomponents/contrib/httpcore/trunk/src/main/java/org/apache/http/contrib/sip/BufferedCompactHeader.java
httpcomponents/contrib/httpcore/trunk/src/main/java/org/apache/http/contrib/sip/EnglishSipReasonPhraseCatalog.java
Modified: httpcomponents/benchmark/httpcore/trunk/src/main/java/org/apache/http/benchmark/jetty/JettyNIOServer.java
URL: http://svn.apache.org/viewvc/httpcomponents/benchmark/httpcore/trunk/src/main/java/org/apache/http/benchmark/jetty/JettyNIOServer.java?rev=1726963&r1=1726962&r2=1726963&view=diff
==============================================================================
--- httpcomponents/benchmark/httpcore/trunk/src/main/java/org/apache/http/benchmark/jetty/JettyNIOServer.java (original)
+++ httpcomponents/benchmark/httpcore/trunk/src/main/java/org/apache/http/benchmark/jetty/JettyNIOServer.java Wed Jan 27 08:51:43 2016
@@ -61,10 +61,12 @@ public class JettyNIOServer implements H
this.server.setHandler(new RandomDataHandler());
}
+ @Override
public String getName() {
return "Jetty (NIO)";
}
+ @Override
public String getVersion() {
return Server.getVersion();
}
@@ -74,10 +76,12 @@ public class JettyNIOServer implements H
return this.port;
}
+ @Override
public void start() throws Exception {
this.server.start();
}
+ @Override
public void shutdown() {
try {
this.server.stop();
Modified: httpcomponents/benchmark/httpcore/trunk/src/main/java/org/apache/http/benchmark/netty/HttpServerPipelineFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/benchmark/httpcore/trunk/src/main/java/org/apache/http/benchmark/netty/HttpServerPipelineFactory.java?rev=1726963&r1=1726962&r2=1726963&view=diff
==============================================================================
--- httpcomponents/benchmark/httpcore/trunk/src/main/java/org/apache/http/benchmark/netty/HttpServerPipelineFactory.java (original)
+++ httpcomponents/benchmark/httpcore/trunk/src/main/java/org/apache/http/benchmark/netty/HttpServerPipelineFactory.java Wed Jan 27 08:51:43 2016
@@ -35,6 +35,7 @@ import org.jboss.netty.handler.codec.htt
class HttpServerPipelineFactory implements ChannelPipelineFactory {
+ @Override
public ChannelPipeline getPipeline() throws Exception {
final ChannelPipeline pipeline = Channels.pipeline();
pipeline.addLast("decoder", new HttpRequestDecoder());
Modified: httpcomponents/contrib/httpcore/trunk/src/main/java/org/apache/http/contrib/compress/RequestAcceptEncoding.java
URL: http://svn.apache.org/viewvc/httpcomponents/contrib/httpcore/trunk/src/main/java/org/apache/http/contrib/compress/RequestAcceptEncoding.java?rev=1726963&r1=1726962&r2=1726963&view=diff
==============================================================================
--- httpcomponents/contrib/httpcore/trunk/src/main/java/org/apache/http/contrib/compress/RequestAcceptEncoding.java (original)
+++ httpcomponents/contrib/httpcore/trunk/src/main/java/org/apache/http/contrib/compress/RequestAcceptEncoding.java Wed Jan 27 08:51:43 2016
@@ -45,6 +45,7 @@ public class RequestAcceptEncoding imple
private static final String ACCEPT_ENCODING = "Accept-Encoding";
private static final String GZIP_CODEC = "gzip";
+ @Override
public void process(final HttpRequest request, final HttpContext context)
throws HttpException, IOException {
if (!request.containsHeader(ACCEPT_ENCODING)) {
Modified: httpcomponents/contrib/httpcore/trunk/src/main/java/org/apache/http/contrib/compress/ResponseGzipCompress.java
URL: http://svn.apache.org/viewvc/httpcomponents/contrib/httpcore/trunk/src/main/java/org/apache/http/contrib/compress/ResponseGzipCompress.java?rev=1726963&r1=1726962&r2=1726963&view=diff
==============================================================================
--- httpcomponents/contrib/httpcore/trunk/src/main/java/org/apache/http/contrib/compress/ResponseGzipCompress.java (original)
+++ httpcomponents/contrib/httpcore/trunk/src/main/java/org/apache/http/contrib/compress/ResponseGzipCompress.java Wed Jan 27 08:51:43 2016
@@ -51,6 +51,7 @@ public class ResponseGzipCompress implem
private static final String ACCEPT_ENCODING = "Accept-Encoding";
private static final String GZIP_CODEC = "gzip";
+ @Override
public void process(final HttpResponse response, final HttpContext context)
throws HttpException, IOException {
Args.notNull(context, "HTTP context");
Modified: httpcomponents/contrib/httpcore/trunk/src/main/java/org/apache/http/contrib/compress/ResponseGzipUncompress.java
URL: http://svn.apache.org/viewvc/httpcomponents/contrib/httpcore/trunk/src/main/java/org/apache/http/contrib/compress/ResponseGzipUncompress.java?rev=1726963&r1=1726962&r2=1726963&view=diff
==============================================================================
--- httpcomponents/contrib/httpcore/trunk/src/main/java/org/apache/http/contrib/compress/ResponseGzipUncompress.java (original)
+++ httpcomponents/contrib/httpcore/trunk/src/main/java/org/apache/http/contrib/compress/ResponseGzipUncompress.java Wed Jan 27 08:51:43 2016
@@ -48,6 +48,7 @@ public class ResponseGzipUncompress impl
private static final String GZIP_CODEC = "gzip";
+ @Override
public void process(final HttpResponse response, final HttpContext context)
throws HttpException, IOException {
Args.notNull(context, "HTTP context");
Modified: httpcomponents/contrib/httpcore/trunk/src/main/java/org/apache/http/contrib/logging/LoggingIOSession.java
URL: http://svn.apache.org/viewvc/httpcomponents/contrib/httpcore/trunk/src/main/java/org/apache/http/contrib/logging/LoggingIOSession.java?rev=1726963&r1=1726962&r2=1726963&view=diff
==============================================================================
--- httpcomponents/contrib/httpcore/trunk/src/main/java/org/apache/http/contrib/logging/LoggingIOSession.java (original)
+++ httpcomponents/contrib/httpcore/trunk/src/main/java/org/apache/http/contrib/logging/LoggingIOSession.java Wed Jan 27 08:51:43 2016
@@ -61,18 +61,22 @@ public class LoggingIOSession implements
this.wirelog = new Wire(wirelog, this.id);
}
+ @Override
public ByteChannel channel() {
return this.channel;
}
+ @Override
public SocketAddress getLocalAddress() {
return this.session.getLocalAddress();
}
+ @Override
public SocketAddress getRemoteAddress() {
return this.session.getRemoteAddress();
}
+ @Override
public int getEventMask() {
return this.session.getEventMask();
}
@@ -96,6 +100,7 @@ public class LoggingIOSession implements
return buffer.toString();
}
+ @Override
public void setEventMask(final int ops) {
this.session.setEventMask(ops);
if (this.log.isDebugEnabled()) {
@@ -103,6 +108,7 @@ public class LoggingIOSession implements
}
}
+ @Override
public void setEvent(final int op) {
this.session.setEvent(op);
if (this.log.isDebugEnabled()) {
@@ -110,6 +116,7 @@ public class LoggingIOSession implements
}
}
+ @Override
public void clearEvent(final int op) {
this.session.clearEvent(op);
if (this.log.isDebugEnabled()) {
@@ -117,6 +124,7 @@ public class LoggingIOSession implements
}
}
+ @Override
public void close() {
if (this.log.isDebugEnabled()) {
this.log.debug(this.id + " " + this.session + ": Close");
@@ -124,14 +132,17 @@ public class LoggingIOSession implements
this.session.close();
}
+ @Override
public int getStatus() {
return this.session.getStatus();
}
+ @Override
public boolean isClosed() {
return this.session.isClosed();
}
+ @Override
public void shutdown() {
if (this.log.isDebugEnabled()) {
this.log.debug(this.id + " " + this.session + ": Shutdown");
@@ -139,10 +150,12 @@ public class LoggingIOSession implements
this.session.shutdown();
}
+ @Override
public int getSocketTimeout() {
return this.session.getSocketTimeout();
}
+ @Override
public void setSocketTimeout(final int timeout) {
if (this.log.isDebugEnabled()) {
this.log.debug(this.id + " " + this.session + ": Set timeout " + timeout);
@@ -150,22 +163,27 @@ public class LoggingIOSession implements
this.session.setSocketTimeout(timeout);
}
+ @Override
public void setBufferStatus(final SessionBufferStatus status) {
this.session.setBufferStatus(status);
}
+ @Override
public boolean hasBufferedInput() {
return this.session.hasBufferedInput();
}
+ @Override
public boolean hasBufferedOutput() {
return this.session.hasBufferedOutput();
}
+ @Override
public Object getAttribute(final String name) {
return this.session.getAttribute(name);
}
+ @Override
public void setAttribute(final String name, final Object obj) {
if (this.log.isDebugEnabled()) {
this.log.debug(this.id + " " + this.session + ": Set attribute " + name);
@@ -173,6 +191,7 @@ public class LoggingIOSession implements
this.session.setAttribute(name, obj);
}
+ @Override
public Object removeAttribute(final String name) {
if (this.log.isDebugEnabled()) {
this.log.debug(this.id + " " + this.session + ": Remove attribute " + name);
@@ -187,6 +206,7 @@ public class LoggingIOSession implements
class LoggingByteChannel implements ByteChannel {
+ @Override
public int read(final ByteBuffer dst) throws IOException {
final int bytesRead = session.channel().read(dst);
if (log.isDebugEnabled()) {
@@ -202,6 +222,7 @@ public class LoggingIOSession implements
return bytesRead;
}
+ @Override
public int write(final ByteBuffer src) throws IOException {
final int byteWritten = session.channel().write(src);
if (log.isDebugEnabled()) {
@@ -217,6 +238,7 @@ public class LoggingIOSession implements
return byteWritten;
}
+ @Override
public void close() throws IOException {
if (log.isDebugEnabled()) {
log.debug(id + " " + session + ": Channel close");
@@ -224,6 +246,7 @@ public class LoggingIOSession implements
session.channel().close();
}
+ @Override
public boolean isOpen() {
return session.channel().isOpen();
}
Modified: httpcomponents/contrib/httpcore/trunk/src/main/java/org/apache/http/contrib/logging/LoggingNHttpClientHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/contrib/httpcore/trunk/src/main/java/org/apache/http/contrib/logging/LoggingNHttpClientHandler.java?rev=1726963&r1=1726962&r2=1726963&view=diff
==============================================================================
--- httpcomponents/contrib/httpcore/trunk/src/main/java/org/apache/http/contrib/logging/LoggingNHttpClientHandler.java (original)
+++ httpcomponents/contrib/httpcore/trunk/src/main/java/org/apache/http/contrib/logging/LoggingNHttpClientHandler.java Wed Jan 27 08:51:43 2016
@@ -56,6 +56,7 @@ public class LoggingNHttpClientHandler i
this.log = LogFactory.getLog(handler.getClass());
}
+ @Override
public void connected(
final NHttpClientConnection conn,
final Object attachment) throws IOException, HttpException {
@@ -65,6 +66,7 @@ public class LoggingNHttpClientHandler i
this.handler.connected(conn, attachment);
}
+ @Override
public void closed(final NHttpClientConnection conn) {
if (this.log.isDebugEnabled()) {
this.log.debug(conn + ": Closed");
@@ -72,12 +74,14 @@ public class LoggingNHttpClientHandler i
this.handler.closed(conn);
}
+ @Override
public void exception(
final NHttpClientConnection conn, final Exception ex) {
this.log.error(conn + ": " + ex.getMessage(), ex);
this.handler.exception(conn, ex);
}
+ @Override
public void requestReady(
final NHttpClientConnection conn) throws IOException, HttpException {
if (this.log.isDebugEnabled()) {
@@ -86,6 +90,7 @@ public class LoggingNHttpClientHandler i
this.handler.requestReady(conn);
}
+ @Override
public void outputReady(
final NHttpClientConnection conn,
final ContentEncoder encoder) throws IOException, HttpException {
@@ -98,6 +103,7 @@ public class LoggingNHttpClientHandler i
}
}
+ @Override
public void responseReceived(
final NHttpClientConnection conn) throws IOException, HttpException {
final HttpResponse response = conn.getHttpResponse();
@@ -107,6 +113,7 @@ public class LoggingNHttpClientHandler i
this.handler.responseReceived(conn);
}
+ @Override
public void inputReady(
final NHttpClientConnection conn,
final ContentDecoder decoder) throws IOException, HttpException {
@@ -119,6 +126,7 @@ public class LoggingNHttpClientHandler i
}
}
+ @Override
public void endOfInput(
final NHttpClientConnection conn) throws IOException {
if (this.log.isDebugEnabled()) {
@@ -127,6 +135,7 @@ public class LoggingNHttpClientHandler i
this.handler.endOfInput(conn);
}
+ @Override
public void timeout(
final NHttpClientConnection conn) throws IOException, HttpException {
if (this.log.isDebugEnabled()) {
Modified: httpcomponents/contrib/httpcore/trunk/src/main/java/org/apache/http/contrib/logging/LoggingNHttpServiceHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/contrib/httpcore/trunk/src/main/java/org/apache/http/contrib/logging/LoggingNHttpServiceHandler.java?rev=1726963&r1=1726962&r2=1726963&view=diff
==============================================================================
--- httpcomponents/contrib/httpcore/trunk/src/main/java/org/apache/http/contrib/logging/LoggingNHttpServiceHandler.java (original)
+++ httpcomponents/contrib/httpcore/trunk/src/main/java/org/apache/http/contrib/logging/LoggingNHttpServiceHandler.java Wed Jan 27 08:51:43 2016
@@ -57,6 +57,7 @@ public class LoggingNHttpServiceHandler
this.log = LogFactory.getLog(handler.getClass());
}
+ @Override
public void connected(
final NHttpServerConnection conn) throws IOException, HttpException {
if (this.log.isDebugEnabled()) {
@@ -65,6 +66,7 @@ public class LoggingNHttpServiceHandler
this.handler.connected(conn);
}
+ @Override
public void closed(final NHttpServerConnection conn) {
if (this.log.isDebugEnabled()) {
this.log.debug(conn + ": Closed");
@@ -72,12 +74,14 @@ public class LoggingNHttpServiceHandler
this.handler.closed(conn);
}
+ @Override
public void exception(
final NHttpServerConnection conn, final Exception ex) {
this.log.error(conn + ": " + ex.getMessage(), ex);
this.handler.exception(conn, ex);
}
+ @Override
public void requestReceived(
final NHttpServerConnection conn) throws IOException, HttpException {
final HttpRequest request = conn.getHttpRequest();
@@ -87,6 +91,7 @@ public class LoggingNHttpServiceHandler
this.handler.requestReceived(conn);
}
+ @Override
public void outputReady(
final NHttpServerConnection conn,
final ContentEncoder encoder) throws IOException, HttpException {
@@ -99,6 +104,7 @@ public class LoggingNHttpServiceHandler
}
}
+ @Override
public void responseReady(
final NHttpServerConnection conn) throws IOException, HttpException {
if (this.log.isDebugEnabled()) {
@@ -107,6 +113,7 @@ public class LoggingNHttpServiceHandler
this.handler.responseReady(conn);
}
+ @Override
public void inputReady(
final NHttpServerConnection conn,
final ContentDecoder decoder) throws IOException, HttpException {
@@ -119,6 +126,7 @@ public class LoggingNHttpServiceHandler
}
}
+ @Override
public void endOfInput(
final NHttpServerConnection conn) throws IOException {
if (this.log.isDebugEnabled()) {
@@ -127,6 +135,7 @@ public class LoggingNHttpServiceHandler
this.handler.endOfInput(conn);
}
+ @Override
public void timeout(
final NHttpServerConnection conn) throws IOException {
if (this.log.isDebugEnabled()) {
Modified: httpcomponents/contrib/httpcore/trunk/src/main/java/org/apache/http/contrib/sip/BasicCompactHeader.java
URL: http://svn.apache.org/viewvc/httpcomponents/contrib/httpcore/trunk/src/main/java/org/apache/http/contrib/sip/BasicCompactHeader.java?rev=1726963&r1=1726962&r2=1726963&view=diff
==============================================================================
--- httpcomponents/contrib/httpcore/trunk/src/main/java/org/apache/http/contrib/sip/BasicCompactHeader.java (original)
+++ httpcomponents/contrib/httpcore/trunk/src/main/java/org/apache/http/contrib/sip/BasicCompactHeader.java Wed Jan 27 08:51:43 2016
@@ -63,6 +63,7 @@ public class BasicCompactHeader extends
// non-javadoc, see interface CompactHeader
+ @Override
public String getCompactName() {
return this.compact;
}
Modified: httpcomponents/contrib/httpcore/trunk/src/main/java/org/apache/http/contrib/sip/BasicCompactHeaderMapper.java
URL: http://svn.apache.org/viewvc/httpcomponents/contrib/httpcore/trunk/src/main/java/org/apache/http/contrib/sip/BasicCompactHeaderMapper.java?rev=1726963&r1=1726962&r2=1726963&view=diff
==============================================================================
--- httpcomponents/contrib/httpcore/trunk/src/main/java/org/apache/http/contrib/sip/BasicCompactHeaderMapper.java (original)
+++ httpcomponents/contrib/httpcore/trunk/src/main/java/org/apache/http/contrib/sip/BasicCompactHeaderMapper.java Wed Jan 27 08:51:43 2016
@@ -126,6 +126,7 @@ public class BasicCompactHeaderMapper im
// non-javadoc, see interface CompactHeaderMapper
+ @Override
public String getCompactName(final String fullname) {
Args.notNull(fullname, "Full name");
return mapFullToCompact.get(fullname.toLowerCase());
@@ -133,6 +134,7 @@ public class BasicCompactHeaderMapper im
// non-javadoc, see interface CompactHeaderMapper
+ @Override
public String getFullName(final String compactname) {
Args.notNull(compactname, "Compact name");
return mapCompactToFull.get(compactname.toLowerCase());
@@ -140,6 +142,7 @@ public class BasicCompactHeaderMapper im
// non-javadoc, see interface CompactHeaderMapper
+ @Override
public String getAlternateName(final String name) {
Args.notNull(name, "Name");
final String namelc = name.toLowerCase();
Modified: httpcomponents/contrib/httpcore/trunk/src/main/java/org/apache/http/contrib/sip/BufferedCompactHeader.java
URL: http://svn.apache.org/viewvc/httpcomponents/contrib/httpcore/trunk/src/main/java/org/apache/http/contrib/sip/BufferedCompactHeader.java?rev=1726963&r1=1726962&r2=1726963&view=diff
==============================================================================
--- httpcomponents/contrib/httpcore/trunk/src/main/java/org/apache/http/contrib/sip/BufferedCompactHeader.java (original)
+++ httpcomponents/contrib/httpcore/trunk/src/main/java/org/apache/http/contrib/sip/BufferedCompactHeader.java Wed Jan 27 08:51:43 2016
@@ -112,23 +112,27 @@ public class BufferedCompactHeader
// non-javadoc, see interface Header
+ @Override
public String getName() {
return this.fullName;
}
// non-javadoc, see interface CompactHeader
+ @Override
public String getCompactName() {
return this.compactName;
}
// non-javadoc, see interface Header
+ @Override
public String getValue() {
return this.buffer.substringTrimmed(this.valuePos,
this.buffer.length());
}
// non-javadoc, see interface Header
+ @Override
public HeaderElement[] getElements() throws ParseException {
final ParserCursor cursor = new ParserCursor(0, this.buffer.length());
cursor.updatePos(this.valuePos);
@@ -136,11 +140,13 @@ public class BufferedCompactHeader
}
// non-javadoc, see interface BufferedHeader
+ @Override
public int getValuePos() {
return this.valuePos;
}
// non-javadoc, see interface BufferedHeader
+ @Override
public CharArrayBuffer getBuffer() {
return this.buffer;
}
Modified: httpcomponents/contrib/httpcore/trunk/src/main/java/org/apache/http/contrib/sip/EnglishSipReasonPhraseCatalog.java
URL: http://svn.apache.org/viewvc/httpcomponents/contrib/httpcore/trunk/src/main/java/org/apache/http/contrib/sip/EnglishSipReasonPhraseCatalog.java?rev=1726963&r1=1726962&r2=1726963&view=diff
==============================================================================
--- httpcomponents/contrib/httpcore/trunk/src/main/java/org/apache/http/contrib/sip/EnglishSipReasonPhraseCatalog.java (original)
+++ httpcomponents/contrib/httpcore/trunk/src/main/java/org/apache/http/contrib/sip/EnglishSipReasonPhraseCatalog.java Wed Jan 27 08:51:43 2016
@@ -76,6 +76,7 @@ public class EnglishSipReasonPhraseCatal
*
* @return the reason phrase, or {@code null}
*/
+ @Override
public String getReason(final int status, final Locale loc) {
Args.check(status >= 100 && status < 700, "Unknown category for status code " + status);
// Unlike HTTP status codes, those for SIP are not compact