VELOCITY-102 add support for static utility class' methods
git-svn-id: https://svn.apache.org/repos/asf/velocity/engine/trunk@687121 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/java/org/apache/velocity/util/introspection/UberspectImpl.java b/src/java/org/apache/velocity/util/introspection/UberspectImpl.java
index ea95bb4..a2f8a68 100644
--- a/src/java/org/apache/velocity/util/introspection/UberspectImpl.java
+++ b/src/java/org/apache/velocity/util/introspection/UberspectImpl.java
@@ -195,8 +195,10 @@
{
return new VelMethodImpl(m);
}
+
+ Class cls = obj.getClass();
// if it's an array
- if (obj.getClass().isArray())
+ if (cls.isArray())
{
// check for support via our array->list wrapper
m = introspector.getMethod(ArrayListWrapper.class, methodName, args);
@@ -207,6 +209,15 @@
return new VelMethodImpl(m, true);
}
}
+ // watch for classes, to allow calling their static methods (VELOCITY-102)
+ else if (cls == Class.class)
+ {
+ m = introspector.getMethod((Class)obj, methodName, args);
+ if (m != null)
+ {
+ return new VelMethodImpl(m);
+ }
+ }
return null;
}
diff --git a/src/test/org/apache/velocity/test/StaticUtilityMethodsTestCase.java b/src/test/org/apache/velocity/test/StaticUtilityMethodsTestCase.java
new file mode 100755
index 0000000..4f8dc9d
--- /dev/null
+++ b/src/test/org/apache/velocity/test/StaticUtilityMethodsTestCase.java
@@ -0,0 +1,58 @@
+package org.apache.velocity.test;
+
+/*
+ * 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.
+ */
+
+import org.apache.velocity.VelocityContext;
+
+/**
+ * This class tests support for putting static utility classes
+ * like java.lang.Math directly into the context in order to
+ * use their methods.
+ */
+public class StaticUtilityMethodsTestCase extends BaseEvalTestCase
+{
+ public StaticUtilityMethodsTestCase(String name)
+ {
+ super(name);
+ }
+
+ public void testMath()
+ {
+ context.put("Math", Math.class);
+ assertEvalEquals("java.lang.Math", "$Math.name");
+ assertEvalEquals("3.0", "$Math.ceil(2.5)");
+ }
+
+ public void testFoo()
+ {
+ context.put("Foo", Foo.class);
+ assertEvalEquals("test", "$Foo.foo('test')");
+ }
+
+
+ public static class Foo
+ {
+ private Foo() {}
+ public static String foo(String s)
+ {
+ return s == null ? "foo" : s;
+ }
+ }
+}
