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/03/05 12:36:25 UTC
(tomcat) 04/04: Fix warnings when targeting Java 11
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit b6f25d3ac41823202f5e6a646568279e4ddd1000
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Mar 5 10:38:10 2026 +0000
Fix warnings when targeting Java 11
---
java/jakarta/el/CompositeELResolver.java | 1 +
java/org/apache/jasper/el/ELResolverImpl.java | 1 +
java/org/apache/juli/OneLineFormatter.java | 3 +--
test/jakarta/el/TestArrayELResolver.java | 1 +
test/jakarta/el/TestBeanELResolver.java | 2 ++
test/jakarta/el/TestBeanNameELResolver.java | 2 ++
test/jakarta/el/TestMapELResolver.java | 2 ++
test/jakarta/el/TestResourceBundleELResolver.java | 2 ++
8 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/java/jakarta/el/CompositeELResolver.java b/java/jakarta/el/CompositeELResolver.java
index 6c8ced4f8e..7e29461c2b 100644
--- a/java/jakarta/el/CompositeELResolver.java
+++ b/java/jakarta/el/CompositeELResolver.java
@@ -234,6 +234,7 @@ public class CompositeELResolver extends ELResolver {
this.guaranteeIterator();
}
+ @SuppressWarnings("removal")
private void guaranteeIterator() {
while (this.itr == null && this.idx < this.size) {
this.itr = this.resolvers[this.idx].getFeatureDescriptors(this.context, this.base);
diff --git a/java/org/apache/jasper/el/ELResolverImpl.java b/java/org/apache/jasper/el/ELResolverImpl.java
index a5fe68493a..b92d1fa1de 100644
--- a/java/org/apache/jasper/el/ELResolverImpl.java
+++ b/java/org/apache/jasper/el/ELResolverImpl.java
@@ -106,6 +106,7 @@ public final class ELResolverImpl extends ELResolver {
return elResolver.isReadOnly(context, base, property);
}
+ @SuppressWarnings("removal")
@Override
public Iterator<java.beans.FeatureDescriptor> getFeatureDescriptors(ELContext context, Object base) {
return elResolver.getFeatureDescriptors(context, base);
diff --git a/java/org/apache/juli/OneLineFormatter.java b/java/org/apache/juli/OneLineFormatter.java
index 57062d0a4e..26eb1f9af0 100644
--- a/java/org/apache/juli/OneLineFormatter.java
+++ b/java/org/apache/juli/OneLineFormatter.java
@@ -24,7 +24,6 @@ import java.lang.management.ThreadInfo;
import java.lang.management.ThreadMXBean;
import java.util.LinkedHashMap;
import java.util.Map;
-import java.util.Map.Entry;
import java.util.logging.Formatter;
import java.util.logging.LogManager;
import java.util.logging.LogRecord;
@@ -270,7 +269,7 @@ public class OneLineFormatter extends Formatter {
}
@Override
- protected boolean removeEldestEntry(Entry<Integer,String> eldest) {
+ protected boolean removeEldestEntry(Map.Entry<Integer,String> eldest) {
return (size() > cacheSize);
}
}
diff --git a/test/jakarta/el/TestArrayELResolver.java b/test/jakarta/el/TestArrayELResolver.java
index 49f0e1f4b0..633c28889a 100644
--- a/test/jakarta/el/TestArrayELResolver.java
+++ b/test/jakarta/el/TestArrayELResolver.java
@@ -486,6 +486,7 @@ public class TestArrayELResolver {
}
+ @SuppressWarnings("removal")
@Deprecated(forRemoval = true, since = "Tomcat 10.1.0")
@Test
public void testGetFeatureDescriptors() {
diff --git a/test/jakarta/el/TestBeanELResolver.java b/test/jakarta/el/TestBeanELResolver.java
index 700f5880a8..69ea92aaf1 100644
--- a/test/jakarta/el/TestBeanELResolver.java
+++ b/test/jakarta/el/TestBeanELResolver.java
@@ -366,6 +366,7 @@ public class TestBeanELResolver {
BeanELResolver resolver = new BeanELResolver();
ELContext context = new StandardELContext(ELManager.getExpressionFactory());
+ @SuppressWarnings("removal")
Iterator<FeatureDescriptor> result = resolver.getFeatureDescriptors(context, null);
Assert.assertNull(result);
@@ -380,6 +381,7 @@ public class TestBeanELResolver {
BeanELResolver resolver = new BeanELResolver();
ELContext context = new StandardELContext(ELManager.getExpressionFactory());
+ @SuppressWarnings("removal")
Iterator<FeatureDescriptor> result = resolver.getFeatureDescriptors(context, new Bean());
while (result.hasNext()) {
diff --git a/test/jakarta/el/TestBeanNameELResolver.java b/test/jakarta/el/TestBeanNameELResolver.java
index 1e4e286c0c..425563c6ee 100644
--- a/test/jakarta/el/TestBeanNameELResolver.java
+++ b/test/jakarta/el/TestBeanNameELResolver.java
@@ -450,6 +450,7 @@ public class TestBeanNameELResolver {
BeanNameELResolver resolver = createBeanNameELResolver();
ELContext context = new StandardELContext(ELManager.getExpressionFactory());
+ @SuppressWarnings("removal")
Object result = resolver.getFeatureDescriptors(context, null);
Assert.assertNull(result);
@@ -464,6 +465,7 @@ public class TestBeanNameELResolver {
public void testGetFeatureDescriptors02() {
BeanNameELResolver resolver = createBeanNameELResolver();
+ @SuppressWarnings("removal")
Object result = resolver.getFeatureDescriptors(null, new Object());
Assert.assertNull(result);
diff --git a/test/jakarta/el/TestMapELResolver.java b/test/jakarta/el/TestMapELResolver.java
index be38847f72..6db67cac89 100644
--- a/test/jakarta/el/TestMapELResolver.java
+++ b/test/jakarta/el/TestMapELResolver.java
@@ -226,6 +226,7 @@ public class TestMapELResolver {
MapELResolver mapELResolver = new MapELResolver();
ELContext context = new StandardELContext(ELManager.getExpressionFactory());
+ @SuppressWarnings("removal")
Iterator<FeatureDescriptor> result = mapELResolver.getFeatureDescriptors(context, new Object());
Assert.assertNull(result);
@@ -242,6 +243,7 @@ public class TestMapELResolver {
Map<String,String> map = new HashMap<>();
map.put("key", "value");
+ @SuppressWarnings("removal")
Iterator<FeatureDescriptor> result = mapELResolver.getFeatureDescriptors(context, map);
while (result.hasNext()) {
diff --git a/test/jakarta/el/TestResourceBundleELResolver.java b/test/jakarta/el/TestResourceBundleELResolver.java
index eaca94f97c..b5cbb714ea 100644
--- a/test/jakarta/el/TestResourceBundleELResolver.java
+++ b/test/jakarta/el/TestResourceBundleELResolver.java
@@ -217,6 +217,7 @@ public class TestResourceBundleELResolver {
ResourceBundleELResolver resolver = new ResourceBundleELResolver();
ELContext context = new StandardELContext(ELManager.getExpressionFactory());
+ @SuppressWarnings("removal")
Iterator<FeatureDescriptor> result = resolver.getFeatureDescriptors(context, new Object());
Assert.assertNull(result);
@@ -232,6 +233,7 @@ public class TestResourceBundleELResolver {
ELContext context = new StandardELContext(ELManager.getExpressionFactory());
ResourceBundle resourceBundle = new TesterResourceBundle(new Object[][] { { "key", "value" } });
+ @SuppressWarnings("removal")
Iterator<FeatureDescriptor> result = resolver.getFeatureDescriptors(context, resourceBundle);
while (result.hasNext()) {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org