Merge pull request #8 from arjantijms/fixtckfailures

Fix TCK failures

Author: arjantijms

pom.xml

@@ -78,7 +78,7 @@
         <dependency>
             <groupId>jakarta.el</groupId>
             <artifactId>jakarta.el-api</artifactId>
-            <version>5.0.0-RC1</version>
+            <version>5.0.0</version>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
@@ -137,6 +137,7 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <version>5.1.4</version>
                 <configuration>
+                	<supportIncrementalBuild>true</supportIncrementalBuild>
                     <instructions>
                         <Bundle-SymbolicName>org.glassfish.expressly</Bundle-SymbolicName>
                         <_include>-osgi.bundle</_include>
@@ -179,7 +180,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.9.0</version>
+                <version>3.10.1</version>
                 <configuration>
                     <release>11</release>
                     <compilerArgument>-Xlint:unchecked</compilerArgument>

src/main/java/org/glassfish/expressly/ExpressionFactoryImpl.java

@@ -1,4 +1,5 @@
 /*
+ * Copyright (c) 2022, 2022 Contributors to the Eclipse Foundation.
  * Copyright (c) 1997, 2021 Oracle and/or its affiliates and others.
  * All rights reserved.
  *
@@ -66,7 +67,7 @@ public ExpressionFactoryImpl(Properties properties) {
     @Override
     public <T> T coerceToType(Object obj, Class<T> type) {
         try {
-            return ELSupport.coerceToType(obj, type, isBackwardCompatible22);
+            return ELSupport.coerceToType(null, obj, type, isBackwardCompatible22);
         } catch (IllegalArgumentException ex) {
             throw new ELException(ex);
         }

src/main/java/org/glassfish/expressly/MethodExpressionImpl.java

@@ -1,4 +1,5 @@
 /*
+ * Copyright (c) 2022, 2022 Contributors to the Eclipse Foundation.
  * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
@@ -38,6 +39,7 @@
 import jakarta.el.MethodExpression;
 import jakarta.el.MethodInfo;
 import jakarta.el.MethodNotFoundException;
+import jakarta.el.MethodReference;
 import jakarta.el.PropertyNotFoundException;
 import jakarta.el.VariableMapper;
 
@@ -77,9 +79,9 @@
 public final class MethodExpressionImpl extends MethodExpression implements Externalizable {
 
     private Class<?> expectedType;
-    private String expr;
-    private FunctionMapper fnMapper;
-    private VariableMapper varMapper;
+    private String expression;
+    private FunctionMapper functionMapper;
+    private VariableMapper variableMapper;
     private Class<?>[] paramTypes;
 
     private transient Node node;
@@ -98,10 +100,10 @@ public MethodExpressionImpl() {
      */
     public MethodExpressionImpl(String expr, Node node, FunctionMapper fnMapper, VariableMapper varMapper, Class<?> expectedType, Class<?>[] paramTypes) {
         super();
-        this.expr = expr;
+        this.expression = expr;
         this.node = node;
-        this.fnMapper = fnMapper;
-        this.varMapper = varMapper;
+        this.functionMapper = fnMapper;
+        this.variableMapper = varMapper;
         this.expectedType = expectedType;
         this.paramTypes = paramTypes;
     }
@@ -156,7 +158,7 @@ public boolean equals(Object obj) {
      */
     @Override
     public String getExpressionString() {
-        return expr;
+        return expression;
     }
 
     /**
@@ -176,7 +178,16 @@ public String getExpressionString() {
      */
     @Override
     public MethodInfo getMethodInfo(ELContext context) throws PropertyNotFoundException, MethodNotFoundException, ELException {
-        return getNode().getMethodInfo(new EvaluationContext(context, fnMapper, varMapper), paramTypes);
+        return getNode().getMethodInfo(new EvaluationContext(context, functionMapper, variableMapper), paramTypes);
+    }
+
+    @Override
+    public MethodReference getMethodReference(ELContext context) {
+        EvaluationContext ctx = new EvaluationContext(context, functionMapper, variableMapper);
+        ctx.notifyBeforeEvaluation(getExpressionString());
+        MethodReference methodReference = getNode().getMethodReference(ctx);
+        ctx.notifyAfterEvaluation(getExpressionString());
+        return methodReference;
     }
 
     /**
@@ -185,7 +196,7 @@ public MethodInfo getMethodInfo(ELContext context) throws PropertyNotFoundExcept
      */
     private Node getNode() throws ELException {
         if (node == null) {
-            node = ExpressionBuilder.createNode(expr);
+            node = ExpressionBuilder.createNode(expression);
         }
 
         return node;
@@ -231,12 +242,12 @@ public int hashCode() {
      */
     @Override
     public Object invoke(ELContext context, Object[] params) throws PropertyNotFoundException, MethodNotFoundException, ELException {
-        EvaluationContext ctx = new EvaluationContext(context, fnMapper, varMapper);
-        ctx.notifyBeforeEvaluation(expr);
+        EvaluationContext ctx = new EvaluationContext(context, functionMapper, variableMapper);
+        ctx.notifyBeforeEvaluation(expression);
 
         Object obj = getNode().invoke(ctx, paramTypes, params);
 
-        ctx.notifyAfterEvaluation(expr);
+        ctx.notifyAfterEvaluation(expression);
         return obj;
     }
 
@@ -247,30 +258,25 @@ public Object invoke(ELContext context, Object[] params) throws PropertyNotFound
      */
     @Override
     public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
-        expr = in.readUTF();
+        expression = in.readUTF();
         String type = in.readUTF();
 
         if (!"".equals(type)) {
             expectedType = forName(type);
         }
 
         paramTypes = toTypeArray(((String[]) in.readObject()));
-        fnMapper = (FunctionMapper) in.readObject();
-        varMapper = (VariableMapper) in.readObject();
+        functionMapper = (FunctionMapper) in.readObject();
+        variableMapper = (VariableMapper) in.readObject();
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see java.io.Externalizable#writeExternal(java.io.ObjectOutput)
-     */
     @Override
     public void writeExternal(ObjectOutput out) throws IOException {
-        out.writeUTF(expr);
+        out.writeUTF(expression);
         out.writeUTF(expectedType != null ? expectedType.getName() : "");
         out.writeObject(toTypeNameArray(paramTypes));
-        out.writeObject(fnMapper);
-        out.writeObject(varMapper);
+        out.writeObject(functionMapper);
+        out.writeObject(variableMapper);
     }
 
     @Override

src/main/java/org/glassfish/expressly/MethodExpressionLiteral.java

@@ -1,4 +1,5 @@
 /*
+ * Copyright (c) 2022, 2022 Contributors to the Eclipse Foundation.
  * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
@@ -34,40 +35,40 @@
 public class MethodExpressionLiteral extends MethodExpression implements Externalizable {
 
     private Class<?> expectedType;
-    private String expr;
+    private String expression;
     private Class<?>[] paramTypes;
 
     public MethodExpressionLiteral() {
         // do nothing
     }
 
-    public MethodExpressionLiteral(String expr, Class<?> expectedType, Class<?>[] paramTypes) {
-        this.expr = expr;
+    public MethodExpressionLiteral(String expression, Class<?> expectedType, Class<?>[] paramTypes) {
+        this.expression = expression;
         this.expectedType = expectedType;
         this.paramTypes = paramTypes;
     }
 
     @Override
     public MethodInfo getMethodInfo(ELContext context) throws ELException {
-        return new MethodInfo(expr, expectedType, paramTypes);
+        return new MethodInfo(expression, expectedType, paramTypes);
     }
 
     @Override
     public Object invoke(ELContext context, Object[] params) throws ELException {
         if (expectedType == null) {
-            return expr;
+            return expression;
         }
 
         try {
-            return context.convertToType(expr, expectedType);
+            return context.convertToType(expression, expectedType);
         } catch (Exception ex) {
             throw new ELException(ex);
         }
     }
 
     @Override
     public String getExpressionString() {
-        return expr;
+        return expression;
     }
 
     @Override
@@ -77,7 +78,7 @@ public boolean equals(Object obj) {
 
     @Override
     public int hashCode() {
-        return expr.hashCode();
+        return expression.hashCode();
     }
 
     @Override
@@ -87,7 +88,7 @@ public boolean isLiteralText() {
 
     @Override
     public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
-        expr = in.readUTF();
+        expression = in.readUTF();
         String type = in.readUTF();
 
         if (!"".equals(type)) {
@@ -99,7 +100,7 @@ public void readExternal(ObjectInput in) throws IOException, ClassNotFoundExcept
 
     @Override
     public void writeExternal(ObjectOutput out) throws IOException {
-        out.writeUTF(expr);
+        out.writeUTF(expression);
         out.writeUTF(expectedType != null ? expectedType.getName() : "");
         out.writeObject(toTypeNameArray(paramTypes));
     }