From 0acf2f965051c9d9f34787b44e8c7a853d351d31 Mon Sep 17 00:00:00 2001 From: Simone Bordet Date: Tue, 28 Aug 2012 09:29:08 +0200 Subject: [PATCH] Jetty9 - Generified HttpChannel and HttpParser listeners to follow the generification of HttpInput. --- .../java/org/eclipse/jetty/http/HttpParser.java | 8 ++++---- .../java/org/eclipse/jetty/http/HttpTester.java | 12 ++++++------ .../jetty/http/HttpGeneratorServerTest.java | 2 +- .../org/eclipse/jetty/http/HttpParserTest.java | 2 +- .../org/eclipse/jetty/server/HttpChannel.java | 16 ++++++++-------- .../org/eclipse/jetty/server/HttpConnection.java | 4 ++-- .../org/eclipse/jetty/server/HttpWriterTest.java | 2 +- 7 files changed, 23 insertions(+), 23 deletions(-) diff --git a/jetty-http/src/main/java/org/eclipse/jetty/http/HttpParser.java b/jetty-http/src/main/java/org/eclipse/jetty/http/HttpParser.java index 714379f1f3d..ee12cbabc9c 100644 --- a/jetty-http/src/main/java/org/eclipse/jetty/http/HttpParser.java +++ b/jetty-http/src/main/java/org/eclipse/jetty/http/HttpParser.java @@ -1222,9 +1222,9 @@ public class HttpParser * These methods return true if they want parsing to return to * the caller. */ - public interface HttpHandler + public interface HttpHandler { - public boolean content(ByteBuffer ref); + public boolean content(T item); public boolean headerComplete(); @@ -1244,7 +1244,7 @@ public class HttpParser public void badMessage(int status, String reason); } - public interface RequestHandler extends HttpHandler + public interface RequestHandler extends HttpHandler { /** * This is the method called by parser when the HTTP request line is parsed @@ -1259,7 +1259,7 @@ public class HttpParser public abstract boolean parsedHostHeader(String host,int port); } - public interface ResponseHandler extends HttpHandler + public interface ResponseHandler extends HttpHandler { /** * This is the method called by parser when the HTTP request line is parsed diff --git a/jetty-http/src/main/java/org/eclipse/jetty/http/HttpTester.java b/jetty-http/src/main/java/org/eclipse/jetty/http/HttpTester.java index d8d537f6347..513c39b96f6 100644 --- a/jetty-http/src/main/java/org/eclipse/jetty/http/HttpTester.java +++ b/jetty-http/src/main/java/org/eclipse/jetty/http/HttpTester.java @@ -31,15 +31,15 @@ import org.eclipse.jetty.util.StringUtil; public class HttpTester { - private HttpTester(){}; + private HttpTester() + { + } public static Request newRequest() { return new Request(); } - - public static Request parseRequest(String request) { Request r=new Request(); @@ -73,7 +73,7 @@ public class HttpTester } - public abstract static class Message extends HttpFields implements HttpParser.HttpHandler + public abstract static class Message extends HttpFields implements HttpParser.HttpHandler { ByteArrayOutputStream _content; HttpVersion _version=HttpVersion.HTTP_1_0; @@ -232,7 +232,7 @@ public class HttpTester } - public static class Request extends Message implements HttpParser.RequestHandler + public static class Request extends Message implements HttpParser.RequestHandler { private String _method; private String _uri; @@ -290,7 +290,7 @@ public class HttpTester } } - public static class Response extends Message implements HttpParser.ResponseHandler + public static class Response extends Message implements HttpParser.ResponseHandler { private int _status; private String _reason; diff --git a/jetty-http/src/test/java/org/eclipse/jetty/http/HttpGeneratorServerTest.java b/jetty-http/src/test/java/org/eclipse/jetty/http/HttpGeneratorServerTest.java index 53ddd096e72..38df347c30b 100644 --- a/jetty-http/src/test/java/org/eclipse/jetty/http/HttpGeneratorServerTest.java +++ b/jetty-http/src/test/java/org/eclipse/jetty/http/HttpGeneratorServerTest.java @@ -38,7 +38,7 @@ import static org.junit.Assert.assertTrue; public class HttpGeneratorServerTest { - private class Handler implements HttpParser.ResponseHandler + private class Handler implements HttpParser.ResponseHandler { @Override public boolean content(ByteBuffer ref) diff --git a/jetty-http/src/test/java/org/eclipse/jetty/http/HttpParserTest.java b/jetty-http/src/test/java/org/eclipse/jetty/http/HttpParserTest.java index dd4a0abdc39..c1ecdd11cd0 100644 --- a/jetty-http/src/test/java/org/eclipse/jetty/http/HttpParserTest.java +++ b/jetty-http/src/test/java/org/eclipse/jetty/http/HttpParserTest.java @@ -697,7 +697,7 @@ public class HttpParserTest private boolean _headerCompleted; private boolean _messageCompleted; - private class Handler implements HttpParser.RequestHandler, HttpParser.ResponseHandler + private class Handler implements HttpParser.RequestHandler, HttpParser.ResponseHandler { private HttpFields fields; private boolean request; diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java b/jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java index c6d59adf331..a0c8c420e22 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java @@ -43,7 +43,6 @@ import org.eclipse.jetty.io.ByteBufferPool; import org.eclipse.jetty.io.EndPoint; import org.eclipse.jetty.io.EofException; import org.eclipse.jetty.server.handler.ErrorHandler; -import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.StringUtil; import org.eclipse.jetty.util.URIUtil; import org.eclipse.jetty.util.log.Log; @@ -61,7 +60,7 @@ import org.eclipse.jetty.util.log.Logger; * HttpTransport.completed(). * */ -public class HttpChannel implements HttpParser.RequestHandler, Runnable +public class HttpChannel implements HttpParser.RequestHandler, Runnable { private static final Logger LOG = Log.getLogger(HttpChannel.class); private static final ThreadLocal __currentChannel = new ThreadLocal<>(); @@ -91,7 +90,7 @@ public class HttpChannel implements HttpParser.RequestHandler, Runnable private boolean _expect100Continue = false; private boolean _expect102Processing = false; - public HttpChannel(Connector connector, HttpConfiguration configuration, EndPoint endPoint, HttpTransport transport, HttpInput input) + public HttpChannel(Connector connector, HttpConfiguration configuration, EndPoint endPoint, HttpTransport transport, HttpInput input) { _connector = connector; _configuration = configuration; @@ -279,7 +278,7 @@ public class HttpChannel implements HttpParser.RequestHandler, Runnable try { _state.completed(); - + if (!_response.isCommitted() && !_request.isHandled()) _response.sendError(404); @@ -511,11 +510,13 @@ public class HttpChannel implements HttpParser.RequestHandler, Runnable } @Override - public boolean content(ByteBuffer ref) + public boolean content(T item) { if (LOG.isDebugEnabled()) - LOG.debug("{} content {}", this, BufferUtil.toDetailString(ref)); - _request.getHttpInput().content(ref); + LOG.debug("{} content {}", this, item); + @SuppressWarnings("unchecked") + HttpInput input = _request.getHttpInput(); + input.content(item); return true; } @@ -616,7 +617,6 @@ public class HttpChannel implements HttpParser.RequestHandler, Runnable _connector.getExecutor().execute(task); } - // TODO: remove public ScheduledExecutorService getScheduler() { return _connector.getScheduler(); diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/HttpConnection.java b/jetty-server/src/main/java/org/eclipse/jetty/server/HttpConnection.java index 3e64db8500d..f87d67ab241 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/HttpConnection.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/HttpConnection.java @@ -581,9 +581,9 @@ public class HttpConnection extends AbstractConnection implements Runnable, Http } } - private class HttpChannelOverHttp extends HttpChannel + private class HttpChannelOverHttp extends HttpChannel { - public HttpChannelOverHttp(Connector connector, HttpConfiguration configuration, EndPoint endPoint, HttpTransport transport, HttpInput input) + public HttpChannelOverHttp(Connector connector, HttpConfiguration configuration, EndPoint endPoint, HttpTransport transport, HttpInput input) { super(connector,configuration,endPoint,transport,input); } diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/HttpWriterTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/HttpWriterTest.java index 86cd74567df..5a055858e26 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/HttpWriterTest.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/HttpWriterTest.java @@ -44,7 +44,7 @@ public class HttpWriterTest final HttpConfiguration configuration = new HttpConfiguration(null, false); final ByteBufferPool bufferPool = new MappedByteBufferPool(); - HttpChannel channel = new HttpChannel(null,null,null,null,null) + HttpChannel channel = new HttpChannel(null,null,null,null,null) { @Override public HttpConfiguration getHttpConfiguration()