#137 Add afterLoaded() callback

Author: Igor Polevoy

activejdbc/src/main/java/org/javalite/activejdbc/CallbackAdapter.java

@@ -24,6 +24,8 @@ public class CallbackAdapter<T extends Model> implements CallbackListener<T>{
 
     @Override public void beforeSave(T m) {}
 
+    @Override public void afterLoad(T m) {}
+
     @Override public void afterSave(T m) {}
 
     @Override public void beforeCreate(T m) {}

activejdbc/src/main/java/org/javalite/activejdbc/CallbackListener.java

@@ -21,6 +21,9 @@
  * @author Igor Polevoy
  */
 public interface  CallbackListener<T extends Model> {
+
+    void afterLoad(T m);
+
     void beforeSave(T m);
     void afterSave(T m);
 

activejdbc/src/main/java/org/javalite/activejdbc/CallbackSupport.java

@@ -24,6 +24,11 @@ abstract class CallbackSupport {
     protected void beforeSave() {
         // overridable
     }
+
+    protected void afterLoad() {
+        // overridable
+    }
+
     protected void afterSave() {
         // overridable
     }

activejdbc/src/main/java/org/javalite/activejdbc/Model.java

@@ -71,6 +71,13 @@ public abstract class Model extends CallbackSupport implements Externalizable {
     protected Model() {
     }
 
+    private void fireAfterLoad() {
+        afterLoad();
+        for (CallbackListener callback : modelRegistryLocal().callbacks()) {
+            callback.afterLoad(this);
+        }
+    }
+
     private void fireBeforeSave() {
         beforeSave();
         for (CallbackListener callback : modelRegistryLocal().callbacks()) {
@@ -161,7 +168,7 @@ protected Set<String> dirtyAttributeNames() {
      * are new values for it.
      */
     public <T extends Model> T fromMap(Map input) {
-        hydrate(input);
+        hydrate(input, false);
         dirtyAttributeNames.addAll(input.keySet());
         return (T) this;
     }
@@ -174,7 +181,7 @@ public <T extends Model> T fromMap(Map input) {
      *
      * @param attributesMap map containing values for this instance.
      */
-    protected void hydrate(Map<String, Object> attributesMap) {
+    protected void hydrate(Map<String, Object> attributesMap, boolean fireAfterLoad) {
         Set<String> attributeNames = getMetaModelLocal().getAttributeNames();
         for (Map.Entry<String, Object> entry : attributesMap.entrySet()) {
             if (attributeNames.contains(entry.getKey())) {
@@ -186,6 +193,11 @@ protected void hydrate(Map<String, Object> attributesMap) {
                 }
             }
         }
+
+        if(fireAfterLoad){
+            fireAfterLoad();
+        }
+
     }
 
 
@@ -1079,7 +1091,7 @@ public <P extends Model> P parent(Class<P> parentClass, boolean cache) {
         } else {
             try {
                 P parent = parentClass.newInstance();
-                parent.hydrate(results.get(0));
+                parent.hydrate(results.get(0), true);
                 if (parentMM.cached()) {
                     QueryCache.instance().addItem(parentTable, query, new Object[]{fkValue}, parent);
                 }

activejdbc/src/main/java/org/javalite/activejdbc/ModelDelegate.java

@@ -228,7 +228,7 @@ static <T extends Model> T instance(Map<String, Object> map, MetaModel metaModel
         try {
             T instance = clazz.newInstance();
             instance.setMetamodelLocal(metaModel);
-            instance.hydrate(map);
+            instance.hydrate(map, true);
             return instance;
         } catch(InstantiationException e) {
             throw new InitException("Failed to create a new instance of: " + metaModel.getModelClass() + ", are you sure this class has a default constructor?");

activejdbc/src/test/java/org/javalite/activejdbc/Issue137Spec.java

@@ -0,0 +1,62 @@
+package org.javalite.activejdbc;
+
+import org.javalite.activejdbc.test.ActiveJDBCTest;
+import org.javalite.activejdbc.test_models.Apple;
+import org.javalite.activejdbc.test_models.Person;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.util.Map;
+
+/**
+ * @author Igor Polevoy on 4/7/15.
+ */
+public class Issue137Spec extends ActiveJDBCTest {
+
+
+    // this is needed to not break the build, since this callback will modify
+    // value on the Person model in other tests.
+    static class Switch {
+        boolean enabled = true;
+    }
+
+    static Switch sw = new Switch();
+
+    static CallbackAdapter adapter = new CallbackAdapter() {
+        @Override
+        public void afterLoad(Model m) {
+            if (sw.enabled) {
+                m.set("name", m.get("name") + " :suffix added after load");
+            }
+        }
+    };
+
+    static {
+        Person.callbackWith(adapter);
+    }
+
+    @Before
+    public void before() throws Exception {
+        super.before();
+        deleteAndPopulateTable("people");
+    }
+
+    @Test
+    public void shouldFireAfterLoadFromDB() {
+        sw.enabled = true;
+        a(Person.findAll().orderBy("name").get(0).get("name")).shouldBeEqual("Joe :suffix added after load");
+        sw.enabled = false;
+    }
+
+    @Test
+    public void shouldNotFireAfterLoadFromMap() {
+        sw.enabled = true;
+        Person p = new Person();
+        Person p1 = (Person) Person.findAll().orderBy("name").get(0);
+        Map m = p1.toMap();
+        m.put("name", "Jim");
+        p.fromMap(m);
+        a(p.get("name")).shouldBeEqual("Jim");
+        sw.enabled = false;
+    }
+}