(tomcat) branch 9.0.x updated: API changes

[remm]

This is an automated email from the ASF dual-hosted git repository.

remm 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 ffc0a2696a API changes
ffc0a2696a is described below

commit ffc0a2696ab0f33f14501174bf5f644e7aa06e3b
Author: remm <r...@apache.org>
AuthorDate: Fri Sep 27 10:39:20 2024 +0200

    API changes
---
 test/org/apache/el/parser/TestAstEmpty.java            | 6 +++---
 test/org/apache/el/parser/TestAstNotEmpty.java         | 6 +++---
 test/org/apache/el/parser/TestELParserPerformance.java | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/test/org/apache/el/parser/TestAstEmpty.java 
b/test/org/apache/el/parser/TestAstEmpty.java
index 1523967189..dd38899754 100644
--- a/test/org/apache/el/parser/TestAstEmpty.java
+++ b/test/org/apache/el/parser/TestAstEmpty.java
@@ -16,7 +16,7 @@
  */
 package org.apache.el.parser;
 
-import jakarta.el.ELProcessor;
+import javax.el.ELProcessor;
 
 import org.junit.Assert;
 import org.junit.Test;
@@ -26,7 +26,7 @@ public class TestAstEmpty {
     @Test
     public void test01() {
         ELProcessor processor = new ELProcessor();
-        Boolean result = processor.eval("empty 'abc'");
+        Object result = processor.eval("empty 'abc'");
         Assert.assertEquals(Boolean.FALSE, result);
     }
 
@@ -34,7 +34,7 @@ public class TestAstEmpty {
     @Test
     public void test02() {
         ELProcessor processor = new ELProcessor();
-        Boolean result = processor.eval("empty ''");
+        Object result = processor.eval("empty ''");
         Assert.assertEquals(Boolean.TRUE, result);
     }
 }
diff --git a/test/org/apache/el/parser/TestAstNotEmpty.java 
b/test/org/apache/el/parser/TestAstNotEmpty.java
index dceca6bb1c..ab6ce3944b 100644
--- a/test/org/apache/el/parser/TestAstNotEmpty.java
+++ b/test/org/apache/el/parser/TestAstNotEmpty.java
@@ -16,7 +16,7 @@
  */
 package org.apache.el.parser;
 
-import jakarta.el.ELProcessor;
+import javax.el.ELProcessor;
 
 import org.junit.Assert;
 import org.junit.Test;
@@ -26,7 +26,7 @@ public class TestAstNotEmpty {
     @Test
     public void test01() {
         ELProcessor processor = new ELProcessor();
-        Boolean result = processor.eval("not empty 'abc'");
+        Object result = processor.eval("not empty 'abc'");
         Assert.assertEquals(Boolean.TRUE, result);
     }
 
@@ -34,7 +34,7 @@ public class TestAstNotEmpty {
     @Test
     public void test02() {
         ELProcessor processor = new ELProcessor();
-        Boolean result = processor.eval("not empty ''");
+        Object result = processor.eval("not empty ''");
         Assert.assertEquals(Boolean.FALSE, result);
     }
 }
diff --git a/test/org/apache/el/parser/TestELParserPerformance.java 
b/test/org/apache/el/parser/TestELParserPerformance.java
index f92f311041..c02bad3a78 100644
--- a/test/org/apache/el/parser/TestELParserPerformance.java
+++ b/test/org/apache/el/parser/TestELParserPerformance.java
@@ -163,7 +163,7 @@ public class TestELParserPerformance {
 
             for (int i = 0; i < 10000000; i++) {
                 ValueExpression ve = factory.createValueExpression(context, 
expression, Boolean.class);
-                Boolean result = ve.getValue(context);
+                Object result = ve.getValue(context);
                 Assert.assertEquals(Boolean.TRUE, result);
             }
 


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org