Merge pull request #30 from vlastimil-dolejs/master

fix for issue #29 - Ognl.GetMethods does not return default methods from interfaces implemented by parent class

src/java/ognl/OgnlRuntime.java

@@ -1789,9 +1789,10 @@ public static Map getMethods(Class targetClass, boolean staticMethods)
                     for (Class c = targetClass; c != null; c = c.getSuperclass())
                     {
                         toExamined.add(c);
+
+                        // Including interfaces is needed as from Java 8 intefaces can implement defaul methods
+                        toExamined.addAll(Arrays.asList(c.getInterfaces()));
                     }
-                    // Including interfaces is needed as from Java 8 intefaces can implement defaul methods
-                    toExamined.addAll(Arrays.asList(targetClass.getInterfaces()));
 
                     for (Class c : toExamined)
                     {

src/test/java/ognl/Java8Test.java

@@ -1,23 +1,37 @@
 package ognl;
 
+import java.util.List;
+
 import junit.framework.TestCase;
 
-import java.util.List;
+public class Java8Test extends TestCase {
 
-public class Java8Test extends TestCase /* implements InterfaceWithDefaults */ {
+    public void testDefaultMethodOnClass() {
+        /* defaultMethod(); */
+        List defaultMethod = OgnlRuntime.getMethods(ClassWithDefaults.class, "defaultMethod", false);
+        assertNotNull(defaultMethod);
+    }
 
-    public void testDefaultMethod() {
+    public void testDefaultMethodOnSubClass() {
         /* defaultMethod(); */
-        List defaultMethod = OgnlRuntime.getMethods(Java8Test.class, "defaultMethod", false);
+        List defaultMethod = OgnlRuntime.getMethods(SubClassWithDefaults.class, "defaultMethod", false);
         assertNotNull(defaultMethod);
     }
 
 }
 
+class SubClassWithDefaults extends ClassWithDefaults {
+
+}
+
+class ClassWithDefaults /* implements InterfaceWithDefaults */ {
+
+}
+
 /**
  * This won't work till switching to Java 8
  *
 interface InterfaceWithDefaults {
     default public void defaultMethod() { }
 }
-*/
+ */