Author: markt Date: Tue Oct 20 09:01:34 2015 New Revision: 1709547 URL: http://svn.apache.org/viewvc?rev=1709547&view=rev Log: Push methods down where they are not required in the Processor interface
Modified: tomcat/trunk/java/org/apache/coyote/AbstractProcessorLight.java tomcat/trunk/java/org/apache/coyote/Processor.java Modified: tomcat/trunk/java/org/apache/coyote/AbstractProcessorLight.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/AbstractProcessorLight.java?rev=1709547&r1=1709546&r2=1709547&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/AbstractProcessorLight.java (original) +++ tomcat/trunk/java/org/apache/coyote/AbstractProcessorLight.java Tue Oct 20 09:01:34 2015 @@ -131,6 +131,33 @@ public abstract class AbstractProcessorL } } + /** + * Service a 'standard' HTTP request. This method is called for both new + * requests and for requests that have partially read the HTTP request line + * or HTTP headers. Once the headers have been fully read this method is not + * called again until there is a new HTTP request to process. Note that the + * request type may change during processing which may result in one or more + * calls to {@link #dispatch(SocketStatus)}. + * + * @param socketWrapper The connection to process + * + * @return The state the caller should put the socket in when this method + * returns + * + * @throws IOException If an I/O error occurs during the processing of the + * request + */ + protected abstract SocketState service(SocketWrapperBase<?> socketWrapper) throws IOException; + + /** + * Process an in-progress request that is not longer in standard HTTP mode. + * Uses currently include Servlet 3.0 Async and HTTP upgrade connections. + * Further uses may be added in the future. These will typically start as + * HTTP requests. + */ + protected abstract SocketState dispatch(SocketStatus status); + + protected abstract SocketState asyncPostProcess(); protected abstract Log getLog(); } Modified: tomcat/trunk/java/org/apache/coyote/Processor.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/Processor.java?rev=1709547&r1=1709546&r2=1709547&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/Processor.java (original) +++ tomcat/trunk/java/org/apache/coyote/Processor.java Tue Oct 20 09:01:34 2015 @@ -54,34 +54,6 @@ public interface Processor { */ SocketState process(SocketWrapperBase<?> socketWrapper, SocketStatus status) throws IOException; - /** - * Service a 'standard' HTTP request. This method is called for both new - * requests and for requests that have partially read the HTTP request line - * or HTTP headers. Once the headers have been fully read this method is not - * called again until there is a new HTTP request to process. Note that the - * request type may change during processing which may result in one or more - * calls to {@link #dispatch(SocketStatus)}. - * - * @param socketWrapper The connection to process - * - * @return The state the caller should put the socket in when this method - * returns - * - * @throws IOException If an I/O error occurs during the processing of the - * request - */ - SocketState service(SocketWrapperBase<?> socketWrapper) throws IOException; - - /** - * Process an in-progress request that is not longer in standard HTTP mode. - * Uses currently include Servlet 3.0 Async and HTTP upgrade connections. - * Further uses may be added in the future. These will typically start as - * HTTP requests. - */ - SocketState dispatch(SocketStatus status); - - SocketState asyncPostProcess(); - HttpUpgradeHandler getHttpUpgradeHandler(); void errorDispatch(); --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org