From 0ca6295cbc0a9f1c50eda1fc90a388165a5ee9ea Mon Sep 17 00:00:00 2001 From: Greg Wilkins Date: Fri, 17 Feb 2023 04:21:12 +1100 Subject: [PATCH] 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 Co-authored-by: Simone Bordet --- .../docs/programming/server/HandlerDocs.java | 20 +++---- .../server/http/HTTPServerDocs.java | 28 ++++----- inceptionDates.csv | 6 +- .../server/ConscryptHTTP2ServerTest.java | 2 +- .../jetty/alpn/java/server/JDK9ALPNTest.java | 6 +- .../client/ClientConnectionCloseTest.java | 8 +-- .../client/ConnectionPoolMaxUsageTest.java | 4 +- .../jetty/client/ContentResponseTest.java | 8 +-- .../jetty/client/EmptyServerHandler.java | 2 +- .../client/HostnameVerificationTest.java | 2 +- .../client/HttpClientAsyncContentTest.java | 2 +- .../jetty/client/HttpClientGZIPTest.java | 4 +- .../client/HttpClientProxyProtocolTest.java | 8 +-- .../jetty/client/HttpClientProxyTest.java | 2 +- .../jetty/client/HttpClientRedirectTest.java | 2 +- .../eclipse/jetty/client/HttpClientTest.java | 28 ++++----- .../jetty/client/HttpRequestAbortTest.java | 2 +- .../client/NetworkTrafficListenerTest.java | 4 +- .../util/MultiPartRequestContentTest.java | 2 +- .../org/eclipse/jetty/demo/HelloHandler.java | 2 +- .../fcgi/proxy/FastCGIProxyHandlerTest.java | 10 ++-- .../jetty/fcgi/server/HttpClientTest.java | 38 ++++++------ .../jetty/http/spi/HttpSpiContextHandler.java | 2 +- .../jetty/http2/tests/AsyncIOTest.java | 6 +- .../eclipse/jetty/http2/tests/BadURITest.java | 10 ++-- .../BlockedWritesWithSmallThreadPoolTest.java | 2 +- .../jetty/http2/tests/ContentLengthTest.java | 8 +-- .../jetty/http2/tests/H2SpecServer.java | 2 +- .../jetty/http2/tests/HTTP2CServer.java | 2 +- .../jetty/http2/tests/HTTP2ServerTest.java | 14 ++--- .../eclipse/jetty/http2/tests/HTTP2Test.java | 18 +++--- .../HttpClientTransportOverHTTP2Test.java | 8 +-- .../jetty/http2/tests/IdleTimeoutTest.java | 6 +- .../http2/tests/MaxConcurrentStreamsTest.java | 16 ++--- .../tests/MultiplexedConnectionPoolTest.java | 8 +-- .../tests/PriorKnowledgeHTTP2OverTLSTest.java | 4 +- .../jetty/http2/tests/ProxyProtocolTest.java | 4 +- .../http2/tests/PushedResourcesTest.java | 6 +- .../http2/tests/ResponseTrailerTest.java | 2 +- .../jetty/http2/tests/ReverseProxyTest.java | 4 +- .../http2/tests/SmallThreadPoolLoadTest.java | 2 +- .../jetty/http2/tests/StreamResetTest.java | 22 +++---- .../jetty/http2/tests/TrailersTest.java | 10 ++-- .../jetty/http3/tests/DataDemandTest.java | 2 +- .../http3/tests/HandlerClientServerTest.java | 4 +- .../HttpClientTransportOverHTTP3Test.java | 10 ++-- .../org/eclipse/jetty/jndi/java/TestJNDI.java | 4 +- .../test/keystore/KeystoreGeneratorTest.java | 2 +- .../org/eclipse/jetty/proxy/ProxyHandler.java | 2 +- .../ForwardProxyWithDynamicTransportTest.java | 4 +- .../jetty/proxy/InterimResponseProxyTest.java | 2 +- .../eclipse/jetty/proxy/ReverseProxyTest.java | 4 +- .../jetty/quic/client/End2EndClientTest.java | 2 +- .../quic/server/ServerQuicConnectorTest.java | 4 +- .../jetty/rewrite/RewriteCustomizer.java | 2 +- .../rewrite/handler/CompactPathRule.java | 4 +- .../rewrite/handler/CookiePatternRule.java | 8 +-- .../handler/ForceRequestHeaderValueRule.java | 4 +- .../handler/ForwardedSchemeHeaderRule.java | 4 +- .../rewrite/handler/HeaderPatternRule.java | 8 +-- .../rewrite/handler/HeaderRegexRule.java | 8 +-- .../jetty/rewrite/handler/HeaderRule.java | 8 +-- .../jetty/rewrite/handler/InvalidURIRule.java | 8 +-- .../jetty/rewrite/handler/PatternRule.java | 8 +-- .../rewrite/handler/RedirectPatternRule.java | 6 +- .../rewrite/handler/RedirectRegexRule.java | 6 +- .../jetty/rewrite/handler/RegexRule.java | 8 +-- .../rewrite/handler/ResponsePatternRule.java | 6 +- .../jetty/rewrite/handler/RewriteHandler.java | 12 ++-- .../rewrite/handler/RewritePatternRule.java | 4 +- .../rewrite/handler/RewriteRegexRule.java | 4 +- .../eclipse/jetty/rewrite/handler/Rule.java | 58 +++++++++--------- .../jetty/rewrite/handler/RuleContainer.java | 8 +-- .../handler/TerminatingPatternRule.java | 2 +- .../rewrite/handler/TerminatingRegexRule.java | 2 +- .../handler/VirtualHostRuleContainer.java | 2 +- .../rewrite/handler/CompactPathRuleTest.java | 2 +- .../handler/CookiePatternRuleTest.java | 2 +- .../ForceRequestHeaderValueRuleTest.java | 2 +- .../ForwardedSchemeHeaderRuleTest.java | 2 +- .../handler/HeaderPatternRuleTest.java | 2 +- .../rewrite/handler/HeaderRegexRuleTest.java | 2 +- .../rewrite/handler/InvalidURIRuleTest.java | 2 +- .../rewrite/handler/PatternRuleTest.java | 4 +- .../handler/RedirectPatternRuleTest.java | 2 +- .../handler/RedirectRegexRuleTest.java | 2 +- .../jetty/rewrite/handler/RegexRuleTest.java | 4 +- .../handler/ResponsePatternRuleTest.java | 2 +- .../rewrite/handler/RewriteHandlerTest.java | 2 +- .../handler/RewritePatternRuleTest.java | 2 +- .../rewrite/handler/RewriteRegexRuleTest.java | 2 +- .../handler/TerminatingPatternRuleTest.java | 2 +- .../handler/TerminatingRegexRuleTest.java | 2 +- .../handler/VirtualHostRuleContainerTest.java | 2 +- .../org/eclipse/jetty/server/Context.java | 4 +- .../org/eclipse/jetty/server/Handler.java | 26 ++++---- .../org/eclipse/jetty/server/Request.java | 44 +++++++------- .../eclipse/jetty/server/ResourceService.java | 5 +- .../org/eclipse/jetty/server/Response.java | 14 ++--- .../java/org/eclipse/jetty/server/Server.java | 34 +++++------ .../AbstractLatencyRecordingHandler.java | 4 +- .../handler/BufferedResponseHandler.java | 10 ++-- .../jetty/server/handler/ConnectHandler.java | 4 +- .../jetty/server/handler/ContextHandler.java | 46 +++++++------- .../handler/ContextHandlerCollection.java | 10 ++-- .../jetty/server/handler/DebugHandler.java | 4 +- .../jetty/server/handler/DefaultHandler.java | 2 +- .../jetty/server/handler/DelayedHandler.java | 8 +-- ...{ErrorProcessor.java => ErrorHandler.java} | 22 +++---- .../jetty/server/handler/GracefulHandler.java | 4 +- .../jetty/server/handler/HotSwapHandler.java | 4 +- .../server/handler/IdleTimeoutHandler.java | 4 +- .../server/handler/InetAccessHandler.java | 4 +- .../server/handler/MovedContextHandler.java | 2 +- .../server/handler/PathMappingsHandler.java | 4 +- .../server/handler/ProxiedRequestHandler.java | 4 +- ...essor.java => ReHandlingErrorHandler.java} | 18 +++--- .../jetty/server/handler/ResourceHandler.java | 6 +- .../handler/SecuredRedirectHandler.java | 4 +- .../jetty/server/handler/ShutdownHandler.java | 6 +- .../server/handler/StatisticsHandler.java | 26 ++++---- .../server/handler/ThreadLimitHandler.java | 24 ++++---- .../jetty/server/handler/TryPathsHandler.java | 6 +- .../server/handler/gzip/GzipHandler.java | 10 ++-- .../server/internal/HttpChannelState.java | 52 ++++++++-------- .../jetty/server/AbstractHttpTest.java | 2 +- .../jetty/server/ConnectionOpenCloseTest.java | 6 +- .../jetty/server/ConnectorTimeoutTest.java | 16 ++--- .../jetty/server/CustomRequestLogTest.java | 26 ++++---- ...ocessorTest.java => ErrorHandlerTest.java} | 60 +++++++++---------- .../jetty/server/ExtendedServerTest.java | 2 +- .../ForwardedRequestCustomizerTest.java | 2 +- .../jetty/server/GracefulHandlerTest.java | 26 ++++---- .../eclipse/jetty/server/HalfCloseTest.java | 4 +- .../jetty/server/HttpChannelEventTest.java | 2 +- .../eclipse/jetty/server/HttpChannelTest.java | 54 ++++++++--------- ...ttpConfigurationAuthorityOverrideTest.java | 16 ++--- .../jetty/server/HttpConnectionTest.java | 8 +-- .../jetty/server/HttpServerTestBase.java | 28 ++++----- .../jetty/server/HttpServerTestFixture.java | 12 ++-- .../server/LatencyRecordingHandlerTest.java | 2 +- .../jetty/server/MultiPartByteRangesTest.java | 2 +- .../jetty/server/NotAcceptingTest.java | 2 +- .../server/OptionalSslConnectionTest.java | 2 +- .../jetty/server/ProxyCustomizerTest.java | 2 +- .../jetty/server/ProxyProtocolTest.java | 6 +- .../eclipse/jetty/server/RequestLogTest.java | 2 +- .../org/eclipse/jetty/server/RequestTest.java | 12 ++-- .../server/ServerConnectorAcceptTest.java | 2 +- .../server/ServerConnectorHttpServerTest.java | 4 +- .../jetty/server/ServerConnectorTest.java | 4 +- .../SlowClientWithPipelinedRequestTest.java | 2 +- .../org/eclipse/jetty/server/StopTest.java | 4 +- .../jetty/server/ThreadStarvationTest.java | 4 +- .../handler/BufferedResponseHandlerTest.java | 2 +- .../handler/ContextHandlerCollectionTest.java | 6 +- .../handler/ContextHandlerDeepTest.java | 2 +- .../server/handler/ContextHandlerTest.java | 16 ++--- .../server/handler/DelayedHandlerTest.java | 28 ++++----- .../jetty/server/handler/DumpHandler.java | 2 +- .../jetty/server/handler/EchoHandler.java | 2 +- .../FileBufferedResponseHandlerTest.java | 24 ++++---- .../jetty/server/handler/HandlerTest.java | 6 +- .../jetty/server/handler/HelloHandler.java | 2 +- .../server/handler/InetAccessHandlerTest.java | 2 +- .../handler/MultiPartFormDataHandlerTest.java | 14 ++--- .../handler/PathMappingsHandlerTest.java | 2 +- .../server/handler/ShutdownHandlerTest.java | 4 +- .../server/handler/StatisticsHandlerTest.java | 44 +++++++------- .../handler/ThreadLimitHandlerTest.java | 10 ++-- .../server/handler/TryPathsHandlerTest.java | 10 ++-- .../server/handler/gzip/GzipHandlerTest.java | 18 +++--- .../jetty/server/ssl/SSLCloseTest.java | 2 +- .../jetty/server/ssl/SSLEngineTest.java | 2 +- .../ssl/SSLReadEOFAfterResponseTest.java | 2 +- .../SSLSelectChannelConnectorLoadTest.java | 2 +- .../ssl/ServerConnectorSslServerTest.java | 2 +- .../jetty/server/ssl/SlowClientsTest.java | 2 +- .../ssl/SniSslConnectionFactoryTest.java | 6 +- .../server/ssl/SslConnectionFactoryTest.java | 2 +- .../ssl/SslContextFactoryReloadTest.java | 4 +- .../jetty/server/ssl/SslUploadTest.java | 2 +- .../jetty/session/SimpleSessionHandler.java | 4 +- .../session/SimpleSessionHandlerTest.java | 2 +- .../transport/AsyncRequestContentTest.java | 2 +- .../transport/ConnectionStatisticsTest.java | 2 +- .../client/transport/EmptyServerHandler.java | 2 +- .../ForwardProxyWithDynamicTransportTest.java | 2 +- .../transport/HttpClientDemandTest.java | 20 +++---- .../transport/HttpClientIdleTimeoutTest.java | 4 +- .../client/transport/HttpClientLoadTest.java | 2 +- .../transport/HttpClientStreamTest.java | 42 ++++++------- .../test/client/transport/HttpClientTest.java | 54 ++++++++--------- .../transport/HttpClientTimeoutTest.java | 6 +- .../HttpClientTransportDynamicTest.java | 12 ++-- .../transport/HttpInterimResponseTest.java | 4 +- .../RoundRobinConnectionPoolTest.java | 6 +- .../test/client/transport/TrailersTest.java | 2 +- .../client/transport/VirtualThreadsTest.java | 2 +- .../unixdomain/server/UnixDomainTest.java | 6 +- .../core/server/WebSocketUpgradeHandler.java | 8 +-- .../core/chat/ChatWebSocketServer.java | 2 +- .../core/proxy/WebSocketProxyTest.java | 2 +- .../jetty/ee10/demos/HelloHandler.java | 2 +- .../eclipse/jetty/ee10/demos/HelloWorld.java | 2 +- .../jetty/ee10/demos/ManyHandlers.java | 6 +- .../jetty/examples/Jetty12Example.java | 2 +- .../jetty/ee10/proxy/ClientAuthProxyTest.java | 2 +- .../ee10/proxy/ConnectHandlerSSLTest.java | 2 +- .../jetty/ee10/proxy/ConnectHandlerTest.java | 2 +- .../jetty/ee10/proxy/EmptyServerHandler.java | 2 +- .../ee10/proxy/ForwardProxyServerTest.java | 4 +- .../ee10/proxy/ForwardProxyTLSServerTest.java | 22 +++---- .../QuickStartGeneratorConfiguration.java | 2 +- .../jetty/ee10/servlet/DefaultServlet.java | 2 +- .../jetty/ee10/servlet/ErrorHandler.java | 16 ++--- .../jetty/ee10/servlet/ServletChannel.java | 8 +-- .../ee10/servlet/ServletContextHandler.java | 4 +- .../jetty/ee10/servlet/ServletHandler.java | 2 +- .../ee10/servlet/ServletRequestState.java | 12 ++-- .../jetty/ee10/servlet/SessionHandler.java | 4 +- .../servlet/security/IdentityService.java | 2 +- .../servlet/security/SecurityHandler.java | 10 ++-- .../jetty/ee10/servlet/AsyncContextTest.java | 2 +- .../jetty/ee10/servlet/AsyncListenerTest.java | 4 +- .../jetty/ee10/servlet/AsyncServletTest.java | 2 +- .../jetty/ee10/servlet/DispatcherTest.java | 2 +- .../jetty/ee10/servlet/ErrorPageTest.java | 8 +-- .../servlet/ServletContextHandlerTest.java | 2 +- .../ee10/servlet/ServletRequestLogTest.java | 4 +- .../ee10/servlets/ThreadStarvationTest.java | 5 +- .../jetty/ee10/test/rfcs/RFC2616BaseTest.java | 2 +- .../webapp/StandardDescriptorProcessor.java | 4 +- .../jetty/ee10/webapp/WebAppContext.java | 2 +- .../ee10/webapp/WebXmlConfiguration.java | 4 +- .../jetty/ee9/demos/FastFileServer.java | 2 +- .../eclipse/jetty/ee9/demos/HelloHandler.java | 2 +- .../eclipse/jetty/ee9/demos/HelloWorld.java | 2 +- .../eclipse/jetty/ee9/demos/ManyHandlers.java | 6 +- .../jetty/ee9/nested/ContextHandler.java | 4 +- .../jetty/ee9/nested/AbstractHttpTest.java | 2 +- .../jetty/ee9/nested/AsyncCompletionTest.java | 4 +- .../jetty/ee9/nested/ContextHandlerTest.java | 2 +- .../ee9/nested/HttpServerTestFixture.java | 12 ++-- .../eclipse/jetty/ee9/nested/RequestTest.java | 4 +- .../jetty/ee9/proxy/ClientAuthProxyTest.java | 2 +- .../ee9/proxy/ConnectHandlerSSLTest.java | 2 +- .../jetty/ee9/proxy/ConnectHandlerTest.java | 2 +- .../jetty/ee9/proxy/EmptyServerHandler.java | 2 +- .../ee9/proxy/ForwardProxyServerTest.java | 4 +- .../ee9/proxy/ForwardProxyTLSServerTest.java | 14 ++--- .../jetty/ee9/servlet/AsyncListenerTest.java | 10 ++-- .../ee9/servlet/GzipHandlerIsHandledTest.java | 2 +- .../ee9/servlets/ThreadStarvationTest.java | 2 +- .../jetty/ee9/test/rfcs/RFC2616BaseTest.java | 3 +- 255 files changed, 986 insertions(+), 987 deletions(-) rename jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/{ErrorProcessor.java => ErrorHandler.java} (96%) rename jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/{ReHandlingErrorProcessor.java => ReHandlingErrorHandler.java} (84%) rename jetty-core/jetty-server/src/test/java/org/eclipse/jetty/server/{ErrorProcessorTest.java => ErrorHandlerTest.java} (93%) diff --git a/documentation/jetty-documentation/src/main/java/org/eclipse/jetty/docs/programming/server/HandlerDocs.java b/documentation/jetty-documentation/src/main/java/org/eclipse/jetty/docs/programming/server/HandlerDocs.java index de9466269443..77428cf7ceeb 100644 --- a/documentation/jetty-documentation/src/main/java/org/eclipse/jetty/docs/programming/server/HandlerDocs.java +++ b/documentation/jetty-documentation/src/main/java/org/eclipse/jetty/docs/programming/server/HandlerDocs.java @@ -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 boolean process(Request request, Response response, Callback callback) th 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 boolean process(Request request, Response response, Callback callback) 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 boolean process(Request request, Response response, Callback callback) 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 boolean process(Request request, Response response, Callback callback) th 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 boolean process(Request request, Response response, Callback callback) th 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 void cancel() 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 boolean process(Request request, Response response, Callback callback) 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 boolean process(Request request, Response response, Callback callback) 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("

Handler Demos

\n