diff --git a/java/org/apache/catalina/WebResourceRoot.java b/java/org/apache/catalina/WebResourceRoot.java index f96dc7d7e86d..b99874ee3f0d 100644 --- a/java/org/apache/catalina/WebResourceRoot.java +++ b/java/org/apache/catalina/WebResourceRoot.java @@ -425,7 +425,7 @@ default void setReadOnly(boolean readOnly) { /** * @return {@code true} if the main resources are read only, otherwise {@code false}. The default implementation - * returns {@code false}. + * returns {@code false}. */ default boolean isReadOnly() { return false; diff --git a/java/org/apache/catalina/servlets/DataSourcePropertyStore.java b/java/org/apache/catalina/servlets/DataSourcePropertyStore.java index 4e5d497909a6..0a4dd8150e51 100644 --- a/java/org/apache/catalina/servlets/DataSourcePropertyStore.java +++ b/java/org/apache/catalina/servlets/DataSourcePropertyStore.java @@ -51,8 +51,7 @@ * * The table name used can be configured using the tableName property of the store. *

- * Example table schema: - * CREATE TABLE properties ( + * Example table schema: CREATE TABLE properties ( * path VARCHAR(1024) NOT NULL, * namespace VARCHAR(64) NOT NULL, * name VARCHAR(64) NOT NULL, @@ -96,8 +95,7 @@ public String getDataSourceName() { } /** - * @param dataSourceName the DataSource JNDI name, will be prefixed with - * java:comp/env for the lookup. + * @param dataSourceName the DataSource JNDI name, will be prefixed with java:comp/env for the lookup. */ public void setDataSourceName(String dataSourceName) { this.dataSourceName = dataSourceName; @@ -128,7 +126,8 @@ public void init() { try { dataSource = (DataSource) ((new InitialContext()).lookup("java:comp/env/" + dataSourceName)); } catch (NamingException e) { - throw new IllegalArgumentException(sm.getString("webdavservlet.dataSourceStore.noDataSource", dataSourceName), e); + throw new IllegalArgumentException( + sm.getString("webdavservlet.dataSourceStore.noDataSource", dataSourceName), e); } } addPropertyStatement = "INSERT INTO " + tableName + " (path, namespace, name, node) VALUES (?, ?, ?, ?)"; diff --git a/java/org/apache/catalina/servlets/DefaultServlet.java b/java/org/apache/catalina/servlets/DefaultServlet.java index 0886155e3a41..c58ce2b5b0b4 100644 --- a/java/org/apache/catalina/servlets/DefaultServlet.java +++ b/java/org/apache/catalina/servlets/DefaultServlet.java @@ -1467,7 +1467,7 @@ protected ArrayList parseRange(HttpServletRequest request, HttpServletRes if (response.isCommitted()) { /* * Ideally, checkIfRange() would be changed to return Boolean so the three states (satisfied, - * unsatisfied and error) could each be communicated via the return value. There isn't a backwards + * unsatisfied and error) could each be communicated via the return value. There isn't a backwards * compatible way to do that that doesn't involve changing the method name and there are benefits to * retaining the consistency of the existing method name pattern. Hence, this 'trick'. For the error * state, checkIfRange() will call response.sendError() which will commit the response which this method diff --git a/java/org/apache/catalina/servlets/WebdavServlet.java b/java/org/apache/catalina/servlets/WebdavServlet.java index 4db072070213..8d96e6666b14 100644 --- a/java/org/apache/catalina/servlets/WebdavServlet.java +++ b/java/org/apache/catalina/servlets/WebdavServlet.java @@ -85,8 +85,8 @@ * users and WebDAV users, the WebDAV servlet may be mounted at a sub-path (e.g. /webdav/*) which creates * an additional mapping for the entire web application under that sub-path, with WebDAV access to all the resources. *

- * By default, the WEB-INF and META-INF directories are not accessible via WebDAV. This may - * be changed by setting the allowSpecialPaths initialisation parameter to true. + * By default, the WEB-INF and META-INF directories are not accessible via WebDAV. This may be + * changed by setting the allowSpecialPaths initialisation parameter to true. *

* It is also possible to enable WebDAV access to a sub-set of the standard web application URL space rather than * creating an additional, WebDAV specific mapping. To do this, map the WebDAV servlet to the desired sub-path and set @@ -1859,8 +1859,8 @@ protected void doUnlock(HttpServletRequest req, HttpServletResponse resp) throws private boolean isSpecialPath(final String path) { if (!allowSpecialPaths) { String upperCasePath = path.toUpperCase(Locale.ENGLISH); - if (upperCasePath.startsWith("/WEB-INF/") || upperCasePath.startsWith("/META-INF/") - || upperCasePath.equals("/WEB-INF") || upperCasePath.equals("/META-INF")) { + if (upperCasePath.startsWith("/WEB-INF/") || upperCasePath.startsWith("/META-INF/") || + upperCasePath.equals("/WEB-INF") || upperCasePath.equals("/META-INF")) { return true; } } diff --git a/java/org/apache/catalina/session/DataSourceStore.java b/java/org/apache/catalina/session/DataSourceStore.java index 99170c977add..caf05bf916df 100644 --- a/java/org/apache/catalina/session/DataSourceStore.java +++ b/java/org/apache/catalina/session/DataSourceStore.java @@ -369,7 +369,8 @@ protected Connection open() throws SQLException { Context envCtx = (Context) (new InitialContext()).lookup("java:comp/env"); this.dataSource = (DataSource) envCtx.lookup(this.dataSourceName); } catch (NamingException e) { - context.getLogger().error(sm.getString("dataSourceStore.wrongDataSource", this.dataSourceName), e); + context.getLogger().error(sm.getString("dataSourceStore.wrongDataSource", this.dataSourceName), + e); } } } diff --git a/java/org/apache/catalina/util/RateLimiter.java b/java/org/apache/catalina/util/RateLimiter.java index 5978de62dbf0..4b261d5073e8 100644 --- a/java/org/apache/catalina/util/RateLimiter.java +++ b/java/org/apache/catalina/util/RateLimiter.java @@ -92,7 +92,7 @@ default String getPolicy() { /** * Provide the quota header for this rate limit for a given request count within the current time window. * - * @param requestCount The request count within the current time window + * @param requestCount The request count within the current time window * * @return the quota header for the given value of request count * diff --git a/java/org/apache/catalina/valves/JDBCAccessLogValve.java b/java/org/apache/catalina/valves/JDBCAccessLogValve.java index 5dcdd5506df3..ba1db102fd7e 100644 --- a/java/org/apache/catalina/valves/JDBCAccessLogValve.java +++ b/java/org/apache/catalina/valves/JDBCAccessLogValve.java @@ -98,6 +98,7 @@ * * @author Andre de Jesus * @author Peter Rossbach + * * @deprecated Non scalable design, and not documented. Will be removed in Tomcat 12. */ @Deprecated @@ -577,6 +578,7 @@ protected void open() throws SQLException { /** * Prepare tables for processing. Used by subclasses for testing. + * * @throws SQLException if an exception occurs */ protected void prepare() throws SQLException { diff --git a/java/org/apache/coyote/NonPipeliningProcessor.java b/java/org/apache/coyote/NonPipeliningProcessor.java index 75a6da08309c..a6e8759a570a 100644 --- a/java/org/apache/coyote/NonPipeliningProcessor.java +++ b/java/org/apache/coyote/NonPipeliningProcessor.java @@ -18,8 +18,8 @@ /** * Marker interface used to indicate that the {@link Processor} does not implement pipe-lining of requests (e.g. - * HTTP/1.1 supports pipe-lining whereas HTTP/2 does not) which may enable some components to clear references sooner - * to aid GC. + * HTTP/1.1 supports pipe-lining whereas HTTP/2 does not) which may enable some components to clear references sooner to + * aid GC. */ public interface NonPipeliningProcessor extends Processor {