Search fields from superclasses #10504

Modified buildAndBindMemberFields method to use a new
getFieldsInDeclareOrder method that searches fields also from
superclasses. Added a unit test to verify the new logic. Fixes the issue
in ticket #10504

Change-Id: Ic855e274c5b4d1c83760d6c2c53c67413a1da42c

1 files changed, 25 insertions, 3 deletions

diff --git a/server/src/com/vaadin/data/fieldgroup/FieldGroup.java b/server/src/com/vaadin/data/fieldgroup/FieldGroup.java
index 51cd3126cb..8803054857 100644
--- a/server/src/com/vaadin/data/fieldgroup/FieldGroup.java
+++ b/server/src/com/vaadin/data/fieldgroup/FieldGroup.java
@@ -794,8 +794,7 @@ public class FieldGroup implements Serializable {
             boolean buildFields) throws BindException {
         Class<?> objectClass = objectWithMemberFields.getClass();
 
-        for (java.lang.reflect.Field memberField : objectClass
-                .getDeclaredFields()) {
+        for (java.lang.reflect.Field memberField : getFieldsInDeclareOrder(objectClass)) {
 
             if (!Field.class.isAssignableFrom(memberField.getType())) {
                 // Process next field
@@ -1001,4 +1000,27 @@ public class FieldGroup implements Serializable {
         field.setCaption(caption);
         return field;
     }
-}
\ No newline at end of file
+
+    /**
+     * Returns an array containing Field objects reflecting all the fields of
+     * the class or interface represented by this Class object. The elements in
+     * the array returned are sorted in declare order from sub class to super
+     * class.
+     * 
+     * @param searchClass
+     * @return
+     */
+    protected static List<java.lang.reflect.Field> getFieldsInDeclareOrder(
+            Class searchClass) {
+        ArrayList<java.lang.reflect.Field> memberFieldInOrder = new ArrayList<java.lang.reflect.Field>();
+
+        while (searchClass != null) {
+            for (java.lang.reflect.Field memberField : searchClass
+                    .getDeclaredFields()) {
+                memberFieldInOrder.add(memberField);
+            }
+            searchClass = searchClass.getSuperclass();
+        }
+        return memberFieldInOrder;
+    }
+}