This is an automated email from the ASF dual-hosted git repository. remm pushed a commit to branch 10.1.x in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push: new bafc402415 Remove override javadoc bafc402415 is described below commit bafc40241579a7349ecec721fac219dc0e71d7da Author: remm <r...@apache.org> AuthorDate: Fri Mar 29 11:26:25 2024 +0100 Remove override javadoc Remove very outdated boilerplate override javadoc from the Servlet API. --- .../org/apache/catalina/core/ApplicationContext.java | 10 ---------- .../apache/catalina/core/ApplicationDispatcher.java | 20 -------------------- .../apache/catalina/core/ApplicationFilterChain.java | 10 ---------- .../catalina/core/ApplicationFilterConfig.java | 18 ------------------ java/org/apache/catalina/core/StandardWrapper.java | 15 --------------- 5 files changed, 73 deletions(-) diff --git a/java/org/apache/catalina/core/ApplicationContext.java b/java/org/apache/catalina/core/ApplicationContext.java index bd8dceb6d3..522d56417a 100644 --- a/java/org/apache/catalina/core/ApplicationContext.java +++ b/java/org/apache/catalina/core/ApplicationContext.java @@ -303,11 +303,6 @@ public class ApplicationContext implements ServletContext { } - /** - * Return the MIME type of the specified file, or <code>null</code> if the MIME type cannot be determined. - * - * @param file Filename for which to identify a MIME type - */ @Override public String getMimeType(String file) { @@ -327,11 +322,6 @@ public class ApplicationContext implements ServletContext { } - /** - * Return a <code>RequestDispatcher</code> object that acts as a wrapper for the named servlet. - * - * @param name Name of the servlet for which a dispatcher is requested - */ @Override public RequestDispatcher getNamedDispatcher(String name) { diff --git a/java/org/apache/catalina/core/ApplicationDispatcher.java b/java/org/apache/catalina/core/ApplicationDispatcher.java index abb7b2fe4d..e2f1ad3a02 100644 --- a/java/org/apache/catalina/core/ApplicationDispatcher.java +++ b/java/org/apache/catalina/core/ApplicationDispatcher.java @@ -250,16 +250,6 @@ final class ApplicationDispatcher implements AsyncDispatcher, RequestDispatcher // --------------------------------------------------------- Public Methods - /** - * Forward this request and response to another resource for processing. Any runtime exception, IOException, or - * ServletException thrown by the called servlet will be propagated to the caller. - * - * @param request The servlet request to be forwarded - * @param response The servlet response to be forwarded - * - * @exception IOException if an input/output error occurs - * @exception ServletException if a servlet exception occurs - */ @Override public void forward(ServletRequest request, ServletResponse response) throws ServletException, IOException { if (Globals.IS_SECURITY_ENABLED) { @@ -446,16 +436,6 @@ final class ApplicationDispatcher implements AsyncDispatcher, RequestDispatcher } - /** - * Include the response from another resource in the current response. Any runtime exception, IOException, or - * ServletException thrown by the called servlet will be propagated to the caller. - * - * @param request The servlet request that is including this one - * @param response The servlet response to be appended to - * - * @exception IOException if an input/output error occurs - * @exception ServletException if a servlet exception occurs - */ @Override public void include(ServletRequest request, ServletResponse response) throws ServletException, IOException { if (Globals.IS_SECURITY_ENABLED) { diff --git a/java/org/apache/catalina/core/ApplicationFilterChain.java b/java/org/apache/catalina/core/ApplicationFilterChain.java index 321be19258..2dc3147781 100644 --- a/java/org/apache/catalina/core/ApplicationFilterChain.java +++ b/java/org/apache/catalina/core/ApplicationFilterChain.java @@ -113,16 +113,6 @@ public final class ApplicationFilterChain implements FilterChain { // ---------------------------------------------------- FilterChain Methods - /** - * Invoke the next filter in this chain, passing the specified request and response. If there are no more filters in - * this chain, invoke the <code>service()</code> method of the servlet itself. - * - * @param request The servlet request we are processing - * @param response The servlet response we are creating - * - * @exception IOException if an input/output error occurs - * @exception ServletException if a servlet exception occurs - */ @Override public void doFilter(ServletRequest request, ServletResponse response) throws IOException, ServletException { diff --git a/java/org/apache/catalina/core/ApplicationFilterConfig.java b/java/org/apache/catalina/core/ApplicationFilterConfig.java index c50eca10ab..41cce09d6d 100644 --- a/java/org/apache/catalina/core/ApplicationFilterConfig.java +++ b/java/org/apache/catalina/core/ApplicationFilterConfig.java @@ -132,9 +132,6 @@ public final class ApplicationFilterConfig implements FilterConfig, Serializable // --------------------------------------------------- FilterConfig Methods - /** - * Return the name of the filter we are configuring. - */ @Override public String getFilterName() { return filterDef.getFilterName(); @@ -147,12 +144,6 @@ public final class ApplicationFilterConfig implements FilterConfig, Serializable return filterDef.getFilterClass(); } - /** - * Return a <code>String</code> containing the value of the named initialization parameter, or <code>null</code> if - * the parameter does not exist. - * - * @param name Name of the requested initialization parameter - */ @Override public String getInitParameter(String name) { @@ -166,9 +157,6 @@ public final class ApplicationFilterConfig implements FilterConfig, Serializable } - /** - * Return an <code>Enumeration</code> of the names of the initialization parameters for this Filter. - */ @Override public Enumeration<String> getInitParameterNames() { Map<String,String> map = filterDef.getParameterMap(); @@ -181,9 +169,6 @@ public final class ApplicationFilterConfig implements FilterConfig, Serializable } - /** - * Return the ServletContext of our associated web application. - */ @Override public ServletContext getServletContext() { @@ -192,9 +177,6 @@ public final class ApplicationFilterConfig implements FilterConfig, Serializable } - /** - * Return a String representation of this object. - */ @Override public String toString() { StringBuilder sb = new StringBuilder("ApplicationFilterConfig["); diff --git a/java/org/apache/catalina/core/StandardWrapper.java b/java/org/apache/catalina/core/StandardWrapper.java index 43a53e1156..29070d4983 100644 --- a/java/org/apache/catalina/core/StandardWrapper.java +++ b/java/org/apache/catalina/core/StandardWrapper.java @@ -1142,21 +1142,12 @@ public class StandardWrapper extends ContainerBase implements ServletConfig, Wra // -------------------------------------------------- ServletConfig Methods - /** - * @return the initialization parameter value for the specified name, if any; otherwise return <code>null</code>. - * - * @param name Name of the initialization parameter to retrieve - */ @Override public String getInitParameter(String name) { return findInitParameter(name); } - /** - * @return the set of initialization parameter names defined for this servlet. If none are defined, an empty - * Enumeration is returned. - */ @Override public Enumeration<String> getInitParameterNames() { @@ -1170,9 +1161,6 @@ public class StandardWrapper extends ContainerBase implements ServletConfig, Wra } - /** - * @return the servlet context with which this servlet is associated. - */ @Override public ServletContext getServletContext() { if (parent == null) { @@ -1185,9 +1173,6 @@ public class StandardWrapper extends ContainerBase implements ServletConfig, Wra } - /** - * @return the name of this servlet. - */ @Override public String getServletName() { return getName(); --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org