This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new 4b4022f5f9 Fix IDE warnings
4b4022f5f9 is described below
commit 4b4022f5f9360767a94bc4f726d3dc4b635e2c3c
Author: Mark Thomas <[email protected]>
AuthorDate: Thu Mar 20 13:22:17 2025 +0000
Fix IDE warnings
---
java/org/apache/catalina/core/DefaultInstanceManager.java | 8 ++++----
java/org/apache/catalina/filters/ExpiresFilter.java | 3 ---
java/org/apache/catalina/loader/WebappClassLoaderBase.java | 5 -----
java/org/apache/catalina/ssi/SSIServlet.java | 1 -
.../tomcat/dbcp/dbcp2/datasources/PerUserPoolDataSource.java | 1 -
5 files changed, 4 insertions(+), 14 deletions(-)
diff --git a/java/org/apache/catalina/core/DefaultInstanceManager.java
b/java/org/apache/catalina/core/DefaultInstanceManager.java
index b9a00b8918..42892d0170 100644
--- a/java/org/apache/catalina/core/DefaultInstanceManager.java
+++ b/java/org/apache/catalina/core/DefaultInstanceManager.java
@@ -376,21 +376,21 @@ public class DefaultInstanceManager implements
InstanceManager {
annotations.add(new
AnnotationCacheEntry(fieldName, null, resourceAnnotation.name(),
AnnotationCacheEntryType.FIELD));
} else if (EJB_PRESENT && (ejbAnnotation =
field.getAnnotation(EJB.class)) != null) {
- annotations.add(new
AnnotationCacheEntry(fieldName, null, ((EJB) ejbAnnotation).name(),
+ annotations.add(new
AnnotationCacheEntry(fieldName, null, ejbAnnotation.name(),
AnnotationCacheEntryType.FIELD));
} else if (WS_PRESENT &&
(webServiceRefAnnotation =
field.getAnnotation(WebServiceRef.class)) != null) {
annotations.add(new
AnnotationCacheEntry(fieldName, null,
- ((WebServiceRef)
webServiceRefAnnotation).name(), AnnotationCacheEntryType.FIELD));
+ webServiceRefAnnotation.name(),
AnnotationCacheEntryType.FIELD));
} else if (JPA_PRESENT &&
(persistenceContextAnnotation =
field.getAnnotation(PersistenceContext.class))
!= null) {
annotations.add(new
AnnotationCacheEntry(fieldName, null,
- ((PersistenceContext)
persistenceContextAnnotation).name(),
+ persistenceContextAnnotation.name(),
AnnotationCacheEntryType.FIELD));
} else if (JPA_PRESENT &&
(persistenceUnitAnnotation =
field.getAnnotation(PersistenceUnit.class)) != null) {
annotations.add(new
AnnotationCacheEntry(fieldName, null,
- ((PersistenceUnit)
persistenceUnitAnnotation).name(),
+ persistenceUnitAnnotation.name(),
AnnotationCacheEntryType.FIELD));
}
}
diff --git a/java/org/apache/catalina/filters/ExpiresFilter.java
b/java/org/apache/catalina/filters/ExpiresFilter.java
index a01b83f1cc..f546fa7bb2 100644
--- a/java/org/apache/catalina/filters/ExpiresFilter.java
+++ b/java/org/apache/catalina/filters/ExpiresFilter.java
@@ -473,9 +473,6 @@ public class ExpiresFilter extends FilterBase {
* <p>
* Can be expressed like '{@code access plus 1 month 15 days 2 hours}'.
* </p>
- *
- * @param durations List of duration elements.
- * @param startingPoint Starting point of the elapse to set in the
response.
*/
protected static class ExpiresConfiguration {
/**
diff --git a/java/org/apache/catalina/loader/WebappClassLoaderBase.java
b/java/org/apache/catalina/loader/WebappClassLoaderBase.java
index 7754d203be..31ccb97489 100644
--- a/java/org/apache/catalina/loader/WebappClassLoaderBase.java
+++ b/java/org/apache/catalina/loader/WebappClassLoaderBase.java
@@ -2217,11 +2217,6 @@ public abstract class WebappClassLoaderBase extends
URLClassLoader
}
- /*
- * The use of getPackage() is appropriate given that the code is checking
if the package is sealed. Therefore,
- * parent class loaders need to be checked.
- */
- @SuppressWarnings("deprecation")
private Class<?> findClassInternal(String name, String path) {
ResourceEntry entry = resourceEntries.get(path);
WebResource resource = null;
diff --git a/java/org/apache/catalina/ssi/SSIServlet.java
b/java/org/apache/catalina/ssi/SSIServlet.java
index 41dad7bb7e..f976591531 100644
--- a/java/org/apache/catalina/ssi/SSIServlet.java
+++ b/java/org/apache/catalina/ssi/SSIServlet.java
@@ -200,7 +200,6 @@ public class SSIServlet extends HttpServlet {
}
if (stringWriter != null) {
printWriter.flush();
- @SuppressWarnings("null")
String text = stringWriter.toString();
res.getWriter().write(text);
}
diff --git
a/java/org/apache/tomcat/dbcp/dbcp2/datasources/PerUserPoolDataSource.java
b/java/org/apache/tomcat/dbcp/dbcp2/datasources/PerUserPoolDataSource.java
index 8ceefe9b68..6d7f8ac98f 100644
--- a/java/org/apache/tomcat/dbcp/dbcp2/datasources/PerUserPoolDataSource.java
+++ b/java/org/apache/tomcat/dbcp/dbcp2/datasources/PerUserPoolDataSource.java
@@ -665,7 +665,6 @@ public class PerUserPoolDataSource extends
InstanceKeyDataSource {
* @throws IOException Any of the usual Input/Output related
exceptions.
* @throws ClassNotFoundException A class of a serialized object cannot be
found.
*/
- @SuppressWarnings("resource")
private void readObject(final ObjectInputStream in) throws IOException,
ClassNotFoundException {
in.defaultReadObject();
this.managers = readObjectImpl().managers;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
