Further fix for #157. Expand use of generics in API.

jakartaee · Jul 7, 2021 · a14b203 · a14b203
1 parent 2a2fa59
commit a14b203
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/api/src/main/java/jakarta/el/ELProcessor.java b/api/src/main/java/jakarta/el/ELProcessor.java
@@ -92,8 +92,10 @@ public ELManager getELManager() {
      * @param expression The Jakarta Expression Language expression to be evaluated.
      * @return The result of the expression evaluation.
      */
-    public Object eval(String expression) {
-        return getValue(expression, Object.class);
+    public <T> T eval(String expression) {
+        @SuppressWarnings("unchecked")
+        T result = (T) getValue(expression, Object.class);
+        return result;
     }
 
     /**

diff --git a/src/test/java/org/glassfish/el/test/ELProcessorTest.java b/src/test/java/org/glassfish/el/test/ELProcessorTest.java
@@ -81,8 +81,8 @@ public void testSetVariable () {
         elp.setVariable("xx", null);
         assertEquals(elp.eval("xx"), null);
         elp.setVariable("yy", "abc");
-        assertEquals(elp.eval("yy = 123; abc"), 123L);
-        assertEquals(elp.eval("abc = 456; yy"), 456L);
+        assertEquals(elp.eval("yy = 123; abc"), Long.valueOf(123));
+        assertEquals(elp.eval("abc = 456; yy"), Long.valueOf(456));
     }
 
     @Test

diff --git a/src/test/java/org/glassfish/el/test/StaticRefTest.java b/src/test/java/org/glassfish/el/test/StaticRefTest.java
@@ -76,6 +76,6 @@ public void testConstructor() {
 
     @Test
     public void testStaticMethod() {
-        assertEquals(4, elp.eval("Integer.numberOfTrailingZeros(16)"));
+        assertEquals(Long.valueOf(4), elp.eval("Integer.numberOfTrailingZeros(16)"));
     }
 }