Implement superclass traversal for all JOhm operations.

This patch is a fix for Issue xetorthio#11 (https://github.com/xetorthio/johm/issues#issue/11); Support mapping of attributes in all classes of the inheritance hierarchy.
catinred2 · Dec 26, 2010 · e8ae80e · e8ae80e
1 parent d928201
commit e8ae80e
Show file tree

Hide file tree

Showing 4 changed files with 441 additions and 372 deletions.
diff --git a/src/main/java/redis/clients/johm/JOhm.java b/src/main/java/redis/clients/johm/JOhm.java
@@ -2,7 +2,6 @@
 
 import java.lang.reflect.Field;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.LinkedHashMap;
@@ -64,11 +63,7 @@ public static <T> T get(Class<?> clazz, int id) {
             JOhmUtils.initCollections(newInstance, nest);
 
             Map<String, String> hashedObject = nest.cat(id).hgetAll();
-            for (Field field : clazz.getDeclaredFields()) {
-                fillField(hashedObject, newInstance, field);
-                fillArrayField(nest, newInstance, field);
-            }
-            for (Field field : clazz.getSuperclass().getDeclaredFields()) {
+            for (Field field : JOhmUtils.gatherAllFields(clazz)) {
                 fillField(hashedObject, newInstance, field);
                 fillArrayField(nest, newInstance, field);
             }
@@ -159,14 +154,10 @@ public static <T> T save(final Object model, boolean saveChildren) {
         final Nest nest = initIfNeeded(model);
 
         final Map<String, String> hashedObject = new HashMap<String, String>();
-        List<Field> fields = new ArrayList<Field>();
-        fields.addAll(Arrays.asList(model.getClass().getDeclaredFields()));
-        fields.addAll(Arrays.asList(model.getClass().getSuperclass()
-                .getDeclaredFields()));
         Map<RedisArray<Object>, Object[]> pendingArraysToPersist = null;
         try {
             String fieldName = null;
-            for (Field field : fields) {
+            for (Field field : JOhmUtils.gatherAllFields(model.getClass())) {
                 field.setAccessible(true);
                 if (JOhmUtils.detectJOhmCollection(field)
                         || field.isAnnotationPresent(Id.class)) {
@@ -273,11 +264,7 @@ public static boolean delete(Class<?> clazz, int id, boolean deleteIndexes,
                 // think about promoting deleteChildren as default behavior so
                 // that this field lookup gets folded into that
                 // if-deleteChildren block
-                List<Field> fields = new ArrayList<Field>();
-                fields.addAll(Arrays.asList(clazz.getDeclaredFields()));
-                fields.addAll(Arrays.asList(clazz.getSuperclass()
-                        .getDeclaredFields()));
-                for (Field field : fields) {
+                for (Field field : JOhmUtils.gatherAllFields(clazz)) {
                     if (field.isAnnotationPresent(Indexed.class)) {
                         field.setAccessible(true);
                         Object fieldValue = null;
@@ -300,11 +287,7 @@ public static boolean delete(Class<?> clazz, int id, boolean deleteIndexes,
                 }
             }
             if (deleteChildren) {
-                List<Field> fields = new ArrayList<Field>();
-                fields.addAll(Arrays.asList(clazz.getDeclaredFields()));
-                fields.addAll(Arrays.asList(clazz.getSuperclass()
-                        .getDeclaredFields()));
-                for (Field field : fields) {
+                for (Field field : JOhmUtils.gatherAllFields(clazz)) {
                     if (field.isAnnotationPresent(Reference.class)) {
                         field.setAccessible(true);
                         try {