This is an automated email from the ASF dual-hosted git repository.
markt-asf pushed a commit to branch 11.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/11.0.x by this push:
new 74857ac3b0 Fix Javadoc indent
74857ac3b0 is described below
commit 74857ac3b051d7549dd23575c7bfcd6017ec1ffc
Author: Mark Thomas <[email protected]>
AuthorDate: Fri Aug 7 17:08:24 2026 +0100
Fix Javadoc indent
---
java/jakarta/servlet/GenericFilter.java | 10 +--
java/jakarta/servlet/annotation/HandlesTypes.java | 10 +--
java/jakarta/servlet/annotation/WebServlet.java | 94 +++++++++++-----------
java/jakarta/servlet/http/HttpFilter.java | 4 +-
java/jakarta/servlet/http/HttpServletMapping.java | 44 +++++-----
java/jakarta/websocket/MessageHandler.java | 2 +-
java/jakarta/websocket/RemoteEndpoint.java | 2 +-
java/org/apache/catalina/UserDatabase.java | 14 ++--
java/org/apache/catalina/connector/Connector.java | 2 +-
java/org/apache/catalina/connector/Request.java | 12 +--
java/org/apache/catalina/filters/FilterBase.java | 4 +-
.../apache/catalina/filters/RemoteIpFilter.java | 2 +-
.../mbeans/DataSourceUserDatabaseMBean.java | 6 +-
.../apache/catalina/tribes/group/GroupChannel.java | 10 +--
java/org/apache/catalina/util/IOTools.java | 2 +-
.../catalina/valves/AbstractAccessLogValve.java | 2 +-
.../catalina/valves/rewrite/RewriteRule.java | 2 +-
.../webresources/AbstractArchiveResource.java | 10 +--
.../apache/catalina/webresources/FileResource.java | 2 +-
java/org/apache/coyote/RequestGroupInfo.java | 4 +-
java/org/apache/coyote/RequestInfo.java | 2 +-
.../apache/coyote/http11/Http11NioProtocol.java | 2 +-
java/org/apache/jasper/JspC.java | 2 +-
java/org/apache/jasper/compiler/JspUtil.java | 2 +-
.../apache/jasper/runtime/JspRuntimeLibrary.java | 2 +-
.../apache/tomcat/buildutil/RepeatableArchive.java | 2 +-
.../dbcp2/datasources/PooledConnectionManager.java | 2 +-
java/org/apache/tomcat/jni/Pool.java | 4 +-
java/org/apache/tomcat/util/buf/ByteChunk.java | 2 +-
.../tomcat/util/descriptor/web/FilterDef.java | 6 +-
.../tomcat/util/descriptor/web/FilterMap.java | 8 +-
.../tomcat/util/file/ConfigurationSource.java | 38 ++++-----
.../tomcat/util/http/Rfc6265CookieProcessor.java | 6 +-
.../apache/tomcat/util/http/WebdavIfHeader.java | 2 +-
.../tomcat/util/http/fileupload/util/Streams.java | 4 +-
java/org/apache/tomcat/util/net/SSLHostConfig.java | 2 +-
.../apache/tomcat/util/net/SocketWrapperBase.java | 26 +++---
.../tomcat/util/threads/ThreadPoolExecutor.java | 10 +--
java/org/apache/tomcat/websocket/WsFrameBase.java | 4 +-
.../apache/tomcat/jdbc/pool/DataSourceFactory.java | 4 +-
.../apache/tomcat/jdbc/pool/DataSourceProxy.java | 38 ++++-----
.../apache/tomcat/jdbc/pool/StatementFacade.java | 2 +-
.../interceptor/StatementDecoratorInterceptor.java | 2 +-
.../tomcat/jdbc/pool/jmx/ConnectionPool.java | 2 +-
.../TestPersistentProviderRegistrations.java | 32 ++++----
45 files changed, 222 insertions(+), 222 deletions(-)
diff --git a/java/jakarta/servlet/GenericFilter.java
b/java/jakarta/servlet/GenericFilter.java
index ef6b8fb901..2262522c5d 100644
--- a/java/jakarta/servlet/GenericFilter.java
+++ b/java/jakarta/servlet/GenericFilter.java
@@ -34,14 +34,14 @@ public abstract class GenericFilter implements Filter,
FilterConfig, Serializabl
@Serial
private static final long serialVersionUID = 1L;
- /**
- * The filter configuration.
- */
+ /**
+ * The filter configuration.
+ */
private volatile FilterConfig filterConfig;
/**
- * Constructs a new GenericFilter.
- */
+ * Constructs a new GenericFilter.
+ */
public GenericFilter() {
// NO-OP
}
diff --git a/java/jakarta/servlet/annotation/HandlesTypes.java
b/java/jakarta/servlet/annotation/HandlesTypes.java
index 203340c8b9..6dc3a2ea30 100644
--- a/java/jakarta/servlet/annotation/HandlesTypes.java
+++ b/java/jakarta/servlet/annotation/HandlesTypes.java
@@ -31,11 +31,11 @@ import java.lang.annotation.Target;
@Retention(RetentionPolicy.RUNTIME)
public @interface HandlesTypes {
- /**
- * Declares the classes handled by the {@link
jakarta.servlet.ServletContainerInitializer}.
- *
- * @return array of classes
- */
+ /**
+ * Declares the classes handled by the {@link
jakarta.servlet.ServletContainerInitializer}.
+ *
+ * @return array of classes
+ */
Class<?>[] value();
}
diff --git a/java/jakarta/servlet/annotation/WebServlet.java
b/java/jakarta/servlet/annotation/WebServlet.java
index ed12b5b1a3..0e1b1340cc 100644
--- a/java/jakarta/servlet/annotation/WebServlet.java
+++ b/java/jakarta/servlet/annotation/WebServlet.java
@@ -46,41 +46,41 @@ import java.lang.annotation.Target;
@Documented
public @interface WebServlet {
- /**
- * Provides the name of this servlet.
- *
- * @return name of the Servlet
- */
+ /**
+ * Provides the name of this servlet.
+ *
+ * @return name of the Servlet
+ */
String name() default "";
- /**
- * A convenience method, to allow extremely simple annotation of a class.
- *
- * @return array of URL patterns
- *
- * @see #urlPatterns()
- */
+ /**
+ * A convenience method, to allow extremely simple annotation of a class.
+ *
+ * @return array of URL patterns
+ *
+ * @see #urlPatterns()
+ */
String[] value() default {};
- /**
- * Declares the URL patterns for this servlet.
- *
- * @return array of URL patterns to which this Servlet applies
- */
+ /**
+ * Declares the URL patterns for this servlet.
+ *
+ * @return array of URL patterns to which this Servlet applies
+ */
String[] urlPatterns() default {};
- /**
- * Provides a load-on-startup ordering hint for this servlet.
- *
- * @return load on startup ordering hint
- */
+ /**
+ * Provides a load-on-startup ordering hint for this servlet.
+ *
+ * @return load on startup ordering hint
+ */
int loadOnStartup() default -1;
- /**
- * Declares initialization parameters for this servlet.
- *
- * @return array of initialization params for this Servlet
- */
+ /**
+ * Declares initialization parameters for this servlet.
+ *
+ * @return array of initialization params for this Servlet
+ */
WebInitParam[] initParams() default {};
/**
@@ -90,31 +90,31 @@ public @interface WebServlet {
*/
boolean asyncSupported() default false;
- /**
- * Provides the URL of a small icon for this servlet.
- *
- * @return small icon for this Servlet, if present
- */
+ /**
+ * Provides the URL of a small icon for this servlet.
+ *
+ * @return small icon for this Servlet, if present
+ */
String smallIcon() default "";
- /**
- * Provides the URL of a large icon for this servlet.
- *
- * @return large icon for this Servlet, if present
- */
+ /**
+ * Provides the URL of a large icon for this servlet.
+ *
+ * @return large icon for this Servlet, if present
+ */
String largeIcon() default "";
- /**
- * Provides a description of this servlet.
- *
- * @return description of this Servlet, if present
- */
+ /**
+ * Provides a description of this servlet.
+ *
+ * @return description of this Servlet, if present
+ */
String description() default "";
- /**
- * Provides a display name for this servlet.
- *
- * @return display name of this Servlet, if present
- */
+ /**
+ * Provides a display name for this servlet.
+ *
+ * @return display name of this Servlet, if present
+ */
String displayName() default "";
}
diff --git a/java/jakarta/servlet/http/HttpFilter.java
b/java/jakarta/servlet/http/HttpFilter.java
index 85070f9f58..15b43a3520 100644
--- a/java/jakarta/servlet/http/HttpFilter.java
+++ b/java/jakarta/servlet/http/HttpFilter.java
@@ -35,8 +35,8 @@ public abstract class HttpFilter extends GenericFilter {
private static final long serialVersionUID = 1L;
/**
- * Constructs a new HttpFilter.
- */
+ * Constructs a new HttpFilter.
+ */
public HttpFilter() {
// NO-OP
}
diff --git a/java/jakarta/servlet/http/HttpServletMapping.java
b/java/jakarta/servlet/http/HttpServletMapping.java
index aece46c8e8..ca402abed8 100644
--- a/java/jakarta/servlet/http/HttpServletMapping.java
+++ b/java/jakarta/servlet/http/HttpServletMapping.java
@@ -25,33 +25,33 @@ import jakarta.servlet.annotation.WebServlet;
*/
public interface HttpServletMapping {
- /**
- * Returns the value that was matched when mapping the request to the
servlet.
- *
- * @return The value that was matched or the empty String if not known.
- */
+ /**
+ * Returns the value that was matched when mapping the request to the
servlet.
+ *
+ * @return The value that was matched or the empty String if not known.
+ */
String getMatchValue();
- /**
- * Returns the URL pattern that matched this request.
- *
- * @return The {@code url-pattern} that matched this request or the
empty String if not known.
- */
+ /**
+ * Returns the URL pattern that matched this request.
+ *
+ * @return The {@code url-pattern} that matched this request or the empty
String if not known.
+ */
String getPattern();
- /**
- * Returns the name of the servlet to which the request was mapped.
- *
- * @return The name of the servlet (as specified in web.xml, {@link
WebServlet#name()},
- * {@link jakarta.servlet.ServletContext#addServlet(String,
Class)} or one of the other
- * <code>addServlet()</code> methods) that the request was
mapped to.
- */
+ /**
+ * Returns the name of the servlet to which the request was mapped.
+ *
+ * @return The name of the servlet (as specified in web.xml, {@link
WebServlet#name()},
+ * {@link jakarta.servlet.ServletContext#addServlet(String,
Class)} or one of the other
+ * <code>addServlet()</code> methods) that the request was
mapped to.
+ */
String getServletName();
- /**
- * Returns the type of match used to map the request to the servlet.
- *
- * @return The type of match ({@code null} if not known)
- */
+ /**
+ * Returns the type of match used to map the request to the servlet.
+ *
+ * @return The type of match ({@code null} if not known)
+ */
MappingMatch getMappingMatch();
}
diff --git a/java/jakarta/websocket/MessageHandler.java
b/java/jakarta/websocket/MessageHandler.java
index ace7c96702..e1278da215 100644
--- a/java/jakarta/websocket/MessageHandler.java
+++ b/java/jakarta/websocket/MessageHandler.java
@@ -39,7 +39,7 @@ public interface MessageHandler {
void onMessage(T messagePart, boolean last);
}
- /**
+ /**
* A message handler that receives whole (complete) messages. The handler
is called once
* per WebSocket message.
*
diff --git a/java/jakarta/websocket/RemoteEndpoint.java
b/java/jakarta/websocket/RemoteEndpoint.java
index a485581c65..978b0bd436 100644
--- a/java/jakarta/websocket/RemoteEndpoint.java
+++ b/java/jakarta/websocket/RemoteEndpoint.java
@@ -116,7 +116,7 @@ public interface RemoteEndpoint {
}
- /**
+ /**
* Synchronous (blocking) API for sending messages to the remote endpoint.
*/
interface Basic extends RemoteEndpoint {
diff --git a/java/org/apache/catalina/UserDatabase.java
b/java/org/apache/catalina/UserDatabase.java
index 8c0dc0ca89..e8ea24ae11 100644
--- a/java/org/apache/catalina/UserDatabase.java
+++ b/java/org/apache/catalina/UserDatabase.java
@@ -29,7 +29,7 @@ public interface UserDatabase {
// ------------------------------------------------------------- Properties
- /**
+ /**
* Get the set of {@link Group}s defined in this user database.
*
* @return the set of {@link Group}s defined in this user database.
@@ -37,7 +37,7 @@ public interface UserDatabase {
Iterator<Group> getGroups();
- /**
+ /**
* Get the unique global identifier of this user database.
*
* @return the unique global identifier of this user database.
@@ -45,7 +45,7 @@ public interface UserDatabase {
String getId();
- /**
+ /**
* Get the set of {@link Role}s defined in this user database.
*
* @return the set of {@link Role}s defined in this user database.
@@ -53,7 +53,7 @@ public interface UserDatabase {
Iterator<Role> getRoles();
- /**
+ /**
* Get the set of {@link User}s defined in this user database.
*
* @return the set of {@link User}s defined in this user database.
@@ -105,7 +105,7 @@ public interface UserDatabase {
User createUser(String username, String password, String fullName);
- /**
+ /**
* Find the {@link Group} with the specified group name.
*
* @param groupname Name of the group to return
@@ -114,7 +114,7 @@ public interface UserDatabase {
Group findGroup(String groupname);
- /**
+ /**
* Find the {@link Role} with the specified role name.
*
* @param rolename Name of the role to return
@@ -123,7 +123,7 @@ public interface UserDatabase {
Role findRole(String rolename);
- /**
+ /**
* Find the {@link User} with the specified username.
*
* @param username Name of the user to return
diff --git a/java/org/apache/catalina/connector/Connector.java
b/java/org/apache/catalina/connector/Connector.java
index e3f89a0eb4..dc5269e7b5 100644
--- a/java/org/apache/catalina/connector/Connector.java
+++ b/java/org/apache/catalina/connector/Connector.java
@@ -482,7 +482,7 @@ public class Connector extends LifecycleMBeanBase {
}
- /**
+ /**
* Returns whether the encoding must be enforced when calling getWriter().
* @return {@code true} if the encoding must be enforced when calling
getWriter()
*/
diff --git a/java/org/apache/catalina/connector/Request.java
b/java/org/apache/catalina/connector/Request.java
index 0affd1be96..4b9fcb61a4 100644
--- a/java/org/apache/catalina/connector/Request.java
+++ b/java/org/apache/catalina/connector/Request.java
@@ -817,12 +817,12 @@ public class Request implements HttpServletRequest {
/**
- * Return the object bound with the specified name to the internal notes
for this request, or {@code null} if
- * no such binding exists.
- *
- * @param name Name of the note to be returned
- * @return the note object, or {@code null}
- */
+ * Return the object bound with the specified name to the internal notes
for this request, or {@code null} if
+ * no such binding exists.
+ *
+ * @param name Name of the note to be returned
+ * @return the note object, or {@code null}
+ */
public Object getNote(String name) {
return notes.get(name);
}
diff --git a/java/org/apache/catalina/filters/FilterBase.java
b/java/org/apache/catalina/filters/FilterBase.java
index 8b9fa362aa..028ffc4061 100644
--- a/java/org/apache/catalina/filters/FilterBase.java
+++ b/java/org/apache/catalina/filters/FilterBase.java
@@ -27,8 +27,8 @@ import org.apache.tomcat.util.IntrospectionUtils;
import org.apache.tomcat.util.res.StringManager;
/**
- * Base class for filters that provides generic initialisation and a
simple no-op destruction.
- */
+ * Base class for filters that provides generic initialisation and a simple
no-op destruction.
+ */
public abstract class FilterBase implements Filter {
/**
diff --git a/java/org/apache/catalina/filters/RemoteIpFilter.java
b/java/org/apache/catalina/filters/RemoteIpFilter.java
index 8ffaacbcf6..48be3b09c4 100644
--- a/java/org/apache/catalina/filters/RemoteIpFilter.java
+++ b/java/org/apache/catalina/filters/RemoteIpFilter.java
@@ -1549,7 +1549,7 @@ public class RemoteIpFilter extends GenericFilter {
* Log objects are not Serializable but this Filter is because it extends
GenericFilter. Tomcat won't serialize a
* Filter but in case something else does...
*/
- /**
+ /**
* Restores the log after deserialization.
* @param ois the object input stream
* @throws ClassNotFoundException if the class is not found
diff --git a/java/org/apache/catalina/mbeans/DataSourceUserDatabaseMBean.java
b/java/org/apache/catalina/mbeans/DataSourceUserDatabaseMBean.java
index d6e76365db..71e2d582da 100644
--- a/java/org/apache/catalina/mbeans/DataSourceUserDatabaseMBean.java
+++ b/java/org/apache/catalina/mbeans/DataSourceUserDatabaseMBean.java
@@ -59,7 +59,7 @@ public class DataSourceUserDatabaseMBean extends
BaseModelMBean {
// ------------------------------------------------------------- Attributes
- /**
+ /**
* Get the names of all groups defined in this database.
*
* @return the names of all groups defined in this database.
@@ -76,7 +76,7 @@ public class DataSourceUserDatabaseMBean extends
BaseModelMBean {
}
- /**
+ /**
* Get the names of all roles defined in this database.
*
* @return the names of all roles defined in this database.
@@ -93,7 +93,7 @@ public class DataSourceUserDatabaseMBean extends
BaseModelMBean {
}
- /**
+ /**
* Get the names of all users defined in this database.
*
* @return the names of all users defined in this database.
diff --git a/java/org/apache/catalina/tribes/group/GroupChannel.java
b/java/org/apache/catalina/tribes/group/GroupChannel.java
index a47876be42..b99f0b5794 100644
--- a/java/org/apache/catalina/tribes/group/GroupChannel.java
+++ b/java/org/apache/catalina/tribes/group/GroupChannel.java
@@ -701,11 +701,11 @@ public class GroupChannel extends ChannelInterceptorBase
implements ManagedChann
private ChannelInterceptor start;
/**
- * Creates an InterceptorIterator.
- *
- * @param start The first interceptor to iterate from
- * @param end The end marker interceptor (not included in iteration)
- */
+ * Creates an InterceptorIterator.
+ *
+ * @param start The first interceptor to iterate from
+ * @param end The end marker interceptor (not included in iteration)
+ */
public InterceptorIterator(ChannelInterceptor start,
ChannelInterceptor end) {
this.end = end;
this.start = start;
diff --git a/java/org/apache/catalina/util/IOTools.java
b/java/org/apache/catalina/util/IOTools.java
index e16cf76054..d69c3574d7 100644
--- a/java/org/apache/catalina/util/IOTools.java
+++ b/java/org/apache/catalina/util/IOTools.java
@@ -27,7 +27,7 @@ import java.io.Writer;
* Contains commonly needed I/O-related methods.
*/
public class IOTools {
- /**
+ /**
* The default buffer size (4 KiB) used for I/O operations.
*/
protected static final int DEFAULT_BUFFER_SIZE = 4 * 1024; // 4k
diff --git a/java/org/apache/catalina/valves/AbstractAccessLogValve.java
b/java/org/apache/catalina/valves/AbstractAccessLogValve.java
index 3051ac1ea7..38dae3c485 100644
--- a/java/org/apache/catalina/valves/AbstractAccessLogValve.java
+++ b/java/org/apache/catalina/valves/AbstractAccessLogValve.java
@@ -1053,7 +1053,7 @@ public abstract class AbstractAccessLogValve extends
ValveBase implements Access
}
}
- /**
+ /**
* Write remote host name - %h.
*/
protected class HostElement implements AccessLogElement, CachedElement {
diff --git a/java/org/apache/catalina/valves/rewrite/RewriteRule.java
b/java/org/apache/catalina/valves/rewrite/RewriteRule.java
index 91777daa59..3a30daf4ec 100644
--- a/java/org/apache/catalina/valves/rewrite/RewriteRule.java
+++ b/java/org/apache/catalina/valves/rewrite/RewriteRule.java
@@ -421,7 +421,7 @@ public class RewriteRule {
*/
protected boolean valveSkip = false;
- /**
+ /**
* Get whether back references are escaped.
* @return true if back references are escaped
*/
diff --git a/java/org/apache/catalina/webresources/AbstractArchiveResource.java
b/java/org/apache/catalina/webresources/AbstractArchiveResource.java
index 408f42abe4..be7facd7cb 100644
--- a/java/org/apache/catalina/webresources/AbstractArchiveResource.java
+++ b/java/org/apache/catalina/webresources/AbstractArchiveResource.java
@@ -306,11 +306,11 @@ public abstract class AbstractArchiveResource extends
AbstractResource {
/**
- * Creates a new JarInputStreamWrapper.
- *
- * @param jarEntry The JAR entry
- * @param is The input stream
- */
+ * Creates a new JarInputStreamWrapper.
+ *
+ * @param jarEntry The JAR entry
+ * @param is The input stream
+ */
public JarInputStreamWrapper(JarEntry jarEntry, InputStream is) {
this.jarEntry = jarEntry;
this.is = is;
diff --git a/java/org/apache/catalina/webresources/FileResource.java
b/java/org/apache/catalina/webresources/FileResource.java
index b6fe29fcdd..4ae08b1adc 100644
--- a/java/org/apache/catalina/webresources/FileResource.java
+++ b/java/org/apache/catalina/webresources/FileResource.java
@@ -65,7 +65,7 @@ public class FileResource extends AbstractResource {
private final WebResourceLockSet lockSet;
private final String lockKey;
- /**
+ /**
* Creates a FileResource without locking support.
*
* @param root The web resource root
diff --git a/java/org/apache/coyote/RequestGroupInfo.java
b/java/org/apache/coyote/RequestGroupInfo.java
index fade5019ba..eb20a424bf 100644
--- a/java/org/apache/coyote/RequestGroupInfo.java
+++ b/java/org/apache/coyote/RequestGroupInfo.java
@@ -22,8 +22,8 @@ import java.util.List;
import org.apache.tomcat.util.modeler.BaseModelMBean;
/**
- * JMX artifact to aggregate data from each request processor thread.
- */
+ * JMX artifact to aggregate data from each request processor thread.
+ */
public class RequestGroupInfo extends BaseModelMBean {
/**
* List of request processors.
diff --git a/java/org/apache/coyote/RequestInfo.java
b/java/org/apache/coyote/RequestInfo.java
index 3423e526a3..c8a6db9764 100644
--- a/java/org/apache/coyote/RequestInfo.java
+++ b/java/org/apache/coyote/RequestInfo.java
@@ -26,7 +26,7 @@ import javax.management.ObjectName;
* and provide management information about the requests being processed. Each
thread uses a Request/Response pair that
* is recycled on each request. This object provides a place to collect global
low-level statistics - without having to
* deal with synchronization (since each thread will have its own
RequestProcessorMX).
- */
+ */
public class RequestInfo {
/**
* Global request group info.
diff --git a/java/org/apache/coyote/http11/Http11NioProtocol.java
b/java/org/apache/coyote/http11/Http11NioProtocol.java
index ce019026a7..5fcf2b8ebf 100644
--- a/java/org/apache/coyote/http11/Http11NioProtocol.java
+++ b/java/org/apache/coyote/http11/Http11NioProtocol.java
@@ -56,7 +56,7 @@ public class Http11NioProtocol extends
AbstractHttp11Protocol<NioChannel> {
// -------------------- Pool setup --------------------
- /**
+ /**
* Sets the selector timeout for the NIO endpoint.
*
* @param timeout the selector timeout in milliseconds
diff --git a/java/org/apache/jasper/JspC.java b/java/org/apache/jasper/JspC.java
index 94f71f67d4..d514e3ef39 100644
--- a/java/org/apache/jasper/JspC.java
+++ b/java/org/apache/jasper/JspC.java
@@ -1964,7 +1964,7 @@ public class JspC extends Task implements Options {
return useNonstandardTagOptimizations;
}
- /**
+ /**
* Runnable task that processes a single JSP file.
*/
private class ProcessFile implements Callable<Void> {
diff --git a/java/org/apache/jasper/compiler/JspUtil.java
b/java/org/apache/jasper/compiler/JspUtil.java
index 254624bafa..48b632ed3e 100644
--- a/java/org/apache/jasper/compiler/JspUtil.java
+++ b/java/org/apache/jasper/compiler/JspUtil.java
@@ -516,7 +516,7 @@ public class JspUtil {
}
}
- /**
+ /**
* Generates code to coerce a string to a Double object.
*
* @param s The string expression
diff --git a/java/org/apache/jasper/runtime/JspRuntimeLibrary.java
b/java/org/apache/jasper/runtime/JspRuntimeLibrary.java
index c238da17a3..278d7781fc 100644
--- a/java/org/apache/jasper/runtime/JspRuntimeLibrary.java
+++ b/java/org/apache/jasper/runtime/JspRuntimeLibrary.java
@@ -1041,7 +1041,7 @@ public class JspRuntimeLibrary {
// *********************************************************************
// PropertyEditor Support
- /**
+ /**
* Gets a value using a bean info property editor.
*
* @param attrClass The attribute class
diff --git a/java/org/apache/tomcat/buildutil/RepeatableArchive.java
b/java/org/apache/tomcat/buildutil/RepeatableArchive.java
index 600d279041..a67939a285 100644
--- a/java/org/apache/tomcat/buildutil/RepeatableArchive.java
+++ b/java/org/apache/tomcat/buildutil/RepeatableArchive.java
@@ -44,7 +44,7 @@ import org.apache.tools.ant.types.FileSet;
* While originally written to address an issue with Javadoc output, this task
takes a generic approach that could be
* used with any archive. The task takes a set of zip (or jar, war etc) files
as its input and sets the last modified
* time of every file in the archive to be the same as the last modified time
of the archive.
- */
+ */
public class RepeatableArchive extends Task {
/**
diff --git
a/java/org/apache/tomcat/dbcp/dbcp2/datasources/PooledConnectionManager.java
b/java/org/apache/tomcat/dbcp/dbcp2/datasources/PooledConnectionManager.java
index 5d84a8c91d..85bf44f026 100644
--- a/java/org/apache/tomcat/dbcp/dbcp2/datasources/PooledConnectionManager.java
+++ b/java/org/apache/tomcat/dbcp/dbcp2/datasources/PooledConnectionManager.java
@@ -38,7 +38,7 @@ interface PooledConnectionManager {
*/
void closePool(String userName) throws SQLException;
- /**
+ /**
* Closes the PooledConnection and remove it from the connection pool to
which it belongs, adjusting pool counters.
*
* @param pc
diff --git a/java/org/apache/tomcat/jni/Pool.java
b/java/org/apache/tomcat/jni/Pool.java
index 03afd7ed70..ed1f90a781 100644
--- a/java/org/apache/tomcat/jni/Pool.java
+++ b/java/org/apache/tomcat/jni/Pool.java
@@ -17,8 +17,8 @@
package org.apache.tomcat.jni;
/**
- * Provides access to APR memory pools which are used to manage memory
allocations for natively created instances.
- */
+ * Provides access to APR memory pools which are used to manage memory
allocations for natively created instances.
+ */
public class Pool {
/**
diff --git a/java/org/apache/tomcat/util/buf/ByteChunk.java
b/java/org/apache/tomcat/util/buf/ByteChunk.java
index 012ae264e7..836c1d0a56 100644
--- a/java/org/apache/tomcat/util/buf/ByteChunk.java
+++ b/java/org/apache/tomcat/util/buf/ByteChunk.java
@@ -143,7 +143,7 @@ public final class ByteChunk extends AbstractChunk {
}
- /**
+ /**
* Serializes this ByteChunk, writing the charset name.
* @param oos the object output stream
* @throws IOException if an I/O error occurs
diff --git a/java/org/apache/tomcat/util/descriptor/web/FilterDef.java
b/java/org/apache/tomcat/util/descriptor/web/FilterDef.java
index 7581a88516..01e6af030a 100644
--- a/java/org/apache/tomcat/util/descriptor/web/FilterDef.java
+++ b/java/org/apache/tomcat/util/descriptor/web/FilterDef.java
@@ -27,9 +27,9 @@ import org.apache.tomcat.util.res.StringManager;
/**
- * Representation of a filter definition for a web application, as
represented in a <code><filter></code> element
- * in the deployment descriptor.
- */
+ * Representation of a filter definition for a web application, as represented
in a <code><filter></code> element
+ * in the deployment descriptor.
+ */
public class FilterDef implements Serializable {
@Serial
diff --git a/java/org/apache/tomcat/util/descriptor/web/FilterMap.java
b/java/org/apache/tomcat/util/descriptor/web/FilterMap.java
index eb9b8caf0b..1e890ad27c 100644
--- a/java/org/apache/tomcat/util/descriptor/web/FilterMap.java
+++ b/java/org/apache/tomcat/util/descriptor/web/FilterMap.java
@@ -27,10 +27,10 @@ import jakarta.servlet.DispatcherType;
import org.apache.tomcat.util.buf.UDecoder;
/**
- * Representation of a filter mapping for a web application, as
represented in a <code><filter-mapping></code>
- * element in the deployment descriptor. Each filter mapping must contain
a filter name plus either a URL pattern or a
- * servlet name.
- */
+ * Representation of a filter mapping for a web application, as represented in
a <code><filter-mapping></code>
+ * element in the deployment descriptor. Each filter mapping must contain a
filter name plus either a URL pattern or a
+ * servlet name.
+ */
public class FilterMap extends XmlEncodingBase implements Serializable {
/**
diff --git a/java/org/apache/tomcat/util/file/ConfigurationSource.java
b/java/org/apache/tomcat/util/file/ConfigurationSource.java
index fbd4518d61..c7ca969058 100644
--- a/java/org/apache/tomcat/util/file/ConfigurationSource.java
+++ b/java/org/apache/tomcat/util/file/ConfigurationSource.java
@@ -92,41 +92,41 @@ public interface ConfigurationSource {
private final URI uri;
/**
- * Creates a new resource with the given input stream and URI.
- *
- * @param inputStream the input stream for the resource content
- * @param uri the URI identifying the resource location
- */
+ * Creates a new resource with the given input stream and URI.
+ *
+ * @param inputStream the input stream for the resource content
+ * @param uri the URI identifying the resource location
+ */
public Resource(InputStream inputStream, URI uri) {
this.inputStream = inputStream;
this.uri = uri;
}
/**
- * Returns the input stream for reading the resource content.
- *
- * @return the input stream
- */
+ * Returns the input stream for reading the resource content.
+ *
+ * @return the input stream
+ */
public InputStream getInputStream() {
return inputStream;
}
/**
- * Returns the URI that identifies the resource location.
- *
- * @return the resource URI
- */
+ * Returns the URI that identifies the resource location.
+ *
+ * @return the resource URI
+ */
public URI getURI() {
return uri;
}
/**
- * Returns the last modified time of the resource in milliseconds since
the epoch.
- *
- * @return the last modified time in milliseconds
- * @throws MalformedURLException if the resource URI cannot be converted
to a URL
- * @throws IOException if an I/O error occurs while fetching the last
modified time
- */
+ * Returns the last modified time of the resource in milliseconds
since the epoch.
+ *
+ * @return the last modified time in milliseconds
+ * @throws MalformedURLException if the resource URI cannot be
converted to a URL
+ * @throws IOException if an I/O error occurs while fetching the last
modified time
+ */
public long getLastModified() throws MalformedURLException,
IOException {
try (CloseableURLConnection connection = new
CloseableURLConnection(uri.toURL())) {
return connection.getLastModified();
diff --git a/java/org/apache/tomcat/util/http/Rfc6265CookieProcessor.java
b/java/org/apache/tomcat/util/http/Rfc6265CookieProcessor.java
index f3d2a361d2..4f93581c77 100644
--- a/java/org/apache/tomcat/util/http/Rfc6265CookieProcessor.java
+++ b/java/org/apache/tomcat/util/http/Rfc6265CookieProcessor.java
@@ -35,9 +35,9 @@ import org.apache.tomcat.util.http.parser.HttpParser;
import org.apache.tomcat.util.res.StringManager;
/**
- * A {@link CookieProcessor} implementation that follows RFC 6265 for cookie
- * parsing and generation.
- */
+ * A {@link CookieProcessor} implementation that follows RFC 6265 for cookie
+ * parsing and generation.
+ */
public class Rfc6265CookieProcessor extends CookieProcessorBase {
private static final Log log =
LogFactory.getLog(Rfc6265CookieProcessor.class);
diff --git a/java/org/apache/tomcat/util/http/WebdavIfHeader.java
b/java/org/apache/tomcat/util/http/WebdavIfHeader.java
index 9a0c370284..220dcf9a72 100644
--- a/java/org/apache/tomcat/util/http/WebdavIfHeader.java
+++ b/java/org/apache/tomcat/util/http/WebdavIfHeader.java
@@ -704,7 +704,7 @@ public class WebdavIfHeader {
* <pre>
* IfList = { [ "Not" ] ( ("<" Word ">" ) | ( "[" Word "]" ) ) } .
* </pre>
- */
+ */
private static class IfList extends ArrayList<IfListEntry> {
@Serial
diff --git a/java/org/apache/tomcat/util/http/fileupload/util/Streams.java
b/java/org/apache/tomcat/util/http/fileupload/util/Streams.java
index ecf82c25d0..775519f20e 100644
--- a/java/org/apache/tomcat/util/http/fileupload/util/Streams.java
+++ b/java/org/apache/tomcat/util/http/fileupload/util/Streams.java
@@ -64,7 +64,7 @@ public final class Streams {
return fileName;
}
- /**
+ /**
* Copies the contents of the given {@link InputStream}
* to the given {@link OutputStream}. Shortcut for
* <pre>
@@ -139,7 +139,7 @@ public final class Streams {
}
}
- /**
+ /**
* Private constructor, to prevent instantiation.
* This class has only static methods.
*/
diff --git a/java/org/apache/tomcat/util/net/SSLHostConfig.java
b/java/org/apache/tomcat/util/net/SSLHostConfig.java
index 30337953ac..16dc62e783 100644
--- a/java/org/apache/tomcat/util/net/SSLHostConfig.java
+++ b/java/org/apache/tomcat/util/net/SSLHostConfig.java
@@ -1319,7 +1319,7 @@ public class SSLHostConfig implements Serializable {
}
- /**
+ /**
* Sets the truststore type.
*
* @param truststoreType the truststore type
diff --git a/java/org/apache/tomcat/util/net/SocketWrapperBase.java
b/java/org/apache/tomcat/util/net/SocketWrapperBase.java
index 5f06f9565d..98785b8974 100644
--- a/java/org/apache/tomcat/util/net/SocketWrapperBase.java
+++ b/java/org/apache/tomcat/util/net/SocketWrapperBase.java
@@ -174,7 +174,7 @@ public abstract class SocketWrapperBase<E> {
return socket;
}
- /**
+ /**
* Resets the wrapped socket with a new socket instance.
*
* @param closedSocket the new socket to wrap
@@ -385,7 +385,7 @@ public abstract class SocketWrapperBase<E> {
return remoteHost;
}
- /**
+ /**
* Populates the cached remote host name from the underlying socket.
*/
protected abstract void populateRemoteHost();
@@ -402,7 +402,7 @@ public abstract class SocketWrapperBase<E> {
return remoteAddr;
}
- /**
+ /**
* Populates the cached remote IP address from the underlying socket.
*/
protected abstract void populateRemoteAddr();
@@ -419,7 +419,7 @@ public abstract class SocketWrapperBase<E> {
return remotePort;
}
- /**
+ /**
* Populates the cached remote port number from the underlying socket.
*/
protected abstract void populateRemotePort();
@@ -436,7 +436,7 @@ public abstract class SocketWrapperBase<E> {
return localName;
}
-/**
+ /**
* Populates the cached local host name from the underlying socket.
*/
protected abstract void populateLocalName();
@@ -453,7 +453,7 @@ public abstract class SocketWrapperBase<E> {
return localAddr;
}
-/**
+ /**
* Populates the cached local IP address from the underlying socket.
*/
protected abstract void populateLocalAddr();
@@ -470,7 +470,7 @@ public abstract class SocketWrapperBase<E> {
return localPort;
}
-/**
+ /**
* Populates the cached local port number from the underlying socket.
*/
protected abstract void populateLocalPort();
@@ -947,7 +947,7 @@ public abstract class SocketWrapperBase<E> {
}
- /**
+ /**
* Flushes remaining buffered data using a non-blocking write.
*
* @return {@code true} if data remains to be flushed after this method
completes, otherwise {@code false}
@@ -1251,7 +1251,7 @@ public abstract class SocketWrapperBase<E> {
/** Indicates whether the vectored I/O completion processing is done.
*/
protected boolean completionDone = true;
- /**
+ /**
* Determines whether the operation is still executing on the original
caller thread.
*
* @return {@code true} if the operation is still inline, {@code
false} if running on a separate thread
@@ -1259,10 +1259,10 @@ public abstract class SocketWrapperBase<E> {
protected abstract boolean isInline();
/**
- * Checks if there is remaining outbound data in the buffers.
- *
- * @return {@code false} by default; overridden by NIO implementations
- */
+ * Checks if there is remaining outbound data in the buffers.
+ *
+ * @return {@code false} by default; overridden by NIO implementations
+ */
protected boolean hasOutboundRemaining() {
// NIO2 and APR never have remaining outbound data when the
// completion handler is called. NIO needs to override this.
diff --git a/java/org/apache/tomcat/util/threads/ThreadPoolExecutor.java
b/java/org/apache/tomcat/util/threads/ThreadPoolExecutor.java
index 1879337f35..b702e74046 100644
--- a/java/org/apache/tomcat/util/threads/ThreadPoolExecutor.java
+++ b/java/org/apache/tomcat/util/threads/ThreadPoolExecutor.java
@@ -1170,8 +1170,8 @@ public class ThreadPoolExecutor extends
AbstractExecutorService {
* awaitTermination} to do that.
*
* @throws SecurityException If a security manager exists and shutting
down this
- * pool requires the {@link RuntimePermission}{@code
("shutdownNow")} permission
- */
+ * pool requires the {@link RuntimePermission}{@code
("shutdownNow")} permission
+ */
@Override
public void shutdown() {
final ReentrantLock mainLock = this.mainLock;
@@ -1198,9 +1198,9 @@ public class ThreadPoolExecutor extends
AbstractExecutorService {
* implementation interrupts tasks via {@link Thread#interrupt}; any task
that fails to respond to interrupts may
* never terminate.
*
- * @throws SecurityException If a security manager exists and shutting down
this
- * pool requires the {@link RuntimePermission}{@code
("shutdownNow")} permission
- */
+ * @throws SecurityException If a security manager exists and shutting
down this
+ * pool requires the {@link RuntimePermission}{@code
("shutdownNow")} permission
+ */
@Override
public List<Runnable> shutdownNow() {
List<Runnable> tasks;
diff --git a/java/org/apache/tomcat/websocket/WsFrameBase.java
b/java/org/apache/tomcat/websocket/WsFrameBase.java
index 17463fa89b..b960c6cd3f 100644
--- a/java/org/apache/tomcat/websocket/WsFrameBase.java
+++ b/java/org/apache/tomcat/websocket/WsFrameBase.java
@@ -402,7 +402,7 @@ public abstract class WsFrameBase {
}
- /**
+ /**
* Sends a text message to the remote endpoint.
*
* @param last Whether this is the last fragment of the message
@@ -586,7 +586,7 @@ public abstract class WsFrameBase {
}
- /**
+ /**
* Sends a binary message to the remote endpoint.
*
* @param msg The message data
diff --git
a/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java
b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java
index 2781197fc2..7c422b3596 100644
---
a/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java
+++
b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java
@@ -749,7 +749,7 @@ public class DataSourceFactory implements ObjectFactory {
public DataSource createDataSource(Properties properties) throws Exception
{
return createDataSource(properties,null,false);
}
- /**
+ /**
* Creates and configures a {@link DataSource} instance based on the given
properties.
*
* @param properties The datasource configuration properties
@@ -773,7 +773,7 @@ public class DataSourceFactory implements ObjectFactory {
return dataSource;
}
- /**
+ /**
* Perform a JNDI lookup for the data source.
*
* @param context The JNDI context
diff --git
a/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java
b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java
index fc8dc27be6..54b6eb33f2 100644
---
a/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java
+++
b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java
@@ -73,7 +73,7 @@ public class DataSourceProxy implements PoolConfiguration {
}
- /**
+ /**
* Check if this proxy wraps an instance of the given interface.
* This implementation always returns {@code false}.
* <p>
@@ -89,17 +89,17 @@ public class DataSourceProxy implements PoolConfiguration {
}
- /**
- * Unwrap the proxy to the given interface.
- * This implementation always returns {@code null}.
- * <p>
- * Has to match signature in DataSource
- *
- * @param <T> The interface type
- * @param iface The interface to unwrap to - ignored
- * @return null
- * @throws SQLException never thrown
- */
+ /**
+ * Unwrap the proxy to the given interface.
+ * This implementation always returns {@code null}.
+ * <p>
+ * Has to match signature in DataSource
+ *
+ * @param <T> The interface type
+ * @param iface The interface to unwrap to - ignored
+ * @return null
+ * @throws SQLException never thrown
+ */
public <T> T unwrap(Class<T> iface) throws SQLException {
//we can't unwrap anything
return null;
@@ -124,7 +124,7 @@ public class DataSourceProxy implements PoolConfiguration {
}
}
- /**
+ /**
* Return the pool configuration properties.
*
* @return the pool configuration
@@ -249,7 +249,7 @@ public class DataSourceProxy implements PoolConfiguration {
return (javax.sql.PooledConnection) getConnection();
}
- /**
+ /**
* Return the underlying connection pool, creating it if necessary.
*
* @return the connection pool or null if creation failed
@@ -264,7 +264,7 @@ public class DataSourceProxy implements PoolConfiguration {
}
- /**
+ /**
* Close the connection pool, returning connections to the database.
*/
public void close() {
@@ -289,7 +289,7 @@ public class DataSourceProxy implements PoolConfiguration {
}
}
- /**
+ /**
* Return the current number of connections in the pool.
*
* @return the pool size
@@ -321,7 +321,7 @@ public class DataSourceProxy implements PoolConfiguration {
}
- /**
+ /**
* Set the pool configuration properties directly.
*
* @param poolProperties The new pool configuration
@@ -1225,7 +1225,7 @@ public class DataSourceProxy implements PoolConfiguration
{
getPoolProperties().setUseStatementFacade(useStatementFacade);
}
- /**
+ /**
* Purge all connections from the pool.
*/
public void purge() {
@@ -1236,7 +1236,7 @@ public class DataSourceProxy implements PoolConfiguration
{
}
}
- /**
+ /**
* Enable purging of connections on return to the pool.
*/
public void purgeOnReturn() {
diff --git
a/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/StatementFacade.java
b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/StatementFacade.java
index fe22ff88c1..2ea918d2f8 100644
---
a/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/StatementFacade.java
+++
b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/StatementFacade.java
@@ -196,7 +196,7 @@ public class StatementFacade extends
AbstractCreateStatementInterceptor {
}
}
- /**
+ /**
* Proxy for a ResultSet.
*/
protected class ResultSetProxy implements InvocationHandler {
diff --git
a/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/StatementDecoratorInterceptor.java
b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/StatementDecoratorInterceptor.java
index 6333ad53f5..b9f753a88d 100644
---
a/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/StatementDecoratorInterceptor.java
+++
b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/StatementDecoratorInterceptor.java
@@ -77,7 +77,7 @@ public class StatementDecoratorInterceptor extends
AbstractCreateStatementInterc
* performance, continue to use Proxy.getProxyClass(). This will need to be
* revisited if that method is marked for removal.
*/
- /**
+ /**
* Gets the constructor for creating ResultSet proxies.
* @return the ResultSet proxy constructor
* @throws NoSuchMethodException if the constructor is not found
diff --git
a/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java
b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java
index 3b18b888fd..ac39b0a824 100644
---
a/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java
+++
b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java
@@ -126,7 +126,7 @@ public class ConnectionPool extends
NotificationBroadcasterSupport
//=================================================================
// NOTIFICATION INFO
//=================================================================
- /**
+ /**
* Notification type sent when pool initialization fails.
*/
public static final String NOTIFY_INIT = "INIT FAILED";
diff --git
a/test/org/apache/catalina/authenticator/jaspic/TestPersistentProviderRegistrations.java
b/test/org/apache/catalina/authenticator/jaspic/TestPersistentProviderRegistrations.java
index 9fb329fe55..cfce28b744 100644
---
a/test/org/apache/catalina/authenticator/jaspic/TestPersistentProviderRegistrations.java
+++
b/test/org/apache/catalina/authenticator/jaspic/TestPersistentProviderRegistrations.java
@@ -1,19 +1,19 @@
-/**
-* Licensed to the Apache Software Foundation (ASF) under one or more
-* contributor license agreements. See the NOTICE file distributed with
-* this work for additional information regarding copyright ownership.
-* The ASF licenses this file to You under the Apache License, Version 2.0
-* (the "License"); you may not use this file except in compliance with
-* the License. You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.apache.catalina.authenticator.jaspic;
import java.io.File;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
