Author: markt
Date: Wed Jul 17 21:38:48 2013
New Revision: 1504286
URL: http://svn.apache.org/r1504286
Log:
Add some basic import tests and fix a couple of identified issues.
Added:
tomcat/trunk/test/org/apache/el/parser/TestAstIdentifier.java (with props)
Modified:
tomcat/trunk/java/org/apache/el/parser/AstIdentifier.java
Modified: tomcat/trunk/java/org/apache/el/parser/AstIdentifier.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/parser/AstIdentifier.java?rev=1504286&r1=1504285&r2=1504286&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/parser/AstIdentifier.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/AstIdentifier.java Wed Jul 17
21:38:48 2013
@@ -18,6 +18,7 @@
package org.apache.el.parser;
+import javax.el.ELClass;
import javax.el.ELException;
import javax.el.MethodExpression;
import javax.el.MethodInfo;
@@ -78,11 +79,27 @@ public final class AstIdentifier extends
// EL Resolvers
ctx.setPropertyResolved(false);
Object result = ctx.getELResolver().getValue(ctx, null, this.image);
- if (!ctx.isPropertyResolved()) {
- throw new PropertyNotFoundException(MessageFactory.get(
- "error.resolver.unhandled.null", this.image));
+ if (ctx.isPropertyResolved()) {
+ return result;
}
- return result;
+
+ // Import
+ result = ctx.getImportHandler().resolveClass(this.image);
+ if (result != null) {
+ return new ELClass((Class<?>) result);
+ }
+ result = ctx.getImportHandler().resolveStatic(this.image);
+ if (result != null) {
+ try {
+ return ((Class<?>) result).getField(this.image).get(null);
+ } catch (IllegalArgumentException | IllegalAccessException
+ | NoSuchFieldException | SecurityException e) {
+ throw new ELException(e);
+ }
+ }
+
+ throw new PropertyNotFoundException(MessageFactory.get(
+ "error.resolver.unhandled.null", this.image));
}
@Override
Added: tomcat/trunk/test/org/apache/el/parser/TestAstIdentifier.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/el/parser/TestAstIdentifier.java?rev=1504286&view=auto
==============================================================================
--- tomcat/trunk/test/org/apache/el/parser/TestAstIdentifier.java (added)
+++ tomcat/trunk/test/org/apache/el/parser/TestAstIdentifier.java Wed Jul 17
21:38:48 2013
@@ -0,0 +1,46 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.el.parser;
+
+import javax.el.ELProcessor;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public class TestAstIdentifier {
+
+ @Test
+ public void testImport01() {
+ ELProcessor processor = new ELProcessor();
+ Object result =
+ processor.getValue("Integer.MAX_VALUE",
+ Integer.class);
+ Assert.assertEquals(Integer.valueOf(Integer.MAX_VALUE), result);
+ }
+
+
+ @Test
+ public void testImport02() {
+ ELProcessor processor = new ELProcessor();
+
processor.getELManager().getELContext().getImportHandler().importStatic(
+ "java.lang.Integer.MAX_VALUE");
+ Object result =
+ processor.getValue("MAX_VALUE",
+ Integer.class);
+ Assert.assertEquals(Integer.valueOf(Integer.MAX_VALUE), result);
+ }
+}
Propchange: tomcat/trunk/test/org/apache/el/parser/TestAstIdentifier.java
------------------------------------------------------------------------------
svn:eol-style = native
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
