You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2026/05/07 14:52:21 UTC
(tomcat) branch 9.0.x updated (0f869d035e -> dccaf44b29)
This is an automated email from the ASF dual-hosted git repository.
markt-asf pushed a change to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
from 0f869d035e Drop useless javadoc on override
new dbe7b61974 Work around an Eclipse bug
new dccaf44b29 Remove unnecessary warning suppression after Javadoc updates
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
java/org/apache/catalina/startup/FailedContext.java | 3 +--
.../webresources/AbstractSingleArchiveResourceSet.java | 3 +++
java/org/apache/jasper/compiler/ELNode.java | 3 ---
java/org/apache/jasper/compiler/Node.java | 5 ++---
java/org/apache/naming/ServiceRef.java | 4 ++--
.../util/http/fileupload/impl/FileItemIteratorImpl.java | 4 ++--
.../server/DefaultServerEndpointConfigurator.java | 1 +
.../java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java | 14 ++++++++------
8 files changed, 19 insertions(+), 18 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
(tomcat) 02/02: Remove unnecessary warning suppression after Javadoc updates
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt-asf pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit dccaf44b29a53551b210e46ac8d370ed64978b55
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu May 7 15:46:33 2026 +0100
Remove unnecessary warning suppression after Javadoc updates
---
java/org/apache/catalina/startup/FailedContext.java | 3 +--
.../webresources/AbstractSingleArchiveResourceSet.java | 3 +++
java/org/apache/jasper/compiler/ELNode.java | 3 ---
java/org/apache/jasper/compiler/Node.java | 5 ++---
java/org/apache/naming/ServiceRef.java | 4 ++--
.../util/http/fileupload/impl/FileItemIteratorImpl.java | 4 ++--
.../java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java | 14 ++++++++------
7 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/java/org/apache/catalina/startup/FailedContext.java b/java/org/apache/catalina/startup/FailedContext.java
index d4ad605c56..78935d7150 100644
--- a/java/org/apache/catalina/startup/FailedContext.java
+++ b/java/org/apache/catalina/startup/FailedContext.java
@@ -1178,9 +1178,8 @@ public class FailedContext extends LifecycleMBeanBase implements Context {
/**
* Adds a valve to this context. This is a no-op for a failed context.
*
- * @param valve the valve to add
+ * @param valve the valve to add - ignored
*/
- @SuppressWarnings("unused")
public synchronized void addValve(Valve valve) {
// NO-OP
}
diff --git a/java/org/apache/catalina/webresources/AbstractSingleArchiveResourceSet.java b/java/org/apache/catalina/webresources/AbstractSingleArchiveResourceSet.java
index bd91b7dde2..a23a8da21b 100644
--- a/java/org/apache/catalina/webresources/AbstractSingleArchiveResourceSet.java
+++ b/java/org/apache/catalina/webresources/AbstractSingleArchiveResourceSet.java
@@ -51,6 +51,9 @@ public abstract class AbstractSingleArchiveResourceSet extends AbstractArchiveRe
* @param webAppMount The web app mount
* @param base The base
* @param internalPath The internal path
+ *
+ * @throws IllegalArgumentException if the {@link WebResourceRoot} is available but this resource set cannot be
+ * started
*/
public AbstractSingleArchiveResourceSet(WebResourceRoot root, String webAppMount, String base, String internalPath)
throws IllegalArgumentException {
diff --git a/java/org/apache/jasper/compiler/ELNode.java b/java/org/apache/jasper/compiler/ELNode.java
index bd27b89efc..e80e870a24 100644
--- a/java/org/apache/jasper/compiler/ELNode.java
+++ b/java/org/apache/jasper/compiler/ELNode.java
@@ -403,7 +403,6 @@ public abstract class ELNode {
*
* @throws JasperException if an error occurs during visitation
*/
- @SuppressWarnings("unused")
public void visit(Function n) throws JasperException {
// NOOP by default
}
@@ -415,7 +414,6 @@ public abstract class ELNode {
*
* @throws JasperException if an error occurs during visitation
*/
- @SuppressWarnings("unused")
public void visit(Text n) throws JasperException {
// NOOP by default
}
@@ -427,7 +425,6 @@ public abstract class ELNode {
*
* @throws JasperException if an error occurs during visitation
*/
- @SuppressWarnings("unused")
public void visit(ELText n) throws JasperException {
// NOOP by default
}
diff --git a/java/org/apache/jasper/compiler/Node.java b/java/org/apache/jasper/compiler/Node.java
index 68e93e8fe5..2843442a3c 100644
--- a/java/org/apache/jasper/compiler/Node.java
+++ b/java/org/apache/jasper/compiler/Node.java
@@ -2931,13 +2931,12 @@ public abstract class Node implements TagConstants {
}
/**
- * This method provides a place to put actions that are common to all nodes. Override this in the child visitor
- * class if needed.
+ * This method provides a place to put actions that are common to all nodes. It is a NO-OP by default. Override
+ * this in the child visitor class if needed.
*
* @param n The node to visit
* @throws JasperException if an error occurs while visiting the node
*/
- @SuppressWarnings("unused")
protected void doVisit(Node n) throws JasperException {
// NOOP by default
}
diff --git a/java/org/apache/naming/ServiceRef.java b/java/org/apache/naming/ServiceRef.java
index 20a9251baa..090cea4db9 100644
--- a/java/org/apache/naming/ServiceRef.java
+++ b/java/org/apache/naming/ServiceRef.java
@@ -100,7 +100,7 @@ public class ServiceRef extends AbstractRef {
/**
* Creates a ServiceRef with the given parameters and factory information.
*
- * @param refname the reference name
+ * @param refname the reference name - unused
* @param serviceInterface the service interface class name
* @param serviceQname the service QName (namespace and local part)
* @param wsdl the WSDL location
@@ -108,7 +108,7 @@ public class ServiceRef extends AbstractRef {
* @param factory the factory class name
* @param factoryLocation the factory location
*/
- public ServiceRef(@SuppressWarnings("unused") String refname, String serviceInterface, String[] serviceQname,
+ public ServiceRef(String refname, String serviceInterface, String[] serviceQname,
String wsdl, String jaxrpcmapping, String factory, String factoryLocation) {
super(serviceInterface, factory, factoryLocation);
StringRefAddr refAddr;
diff --git a/java/org/apache/tomcat/util/http/fileupload/impl/FileItemIteratorImpl.java b/java/org/apache/tomcat/util/http/fileupload/impl/FileItemIteratorImpl.java
index 4682de2960..fd0b01a0b7 100644
--- a/java/org/apache/tomcat/util/http/fileupload/impl/FileItemIteratorImpl.java
+++ b/java/org/apache/tomcat/util/http/fileupload/impl/FileItemIteratorImpl.java
@@ -146,11 +146,11 @@ public class FileItemIteratorImpl implements FileItemIterator {
* Initializes the multipart stream for processing the request.
*
* @param fileUploadBase The file upload base configuration
- * @param pRequestContext The request context
+ * @param pRequestContext The request context - unused
* @throws FileUploadException If the request content type is invalid or size exceeds limits
* @throws IOException If an I/O error occurs
*/
- protected void init(final FileUploadBase fileUploadBase, @SuppressWarnings("unused") final RequestContext pRequestContext)
+ protected void init(final FileUploadBase fileUploadBase, final RequestContext pRequestContext)
throws FileUploadException, IOException {
final String contentType = ctx.getContentType();
if ((null == contentType)
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 d050dbf13a..fc8dc27be6 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
@@ -75,13 +75,14 @@ public class DataSourceProxy implements PoolConfiguration {
/**
* Check if this proxy wraps an instance of the given interface.
- * This implementation always returns false.
+ * This implementation always returns {@code false}.
+ * <p>
+ * Has to match signature in DataSource.
*
- * @param iface The interface to check
+ * @param iface The interface to check - ignored
* @return false
* @throws SQLException never thrown
*/
- @SuppressWarnings("unused") // Has to match signature in DataSource
public boolean isWrapperFor(Class<?> iface) throws SQLException {
// we are not a wrapper of anything
return false;
@@ -90,14 +91,15 @@ public class DataSourceProxy implements PoolConfiguration {
/**
* Unwrap the proxy to the given interface.
- * This implementation always returns null.
+ * 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
+ * @param iface The interface to unwrap to - ignored
* @return null
* @throws SQLException never thrown
*/
- @SuppressWarnings("unused") // Has to match signature in DataSource
public <T> T unwrap(Class<T> iface) throws SQLException {
//we can't unwrap anything
return null;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
(tomcat) 01/02: Work around an Eclipse bug
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt-asf pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit dbe7b61974985795582b9b1dc5ed908f6a90df24
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu May 7 15:45:42 2026 +0100
Work around an Eclipse bug
---
.../tomcat/websocket/server/DefaultServerEndpointConfigurator.java | 1 +
1 file changed, 1 insertion(+)
diff --git a/java/org/apache/tomcat/websocket/server/DefaultServerEndpointConfigurator.java b/java/org/apache/tomcat/websocket/server/DefaultServerEndpointConfigurator.java
index 7b730874f4..496099316e 100644
--- a/java/org/apache/tomcat/websocket/server/DefaultServerEndpointConfigurator.java
+++ b/java/org/apache/tomcat/websocket/server/DefaultServerEndpointConfigurator.java
@@ -29,6 +29,7 @@ import javax.websocket.server.ServerEndpointConfig;
/**
* Default implementation of {@link ServerEndpointConfig.Configurator} for WebSocket server endpoints.
*/
+@SuppressWarnings("javadoc") // Eclipse bug - the Javadoc is fine
@aQute.bnd.annotation.spi.ServiceProvider(value = ServerEndpointConfig.Configurator.class)
public class DefaultServerEndpointConfigurator extends ServerEndpointConfig.Configurator {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org