Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename process to handle (#9385) 

Renamed Request.Processor to Request.Handler
Renamed Handler.process to Handler.handle
Renamed Rule.Processor to Rule.Handler.
Renamed accordingly methods and variable.
Updated comments accordingly.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
Co-authored-by: Simone Bordet <simone.bordet@gmail.com>
This commit is contained in:
Greg Wilkins 2023-02-17 04:21:12 +11:00 committed by GitHub
parent a6b1de5599
commit 0ca6295cbc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
255 changed files with 986 additions and 987 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
documentation/jetty-documentation/src/main/java/org/eclipse/jetty/docs/programming/server/HandlerDocs.java
View File

@ -39,7 +39,7 @@ public class HandlerDocs
public static class HelloHandler0 extends Handler.Abstract
{
@Override
public boolean process(Request request, Response response, Callback callback) throws Exception
public boolean handle(Request request, Response response, Callback callback) throws Exception
{
response.setStatus(200);
response.getHeaders().add(HttpHeader.CONTENT_LENGTH, "text/plain");
@ -51,7 +51,7 @@ public class HandlerDocs
public static class HelloHandler1 extends Handler.Abstract
{
@Override
public boolean process(Request request, Response response, Callback callback)
public boolean handle(Request request, Response response, Callback callback)
{
response.setStatus(200);
response.getHeaders().add(HttpHeader.CONTENT_LENGTH, "text/plain");
@ -63,7 +63,7 @@ public class HandlerDocs
public static class HelloHandler2 extends Handler.Abstract.NonBlocking
{
@Override
public boolean process(Request request, Response response, Callback callback)
public boolean handle(Request request, Response response, Callback callback)
{
response.setStatus(200);
response.getHeaders().add(HttpHeader.CONTENT_LENGTH, "text/plain");
@ -75,7 +75,7 @@ public class HandlerDocs
public static class HelloHandler3 extends Handler.Abstract.NonBlocking
{
@Override
public boolean process(Request request, Response response, Callback callback) throws IOException
public boolean handle(Request request, Response response, Callback callback) throws IOException
{
response.setStatus(200);
response.getHeaders().add(HttpHeader.CONTENT_LENGTH, "text/plain");
@ -98,7 +98,7 @@ public class HandlerDocs
public static class HelloHandler4 extends Handler.Abstract
{
@Override
public boolean process(Request request, Response response, Callback callback) throws IOException
public boolean handle(Request request, Response response, Callback callback) throws IOException
{
response.setStatus(200);
response.getHeaders().add(HttpHeader.CONTENT_LENGTH, "text/plain");
@ -119,7 +119,7 @@ public class HandlerDocs
public static class HelloHandler5 extends Handler.Abstract.NonBlocking
{
@Override
public boolean process(Request request, Response response, Callback callback) throws IOException
public boolean handle(Request request, Response response, Callback callback) throws IOException
{
response.setStatus(200);
response.getHeaders().add(HttpHeader.CONTENT_LENGTH, "text/plain");
@ -160,7 +160,7 @@ public class HandlerDocs
public static class DiscriminatingGreeterHandler extends Handler.Abstract.NonBlocking
{
@Override
public boolean process(Request request, Response response, Callback callback)
public boolean handle(Request request, Response response, Callback callback)
{
if (!HttpMethod.GET.is(request.getMethod()) || !"greeting".equals(Request.getPathInContext(request)))
return false;
@ -175,7 +175,7 @@ public class HandlerDocs
public static class EchoHandler extends Handler.Abstract.NonBlocking
{
@Override
public boolean process(Request request, Response response, Callback callback)
public boolean handle(Request request, Response response, Callback callback)
{
response.setStatus(200);
response.getHeaders().put(HttpHeader.CONTENT_TYPE, request.getHeaders().get(HttpHeader.CONTENT_TYPE));
@ -192,7 +192,7 @@ public class HandlerDocs
public static class RootHandler extends Handler.Sequence
{
@Override
public boolean process(Request request, Response response, Callback callback) throws Exception
public boolean handle(Request request, Response response, Callback callback) throws Exception
{
final StringBuilder index = new StringBuilder();
index.append("<h2>Handler Demos</h2>\n<ul>\n");
@ -202,7 +202,7 @@ public class HandlerDocs
String name = handler.getClass().getSimpleName().replace("Handler", "");
String path = "/" + name;
if (Request.getPathInContext(request).equals(name))
return handler.process(request, response, callback);
return handler.handle(request, response, callback);
index.append("<li><a href=\"")
.append(URIUtil.addPaths(request.getContext().getContextPath(), path))

28
documentation/jetty-documentation/src/main/java/org/eclipse/jetty/docs/programming/server/http/HTTPServerDocs.java
View File

@ -97,7 +97,7 @@ public class HTTPServerDocs
server.setHandler(new Handler.Abstract()
{
@Override
public boolean process(Request request, Response response, Callback callback)
public boolean handle(Request request, Response response, Callback callback)
{
// Succeed the callback to write the response.
callback.succeeded();
@ -478,7 +478,7 @@ public class HTTPServerDocs
class LoggingHandler extends Handler.Abstract
{
@Override
public boolean process(Request request, Response response, Callback callback) throws Exception
public boolean handle(Request request, Response response, Callback callback) throws Exception
{
callback.succeeded();
return true;
@ -488,7 +488,7 @@ public class HTTPServerDocs
class App1Handler extends Handler.Abstract
{
@Override
public boolean process(Request request, Response response, Callback callback) throws Exception
public boolean handle(Request request, Response response, Callback callback) throws Exception
{
callback.succeeded();
return true;
@ -498,7 +498,7 @@ public class HTTPServerDocs
class App2Handler extends Handler.Abstract
{
@Override
public boolean process(Request request, Response response, Callback callback) throws Exception
public boolean handle(Request request, Response response, Callback callback) throws Exception
{
callback.succeeded();
return true;
@ -525,7 +525,7 @@ public class HTTPServerDocs
{
@Override
// tag::handlerAPI[]
public boolean process(Request request, Response response, Callback callback) throws Exception
public boolean handle(Request request, Response response, Callback callback) throws Exception
{
return true;
}
@ -539,7 +539,7 @@ public class HTTPServerDocs
class HelloWorldHandler extends Handler.Abstract
{
@Override
public boolean process(Request request, Response response, Callback callback)
public boolean handle(Request request, Response response, Callback callback)
{
response.setStatus(200);
response.getHeaders().put(HttpHeader.CONTENT_TYPE, "text/html; charset=UTF-8");
@ -576,7 +576,7 @@ public class HTTPServerDocs
class HelloWorldHandler extends Handler.Abstract
{
@Override
public boolean process(Request request, Response response, Callback callback)
public boolean handle(Request request, Response response, Callback callback)
{
return true;
}
@ -586,7 +586,7 @@ public class HTTPServerDocs
class FilterHandler extends Handler.Wrapper
{
@Override
public boolean process(Request request, Response response, Callback callback) throws Exception
public boolean handle(Request request, Response response, Callback callback) throws Exception
{
String path = Request.getPathInContext(request);
if (path.startsWith("/old_path/"))
@ -608,7 +608,7 @@ public class HTTPServerDocs
}
// Forward to the next Handler.
return super.process(request, response, callback);
return super.handle(request, response, callback);
}
}
@ -631,7 +631,7 @@ public class HTTPServerDocs
class ShopHandler extends Handler.Abstract
{
@Override
public boolean process(Request request, Response response, Callback callback) throws Exception
public boolean handle(Request request, Response response, Callback callback) throws Exception
{
// Implement the shop, remembering to complete the callback.
return true;
@ -660,7 +660,7 @@ public class HTTPServerDocs
class ShopHandler extends Handler.Abstract
{
@Override
public boolean process(Request request, Response response, Callback callback) throws Exception
public boolean handle(Request request, Response response, Callback callback) throws Exception
{
// Implement the shop, remembering to complete the callback.
return true;
@ -670,7 +670,7 @@ public class HTTPServerDocs
class RESTHandler extends Handler.Abstract
{
@Override
public boolean process(Request request, Response response, Callback callback) throws Exception
public boolean handle(Request request, Response response, Callback callback) throws Exception
{
// Implement the REST APIs, remembering to complete the callback.
return true;
@ -849,7 +849,7 @@ public class HTTPServerDocs
class ShopHandler extends Handler.Abstract
{
@Override
public boolean process(Request request, Response response, Callback callback) throws Exception
public boolean handle(Request request, Response response, Callback callback) throws Exception
{
// Implement the shop, remembering to complete the callback.
return true;
@ -859,7 +859,7 @@ public class HTTPServerDocs
class RESTHandler extends Handler.Abstract
{
@Override
public boolean process(Request request, Response response, Callback callback) throws Exception
public boolean handle(Request request, Response response, Callback callback) throws Exception
{
// Implement the REST APIs, remembering to complete the callback.
return true;

6
inceptionDates.csv
View File

@ -2929,7 +2929,7 @@ jetty-core/jetty-server/src/test/java/org/eclipse/jetty/server/RequestTest.java,
jetty-core/jetty-server/src/test/java/org/eclipse/jetty/server/ResourceListingTest.java, 2022-09-27
jetty-core/jetty-server/src/test/java/org/eclipse/jetty/server/LatencyRecordingHandlerTest.java, 2023-01-19
jetty-core/jetty-server/src/test/java/org/eclipse/jetty/server/GracefulHandlerTest.java, 2023-01-23
jetty-core/jetty-server/src/test/java/org/eclipse/jetty/server/ErrorProcessorTest.java, 2016-07-18
jetty-core/jetty-server/src/test/java/org/eclipse/jetty/server/ErrorHandlerTest.java, 2016-07-18
jetty-core/jetty-server/src/test/java/org/eclipse/jetty/server/HttpServerTestFixture.java, 2010-07-13
jetty-core/jetty-server/src/test/java/org/eclipse/jetty/server/HttpServerTestBase.java, 2009-03-24
jetty-core/jetty-server/src/test/java/org/eclipse/jetty/server/ForwardedRequestCustomizerTest.java, 2016-08-11
@ -2997,7 +2997,7 @@ jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/ForwardedRequestC
jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/ResourceListing.java, 2022-08-02
jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/DelayedHandler.java, 2022-05-03
jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/GracefulHandler.java, 2023-01-23
jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ReHandlingErrorProcessor.java, 2022-10-24
jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ReHandlingErrorHandler.java, 2022-10-24
jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/jmx/ContextHandlerMBean.java, 2009-03-24
jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/jmx/AbstractHandlerMBean.java, 2009-06-30
jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/jmx/package-info.java, 2012-11-02
@ -3031,7 +3031,7 @@ jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHa
jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/package-info.java, 2012-11-02
jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextResponse.java, 2022-05-03
jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java, 2009-03-24
jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ErrorProcessor.java, 2022-05-03
jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ErrorHandler.java, 2022-05-03
jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/IdleTimeoutHandler.java, 2013-11-08
jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/StatisticsHandler.java, 2009-03-24
jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/SecuredRedirectHandler.java, 2014-09-30

Can't render this file because it is too large.

2
jetty-core/jetty-alpn/jetty-alpn-conscrypt-server/src/test/java/org/eclipse/jetty/alpn/conscrypt/server/ConscryptHTTP2ServerTest.java
View File

@ -108,7 +108,7 @@ public class ConscryptHTTP2ServerTest
server.setHandler(new Handler.Abstract()
{
@Override
public boolean process(Request request, Response response, Callback callback)
public boolean handle(Request request, Response response, Callback callback)
{
callback.succeeded();
return true;

6
jetty-core/jetty-alpn/jetty-alpn-java-server/src/test/java/org/eclipse/jetty/alpn/java/server/JDK9ALPNTest.java
View File

@ -90,7 +90,7 @@ public class JDK9ALPNTest
startServer(new Handler.Abstract()
{
@Override
public boolean process(Request request, Response response, Callback callback)
public boolean handle(Request request, Response response, Callback callback)
{
callback.succeeded();
return true;
@ -133,7 +133,7 @@ public class JDK9ALPNTest
startServer(new Handler.Abstract()
{
@Override
public boolean process(Request request, Response response, Callback callback)
public boolean handle(Request request, Response response, Callback callback)
{
callback.succeeded();
return true;
@ -179,7 +179,7 @@ public class JDK9ALPNTest
startServer(new Handler.Abstract()
{
@Override
public boolean process(Request request, Response response, Callback callback)
public boolean handle(Request request, Response response, Callback callback)
{
callback.succeeded();
return true;

8
jetty-core/jetty-client/src/test/java/org/eclipse/jetty/client/ClientConnectionCloseTest.java
View File

@ -48,7 +48,7 @@ public class ClientConnectionCloseTest extends AbstractHttpClientServerTest
start(scenario, new Handler.Abstract()
{
@Override
public boolean process(Request request, Response response, Callback callback) throws Exception
public boolean handle(Request request, Response response, Callback callback) throws Exception
{
Content.Source.consumeAll(request);
@ -99,7 +99,7 @@ public class ClientConnectionCloseTest extends AbstractHttpClientServerTest
start(scenario, new Handler.Abstract()
{
@Override
public boolean process(Request request, Response response, Callback callback)
public boolean handle(Request request, Response response, Callback callback)
{
// Do not respond.
return true;
@ -142,7 +142,7 @@ public class ClientConnectionCloseTest extends AbstractHttpClientServerTest
start(scenario, new Handler.Abstract()
{
@Override
public boolean process(Request request, Response response, Callback callback) throws Exception
public boolean handle(Request request, Response response, Callback callback) throws Exception
{
Content.Source.consumeAll(request);
@ -204,7 +204,7 @@ public class ClientConnectionCloseTest extends AbstractHttpClientServerTest
start(scenario, new Handler.Abstract()
{
@Override
public boolean process(Request request, Response response, Callback callback) throws Exception
public boolean handle(Request request, Response response, Callback callback) throws Exception
{
response.getHeaders().putLongField(HttpHeader.CONTENT_LENGTH, 0);
Content.Sink.write(response, false, null);

4
jetty-core/jetty-client/src/test/java/org/eclipse/jetty/client/ConnectionPoolMaxUsageTest.java
View File

@ -65,7 +65,7 @@ public class ConnectionPoolMaxUsageTest
start(new Handler.Abstract()
{
@Override
public boolean process(Request request, Response response, Callback callback)
public boolean handle(Request request, Response response, Callback callback)
{
response.getHeaders().put(HttpHeader.CONTENT_TYPE, "text/plain");
Content.Sink.write(response, true, String.valueOf(Request.getRemotePort(request)), callback);
@ -108,7 +108,7 @@ public class ConnectionPoolMaxUsageTest
start(new Handler.Abstract()
{
@Override
public boolean process(Request request, Response response, Callback callback)
public boolean handle(Request request, Response response, Callback callback)
{
response.getHeaders().put(HttpHeader.CONTENT_TYPE, "text/plain");
Content.Sink.write(response, true, String.valueOf(Request.getRemotePort(request)), callback);

8
jetty-core/jetty-client/src/test/java/org/eclipse/jetty/client/ContentResponseTest.java
View File

@ -41,7 +41,7 @@ public class ContentResponseTest extends AbstractHttpClientServerTest
start(scenario, new Handler.Abstract()
{
@Override
public boolean process(Request request, Response response, Callback callback)
public boolean handle(Request request, Response response, Callback callback)
{
response.write(true, ByteBuffer.wrap(content), callback);
return true;
@ -68,7 +68,7 @@ public class ContentResponseTest extends AbstractHttpClientServerTest
start(scenario, new Handler.Abstract()
{
@Override
public boolean process(Request request, Response response, Callback callback)
public boolean handle(Request request, Response response, Callback callback)
{
response.getHeaders().put(HttpHeader.CONTENT_TYPE, mediaType);
Content.Sink.write(response, true, content, callback);
@ -98,7 +98,7 @@ public class ContentResponseTest extends AbstractHttpClientServerTest
start(scenario, new Handler.Abstract()
{
@Override
public boolean process(Request request, Response response, Callback callback) throws Exception
public boolean handle(Request request, Response response, Callback callback) throws Exception
{
response.getHeaders().put(HttpHeader.CONTENT_TYPE, contentType);
response.write(true, ByteBuffer.wrap(content.getBytes(encoding)), callback);
@ -128,7 +128,7 @@ public class ContentResponseTest extends AbstractHttpClientServerTest
start(scenario, new Handler.Abstract()
{
@Override
public boolean process(Request request, Response response, Callback callback) throws Exception
public boolean handle(Request request, Response response, Callback callback) throws Exception
{
response.getHeaders().put(HttpHeader.CONTENT_TYPE, contentType);
response.write(true, ByteBuffer.wrap(content.getBytes(encoding)), callback);

2
jetty-core/jetty-client/src/test/java/org/eclipse/jetty/client/EmptyServerHandler.java
View File

@ -24,7 +24,7 @@ public class EmptyServerHandler extends Handler.Abstract
protected Blocker.Shared _blocking = new Blocker.Shared();
@Override
public boolean process(Request request, Response response, Callback callback) throws Exception
public boolean handle(Request request, Response response, Callback callback) throws Exception
{
try
{

2
jetty-core/jetty-client/src/test/java/org/eclipse/jetty/client/HostnameVerificationTest.java
View File

@ -75,7 +75,7 @@ public class HostnameVerificationTest
server.setHandler(new Handler.Abstract()
{
@Override
public boolean process(Request request, Response response, Callback callback) throws Exception
public boolean handle(Request request, Response response, Callback callback) throws Exception
{
try (Blocker.Callback blocker = Blocker.callback())
{

2
jetty-core/jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientAsyncContentTest.java
View File

@ -204,7 +204,7 @@ public class HttpClientAsyncContentTest extends AbstractHttpClientServerTest
start(scenario, new Handler.Abstract()
{
@Override
public boolean process(Request request, org.eclipse.jetty.server.Response response, Callback callback)
public boolean handle(Request request, org.eclipse.jetty.server.Response response, Callback callback)
{
response.write(true, ByteBuffer.wrap(new byte[1024]), callback);
return true;

4
jetty-core/jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientGZIPTest.java
View File

@ -115,7 +115,7 @@ public class HttpClientGZIPTest extends AbstractHttpClientServerTest
start(scenario, new Handler.Abstract()
{
@Override
public boolean process(Request request, org.eclipse.jetty.server.Response response, Callback callback) throws Exception
public boolean handle(Request request, org.eclipse.jetty.server.Response response, Callback callback) throws Exception
{
response.getHeaders().put("Content-Encoding", "gzip");
@ -202,7 +202,7 @@ public class HttpClientGZIPTest extends AbstractHttpClientServerTest
start(scenario, new Handler.Abstract()
{
@Override
public boolean process(Request request, org.eclipse.jetty.server.Response response, Callback callback)
public boolean handle(Request request, org.eclipse.jetty.server.Response response, Callback callback)
{
response.getHeaders().put("Content-Encoding", "gzip");
// Not gzipped, will cause the client to blow up.

8
jetty-core/jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientProxyProtocolTest.java
View File

@ -87,7 +87,7 @@ public class HttpClientProxyProtocolTest
startServer(new Handler.Abstract()
{
@Override
public boolean process(Request request, Response response, Callback callback)
public boolean handle(Request request, Response response, Callback callback)
{
response.getHeaders().put(HttpHeader.CONTENT_TYPE, MimeTypes.Type.TEXT_PLAIN.asString());
Content.Sink.write(response, true, String.valueOf(Request.getRemotePort(request)), callback);
@ -126,7 +126,7 @@ public class HttpClientProxyProtocolTest
startServer(new Handler.Abstract()
{
@Override
public boolean process(Request request, Response response, Callback callback)
public boolean handle(Request request, Response response, Callback callback)
{
response.getHeaders().put(HttpHeader.CONTENT_TYPE, MimeTypes.Type.TEXT_PLAIN.asString());
Content.Sink.write(response, true, String.valueOf(Request.getRemotePort(request)), callback);
@ -168,7 +168,7 @@ public class HttpClientProxyProtocolTest
startServer(new Handler.Abstract()
{
@Override
public boolean process(Request request, Response response, Callback callback)
public boolean handle(Request request, Response response, Callback callback)
{
EndPoint endPoint = request.getConnectionMetaData().getConnection().getEndPoint();
assertTrue(endPoint instanceof ProxyConnectionFactory.ProxyEndPoint);
@ -223,7 +223,7 @@ public class HttpClientProxyProtocolTest
startServer(new Handler.Abstract()
{
@Override
public boolean process(Request request, Response response, Callback callback)
public boolean handle(Request request, Response response, Callback callback)
{
response.getHeaders().put(HttpHeader.CONTENT_TYPE, MimeTypes.Type.TEXT_PLAIN.asString());
Content.Sink.write(response, true, String.valueOf(Request.getRemotePort(request)), callback);

2
jetty-core/jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientProxyTest.java
View File

@ -151,7 +151,7 @@ public class HttpClientProxyTest extends AbstractHttpClientServerTest
start(scenario, new Handler.Abstract()
{
@Override
public boolean process(org.eclipse.jetty.server.Request request, Response response, Callback callback)
public boolean handle(org.eclipse.jetty.server.Request request, Response response, Callback callback)
{
String target = org.eclipse.jetty.server.Request.getPathInContext(request);
if (target.startsWith("/proxy"))

2
jetty-core/jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientRedirectTest.java
View File

@ -482,7 +482,7 @@ public class HttpClientRedirectTest extends AbstractHttpClientServerTest
start(scenario, new Handler.Abstract()
{
@Override
public boolean process(Request request, org.eclipse.jetty.server.Response response, Callback callback) throws Exception
public boolean handle(Request request, org.eclipse.jetty.server.Response response, Callback callback) throws Exception
{
if (Request.getPathInContext(request).startsWith("/redirect"))
{

28
jetty-core/jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientTest.java
View File

@ -172,7 +172,7 @@ public class HttpClientTest extends AbstractHttpClientServerTest
start(scenario, new Handler.Abstract()
{
@Override
public boolean process(org.eclipse.jetty.server.Request request, org.eclipse.jetty.server.Response response, Callback callback)
public boolean handle(org.eclipse.jetty.server.Request request, org.eclipse.jetty.server.Response response, Callback callback)
{
response.write(true, ByteBuffer.wrap(data), callback);
return true;
@ -268,7 +268,7 @@ public class HttpClientTest extends AbstractHttpClientServerTest
start(scenario, new Handler.Abstract()
{
@Override
public boolean process(org.eclipse.jetty.server.Request request, org.eclipse.jetty.server.Response response, Callback callback)
public boolean handle(org.eclipse.jetty.server.Request request, org.eclipse.jetty.server.Response response, Callback callback)
{
Fields fields = org.eclipse.jetty.server.Request.extractQueryParameters(request);
String value = fields.getValue(paramName);
@ -301,7 +301,7 @@ public class HttpClientTest extends AbstractHttpClientServerTest
start(scenario, new Handler.Abstract()
{
@Override
public boolean process(org.eclipse.jetty.server.Request request, org.eclipse.jetty.server.Response response, Callback callback)
public boolean handle(org.eclipse.jetty.server.Request request, org.eclipse.jetty.server.Response response, Callback callback)
{
Fields fields = org.eclipse.jetty.server.Request.extractQueryParameters(request);
String value = fields.getValue(paramName);
@ -335,7 +335,7 @@ public class HttpClientTest extends AbstractHttpClientServerTest
start(scenario, new Handler.Abstract()
{
@Override
public boolean process(org.eclipse.jetty.server.Request request, org.eclipse.jetty.server.Response response, Callback callback) throws Exception
public boolean handle(org.eclipse.jetty.server.Request request, org.eclipse.jetty.server.Response response, Callback callback) throws Exception
{
Content.Source.consumeAll(request);
Fields fields = org.eclipse.jetty.server.Request.extractQueryParameters(request);
@ -759,7 +759,7 @@ public class HttpClientTest extends AbstractHttpClientServerTest
start(scenario, new Handler.Abstract()
{
@Override
public boolean process(org.eclipse.jetty.server.Request request, org.eclipse.jetty.server.Response response, Callback callback)
public boolean handle(org.eclipse.jetty.server.Request request, org.eclipse.jetty.server.Response response, Callback callback)
{
response.write(true, ByteBuffer.wrap(new byte[length]), callback);
return true;
@ -1097,7 +1097,7 @@ public class HttpClientTest extends AbstractHttpClientServerTest
start(scenario, new Handler.Abstract()
{
@Override
public boolean process(org.eclipse.jetty.server.Request request, org.eclipse.jetty.server.Response response, Callback callback)
public boolean handle(org.eclipse.jetty.server.Request request, org.eclipse.jetty.server.Response response, Callback callback)
{
response.write(true, ByteBuffer.wrap(content), callback);
return true;
@ -1160,7 +1160,7 @@ public class HttpClientTest extends AbstractHttpClientServerTest
start(scenario, new Handler.Abstract()
{
@Override
public boolean process(org.eclipse.jetty.server.Request request, org.eclipse.jetty.server.Response response, Callback callback) throws Exception
public boolean handle(org.eclipse.jetty.server.Request request, org.eclipse.jetty.server.Response response, Callback callback) throws Exception
{
// Send the headers at this point, then write the content.
byte[] content = "TEST".getBytes(UTF_8);
@ -1189,7 +1189,7 @@ public class HttpClientTest extends AbstractHttpClientServerTest
start(scenario, new Handler.Abstract()
{
@Override
public boolean process(org.eclipse.jetty.server.Request request, org.eclipse.jetty.server.Response response, Callback callback) throws Exception
public boolean handle(org.eclipse.jetty.server.Request request, org.eclipse.jetty.server.Response response, Callback callback) throws Exception
{
// Send the headers at this point, then write the content
Content.Sink.write(response, false, null);
@ -1247,7 +1247,7 @@ public class HttpClientTest extends AbstractHttpClientServerTest
start(scenario, new Handler.Abstract()
{
@Override
public boolean process(org.eclipse.jetty.server.Request request, org.eclipse.jetty.server.Response response, Callback callback)
public boolean handle(org.eclipse.jetty.server.Request request, org.eclipse.jetty.server.Response response, Callback callback)
{
// Do not complete the callback.
latch.countDown();
@ -1324,7 +1324,7 @@ public class HttpClientTest extends AbstractHttpClientServerTest
start(scenario, new Handler.Abstract()
{
@Override
public boolean process(org.eclipse.jetty.server.Request request, org.eclipse.jetty.server.Response response, Callback callback)
public boolean handle(org.eclipse.jetty.server.Request request, org.eclipse.jetty.server.Response response, Callback callback)
{
// Send Connection: close to avoid that the server chunks the content with HTTP 1.1.
if (version.compareTo(HttpVersion.HTTP_1_0) > 0)
@ -1361,7 +1361,7 @@ public class HttpClientTest extends AbstractHttpClientServerTest
start(scenario, new Handler.Abstract()
{
@Override
public boolean process(org.eclipse.jetty.server.Request request, org.eclipse.jetty.server.Response response, Callback callback) throws Exception
public boolean handle(org.eclipse.jetty.server.Request request, org.eclipse.jetty.server.Response response, Callback callback) throws Exception
{
Content.Source.consumeAll(request);
int count = requests.incrementAndGet();
@ -1393,7 +1393,7 @@ public class HttpClientTest extends AbstractHttpClientServerTest
start(scenario, new Handler.Abstract()
{
@Override
public boolean process(org.eclipse.jetty.server.Request request, org.eclipse.jetty.server.Response response, Callback callback)
public boolean handle(org.eclipse.jetty.server.Request request, org.eclipse.jetty.server.Response response, Callback callback)
{
response.write(true, ByteBuffer.allocate(1024), callback);
return true;
@ -1552,7 +1552,7 @@ public class HttpClientTest extends AbstractHttpClientServerTest
start(scenario, new Handler.Abstract()
{
@Override
public boolean process(org.eclipse.jetty.server.Request request, org.eclipse.jetty.server.Response response, Callback callback)
public boolean handle(org.eclipse.jetty.server.Request request, org.eclipse.jetty.server.Response response, Callback callback)
{
response.getHeaders().put(HttpHeader.CONTENT_TYPE, "text/plain");
Content.Sink.write(response, true, org.eclipse.jetty.server.Request.getServerName(request), callback);
@ -1723,7 +1723,7 @@ public class HttpClientTest extends AbstractHttpClientServerTest
start(scenario, new Handler.Abstract()
{
@Override
public boolean process(org.eclipse.jetty.server.Request request, org.eclipse.jetty.server.Response response, Callback callback)
public boolean handle(org.eclipse.jetty.server.Request request, org.eclipse.jetty.server.Response response, Callback callback)
{
response.write(true, ByteBuffer.wrap(bytes), callback);
return true;

2
jetty-core/jetty-client/src/test/java/org/eclipse/jetty/client/HttpRequestAbortTest.java
View File

@ -481,7 +481,7 @@ public class HttpRequestAbortTest extends AbstractHttpClientServerTest
start(scenario, new Handler.Abstract()
{
@Override
public boolean process(org.eclipse.jetty.server.Request request, Response response, Callback callback)
public boolean handle(org.eclipse.jetty.server.Request request, Response response, Callback callback)
{
if ("/done".equals(org.eclipse.jetty.server.Request.getPathInContext(request)))
callback.succeeded();

4
jetty-core/jetty-client/src/test/java/org/eclipse/jetty/client/NetworkTrafficListenerTest.java
View File

@ -190,7 +190,7 @@ public class NetworkTrafficListenerTest
start(new Handler.Abstract()
{
@Override
public boolean process(Request request, Response response, Callback callback)
public boolean handle(Request request, Response response, Callback callback)
{
response.write(true, UTF_8.encode(responseContent), callback);
return true;
@ -329,7 +329,7 @@ public class NetworkTrafficListenerTest
start(new Handler.Abstract()
{
@Override
public boolean process(Request request, Response response, Callback callback)
public boolean handle(Request request, Response response, Callback callback)
{
Response.sendRedirect(request, response, callback, location);
return true;

2
jetty-core/jetty-client/src/test/java/org/eclipse/jetty/client/util/MultiPartRequestContentTest.java
View File

@ -431,7 +431,7 @@ public class MultiPartRequestContentTest extends AbstractHttpClientServerTest
private abstract static class AbstractMultiPartHandler extends Handler.Abstract
{
@Override
public boolean process(Request request, Response response, Callback callback) throws Exception
public boolean handle(Request request, Response response, Callback callback) throws Exception
{
// TODO use the DelayedHandler.UntilMultiPartFormData

2
jetty-core/jetty-demos/jetty-demo-handler/src/main/java/org/eclipse/jetty/demo/HelloHandler.java
View File

@ -23,7 +23,7 @@ import org.eclipse.jetty.util.Callback;
public class HelloHandler extends Handler.Abstract
{
@Override
public boolean process(Request request, Response response, Callback callback)
public boolean handle(Request request, Response response, Callback callback)
{
response.setStatus(200);
response.getHeaders().add(HttpHeader.CONTENT_TYPE, "text/plain");

10
jetty-core/jetty-fcgi/jetty-fcgi-proxy/src/test/java/org/eclipse/jetty/fcgi/proxy/FastCGIProxyHandlerTest.java
View File

@ -149,7 +149,7 @@ public class FastCGIProxyHandlerTest
start(sendStatus200, new Handler.Abstract()
{
@Override
public boolean process(Request request, Response response, Callback callback)
public boolean handle(Request request, Response response, Callback callback)
{
assertNotEquals(proxyContext.getContextPath(), request.getContext().getContextPath());
assertEquals(path, Request.getPathInContext(request));
@ -195,7 +195,7 @@ public class FastCGIProxyHandlerTest
start(sendStatus200, new Handler.Abstract()
{
@Override
public boolean process(Request request, Response response, Callback callback)
public boolean handle(Request request, Response response, Callback callback)
{
assertThat((String)request.getAttribute(FCGI.Headers.REQUEST_URI), startsWith(originalPath));
assertEquals(originalQuery, request.getAttribute(FCGI.Headers.QUERY_STRING));
@ -211,14 +211,14 @@ public class FastCGIProxyHandlerTest
proxyContext.insertHandler(new Handler.Wrapper()
{
@Override
public boolean process(Request request, Response response, Callback callback) throws Exception
public boolean handle(Request request, Response response, Callback callback) throws Exception
{
if (Request.getPathInContext(request).startsWith("/remote/"))
{
request.setAttribute(pathAttribute, originalPath);
request.setAttribute(queryAttribute, originalQuery);
}
return super.process(request, response, callback);
return super.handle(request, response, callback);
}
});
proxyContext.start();
@ -243,7 +243,7 @@ public class FastCGIProxyHandlerTest
start(true, new Handler.Abstract()
{
@Override
public boolean process(Request request, Response response, Callback callback)
public boolean handle(Request request, Response response, Callback callback)
{
response.write(true, ByteBuffer.wrap(content), callback);
return true;

38
jetty-core/jetty-fcgi/jetty-fcgi-server/src/test/java/org/eclipse/jetty/fcgi/server/HttpClientTest.java
View File

@ -61,7 +61,7 @@ public class HttpClientTest extends AbstractHttpClientServerTest
start(new Handler.Abstract()
{
@Override
public boolean process(org.eclipse.jetty.server.Request request, org.eclipse.jetty.server.Response response, Callback callback)
public boolean handle(org.eclipse.jetty.server.Request request, org.eclipse.jetty.server.Response response, Callback callback)
{
callback.succeeded();
return true;
@ -83,7 +83,7 @@ public class HttpClientTest extends AbstractHttpClientServerTest
start(new Handler.Abstract()
{
@Override
public boolean process(org.eclipse.jetty.server.Request request, org.eclipse.jetty.server.Response response, Callback callback)
public boolean handle(org.eclipse.jetty.server.Request request, org.eclipse.jetty.server.Response response, Callback callback)
{
response.write(true, ByteBuffer.wrap(data), callback);
return true;
@ -111,7 +111,7 @@ public class HttpClientTest extends AbstractHttpClientServerTest
start(new Handler.Abstract()
{
@Override
public boolean process(org.eclipse.jetty.server.Request request, org.eclipse.jetty.server.Response response, Callback callback)
public boolean handle(org.eclipse.jetty.server.Request request, org.eclipse.jetty.server.Response response, Callback callback)
{
// Setting the Content-Length triggers the HTTP
// content mode for response content parsing,
@ -140,7 +140,7 @@ public class HttpClientTest extends AbstractHttpClientServerTest
start(new Handler.Abstract()
{
@Override
public boolean process(org.eclipse.jetty.server.Request request, org.eclipse.jetty.server.Response response, Callback callback) throws Exception
public boolean handle(org.eclipse.jetty.server.Request request, org.eclipse.jetty.server.Response response, Callback callback) throws Exception
{
response.getHeaders().put(HttpHeader.CONTENT_TYPE, "text/plain;charset=utf-8");
Fields fields = org.eclipse.jetty.server.Request.extractQueryParameters(request);
@ -172,7 +172,7 @@ public class HttpClientTest extends AbstractHttpClientServerTest
start(new Handler.Abstract()
{
@Override
public boolean process(org.eclipse.jetty.server.Request request, org.eclipse.jetty.server.Response response, Callback callback) throws Exception
public boolean handle(org.eclipse.jetty.server.Request request, org.eclipse.jetty.server.Response response, Callback callback) throws Exception
{
response.getHeaders().put(HttpHeader.CONTENT_TYPE, "text/plain;charset=utf-8");
Fields fields = org.eclipse.jetty.server.Request.extractQueryParameters(request);
@ -210,7 +210,7 @@ public class HttpClientTest extends AbstractHttpClientServerTest
start(new Handler.Abstract()
{
@Override
public boolean process(org.eclipse.jetty.server.Request request, org.eclipse.jetty.server.Response response, Callback callback)
public boolean handle(org.eclipse.jetty.server.Request request, org.eclipse.jetty.server.Response response, Callback callback)
{
Fields fields = org.eclipse.jetty.server.Request.extractQueryParameters(request);
String value = fields.getValue(paramName);
@ -241,7 +241,7 @@ public class HttpClientTest extends AbstractHttpClientServerTest
start(new Handler.Abstract()
{
@Override
public boolean process(org.eclipse.jetty.server.Request request, org.eclipse.jetty.server.Response response, Callback callback)
public boolean handle(org.eclipse.jetty.server.Request request, org.eclipse.jetty.server.Response response, Callback callback)
{
Fields fields = org.eclipse.jetty.server.Request.extractQueryParameters(request);
String value = fields.getValue(paramName);
@ -273,7 +273,7 @@ public class HttpClientTest extends AbstractHttpClientServerTest
start(new Handler.Abstract()
{
@Override
public boolean process(org.eclipse.jetty.server.Request request, org.eclipse.jetty.server.Response response, Callback callback)
public boolean handle(org.eclipse.jetty.server.Request request, org.eclipse.jetty.server.Response response, Callback callback)
{
Fields fields = org.eclipse.jetty.server.Request.extractQueryParameters(request);
String value = fields.getValue(paramName);
@ -306,7 +306,7 @@ public class HttpClientTest extends AbstractHttpClientServerTest
start(new Handler.Abstract()
{
@Override
public boolean process(org.eclipse.jetty.server.Request request, org.eclipse.jetty.server.Response response, Callback callback)
public boolean handle(org.eclipse.jetty.server.Request request, org.eclipse.jetty.server.Response response, Callback callback)
{
Fields fields = org.eclipse.jetty.server.Request.extractQueryParameters(request);
String value = fields.getValue(paramName);
@ -340,7 +340,7 @@ public class HttpClientTest extends AbstractHttpClientServerTest
start(new Handler.Abstract()
{
@Override
public boolean process(org.eclipse.jetty.server.Request request, org.eclipse.jetty.server.Response response, Callback callback)
public boolean handle(org.eclipse.jetty.server.Request request, org.eclipse.jetty.server.Response response, Callback callback)
{
callback.succeeded();
return true;
@ -369,7 +369,7 @@ public class HttpClientTest extends AbstractHttpClientServerTest
start(new Handler.Abstract()
{
@Override
public boolean process(org.eclipse.jetty.server.Request request, org.eclipse.jetty.server.Response response, Callback callback)
public boolean handle(org.eclipse.jetty.server.Request request, org.eclipse.jetty.server.Response response, Callback callback)
{
Content.Source.consumeAll(request, callback);
return true;
@ -403,7 +403,7 @@ public class HttpClientTest extends AbstractHttpClientServerTest
start(new Handler.Abstract()
{
@Override
public boolean process(org.eclipse.jetty.server.Request request, org.eclipse.jetty.server.Response response, Callback callback) throws Exception
public boolean handle(org.eclipse.jetty.server.Request request, org.eclipse.jetty.server.Response response, Callback callback) throws Exception
{
response.getHeaders().put("Content-Encoding", "gzip");
OutputStream outputStream = Content.Sink.asOutputStream(response);
@ -431,7 +431,7 @@ public class HttpClientTest extends AbstractHttpClientServerTest
start(new Handler.Abstract()
{
@Override
public boolean process(org.eclipse.jetty.server.Request request, org.eclipse.jetty.server.Response response, Callback callback) throws Exception
public boolean handle(org.eclipse.jetty.server.Request request, org.eclipse.jetty.server.Response response, Callback callback) throws Exception
{
TimeUnit.MILLISECONDS.sleep(2 * idleTimeout);
callback.succeeded();
@ -470,7 +470,7 @@ public class HttpClientTest extends AbstractHttpClientServerTest
start(new Handler.Abstract()
{
@Override
public boolean process(org.eclipse.jetty.server.Request request, org.eclipse.jetty.server.Response response, Callback callback)
public boolean handle(org.eclipse.jetty.server.Request request, org.eclipse.jetty.server.Response response, Callback callback)
{
callback.succeeded();
return true;
@ -493,7 +493,7 @@ public class HttpClientTest extends AbstractHttpClientServerTest
start(new Handler.Abstract()
{
@Override
public boolean process(org.eclipse.jetty.server.Request request, org.eclipse.jetty.server.Response response, Callback callback)
public boolean handle(org.eclipse.jetty.server.Request request, org.eclipse.jetty.server.Response response, Callback callback)
{
response.write(true, ByteBuffer.wrap(new byte[length]), callback);
return true;
@ -530,7 +530,7 @@ public class HttpClientTest extends AbstractHttpClientServerTest
start(new Handler.Abstract()
{
@Override
public boolean process(org.eclipse.jetty.server.Request request, org.eclipse.jetty.server.Response response, Callback callback)
public boolean handle(org.eclipse.jetty.server.Request request, org.eclipse.jetty.server.Response response, Callback callback)
{
latch.countDown();
// Do not complete the callback.
@ -561,7 +561,7 @@ public class HttpClientTest extends AbstractHttpClientServerTest
start(new Handler.Abstract()
{
@Override
public boolean process(org.eclipse.jetty.server.Request request, org.eclipse.jetty.server.Response response, Callback callback) throws Exception
public boolean handle(org.eclipse.jetty.server.Request request, org.eclipse.jetty.server.Response response, Callback callback) throws Exception
{
// Promise some content, then flush the headers, then fail to send the content.
response.getHeaders().putLongField(HttpHeader.CONTENT_LENGTH, 16);
@ -599,7 +599,7 @@ public class HttpClientTest extends AbstractHttpClientServerTest
start(new Handler.Abstract()
{
@Override
public boolean process(org.eclipse.jetty.server.Request request, org.eclipse.jetty.server.Response response, Callback callback)
public boolean handle(org.eclipse.jetty.server.Request request, org.eclipse.jetty.server.Response response, Callback callback)
{
response.getHeaders().put("Connection", "close");
response.write(true, ByteBuffer.wrap(data), callback);
@ -629,7 +629,7 @@ public class HttpClientTest extends AbstractHttpClientServerTest
start(new Handler.Abstract()
{
@Override
public boolean process(org.eclipse.jetty.server.Request request, org.eclipse.jetty.server.Response response, Callback callback) throws Exception
public boolean handle(org.eclipse.jetty.server.Request request, org.eclipse.jetty.server.Response response, Callback callback) throws Exception
{
Content.Sink.write(response, false, UTF_8.encode("A"));
Content.Sink.write(response, true, UTF_8.encode("B"));

2
jetty-core/jetty-http-spi/src/main/java/org/eclipse/jetty/http/spi/HttpSpiContextHandler.java
View File

@ -48,7 +48,7 @@ public class HttpSpiContextHandler extends ContextHandler
super.setHandler(new Handler.Abstract()
{
@Override
public boolean process(Request request, Response response, Callback callback)
public boolean handle(Request request, Response response, Callback callback)
{
try (HttpExchange jettyHttpExchange = request.isSecure()
? new JettyHttpsExchange(_httpContext, request, response)

6
jetty-core/jetty-http2/jetty-http2-tests/src/test/java/org/eclipse/jetty/http2/tests/AsyncIOTest.java
View File

@ -44,7 +44,7 @@ public class AsyncIOTest extends AbstractTest
start(new Handler.Abstract()
{
@Override
public boolean process(Request request, Response response, Callback callback) throws Exception
public boolean handle(Request request, Response response, Callback callback) throws Exception
{
// Wait for the data to fully arrive.
sleep(1000);
@ -81,7 +81,7 @@ public class AsyncIOTest extends AbstractTest
start(new Handler.Abstract()
{
@Override
public boolean process(Request request, Response response, Callback callback) throws Exception
public boolean handle(Request request, Response response, Callback callback) throws Exception
{
Content.Source.consumeAll(request);
callback.succeeded();
@ -123,7 +123,7 @@ public class AsyncIOTest extends AbstractTest
start(new Handler.Abstract()
{
@Override
public void process(Request request, Response response, Callback callback) throws Exception
public void handle(request request, Response response, Callback callback) throws Exception
{
final AsyncContext asyncContext = request.startAsync();
asyncContext.setTimeout(0);

10
jetty-core/jetty-http2/jetty-http2-tests/src/test/java/org/eclipse/jetty/http2/tests/BadURITest.java
View File

@ -38,7 +38,7 @@ import org.eclipse.jetty.server.Request;
import org.eclipse.jetty.server.Response;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.ServerConnector;
import org.eclipse.jetty.server.handler.ErrorProcessor;
import org.eclipse.jetty.server.handler.ErrorHandler;
import org.eclipse.jetty.util.BufferUtil;
import org.eclipse.jetty.util.Callback;
import org.eclipse.jetty.util.component.LifeCycle;
@ -69,14 +69,14 @@ public class BadURITest
}
@Test
@Disabled("TODO: need to fix ErrorProcessor")
@Disabled("TODO: need to fix ErrorHandler")
public void testBadURI() throws Exception
{
CountDownLatch handlerLatch = new CountDownLatch(1);
startServer(new Handler.Abstract()
{
@Override
public boolean process(Request request, Response response, Callback callback)
public boolean handle(Request request, Response response, Callback callback)
{
handlerLatch.countDown();
callback.succeeded();
@ -85,9 +85,9 @@ public class BadURITest
});
// Remove existing ErrorHandlers.
server.getBeans(ErrorProcessor.class).forEach(server::removeBean);
server.getBeans(ErrorHandler.class).forEach(server::removeBean);
server.addBean(new ErrorProcessor()
server.addBean(new ErrorHandler()
{
@Override
public ByteBuffer badMessageError(int status, String reason, HttpFields.Mutable fields)

2
jetty-core/jetty-http2/jetty-http2-tests/src/test/java/org/eclipse/jetty/http2/tests/BlockedWritesWithSmallThreadPoolTest.java
View File

@ -108,7 +108,7 @@ public class BlockedWritesWithSmallThreadPoolTest
start(new Handler.Abstract()
{
@Override
public boolean process(Request request, Response response, Callback callback)
public boolean handle(Request request, Response response, Callback callback)
{
serverEndPointRef.compareAndSet(null, (AbstractEndPoint)request.getConnectionMetaData().getConnection().getEndPoint());
// Write a large content to cause TCP congestion.

8
jetty-core/jetty-http2/jetty-http2-tests/src/test/java/org/eclipse/jetty/http2/tests/ContentLengthTest.java
View File

@ -49,7 +49,7 @@ public class ContentLengthTest extends AbstractTest
start(new Handler.Abstract()
{
@Override
public boolean process(Request request, Response response, Callback callback)
public boolean handle(Request request, Response response, Callback callback)
{
callback.succeeded();
return true;
@ -73,7 +73,7 @@ public class ContentLengthTest extends AbstractTest
start(new Handler.Abstract()
{
@Override
public boolean process(Request request, Response response, Callback callback)
public boolean handle(Request request, Response response, Callback callback)
{
response.write(true, ByteBuffer.wrap(data), callback);
return true;
@ -97,7 +97,7 @@ public class ContentLengthTest extends AbstractTest
start(new Handler.Abstract()
{
@Override
public boolean process(Request request, Response response, Callback callback)
public boolean handle(Request request, Response response, Callback callback)
{
Content.Source.consumeAll(request, callback);
return true;
@ -133,7 +133,7 @@ public class ContentLengthTest extends AbstractTest
gzipHandler.setHandler(new Handler.Abstract()
{
@Override
public boolean process(Request request, Response response, Callback callback)
public boolean handle(Request request, Response response, Callback callback)
{
// Write a single buffer, with a Content-Length
response.getHeaders().putLongField(HttpHeader.CONTENT_LENGTH, data.length);

2
jetty-core/jetty-http2/jetty-http2-tests/src/test/java/org/eclipse/jetty/http2/tests/H2SpecServer.java
View File

@ -51,7 +51,7 @@ public class H2SpecServer
server.setHandler(new Handler.Abstract()
{
@Override
public boolean process(Request request, Response response, Callback callback)
public boolean handle(Request request, Response response, Callback callback)
{
Content.Source.consumeAll(request, Callback.NOOP);
response.write(true, UTF_8.encode("hello"), callback);

2
jetty-core/jetty-http2/jetty-http2-tests/src/test/java/org/eclipse/jetty/http2/tests/HTTP2CServer.java
View File

@ -55,7 +55,7 @@ public class HTTP2CServer extends Server
private static class SimpleHandler extends NonBlocking
{
@Override
public boolean process(Request request, Response response, Callback callback) throws Exception
public boolean handle(Request request, Response response, Callback callback) throws Exception
{
Fields fields = Request.extractQueryParameters(request);

14
jetty-core/jetty-http2/jetty-http2-tests/src/test/java/org/eclipse/jetty/http2/tests/HTTP2ServerTest.java
View File

@ -76,7 +76,7 @@ public class HTTP2ServerTest extends AbstractServerTest
startServer(new Handler.Abstract()
{
@Override
public boolean process(Request request, Response response, Callback callback)
public boolean handle(Request request, Response response, Callback callback)
{
callback.succeeded();
return true;
@ -120,7 +120,7 @@ public class HTTP2ServerTest extends AbstractServerTest
startServer(new Handler.Abstract()
{
@Override
public boolean process(Request request, Response response, Callback callback)
public boolean handle(Request request, Response response, Callback callback)
{
latch.countDown();
callback.succeeded();
@ -179,7 +179,7 @@ public class HTTP2ServerTest extends AbstractServerTest
startServer(new Handler.Abstract()
{
@Override
public boolean process(Request request, Response response, Callback callback)
public boolean handle(Request request, Response response, Callback callback)
{
latch.countDown();
response.write(true, ByteBuffer.wrap(content), callback);
@ -248,7 +248,7 @@ public class HTTP2ServerTest extends AbstractServerTest
startServer(new Handler.Abstract()
{
@Override
public boolean process(Request request, Response response, Callback callback)
public boolean handle(Request request, Response response, Callback callback)
{
callback.succeeded();
return true;
@ -294,7 +294,7 @@ public class HTTP2ServerTest extends AbstractServerTest
startServer(new Handler.Abstract()
{
@Override
public boolean process(Request request, Response response, Callback callback)
public boolean handle(Request request, Response response, Callback callback)
{
callback.succeeded();
return true;
@ -342,7 +342,7 @@ public class HTTP2ServerTest extends AbstractServerTest
startServer(new Handler.Abstract()
{
@Override
public boolean process(Request request, Response response, Callback callback) throws Exception
public boolean handle(Request request, Response response, Callback callback) throws Exception
{
// Wait for the SETTINGS frames to be exchanged.
Thread.sleep(delay);
@ -404,7 +404,7 @@ public class HTTP2ServerTest extends AbstractServerTest
startServer(new Handler.Abstract()
{
@Override
public boolean process(Request request, Response response, Callback callback)
public boolean handle(Request request, Response response, Callback callback)
{
// @checkstyle-disable-check : AvoidEscapedUnicodeCharactersCheck
// Invalid header name, the connection must be closed.

18
jetty-core/jetty-http2/jetty-http2-tests/src/test/java/org/eclipse/jetty/http2/tests/HTTP2Test.java
View File

@ -75,7 +75,7 @@ public class HTTP2Test extends AbstractTest
start(new Handler.Abstract()
{
@Override
public boolean process(Request request, Response response, Callback callback)
public boolean handle(Request request, Response response, Callback callback)
{
callback.succeeded();
return true;
@ -165,7 +165,7 @@ public class HTTP2Test extends AbstractTest
start(new Handler.Abstract()
{
@Override
public boolean process(Request request, Response response, Callback callback) throws Exception
public boolean handle(Request request, Response response, Callback callback) throws Exception
{
Content.Sink.write(response, true, ByteBuffer.wrap(content));
return true;
@ -216,7 +216,7 @@ public class HTTP2Test extends AbstractTest
start(new Handler.Abstract()
{
@Override
public boolean process(Request request, Response response, Callback callback)
public boolean handle(Request request, Response response, Callback callback)
{
Content.copy(request, response, callback);
return true;
@ -254,7 +254,7 @@ public class HTTP2Test extends AbstractTest
start(new Handler.Abstract()
{
@Override
public boolean process(Request request, Response response, Callback callback)
public boolean handle(Request request, Response response, Callback callback)
{
int download = (int)request.getHeaders().getLongField(downloadBytes);
byte[] content = new byte[download];
@ -301,7 +301,7 @@ public class HTTP2Test extends AbstractTest
start(new Handler.Abstract()
{
@Override
public boolean process(Request request, Response response, Callback callback)
public boolean handle(Request request, Response response, Callback callback)
{
response.setStatus(status);
callback.succeeded();
@ -337,7 +337,7 @@ public class HTTP2Test extends AbstractTest
start(new Handler.Abstract()
{
@Override
public boolean process(Request request, Response response, Callback callback)
public boolean handle(Request request, Response response, Callback callback)
{
assertEquals(host, Request.getServerName(request));
assertEquals(port, Request.getServerPort(request));
@ -752,7 +752,7 @@ public class HTTP2Test extends AbstractTest
start(new Handler.Abstract()
{
@Override
public boolean process(Request request, Response response, Callback callback)
public boolean handle(Request request, Response response, Callback callback)
{
callback.succeeded();
return true;
@ -777,7 +777,7 @@ public class HTTP2Test extends AbstractTest
start(new Handler.Abstract()
{
@Override
public boolean process(Request request, Response response, Callback callback)
public boolean handle(Request request, Response response, Callback callback)
{
response.getHeaders().put(":custom", "special");
callback.succeeded();
@ -813,7 +813,7 @@ public class HTTP2Test extends AbstractTest
start(new Handler.Abstract()
{
@Override
public boolean process(Request request, Response response, Callback callback) throws Exception
public boolean handle(Request request, Response response, Callback callback) throws Exception
{
response.getHeaders().put(":custom", "special");
try

8
jetty-core/jetty-http2/jetty-http2-tests/src/test/java/org/eclipse/jetty/http2/tests/HttpClientTransportOverHTTP2Test.java
View File

@ -195,7 +195,7 @@ public class HttpClientTransportOverHTTP2Test extends AbstractTest
start(new Handler.Abstract()
{
@Override
public boolean process(Request request, org.eclipse.jetty.server.Response response, Callback callback)
public boolean handle(Request request, org.eclipse.jetty.server.Response response, Callback callback)
{
HttpVersion version = HttpVersion.fromString(request.getConnectionMetaData().getProtocol());
response.setStatus(version == HttpVersion.HTTP_2 ? HttpStatus.OK_200 : HttpStatus.INTERNAL_SERVER_ERROR_500);
@ -221,7 +221,7 @@ public class HttpClientTransportOverHTTP2Test extends AbstractTest
start(new Handler.Abstract()
{
@Override
public boolean process(Request request, org.eclipse.jetty.server.Response response, Callback callback)
public boolean handle(Request request, org.eclipse.jetty.server.Response response, Callback callback)
{
Callback.Completable.with(c -> response.write(false, ByteBuffer.allocate(1), c))
.whenComplete((r, x) ->
@ -397,7 +397,7 @@ public class HttpClientTransportOverHTTP2Test extends AbstractTest
start(new Handler.Abstract()
{
@Override
public boolean process(Request request, org.eclipse.jetty.server.Response response, Callback callback)
public boolean handle(Request request, org.eclipse.jetty.server.Response response, Callback callback)
{
HttpURI httpURI = request.getHttpURI();
assertEquals(path, httpURI.getPath());
@ -423,7 +423,7 @@ public class HttpClientTransportOverHTTP2Test extends AbstractTest
start(new Handler.Abstract()
{
@Override
public boolean process(Request request, org.eclipse.jetty.server.Response response, Callback callback)
public boolean handle(Request request, org.eclipse.jetty.server.Response response, Callback callback)
{
HttpURI httpURI = request.getHttpURI();
assertEquals(path, httpURI.getPath());

6
jetty-core/jetty-http2/jetty-http2-tests/src/test/java/org/eclipse/jetty/http2/tests/IdleTimeoutTest.java
View File

@ -339,7 +339,7 @@ public class IdleTimeoutTest extends AbstractTest
start(new Handler.Abstract()
{
@Override
public boolean process(Request request, Response response, Callback callback)
public boolean handle(Request request, Response response, Callback callback)
{
sleep(2 * idleTimeout);
@ -589,7 +589,7 @@ public class IdleTimeoutTest extends AbstractTest
private Callback _callback;
@Override
public boolean process(Request request, Response response, Callback callback)
public boolean handle(Request request, Response response, Callback callback)
{
_request = request;
_callback = callback;
@ -675,7 +675,7 @@ public class IdleTimeoutTest extends AbstractTest
server.setHandler(new Handler.Abstract()
{
@Override
public boolean process(Request request, Response response, Callback callback)
public boolean handle(Request request, Response response, Callback callback)
{
System.err.println("processing request " + request.getHttpURI().getPath());
requests.incrementAndGet();

16
jetty-core/jetty-http2/jetty-http2-tests/src/test/java/org/eclipse/jetty/http2/tests/MaxConcurrentStreamsTest.java
View File

@ -104,7 +104,7 @@ public class MaxConcurrentStreamsTest extends AbstractTest
start(1, new Handler.Abstract()
{
@Override
public boolean process(Request request, org.eclipse.jetty.server.Response response, Callback callback)
public boolean handle(Request request, org.eclipse.jetty.server.Response response, Callback callback)
{
// Sleep a bit to allow the second request to be queued.
sleep(sleep);
@ -147,7 +147,7 @@ public class MaxConcurrentStreamsTest extends AbstractTest
start(concurrency, new Handler.Abstract()
{
@Override
public boolean process(Request request, org.eclipse.jetty.server.Response response, Callback callback)
public boolean handle(Request request, org.eclipse.jetty.server.Response response, Callback callback)
{
callback.succeeded();
return true;
@ -181,7 +181,7 @@ public class MaxConcurrentStreamsTest extends AbstractTest
startServer(maxConcurrentStreams, new Handler.Abstract()
{
@Override
public boolean process(Request request, org.eclipse.jetty.server.Response response, Callback callback)
public boolean handle(Request request, org.eclipse.jetty.server.Response response, Callback callback)
{
sleep(1000);
callback.succeeded();
@ -264,7 +264,7 @@ public class MaxConcurrentStreamsTest extends AbstractTest
start(maxStreams, new Handler.Abstract()
{
@Override
public boolean process(Request request, org.eclipse.jetty.server.Response response, Callback callback)
public boolean handle(Request request, org.eclipse.jetty.server.Response response, Callback callback)
{
sleep(sleep);
callback.succeeded();
@ -308,7 +308,7 @@ public class MaxConcurrentStreamsTest extends AbstractTest
start(1, new Handler.Abstract()
{
@Override
public boolean process(Request request, org.eclipse.jetty.server.Response response, Callback callback)
public boolean handle(Request request, org.eclipse.jetty.server.Response response, Callback callback)
{
sleep(sleep);
callback.succeeded();
@ -339,7 +339,7 @@ public class MaxConcurrentStreamsTest extends AbstractTest
start(maxConcurrent, new Handler.Abstract()
{
@Override
public boolean process(Request request, org.eclipse.jetty.server.Response response, Callback callback)
public boolean handle(Request request, org.eclipse.jetty.server.Response response, Callback callback)
{
sleep(sleep);
callback.succeeded();
@ -368,7 +368,7 @@ public class MaxConcurrentStreamsTest extends AbstractTest
start(1, new Handler.Abstract()
{
@Override
public boolean process(Request request, org.eclipse.jetty.server.Response response, Callback callback)
public boolean handle(Request request, org.eclipse.jetty.server.Response response, Callback callback)
{
response.write(true, ByteBuffer.wrap(data), callback);
return true;
@ -429,7 +429,7 @@ public class MaxConcurrentStreamsTest extends AbstractTest
start(1, new Handler.Abstract()
{
@Override
public boolean process(Request request, org.eclipse.jetty.server.Response response, Callback callback)
public boolean handle(Request request, org.eclipse.jetty.server.Response response, Callback callback)
{
if (Request.getPathInContext(request).endsWith("/1"))
sleep(2 * timeout);

8
jetty-core/jetty-http2/jetty-http2-tests/src/test/java/org/eclipse/jetty/http2/tests/MultiplexedConnectionPoolTest.java
View File

@ -139,7 +139,7 @@ public class MultiplexedConnectionPoolTest
startServer(new Handler.Abstract()
{
@Override
public boolean process(Request request, Response response, Callback callback) throws Exception
public boolean handle(Request request, Response response, Callback callback) throws Exception
{
int req = Integer.parseInt(Request.getPathInContext(request).substring(1));
reqExecutingLatches[req].countDown();
@ -240,7 +240,7 @@ public class MultiplexedConnectionPoolTest
startServer(new Handler.Abstract()
{
@Override
public boolean process(Request request, Response response, Callback callback)
public boolean handle(Request request, Response response, Callback callback)
{
int req = Integer.parseInt(Request.getPathInContext(request).substring(1));
Content.Sink.write(response, true, "req " + req + " executed", callback);
@ -316,7 +316,7 @@ public class MultiplexedConnectionPoolTest
startServer(new Handler.Abstract()
{
@Override
public boolean process(Request request, Response response, Callback callback)
public boolean handle(Request request, Response response, Callback callback)
{
callback.succeeded();
return true;
@ -389,7 +389,7 @@ public class MultiplexedConnectionPoolTest
startServer(new Handler.Abstract()
{
@Override
public boolean process(Request request, Response response, Callback callback) throws Exception
public boolean handle(Request request, Response response, Callback callback) throws Exception
{
if (Request.getPathInContext(request).equals("/block"))
{

4
jetty-core/jetty-http2/jetty-http2-tests/src/test/java/org/eclipse/jetty/http2/tests/PriorKnowledgeHTTP2OverTLSTest.java
View File

@ -132,7 +132,7 @@ public class PriorKnowledgeHTTP2OverTLSTest
start(new Handler.Abstract()
{
@Override
public boolean process(Request request, Response response, Callback callback)
public boolean handle(Request request, Response response, Callback callback)
{
callback.succeeded();
return true;
@ -172,7 +172,7 @@ public class PriorKnowledgeHTTP2OverTLSTest
start(new Handler.Abstract()
{
@Override
public boolean process(Request request, Response response, Callback callback)
public boolean handle(Request request, Response response, Callback callback)
{
callback.succeeded();
return true;

4
jetty-core/jetty-http2/jetty-http2-tests/src/test/java/org/eclipse/jetty/http2/tests/ProxyProtocolTest.java
View File

@ -84,7 +84,7 @@ public class ProxyProtocolTest
startServer(new Handler.Abstract()
{
@Override
public boolean process(Request request, Response response, Callback callback)
public boolean handle(Request request, Response response, Callback callback)
{
assertEquals("1.2.3.4", Request.getRemoteAddr(request));
assertEquals(1111, Request.getRemotePort(request));
@ -128,7 +128,7 @@ public class ProxyProtocolTest
startServer(new Handler.Abstract()
{
@Override
public boolean process(Request request, Response response, Callback callback)
public boolean handle(Request request, Response response, Callback callback)
{
assertEquals("10.0.0.4", Request.getRemoteAddr(request));
assertEquals(33824, Request.getRemotePort(request));

6
jetty-core/jetty-http2/jetty-http2-tests/src/test/java/org/eclipse/jetty/http2/tests/PushedResourcesTest.java
View File

@ -111,7 +111,7 @@ public class PushedResourcesTest extends AbstractTest
start(new Handler.Abstract()
{
@Override
public boolean process(Request request, Response response, Callback callback)
public boolean handle(Request request, Response response, Callback callback)
{
String target = Request.getPathInContext(request);
if (target.equals(path1))
@ -176,7 +176,7 @@ public class PushedResourcesTest extends AbstractTest
start(new Handler.Abstract()
{
@Override
public boolean process(Request request, Response response, Callback callback)
public boolean handle(Request request, Response response, Callback callback)
{
String target = Request.getPathInContext(request);
if (target.equals(oldPath))
@ -226,7 +226,7 @@ public class PushedResourcesTest extends AbstractTest
start(new Handler.Abstract()
{
@Override
public boolean process(Request request, Response response, Callback callback)
public boolean handle(Request request, Response response, Callback callback)
{
String requestURI = Request.getPathInContext(request);
if (requestURI.endsWith(primaryResource))

2
jetty-core/jetty-http2/jetty-http2-tests/src/test/java/org/eclipse/jetty/http2/tests/ResponseTrailerTest.java
View File

@ -61,7 +61,7 @@ public class ResponseTrailerTest extends AbstractTest
start(new Handler.Abstract()
{
@Override
public boolean process(Request request, Response response, Callback callback)
public boolean handle(Request request, Response response, Callback callback)
{
// Send empty response trailers.
response.setTrailersSupplier(() -> HttpFields.EMPTY);

4
jetty-core/jetty-http2/jetty-http2-tests/src/test/java/org/eclipse/jetty/http2/tests/ReverseProxyTest.java
View File

@ -122,7 +122,7 @@ public class ReverseProxyTest
startServer(new Handler.Abstract()
{
@Override
public boolean process(Request request, Response response, Callback callback)
public boolean handle(Request request, Response response, Callback callback)
{
assertEquals(HttpVersion.HTTP_1_1.asString(), request.getConnectionMetaData().getProtocol());
callback.succeeded();
@ -160,7 +160,7 @@ public class ReverseProxyTest
startServer(new Handler.Abstract()
{
@Override
public boolean process(Request request, Response response, Callback callback)
public boolean handle(Request request, Response response, Callback callback)
{
response.write(true, ByteBuffer.wrap(content), Callback.from(() ->
{

2
jetty-core/jetty-http2/jetty-http2-tests/src/test/java/org/eclipse/jetty/http2/tests/SmallThreadPoolLoadTest.java
View File

@ -192,7 +192,7 @@ public class SmallThreadPoolLoadTest extends AbstractTest
private static class LoadHandler extends Handler.Abstract
{
@Override
public boolean process(Request request, Response response, Callback callback) throws Exception
public boolean handle(Request request, Response response, Callback callback) throws Exception
{
switch (HttpMethod.fromString(request.getMethod()))
{

22
jetty-core/jetty-http2/jetty-http2-tests/src/test/java/org/eclipse/jetty/http2/tests/StreamResetTest.java
View File

@ -265,7 +265,7 @@ public class StreamResetTest extends AbstractTest
start(new Handler.Abstract()
{
@Override
public boolean process(Request request, Response response, Callback callback) throws Exception
public boolean handle(Request request, Response response, Callback callback) throws Exception
{
Charset charset = StandardCharsets.UTF_8;
byte[] data = "AFTER RESET".getBytes(charset);
@ -350,7 +350,7 @@ public class StreamResetTest extends AbstractTest
start(new Handler.Abstract()
{
@Override
public boolean process(Request request, Response response, Callback callback) throws Exception
public boolean handle(Request request, Response response, Callback callback) throws Exception
{
Charset charset = StandardCharsets.UTF_8;
ByteBuffer data = charset.encode("AFTER RESET");
@ -429,7 +429,7 @@ public class StreamResetTest extends AbstractTest
start(new Handler.Abstract()
{
@Override
public boolean process(Request request, Response response, Callback callback) throws Exception
public boolean handle(Request request, Response response, Callback callback) throws Exception
{
// Wait for the data to be sent.
assertTrue(dataLatch.await(5, TimeUnit.SECONDS));
@ -479,7 +479,7 @@ public class StreamResetTest extends AbstractTest
server.setHandler(new Handler.Abstract()
{
@Override
public boolean process(Request request, Response response, Callback callback) throws Exception
public boolean handle(Request request, Response response, Callback callback) throws Exception
{
requestOnServer.get().countDown();
@ -588,7 +588,7 @@ public class StreamResetTest extends AbstractTest
start(new Handler.Abstract()
{
@Override
public boolean process(Request request, Response response, Callback callback) throws Exception
public boolean handle(Request request, Response response, Callback callback) throws Exception
{
// Wait to let the data sent by the client to be queued.
Thread.sleep(1000);
@ -633,7 +633,7 @@ public class StreamResetTest extends AbstractTest
start(new Handler.Abstract()
{
@Override
public boolean process(Request request, Response response, Callback callback)
public boolean handle(Request request, Response response, Callback callback)
{
new Thread(() ->
{
@ -695,7 +695,7 @@ public class StreamResetTest extends AbstractTest
start(new Handler.Abstract()
{
@Override
public boolean process(Request request, Response response, Callback callback)
public boolean handle(Request request, Response response, Callback callback)
{
try
{
@ -758,7 +758,7 @@ public class StreamResetTest extends AbstractTest
start(new Handler.Abstract()
{
@Override
public boolean process(Request request, Response response, Callback callback)
public boolean handle(Request request, Response response, Callback callback)
{
response.write(true, ByteBuffer.wrap(new byte[10 * windowSize]), Callback.from(callback::succeeded, x ->
{
@ -809,7 +809,7 @@ public class StreamResetTest extends AbstractTest
start(new Handler.Abstract()
{
@Override
public boolean process(Request request, Response response, Callback callback) throws Exception
public boolean handle(Request request, Response response, Callback callback) throws Exception
{
try
{
@ -859,7 +859,7 @@ public class StreamResetTest extends AbstractTest
start(new Handler.Abstract()
{
@Override
public boolean process(Request request, Response response, Callback callback)
public boolean handle(Request request, Response response, Callback callback)
{
flusherRef.set(((AbstractEndPoint)request.getConnectionMetaData().getConnection().getEndPoint()).getWriteFlusher());
flusherLatch.countDown();
@ -938,7 +938,7 @@ public class StreamResetTest extends AbstractTest
start(new Handler.Abstract()
{
@Override
public boolean process(Request request, Response response, Callback callback) throws Exception
public boolean handle(Request request, Response response, Callback callback) throws Exception
{
String target = Request.getPathInContext(request);
if (target.equals("/1"))

10
jetty-core/jetty-http2/jetty-http2-tests/src/test/java/org/eclipse/jetty/http2/tests/TrailersTest.java
View File

@ -113,7 +113,7 @@ public class TrailersTest extends AbstractTest
private Callback _callback;
@Override
public boolean process(Request request, Response response, Callback callback)
public boolean handle(Request request, Response response, Callback callback)
{
_request = request;
_callback = callback;
@ -263,7 +263,7 @@ public class TrailersTest extends AbstractTest
start(new Handler.Abstract()
{
@Override
public boolean process(Request request, Response response, Callback callback) throws Exception
public boolean handle(Request request, Response response, Callback callback) throws Exception
{
HttpFields.Mutable trailers = HttpFields.build();
response.setTrailersSupplier(() -> trailers);
@ -325,7 +325,7 @@ public class TrailersTest extends AbstractTest
start(new Handler.Abstract()
{
@Override
public boolean process(Request request, Response response, Callback callback)
public boolean handle(Request request, Response response, Callback callback)
{
callback.succeeded();
return true;
@ -364,7 +364,7 @@ public class TrailersTest extends AbstractTest
start(new Handler.Abstract()
{
@Override
public boolean process(Request request, Response response, Callback callback) throws Exception
public boolean handle(Request request, Response response, Callback callback) throws Exception
{
try
{
@ -417,7 +417,7 @@ public class TrailersTest extends AbstractTest
start(new Handler.Abstract()
{
@Override
public boolean process(Request request, Response response, Callback callback)
public boolean handle(Request request, Response response, Callback callback)
{
HttpFields.Mutable trailers = HttpFields.build();
response.setTrailersSupplier(() -> trailers);

2
jetty-core/jetty-http3/jetty-http3-tests/src/test/java/org/eclipse/jetty/http3/tests/DataDemandTest.java
View File

@ -623,7 +623,7 @@ public class DataDemandTest extends AbstractClientServerTest
start(new Handler.Abstract()
{
@Override
public boolean process(Request request, Response response, Callback callback)
public boolean handle(Request request, Response response, Callback callback)
{
Content.Sink.write(response, true, "hello", callback);
return true;

4
jetty-core/jetty-http3/jetty-http3-tests/src/test/java/org/eclipse/jetty/http3/tests/HandlerClientServerTest.java
View File

@ -50,7 +50,7 @@ public class HandlerClientServerTest extends AbstractClientServerTest
start(new Handler.Abstract()
{
@Override
public boolean process(Request request, Response response, Callback callback)
public boolean handle(Request request, Response response, Callback callback)
{
serverLatch.countDown();
callback.succeeded();
@ -86,7 +86,7 @@ public class HandlerClientServerTest extends AbstractClientServerTest
start(new Handler.Abstract()
{
@Override
public boolean process(Request request, Response response, Callback callback)
public boolean handle(Request request, Response response, Callback callback)
{
Content.copy(request, response, callback);
serverLatch.countDown();

10
jetty-core/jetty-http3/jetty-http3-tests/src/test/java/org/eclipse/jetty/http3/tests/HttpClientTransportOverHTTP3Test.java
View File

@ -41,7 +41,7 @@ public class HttpClientTransportOverHTTP3Test extends AbstractClientServerTest
start(new Handler.Abstract()
{
@Override
public boolean process(Request request, org.eclipse.jetty.server.Response response, Callback callback)
public boolean handle(Request request, org.eclipse.jetty.server.Response response, Callback callback)
{
HttpVersion version = HttpVersion.fromString(request.getConnectionMetaData().getProtocol());
response.setStatus(version == HttpVersion.HTTP_3 ? HttpStatus.OK_200 : HttpStatus.INTERNAL_SERVER_ERROR_500);
@ -69,7 +69,7 @@ public class HttpClientTransportOverHTTP3Test extends AbstractClientServerTest
start(new Handler.Abstract()
{
@Override
public boolean process(Request request, org.eclipse.jetty.server.Response response, Callback callback)
public boolean handle(Request request, org.eclipse.jetty.server.Response response, Callback callback)
{
Content.Sink.write(response, true, content, callback);
return true;
@ -88,7 +88,7 @@ public class HttpClientTransportOverHTTP3Test extends AbstractClientServerTest
start(new Handler.Abstract()
{
@Override
public boolean process(Request request, org.eclipse.jetty.server.Response response, Callback callback)
public boolean handle(Request request, org.eclipse.jetty.server.Response response, Callback callback)
{
response.write(true, ByteBuffer.wrap(new byte[10 * 1024]), callback);
return true;
@ -152,7 +152,7 @@ public class HttpClientTransportOverHTTP3Test extends AbstractClientServerTest
start(new Handler.Abstract()
{
@Override
public boolean process(Request request, org.eclipse.jetty.server.Response response, Callback callback)
public boolean handle(Request request, org.eclipse.jetty.server.Response response, Callback callback)
{
callback.succeeded();
return true;
@ -197,7 +197,7 @@ public class HttpClientTransportOverHTTP3Test extends AbstractClientServerTest
start(new Handler.Abstract()
{
@Override
public boolean process(Request request, org.eclipse.jetty.server.Response response, Callback callback)
public boolean handle(Request request, org.eclipse.jetty.server.Response response, Callback callback)
{
Content.Sink.write(response, true, "0", callback);
return true;

4
jetty-core/jetty-jndi/src/test/java/org/eclipse/jetty/jndi/java/TestJNDI.java
View File

@ -94,7 +94,7 @@ public class TestJNDI
private Object testObj = new Object();
@Override
public boolean process(Request request, Response response, Callback callback) throws Exception
public boolean handle(Request request, Response response, Callback callback) throws Exception
{
return false;
}
@ -148,7 +148,7 @@ public class TestJNDI
private Object testObj = new Object();
@Override
public boolean process(Request request, Response response, Callback callback) throws Exception
public boolean handle(Request request, Response response, Callback callback) throws Exception
{
return false;
}

2
jetty-core/jetty-keystore/src/test/java/org/eclipse/jetty/test/keystore/KeystoreGeneratorTest.java
View File

@ -81,7 +81,7 @@ public class KeystoreGeneratorTest
_server.setHandler(new Handler.Abstract()
{
@Override
public boolean process(Request request, Response response, Callback callback)
public boolean handle(Request request, Response response, Callback callback)
{
response.setStatus(200);
response.write(true, BufferUtil.toBuffer("success"), callback);

2
jetty-core/jetty-proxy/src/main/java/org/eclipse/jetty/proxy/ProxyHandler.java
View File

@ -212,7 +212,7 @@ public abstract class ProxyHandler extends Handler.Abstract
}
@Override
public boolean process(Request clientToProxyRequest, Response proxyToClientResponse, Callback proxyToClientCallback)
public boolean handle(Request clientToProxyRequest, Response proxyToClientResponse, Callback proxyToClientCallback)
{
if (LOG.isDebugEnabled())
LOG.debug("""

4
jetty-core/jetty-proxy/src/test/java/org/eclipse/jetty/proxy/ForwardProxyWithDynamicTransportTest.java
View File

@ -246,7 +246,7 @@ public class ForwardProxyWithDynamicTransportTest
start(new Handler.Abstract()
{
@Override
public boolean process(Request request, Response response, Callback callback)
public boolean handle(Request request, Response response, Callback callback)
{
response.setStatus(status);
callback.succeeded();
@ -576,7 +576,7 @@ public class ForwardProxyWithDynamicTransportTest
private static class EmptyServerHandler extends Handler.Abstract
{
@Override
public boolean process(Request request, Response response, Callback callback)
public boolean handle(Request request, Response response, Callback callback)
{
callback.succeeded();
return true;

2
jetty-core/jetty-proxy/src/test/java/org/eclipse/jetty/proxy/InterimResponseProxyTest.java
View File

@ -41,7 +41,7 @@ public class InterimResponseProxyTest extends AbstractProxyTest
startServer(new Handler.Abstract()
{
@Override
public boolean process(Request request, Response response, Callback callback)
public boolean handle(Request request, Response response, Callback callback)
{
CompletableFuture<Void> completable = response.writeInterim(HttpStatus.CONTINUE_100, HttpFields.EMPTY)
.thenCompose(ignored -> Promise.Completable.<String>with(p -> Content.Source.asString(request, StandardCharsets.UTF_8, p)))

4
jetty-core/jetty-proxy/src/test/java/org/eclipse/jetty/proxy/ReverseProxyTest.java
View File

@ -47,7 +47,7 @@ public class ReverseProxyTest extends AbstractProxyTest
startServer(new Handler.Abstract()
{
@Override
public boolean process(Request request, Response response, Callback callback) throws Exception
public boolean handle(Request request, Response response, Callback callback) throws Exception
{
String requestContent = Content.Source.asString(request);
assertEquals(clientContent, requestContent);
@ -97,7 +97,7 @@ public class ReverseProxyTest extends AbstractProxyTest
startServer(new Handler.Abstract()
{
@Override
public boolean process(Request request, Response response, Callback callback)
public boolean handle(Request request, Response response, Callback callback)
{
assertEquals("", request.getHeaders().get(emptyHeaderName));
response.getHeaders().put(emptyHeaderName, "");

2
jetty-core/jetty-quic/jetty-quic-client/src/test/java/org/eclipse/jetty/quic/client/End2EndClientTest.java
View File

@ -76,7 +76,7 @@ public class End2EndClientTest
server.setHandler(new Handler.Abstract()
{
@Override
public boolean process(Request request, Response response, Callback callback)
public boolean handle(Request request, Response response, Callback callback)
{
Content.Sink.write(response, true, responseContent, callback);
return true;

4
jetty-core/jetty-quic/jetty-quic-server/src/test/java/org/eclipse/jetty/quic/server/ServerQuicConnectorTest.java
View File

@ -50,7 +50,7 @@ public class ServerQuicConnectorTest
server.setHandler(new Handler.Abstract()
{
@Override
public boolean process(Request request, Response response, Callback callback)
public boolean handle(Request request, Response response, Callback callback)
{
Content.Sink.write(response, true, """
<html>
@ -92,7 +92,7 @@ public class ServerQuicConnectorTest
server.setHandler(new Handler.Abstract()
{
@Override
public boolean process(Request request, Response response, Callback callback)
public boolean handle(Request request, Response response, Callback callback)
{
int contentLength = 16 * 1024 * 1024;
response.getHeaders().putLongField(HttpHeader.CONTENT_LENGTH, contentLength);

2
jetty-core/jetty-rewrite/src/main/java/org/eclipse/jetty/rewrite/RewriteCustomizer.java
View File

@ -35,7 +35,7 @@ public class RewriteCustomizer extends RuleContainer implements Customizer
try
{
// TODO: rule are able to complete the request/response, but customizers cannot.
Processor input = new Processor(request);
Handler input = new Handler(request);
return matchAndApply(input);
}
catch (IOException e)

4
jetty-core/jetty-rewrite/src/main/java/org/eclipse/jetty/rewrite/handler/CompactPathRule.java
View File

@ -26,7 +26,7 @@ import org.eclipse.jetty.util.URIUtil;
public class CompactPathRule extends Rule
{
@Override
public Processor matchAndApply(Processor input) throws IOException
public Handler matchAndApply(Handler input) throws IOException
{
String path = input.getHttpURI().getCanonicalPath();
String compacted = URIUtil.compactPath(path);
@ -36,6 +36,6 @@ public class CompactPathRule extends Rule
HttpURI uri = Request.newHttpURIFrom(input, compacted);
return new HttpURIProcessor(input, uri);
return new HttpURIHandler(input, uri);
}
}

8
jetty-core/jetty-rewrite/src/main/java/org/eclipse/jetty/rewrite/handler/CookiePatternRule.java
View File

@ -76,7 +76,7 @@ public class CookiePatternRule extends PatternRule
}
@Override
public Processor apply(Processor input) throws IOException
public Handler apply(Handler input) throws IOException
{
// Check that cookie is not already set
List<HttpCookie> cookies = Request.getCookies(input);
@ -89,13 +89,13 @@ public class CookiePatternRule extends PatternRule
}
}
return new Processor(input)
return new Handler(input)
{
@Override
public boolean process(Response response, Callback callback) throws Exception
public boolean handle(Response response, Callback callback) throws Exception
{
Response.addCookie(response, HttpCookie.from(_name, _value));
return super.process(response, callback);
return super.handle(response, callback);
}
};
}

4
jetty-core/jetty-rewrite/src/main/java/org/eclipse/jetty/rewrite/handler/ForceRequestHeaderValueRule.java
View File

@ -43,7 +43,7 @@ public class ForceRequestHeaderValueRule extends Rule
}
@Override
public Processor matchAndApply(Processor input) throws IOException
public Handler matchAndApply(Handler input) throws IOException
{
HttpFields headers = input.getHeaders();
String existingValue = headers.get(headerName);
@ -59,7 +59,7 @@ public class ForceRequestHeaderValueRule extends Rule
HttpFields.Mutable newHeaders = HttpFields.build(headers);
newHeaders.remove(headerName);
newHeaders.add(headerName, headerValue);
return new Processor(input)
return new Handler(input)
{
@Override
public HttpFields getHeaders()

4
jetty-core/jetty-rewrite/src/main/java/org/eclipse/jetty/rewrite/handler/ForwardedSchemeHeaderRule.java
View File

@ -33,9 +33,9 @@ public class ForwardedSchemeHeaderRule extends HeaderRule
}
@Override
protected Processor apply(Processor input, String value)
protected Handler apply(Handler input, String value)
{
HttpURI newURI = HttpURI.build(input.getHttpURI()).scheme(getScheme());
return new HttpURIProcessor(input, newURI);
return new HttpURIHandler(input, newURI);
}
}

8
jetty-core/jetty-rewrite/src/main/java/org/eclipse/jetty/rewrite/handler/HeaderPatternRule.java
View File

@ -73,18 +73,18 @@ public class HeaderPatternRule extends PatternRule
}
@Override
public Processor apply(Processor input) throws IOException
public Handler apply(Handler input) throws IOException
{
return new Processor(input)
return new Handler(input)
{
@Override
public boolean process(Response response, Callback callback) throws Exception
public boolean handle(Response response, Callback callback) throws Exception
{
if (isAdd())
response.getHeaders().add(getHeaderName(), getHeaderValue());
else
response.getHeaders().put(getHeaderName(), getHeaderValue());
return super.process(response, callback);
return super.handle(response, callback);
}
};
}

8
jetty-core/jetty-rewrite/src/main/java/org/eclipse/jetty/rewrite/handler/HeaderRegexRule.java
View File

@ -74,18 +74,18 @@ public class HeaderRegexRule extends RegexRule
}
@Override
protected Processor apply(Processor input, Matcher matcher) throws IOException
protected Handler apply(Handler input, Matcher matcher) throws IOException
{
return new Processor(input)
return new Handler(input)
{
@Override
public boolean process(Response response, Callback callback) throws Exception
public boolean handle(Response response, Callback callback) throws Exception
{
if (isAdd())
response.getHeaders().add(getHeaderName(), matcher.replaceAll(getHeaderValue()));
else
response.getHeaders().put(getHeaderName(), matcher.replaceAll(getHeaderValue()));
return super.process(response, callback);
return super.handle(response, callback);
}
};
}

8
jetty-core/jetty-rewrite/src/main/java/org/eclipse/jetty/rewrite/handler/HeaderRule.java
View File

@ -48,7 +48,7 @@ public abstract class HeaderRule extends Rule
}
@Override
public Processor matchAndApply(Processor input) throws IOException
public Handler matchAndApply(Handler input) throws IOException
{
String value = input.getHeaders().get(getHeaderName());
if (value == null)
@ -62,12 +62,12 @@ public abstract class HeaderRule extends Rule
/**
* <p>Invoked after the header matched the {@code Request} headers to apply the rule's logic.</p>
*
* @param input the input {@code Request} and {@code Processor}
* @param input the input {@code Request} and {@code Handler}
* @param value the header value
* @return the possibly wrapped {@code Request} and {@code Processor}
* @return the possibly wrapped {@code Request} and {@code Handler}
* @throws IOException if applying the rule failed
*/
protected abstract Processor apply(Processor input, String value) throws IOException;
protected abstract Handler apply(Handler input, String value) throws IOException;
@Override
public String toString()

8
jetty-core/jetty-rewrite/src/main/java/org/eclipse/jetty/rewrite/handler/InvalidURIRule.java
View File

@ -74,7 +74,7 @@ public class InvalidURIRule extends Rule
}
@Override
public Processor matchAndApply(Processor input) throws IOException
public Handler matchAndApply(Handler input) throws IOException
{
String path = input.getHttpURI().getDecodedPath();
@ -90,12 +90,12 @@ public class InvalidURIRule extends Rule
return null;
}
private Processor apply(Processor input)
private Handler apply(Handler input)
{
return new Processor(input)
return new Handler(input)
{
@Override
public boolean process(Response response, Callback callback)
public boolean handle(Response response, Callback callback)
{
String message = getMessage();
if (StringUtil.isBlank(message))

8
jetty-core/jetty-rewrite/src/main/java/org/eclipse/jetty/rewrite/handler/PatternRule.java
View File

@ -45,7 +45,7 @@ public abstract class PatternRule extends Rule
}
@Override
public Processor matchAndApply(Processor input) throws IOException
public Handler matchAndApply(Handler input) throws IOException
{
if (ServletPathSpec.match(_pattern, input.getHttpURI().getPath()))
return apply(input);
@ -55,11 +55,11 @@ public abstract class PatternRule extends Rule
/**
* <p>Invoked after the Servlet pattern matched the URI path to apply the rule's logic.</p>
*
* @param input the input {@code Request} and {@code Processor}
* @return the possibly wrapped {@code Request} and {@code Processor}
* @param input the input {@code Request} and {@code Handler}
* @return the possibly wrapped {@code Request} and {@code Handler}
* @throws IOException if applying the rule failed
*/
protected abstract Processor apply(Processor input) throws IOException;
protected abstract Handler apply(Handler input) throws IOException;
@Override
public String toString()

6
jetty-core/jetty-rewrite/src/main/java/org/eclipse/jetty/rewrite/handler/RedirectPatternRule.java
View File

@ -77,12 +77,12 @@ public class RedirectPatternRule extends PatternRule
}
@Override
public Processor apply(Processor input) throws IOException
public Handler apply(Handler input) throws IOException
{
return new Processor(input)
return new Handler(input)
{
@Override
public boolean process(Response response, Callback callback)
public boolean handle(Response response, Callback callback)
{
String location = getLocation();
response.setStatus(getStatusCode());

6
jetty-core/jetty-rewrite/src/main/java/org/eclipse/jetty/rewrite/handler/RedirectRegexRule.java
View File

@ -76,12 +76,12 @@ public class RedirectRegexRule extends RegexRule
}
@Override
protected Processor apply(Processor input, Matcher matcher) throws IOException
protected Handler apply(Handler input, Matcher matcher) throws IOException
{
return new Processor(input)
return new Handler(input)
{
@Override
public boolean process(Response response, Callback callback)
public boolean handle(Response response, Callback callback)
{
String target = matcher.replaceAll(getLocation());
response.setStatus(_statusCode);

8
jetty-core/jetty-rewrite/src/main/java/org/eclipse/jetty/rewrite/handler/RegexRule.java
View File

@ -52,7 +52,7 @@ public abstract class RegexRule extends Rule
}
@Override
public Processor matchAndApply(Processor input) throws IOException
public Handler matchAndApply(Handler input) throws IOException
{
String target = input.getHttpURI().getPathQuery();
Matcher matcher = _regex.matcher(target);
@ -64,12 +64,12 @@ public abstract class RegexRule extends Rule
/**
* <p>Invoked after the regular expression matched the URI path to apply the rule's logic.</p>
*
* @param input the input {@code Request} and {@code Processor}
* @param input the input {@code Request} and {@code Handler}
* @param matcher the {@code Matcher} that matched the request path, with capture groups available for replacement.
* @return the possibly wrapped {@code Request} and {@code Processor}
* @return the possibly wrapped {@code Request} and {@code Handler}
* @throws IOException if applying the rule failed
*/
protected abstract Processor apply(Processor input, Matcher matcher) throws IOException;
protected abstract Handler apply(Handler input, Matcher matcher) throws IOException;
@Override
public String toString()

6
jetty-core/jetty-rewrite/src/main/java/org/eclipse/jetty/rewrite/handler/ResponsePatternRule.java
View File

@ -75,15 +75,15 @@ public class ResponsePatternRule extends PatternRule
}
@Override
public Processor apply(Processor input) throws IOException
public Handler apply(Handler input) throws IOException
{
if (getCode() < HttpStatus.CONTINUE_100)
return null;
return new Processor(input)
return new Handler(input)
{
@Override
public boolean process(Response response, Callback callback)
public boolean handle(Response response, Callback callback)
{
String message = getMessage();
if (StringUtil.isBlank(message))

12
jetty-core/jetty-rewrite/src/main/java/org/eclipse/jetty/rewrite/handler/RewriteHandler.java
View File

@ -105,20 +105,20 @@ public class RewriteHandler extends Handler.Wrapper
}
@Override
public boolean process(Request request, Response response, Callback callback) throws Exception
public boolean handle(Request request, Response response, Callback callback) throws Exception
{
if (!isStarted())
return false;
Rule.Processor input = new Rule.Processor(request);
Rule.Processor output = _rules.matchAndApply(input);
Rule.Handler input = new Rule.Handler(request);
Rule.Handler output = _rules.matchAndApply(input);
// No rule matched, call super with the original request.
if (output == null)
return super.process(request, response, callback);
return super.handle(request, response, callback);
// At least one rule matched, call super with the result of the rule applications.
output.setProcessor(getHandler());
return output.process(output, response, callback);
output.setHandler(getHandler());
return output.handle(output, response, callback);
}
}

4
jetty-core/jetty-rewrite/src/main/java/org/eclipse/jetty/rewrite/handler/RewritePatternRule.java
View File

@ -63,7 +63,7 @@ public class RewritePatternRule extends PatternRule
}
@Override
public Processor apply(Processor input) throws IOException
public Handler apply(Handler input) throws IOException
{
HttpURI httpURI = input.getHttpURI();
String newQuery = URIUtil.addQueries(httpURI.getQuery(), _query);
@ -71,7 +71,7 @@ public class RewritePatternRule extends PatternRule
HttpURI newURI = HttpURI.build(httpURI, newPath, httpURI.getParam(), newQuery);
if (LOG.isDebugEnabled())
LOG.debug("rewriting {} to {}", httpURI, newURI);
return new HttpURIProcessor(input, newURI);
return new HttpURIHandler(input, newURI);
}
@Override

4
jetty-core/jetty-rewrite/src/main/java/org/eclipse/jetty/rewrite/handler/RewriteRegexRule.java
View File

@ -48,13 +48,13 @@ public class RewriteRegexRule extends RegexRule
}
@Override
public Processor apply(Processor input, Matcher matcher) throws IOException
public Handler apply(Handler input, Matcher matcher) throws IOException
{
HttpURI httpURI = input.getHttpURI();
String replacedPath = matcher.replaceAll(replacement);
HttpURI newURI = HttpURI.build(httpURI, replacedPath);
return new HttpURIProcessor(input, newURI);
return new HttpURIHandler(input, newURI);
}
@Override

58
jetty-core/jetty-rewrite/src/main/java/org/eclipse/jetty/rewrite/handler/Rule.java
View File

@ -22,7 +22,7 @@ import org.eclipse.jetty.util.Callback;
/**
* <p>An abstract rule that, upon matching a certain condition, may wrap
* the {@code Request} or the {@code Processor} to execute custom logic.</p>
* the {@code Request} or the {@code Handler} to execute custom logic.</p>
*/
public abstract class Rule
{
@ -31,14 +31,14 @@ public abstract class Rule
/**
* <p>Tests whether the given {@code Request} should apply, and if so the rule logic is triggered.</p>
*
* @param input the input {@code Request} and {@code Processor}
* @return the possibly wrapped {@code Request} and {@code Processor}, or {@code null} if the rule did not match
* @param input the input {@code Request} and {@code Handler}
* @return the possibly wrapped {@code Request} and {@code Handler}, or {@code null} if the rule did not match
* @throws IOException if applying the rule failed
*/
public abstract Processor matchAndApply(Processor input) throws IOException;
public abstract Handler matchAndApply(Handler input) throws IOException;
/**
* @return when {@code true}, rules after this one are not processed
* @return when {@code true}, rules after this one are not invoked
*/
public boolean isTerminating()
{
@ -60,61 +60,61 @@ public abstract class Rule
}
/**
* <p>A {@link Request.Wrapper} that is also a {@link org.eclipse.jetty.server.Request.Processor},
* <p>A {@link Request.Wrapper} that is also a {@link Handler},
* used to chain a sequence of {@link Rule}s together.
* The rule processor is initialized with the initial request, then it is
* The rule handler is initialized with the initial request, then it is
* passed to a chain of rules before the child {@code Handler} is
* passed in {@link #setProcessor(Processor)}. Finally, the response
* and callback are provided in a call to {@link #process(Request, Response, Callback)},
* which calls the {@link #process(Response, Callback)}.</p>
* passed in {@link #setHandler(Handler)}. Finally, the response
* and callback are provided in a call to {@link #handle(Request, Response, Callback)},
* which calls the {@link #handle(Response, Callback)}.</p>
*/
public static class Processor extends Request.Wrapper implements Request.Processor
public static class Handler extends Request.Wrapper implements Request.Handler
{
private volatile Processor _processor;
private volatile Handler _handler;
public Processor(Request request)
public Handler(Request request)
{
super(request);
}
@Override
public boolean process(Request request, Response response, Callback callback) throws Exception
public boolean handle(Request request, Response response, Callback callback) throws Exception
{
return process(response, callback);
return handle(response, callback);
}
/**
* <p>Processes this wrapped request together with the passed response and
* callback, using the processor set in {@link #setProcessor(Processor)}.
* This method should be extended if additional processing of the wrapped
* <p>Handles this wrapped request together with the passed response and
* callback, using the handler set in {@link #setHandler(Handler)}.
* This method should be extended if additional handling of the wrapped
* request is required.</p>
* @param response The response
* @param callback The callback
* @throws Exception If there is a problem processing
* @see #setProcessor(Processor)
* @throws Exception If there is a problem handling
* @see #setHandler(Handler)
*/
protected boolean process(Response response, Callback callback) throws Exception
protected boolean handle(Response response, Callback callback) throws Exception
{
Processor processor = _processor;
return processor != null && processor.process(this, response, callback);
Handler handler = _handler;
return handler != null && handler.handle(this, response, callback);
}
/**
* <p>Wraps the given {@code Processor} within this instance and returns this instance.</p>
* <p>Wraps the given {@code Handler} within this instance and returns this instance.</p>
*
* @param processor the {@code Processor} to wrap
* @param handler the {@code Handler} to wrap
*/
public void setProcessor(Processor processor)
public void setHandler(Handler handler)
{
_processor = processor;
_handler = handler;
}
}
public static class HttpURIProcessor extends Processor
public static class HttpURIHandler extends Handler
{
private final HttpURI _uri;
public HttpURIProcessor(Request request, HttpURI uri)
public HttpURIHandler(Request request, HttpURI uri)
{
super(request);
_uri = uri;

8
jetty-core/jetty-rewrite/src/main/java/org/eclipse/jetty/rewrite/handler/RuleContainer.java
View File

@ -98,12 +98,12 @@ public class RuleContainer extends Rule implements Iterable<Rule>, Dumpable
/**
* <p>Processes the rules.</p>
*
* @param input the input {@code Request} and {@code Processor}
* @return a {@code Request} and {@code Processor}, possibly wrapped by rules to implement the rule's logic,
* @param input the input {@code Request} and {@code Handler}
* @return a {@code Request} and {@code Handler}, possibly wrapped by rules to implement the rule's logic,
* or {@code null} if no rule matched
*/
@Override
public Processor matchAndApply(Processor input) throws IOException
public Handler matchAndApply(Handler input) throws IOException
{
String originalPathAttribute = getOriginalPathAttribute();
if (originalPathAttribute != null)
@ -120,7 +120,7 @@ public class RuleContainer extends Rule implements Iterable<Rule>, Dumpable
{
if (LOG.isDebugEnabled())
LOG.debug("applying {}", rule);
Processor output = rule.matchAndApply(input);
Handler output = rule.matchAndApply(input);
if (output == null)
{
if (LOG.isDebugEnabled())

2
jetty-core/jetty-rewrite/src/main/java/org/eclipse/jetty/rewrite/handler/TerminatingPatternRule.java
View File

@ -37,7 +37,7 @@ public class TerminatingPatternRule extends PatternRule
}
@Override
protected Processor apply(Processor input) throws IOException
protected Handler apply(Handler input) throws IOException
{
return input;
}

2
jetty-core/jetty-rewrite/src/main/java/org/eclipse/jetty/rewrite/handler/TerminatingRegexRule.java
View File

@ -40,7 +40,7 @@ public class TerminatingRegexRule extends RegexRule
}
@Override
public Processor apply(Processor input, Matcher matcher) throws IOException
public Handler apply(Handler input, Matcher matcher) throws IOException
{
return input;
}

2
jetty-core/jetty-rewrite/src/main/java/org/eclipse/jetty/rewrite/handler/VirtualHostRuleContainer.java
View File

@ -55,7 +55,7 @@ public class VirtualHostRuleContainer extends RuleContainer
}
@Override
public Processor matchAndApply(Processor input) throws IOException
public Handler matchAndApply(Handler input) throws IOException
{
if (_virtualHosts.isEmpty())
return super.matchAndApply(input);

2
jetty-core/jetty-rewrite/src/test/java/org/eclipse/jetty/rewrite/handler/CompactPathRuleTest.java
View File

@ -57,7 +57,7 @@ public class CompactPathRuleTest extends AbstractRuleTest
start(new Handler.Abstract()
{
@Override
public boolean process(Request request, Response response, Callback callback)
public boolean handle(Request request, Response response, Callback callback)
{
Content.Sink.write(response, true, request.getHttpURI().getPathQuery(), callback);
return true;

2
jetty-core/jetty-rewrite/src/test/java/org/eclipse/jetty/rewrite/handler/CookiePatternRuleTest.java
View File

@ -40,7 +40,7 @@ public class CookiePatternRuleTest extends AbstractRuleTest
start(new Handler.Abstract()
{
@Override
public boolean process(Request request, Response response, Callback callback)
public boolean handle(Request request, Response response, Callback callback)
{
response.getHeaders().put(HttpHeader.CONTENT_TYPE, "text/plain;charset=utf-8");
Content.Sink.write(response, false, "pathInContext=%s%n".formatted(Request.getPathInContext(request)), Callback.NOOP);

2
jetty-core/jetty-rewrite/src/test/java/org/eclipse/jetty/rewrite/handler/ForceRequestHeaderValueRuleTest.java
View File

@ -37,7 +37,7 @@ public class ForceRequestHeaderValueRuleTest extends AbstractRuleTest
start(new Handler.Abstract()
{
@Override
public boolean process(Request request, Response response, Callback callback)
public boolean handle(Request request, Response response, Callback callback)
{
response.getHeaders().put(HttpHeader.CONTENT_TYPE, "text/plain;charset=utf-8");
for (HttpField httpField : request.getHeaders())

2
jetty-core/jetty-rewrite/src/test/java/org/eclipse/jetty/rewrite/handler/ForwardedSchemeHeaderRuleTest.java
View File

@ -30,7 +30,7 @@ public class ForwardedSchemeHeaderRuleTest extends AbstractRuleTest
start(new Handler.Abstract()
{
@Override
public boolean process(Request request, Response response, Callback callback)
public boolean handle(Request request, Response response, Callback callback)
{
response.getHeaders().put("request-scheme", request.getHttpURI().getScheme());
callback.succeeded();

2
jetty-core/jetty-rewrite/src/test/java/org/eclipse/jetty/rewrite/handler/HeaderPatternRuleTest.java
View File

@ -32,7 +32,7 @@ public class HeaderPatternRuleTest extends AbstractRuleTest
start(new Handler.Abstract()
{
@Override
public boolean process(Request request, Response response, Callback callback)
public boolean handle(Request request, Response response, Callback callback)
{
callback.succeeded();
return true;

2
jetty-core/jetty-rewrite/src/test/java/org/eclipse/jetty/rewrite/handler/HeaderRegexRuleTest.java
View File

@ -33,7 +33,7 @@ public class HeaderRegexRuleTest extends AbstractRuleTest
start(new Handler.Abstract()
{
@Override
public boolean process(Request request, Response response, Callback callback)
public boolean handle(Request request, Response response, Callback callback)
{
callback.succeeded();
return true;

2
jetty-core/jetty-rewrite/src/test/java/org/eclipse/jetty/rewrite/handler/InvalidURIRuleTest.java
View File

@ -33,7 +33,7 @@ public class InvalidURIRuleTest extends AbstractRuleTest
start(new Handler.Abstract()
{
@Override
public boolean process(Request request, Response response, Callback callback)
public boolean handle(Request request, Response response, Callback callback)
{
callback.succeeded();
return true;

4
jetty-core/jetty-rewrite/src/test/java/org/eclipse/jetty/rewrite/handler/PatternRuleTest.java
View File

@ -104,7 +104,7 @@ public class PatternRuleTest extends AbstractRuleTest
start(new Handler.Abstract()
{
@Override
public boolean process(Request request, Response response, Callback callback)
public boolean handle(Request request, Response response, Callback callback)
{
callback.succeeded();
return true;
@ -158,7 +158,7 @@ public class PatternRuleTest extends AbstractRuleTest
}
@Override
public Processor apply(Processor input)
public Handler apply(Handler input)
{
_applied = true;
return input;

2
jetty-core/jetty-rewrite/src/test/java/org/eclipse/jetty/rewrite/handler/RedirectPatternRuleTest.java
View File

@ -32,7 +32,7 @@ public class RedirectPatternRuleTest extends AbstractRuleTest
start(new Handler.Abstract()
{
@Override
public boolean process(Request request, Response response, Callback callback)
public boolean handle(Request request, Response response, Callback callback)
{
callback.succeeded();
return true;

2
jetty-core/jetty-rewrite/src/test/java/org/eclipse/jetty/rewrite/handler/RedirectRegexRuleTest.java
View File

@ -32,7 +32,7 @@ public class RedirectRegexRuleTest extends AbstractRuleTest
start(new Handler.Abstract()
{
@Override
public boolean process(Request request, Response response, Callback callback)
public boolean handle(Request request, Response response, Callback callback)
{
callback.succeeded();
return true;

4
jetty-core/jetty-rewrite/src/test/java/org/eclipse/jetty/rewrite/handler/RegexRuleTest.java
View File

@ -71,7 +71,7 @@ public class RegexRuleTest extends AbstractRuleTest
start(new Handler.Abstract()
{
@Override
public boolean process(Request request, Response response, Callback callback)
public boolean handle(Request request, Response response, Callback callback)
{
callback.succeeded();
return true;
@ -125,7 +125,7 @@ public class RegexRuleTest extends AbstractRuleTest
}
@Override
public Processor apply(Processor input, Matcher matcher)
public Handler apply(Handler input, Matcher matcher)
{
_applied = true;
return input;

2
jetty-core/jetty-rewrite/src/test/java/org/eclipse/jetty/rewrite/handler/ResponsePatternRuleTest.java
View File

@ -33,7 +33,7 @@ public class ResponsePatternRuleTest extends AbstractRuleTest
start(new Handler.Abstract()
{
@Override
public boolean process(Request request, Response response, Callback callback)
public boolean handle(Request request, Response response, Callback callback)
{
callback.succeeded();
return true;

2
jetty-core/jetty-rewrite/src/test/java/org/eclipse/jetty/rewrite/handler/RewriteHandlerTest.java
View File

@ -40,7 +40,7 @@ public class RewriteHandlerTest extends AbstractRuleTest
start(new Handler.Abstract()
{
@Override
public boolean process(Request request, Response response, Callback callback)
public boolean handle(Request request, Response response, Callback callback)
{
response.setStatus(HttpStatus.OK_200);
response.getHeaders().put("X-Path", request.getHttpURI().getPath());

2
jetty-core/jetty-rewrite/src/test/java/org/eclipse/jetty/rewrite/handler/RewritePatternRuleTest.java
View File

@ -49,7 +49,7 @@ public class RewritePatternRuleTest extends AbstractRuleTest
start(new Handler.Abstract()
{
@Override
public boolean process(Request request, Response response, Callback callback)
public boolean handle(Request request, Response response, Callback callback)
{
response.getHeaders().put("X-URI", request.getHttpURI().getPathQuery());
callback.succeeded();

2
jetty-core/jetty-rewrite/src/test/java/org/eclipse/jetty/rewrite/handler/RewriteRegexRuleTest.java
View File

@ -73,7 +73,7 @@ public class RewriteRegexRuleTest extends AbstractRuleTest
start(new Handler.Abstract()
{
@Override
public boolean process(Request request, Response response, Callback callback)
public boolean handle(Request request, Response response, Callback callback)
{
HttpURI httpURI = request.getHttpURI();
response.getHeaders().put("X-Path", httpURI.getPath());

2
jetty-core/jetty-rewrite/src/test/java/org/eclipse/jetty/rewrite/handler/TerminatingPatternRuleTest.java
View File

@ -41,7 +41,7 @@ public class TerminatingPatternRuleTest extends AbstractRuleTest
start(new Handler.Abstract()
{
@Override
public boolean process(Request request, Response response, Callback callback)
public boolean handle(Request request, Response response, Callback callback)
{
response.setStatus(HttpStatus.CREATED_201);
callback.succeeded();

2
jetty-core/jetty-rewrite/src/test/java/org/eclipse/jetty/rewrite/handler/TerminatingRegexRuleTest.java
View File

@ -41,7 +41,7 @@ public class TerminatingRegexRuleTest extends AbstractRuleTest
start(new Handler.Abstract()
{
@Override
public boolean process(Request request, Response response, Callback callback)
public boolean handle(Request request, Response response, Callback callback)
{
response.setStatus(HttpStatus.CREATED_201);
callback.succeeded();

2
jetty-core/jetty-rewrite/src/test/java/org/eclipse/jetty/rewrite/handler/VirtualHostRuleContainerTest.java
View File

@ -39,7 +39,7 @@ public class VirtualHostRuleContainerTest extends AbstractRuleTest
start(new Handler.Abstract()
{
@Override
public boolean process(Request request, Response response, Callback callback)
public boolean handle(Request request, Response response, Callback callback)
{
response.getHeaders().put("X-Path", request.getHttpURI().getPath());
callback.succeeded();

4
jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/Context.java
View File

@ -23,7 +23,7 @@ import org.eclipse.jetty.util.Decorator;
import org.eclipse.jetty.util.resource.Resource;
/**
* A Context for handling/processing a request.
* A Context for handling a request.
* Every request will always have a non-null context, which may initially be the Server context, or
* a context provided by a ContextHandler.
* <p>
@ -45,7 +45,7 @@ public interface Context extends Attributes, Decorator, Executor
Resource getBaseResource();
Request.Processor getErrorProcessor();
Request.Handler getErrorHandler();
List<String> getVirtualHosts();

26
jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/Handler.java
View File

@ -30,7 +30,7 @@ import org.slf4j.LoggerFactory;
/**
* <p>A Jetty component that handles HTTP requests, of any version (HTTP/1.1, HTTP/2 or HTTP/3).
* A {@code Handler} is a {@link Request.Processor} with the addition of {@link LifeCycle}
* A {@code Handler} is a {@link Request.Handler} with the addition of {@link LifeCycle}
* behaviours, plus variants that allow organizing {@code Handler}s as a tree structure.</p>
* <p>{@code Handler}s may wrap the {@link Request}, {@link Response} and/or {@link Callback} and
* then forward the wrapped instances to their children, so that they see a modified request;
@ -38,7 +38,7 @@ import org.slf4j.LoggerFactory;
* response; and/or to intercept the completion of the callback.
* <p>A {@code Handler} is an {@link Invocable} and implementations must respect
* the {@link InvocationType} they declare within calls to
* {@link #process(Request, Response, Callback)}.</p>
* {@link #handle(Request, Response, Callback)}.</p>
* <p>A minimal tree structure could be:</p>
* <pre>
* Server
@ -61,7 +61,7 @@ import org.slf4j.LoggerFactory;
* class SimpleHandler extends Handler.Abstract.NonBlocking
* {
* @Override
* public boolean process(Request request, Response response, Callback callback)
* public boolean handle(Request request, Response response, Callback callback)
* {
* // Implicitly sends a 200 OK response with no content.
* callback.succeeded();
@ -76,7 +76,7 @@ import org.slf4j.LoggerFactory;
* class YourHelloHandler extends Handler.Abstract.NonBlocking
* {
* @Override
* public boolean process(Request request, Response response, Callback callback)
* public boolean handle(Request request, Response response, Callback callback)
* {
* if (request.getHttpURI().getPath().startsWith("/yourPath"))
* {
@ -96,10 +96,10 @@ import org.slf4j.LoggerFactory;
* class ConditionalHandler extends Handler.Wrapper
* {
* @Override
* public boolean process(Request request, Response response, Callback callback)
* public boolean handle(Request request, Response response, Callback callback)
* {
* if (request.getHttpURI().getPath().startsWith("/yourPath")
* return super.process(request, response, callback);
* return super.handle(request, response, callback);
* if (request.getHttpURI().getPath().startsWith("/wrong"))
* {
* Response.writeError(request, response, callback, 400);
@ -110,10 +110,10 @@ import org.slf4j.LoggerFactory;
* }
* }</pre>
*
* @see Request.Processor
* @see Request.Handler
*/
@ManagedObject("Handler")
public interface Handler extends LifeCycle, Destroyable, Invocable, Request.Processor
public interface Handler extends LifeCycle, Destroyable, Request.Handler
{
/**
* @return the {@code Server} associated with this {@code Handler}
@ -605,10 +605,10 @@ public interface Handler extends LifeCycle, Destroyable, Invocable, Request.Proc
}
@Override
public boolean process(Request request, Response response, Callback callback) throws Exception
public boolean handle(Request request, Response response, Callback callback) throws Exception
{
Handler next = getHandler();
return next != null && next.process(request, response, callback);
return next != null && next.handle(request, response, callback);
}
@Override
@ -623,7 +623,7 @@ public interface Handler extends LifeCycle, Destroyable, Invocable, Request.Proc
/**
* <p>A {@link Handler.Container} that contains a list of other {@code Handler}s that are
* tried in sequence by {@link #process(Request, Response, Callback)}.</p>
* tried in sequence by {@link #handle(Request, Response, Callback)}.</p>
*/
class Sequence extends AbstractContainer implements Collection
{
@ -658,11 +658,11 @@ public interface Handler extends LifeCycle, Destroyable, Invocable, Request.Proc
}
@Override
public boolean process(Request request, Response response, Callback callback) throws Exception
public boolean handle(Request request, Response response, Callback callback) throws Exception
{
for (Handler h : _handlers)
{
if (h.process(request, response, callback))
if (h.handle(request, response, callback))
return true;
}
return false;

44
jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/Request.java
View File

@ -36,7 +36,7 @@ import org.eclipse.jetty.http.HttpURI;
import org.eclipse.jetty.http.MetaData;
import org.eclipse.jetty.http.Trailers;
import org.eclipse.jetty.io.Content;
import org.eclipse.jetty.server.handler.ErrorProcessor;
import org.eclipse.jetty.server.handler.ErrorHandler;
import org.eclipse.jetty.server.internal.HttpChannelState;
import org.eclipse.jetty.util.Attributes;
import org.eclipse.jetty.util.Callback;
@ -51,7 +51,7 @@ import org.eclipse.jetty.util.thread.Invocable;
* <p>The representation of an HTTP request, for any protocol version (HTTP/1.1, HTTP/2, HTTP/3).</p>
* <p>The typical idiom to read request content is the following:</p>
* <pre>{@code
* public boolean process(Request request, Response response, Callback callback)
* public boolean handle(Request request, Response response, Callback callback)
* {
* // Reject requests not appropriate for this handler.
* if (!request.getHttpURI().getPath().startsWith("/yourPath"))
@ -63,7 +63,7 @@ import org.eclipse.jetty.util.thread.Invocable;
* if (chunk == null)
* {
* // The chunk is not currently available, demand to be called back.
* request.demand(() -> process(request, response, callback));
* request.demand(() -> handle(request, response, callback));
* return true;
* }
*
@ -72,7 +72,7 @@ import org.eclipse.jetty.util.thread.Invocable;
* Throwable failure = error.getCause();
*
* // Handle errors.
* // Mark the processing as complete, either generating a custom
* // Mark the handling as complete, either generating a custom
* // response and succeeding the callback, or failing the callback.
* callback.failed(failure);
* return true;
@ -86,7 +86,7 @@ import org.eclipse.jetty.util.thread.Invocable;
*
* // Generate a response.
*
* // Mark the processing as complete.
* // Mark the handling as complete.
* callback.succeeded();
*
* return true;
@ -102,7 +102,7 @@ import org.eclipse.jetty.util.thread.Invocable;
* {
* // Generate a response.
*
* // Mark the processing as complete.
* // Mark the handling as complete.
* callback.succeeded();
*
* return true;
@ -254,7 +254,7 @@ public interface Request extends Attributes, Content.Source
* <p>Adds a listener for asynchronous errors.</p>
* <p>The listener is a predicate function that should return {@code true} to indicate
* that the function has completed (either successfully or with a failure) the callback
* received from {@link Handler#process(Request, Response, Callback)}, or
* received from {@link org.eclipse.jetty.server.Handler#handle(Request, Response, Callback)}, or
* {@code false} otherwise.</p>
* <p>Listeners are processed in sequence, and the first that returns {@code true}
* stops the processing of subsequent listeners, which are therefore not invoked.</p>
@ -494,24 +494,24 @@ public interface Request extends Attributes, Content.Source
}
/**
* <p>A processor for an HTTP request and response.</p>
* <p>The processing typically involves reading the request content (if any) and producing a response.</p>
* <p>A handler for an HTTP request and response.</p>
* <p>The handling typically involves reading the request content (if any) and producing a response.</p>
*/
@FunctionalInterface
interface Processor extends Invocable
interface Handler extends Invocable
{
/**
* <p>Invoked to process the passed HTTP request and response.</p>
* <p>The request is accepted by returning true, then processing <em>must</em> be concluded by
* completing the passed callback. The processing may be asynchronous, i.e. this method may return true and
* <p>Invoked to handle the passed HTTP request and response.</p>
* <p>The request is accepted by returning true, then handling <em>must</em> be concluded by
* completing the passed callback. The handling may be asynchronous, i.e. this method may return true and
* complete the given callback later, possibly from a different thread. If this method returns false,
* then the callback must not be invoked and any mutation on the response reversed.</p>
* <p>Exceptions thrown by this method are processed by an {@link ErrorProcessor},
* <p>Exceptions thrown by this method may be subsequently handled by an {@link ErrorHandler},
* if present, otherwise a default HTTP 500 error is generated and the
* callback completed while writing the error response.</p>
* <p>The simplest implementation is:</p>
* <pre>
* public boolean process(Request request, Response response, Callback callback)
* public boolean handle(Request request, Response response, Callback callback)
* {
* callback.succeeded();
* return true;
@ -519,23 +519,23 @@ public interface Request extends Attributes, Content.Source
* </pre>
* <p>A HelloWorld implementation is:</p>
* <pre>
* public boolean process(Request request, Response response, Callback callback)
* public boolean handle(Request request, Response response, Callback callback)
* {
* response.write(true, ByteBuffer.wrap("Hello World\n".getBytes(StandardCharsets.UTF_8)), callback);
* return true;
* }
* </pre>
*
* @param request the HTTP request to process
* @param response the HTTP response to process
* @param callback the callback to complete when the processing is complete
* @return True if an only if the request will be processed, a response generated and the callback eventually called.
* @param request the HTTP request to handle
* @param response the HTTP response to handle
* @param callback the callback to complete when the handling is complete
* @return True if an only if the request will be handled, a response generated and the callback eventually called.
* This may occur within the scope of the call to this method, or asynchronously some time later. If false
* is returned, then this method must not generate a response, nor complete the callback.
* @throws Exception if there is a failure during the processing. Catchers cannot assume that the callback will be
* @throws Exception if there is a failure during the handling. Catchers cannot assume that the callback will be
* called and thus should attempt to complete the request as if a false had been returned.
*/
boolean process(Request request, Response response, Callback callback) throws Exception;
boolean handle(Request request, Response response, Callback callback) throws Exception;
}
/**

5
jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/ResourceService.java
View File

@ -504,12 +504,11 @@ public class ResourceService
if (welcomeAction == null)
return false;
welcomeActionProcess(request, response, callback, welcomeAction);
handleWelcomeAction(request, response, callback, welcomeAction);
return true;
}
// TODO: could use a better name
protected void welcomeActionProcess(Request request, Response response, Callback callback, WelcomeAction welcomeAction) throws IOException
protected void handleWelcomeAction(Request request, Response response, Callback callback, WelcomeAction welcomeAction) throws IOException
{
switch (welcomeAction.type)
{

14
jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/Response.java
View File

@ -32,7 +32,7 @@ import org.eclipse.jetty.http.HttpStatus;
import org.eclipse.jetty.http.Trailers;
import org.eclipse.jetty.io.Content;
import org.eclipse.jetty.io.QuietException;
import org.eclipse.jetty.server.handler.ErrorProcessor;
import org.eclipse.jetty.server.handler.ErrorHandler;
import org.eclipse.jetty.server.internal.HttpChannelState;
import org.eclipse.jetty.util.Callback;
import org.eclipse.jetty.util.StringUtil;
@ -277,15 +277,15 @@ public interface Response extends Content.Sink
response.setStatus(status);
// TODO: detect recursion when an ErrorProcessor calls this method, otherwise StackOverflowError.
// TODO: detect recursion when an ErrorHandler calls this method, otherwise StackOverflowError.
Context context = request.getContext();
Request.Processor errorProcessor = context.getErrorProcessor();
if (errorProcessor != null)
Request.Handler errorHandler = context.getErrorHandler();
if (errorHandler != null)
{
Request errorRequest = new ErrorProcessor.ErrorRequest(request, status, message, cause);
Request errorRequest = new ErrorHandler.ErrorRequest(request, status, message, cause);
try
{
if (errorProcessor.process(errorRequest, response, callback))
if (errorHandler.handle(errorRequest, response, callback))
return;
}
catch (Exception e)
@ -296,7 +296,7 @@ public interface Response extends Content.Sink
}
// fall back to very empty error page
response.getHeaders().put(ErrorProcessor.ERROR_CACHE_CONTROL);
response.getHeaders().put(ErrorHandler.ERROR_CACHE_CONTROL);
response.write(true, null, callback);
}

34
jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/Server.java
View File

@ -39,7 +39,7 @@ import org.eclipse.jetty.io.ArrayByteBufferPool;
import org.eclipse.jetty.io.ByteBufferPool;
import org.eclipse.jetty.io.Connection;
import org.eclipse.jetty.server.handler.ContextHandler;
import org.eclipse.jetty.server.handler.ErrorProcessor;
import org.eclipse.jetty.server.handler.ErrorHandler;
import org.eclipse.jetty.util.Attributes;
import org.eclipse.jetty.util.Callback;
import org.eclipse.jetty.util.DecoratedObjectFactory;
@ -86,7 +86,7 @@ public class Server extends Handler.Wrapper implements Attributes
private boolean _dumpAfterStart;
private boolean _dumpBeforeStop;
private Handler _defaultHandler;
private Request.Processor _errorProcessor;
private Request.Handler _errorHandler;
private RequestLog _requestLog;
private boolean _dryRun;
private volatile DateField _dateField;
@ -154,7 +154,7 @@ public class Server extends Handler.Wrapper implements Attributes
}
/**
* @param defaultHandler The handler to use if no other handler is set or has processed the request. This handler should
* @param defaultHandler The handler to use if no other handler is set or has handled the request. This handler should
* always accept the request, even if only to send a 404.
*/
public void setDefaultHandler(Handler defaultHandler)
@ -167,10 +167,10 @@ public class Server extends Handler.Wrapper implements Attributes
}
@Override
public boolean process(Request request, Response response, Callback callback) throws Exception
public boolean handle(Request request, Response response, Callback callback) throws Exception
{
// Handle either with normal handler or default handler
return super.process(request, response, callback) || _defaultHandler != null && _defaultHandler.process(request, response, callback);
return super.handle(request, response, callback) || _defaultHandler != null && _defaultHandler.handle(request, response, callback);
}
public String getServerInfo()
@ -271,9 +271,9 @@ public class Server extends Handler.Wrapper implements Attributes
return _requestLog;
}
public Request.Processor getErrorProcessor()
public Request.Handler getErrorHandler()
{
return _errorProcessor;
return _errorHandler;
}
public void setRequestLog(RequestLog requestLog)
@ -282,10 +282,10 @@ public class Server extends Handler.Wrapper implements Attributes
_requestLog = requestLog;
}
public void setErrorProcessor(Request.Processor errorProcessor)
public void setErrorHandler(Request.Handler errorHandler)
{
updateBean(_errorProcessor, errorProcessor);
_errorProcessor = errorProcessor;
updateBean(_errorHandler, errorHandler);
_errorHandler = errorHandler;
}
@ManagedAttribute("version of this server")
@ -498,8 +498,8 @@ public class Server extends Handler.Wrapper implements Attributes
//Start a thread waiting to receive "stop" commands.
ShutdownMonitor.getInstance().start(); // initialize
if (_errorProcessor == null)
setErrorProcessor(new DynamicErrorProcessor());
if (_errorHandler == null)
setErrorHandler(new DynamicErrorHandler());
String gitHash = Jetty.GIT_HASH;
String timestamp = Jetty.BUILD_TIMESTAMP;
@ -648,8 +648,8 @@ public class Server extends Handler.Wrapper implements Attributes
multiException = ExceptionUtil.combine(multiException, e);
}
if (getErrorProcessor() instanceof DynamicErrorProcessor)
setErrorProcessor(null);
if (getErrorHandler() instanceof DynamicErrorHandler)
setErrorHandler(null);
if (getStopAtShutdown())
ShutdownThread.deregister(this);
@ -825,7 +825,7 @@ public class Server extends Handler.Wrapper implements Attributes
}
}
private static class DynamicErrorProcessor extends ErrorProcessor {}
private static class DynamicErrorHandler extends ErrorHandler {}
class ServerContext extends Attributes.Wrapper implements Context
{
@ -887,9 +887,9 @@ public class Server extends Handler.Wrapper implements Attributes
}
@Override
public Request.Processor getErrorProcessor()
public Request.Handler getErrorHandler()
{
return Server.this.getErrorProcessor();
return Server.this.getErrorHandler();
}
@Override

Some files were not shown because too many files have changed in this diff Show More