Some more work on Triggers. issue 6

build.xml

@@ -94,7 +94,7 @@
 
 	<target name="build-dependencies">
 		<mkdir dir="${buildDir}" />
-		<get src="http://ci.koc.se/jenkins/job/Zutil/136/artifact/build/release/Zutil.jar"
+		<get src="http://ci.koc.se/jenkins/job/Zutil/137/artifact/build/release/Zutil.jar"
 			 dest="${libDir}" verbose="true" usetimestamp="true"/>
 	</target>
 

src/se/hal/action/SendEventAction.java

@@ -1,4 +1,4 @@
-package se.hal.trigger.action;
+package se.hal.action;
 
 import se.hal.ControllerManager;
 import se.hal.HalContext;
@@ -9,7 +9,6 @@ import zutil.db.DBConnection;
 import zutil.log.LogUtil;
 import zutil.ui.Configurator;
 
-import java.sql.SQLException;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 

src/se/hal/page/TriggerHttpPage.java

@@ -79,7 +79,7 @@ public class TriggerHttpPage extends HalHttpPage {
                 case "modify_trigger":
                     trigger.setObjectClass(request.get("type"));
                     trigger.getObjectConfigurator().setValues(request).applyConfiguration();
-                    trigger.save(db);
+                    flow.save(db); // will save all sub beans also
                     break;
                 case "remove_trigger":
                     flow.removeTrigger(trigger);
@@ -99,7 +99,7 @@ public class TriggerHttpPage extends HalHttpPage {
                 case "modify_action":
                     action.setObjectClass(request.get("type"));
                     action.getObjectConfigurator().setValues(request).applyConfiguration();
-                    action.save(db);
+                    flow.save(db); // will save all sub beans also
                     break;
                 case "remove_action":
                     flow.removeAction(action);

src/se/hal/struct/Action.java

@@ -5,7 +5,9 @@ import se.hal.intf.HalTrigger;
 import zutil.db.DBConnection;
 import zutil.db.bean.DBBean;
 import zutil.db.bean.DBBeanObjectDSO;
+import zutil.db.bean.DBBeanSQLResultHandler;
 
+import java.sql.PreparedStatement;
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
@@ -20,9 +22,10 @@ public class Action extends DBBeanObjectDSO<HalAction>{
     public static Action getAction(DBConnection db, long id) throws SQLException {
         return DBBean.load(db, Action.class, id);
     }
-    public static List<Action> getActions(DBConnection db, TriggerFlow flow) {
+    public static List<Action> getActions(DBConnection db, TriggerFlow flow) throws SQLException {
-        // TODO:
+        PreparedStatement stmt = db.getPreparedStatement( "SELECT * FROM action WHERE flow_id == ?" );
-        return new ArrayList<>();
+        stmt.setLong(1, flow.getId());
+        return DBConnection.exec(stmt, DBBeanSQLResultHandler.createList(Action.class, db) );
     }
 
 

src/se/hal/struct/Trigger.java

@@ -4,7 +4,9 @@ import se.hal.intf.HalTrigger;
 import zutil.db.DBConnection;
 import zutil.db.bean.DBBean;
 import zutil.db.bean.DBBeanObjectDSO;
+import zutil.db.bean.DBBeanSQLResultHandler;
 
+import java.sql.PreparedStatement;
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
@@ -21,9 +23,10 @@ public class Trigger extends DBBeanObjectDSO<HalTrigger>{
     public static Trigger getTrigger(DBConnection db, long id) throws SQLException {
         return DBBean.load(db, Trigger.class, id);
     }
-    public static List<Trigger> getTriggers(DBConnection db, TriggerFlow flow) {
+    public static List<Trigger> getTriggers(DBConnection db, TriggerFlow flow) throws SQLException {
-        // Todo:
+        PreparedStatement stmt = db.getPreparedStatement( "SELECT * FROM trigger WHERE flow_id == ?" );
-        return new ArrayList<>();
+        stmt.setLong(1, flow.getId());
+        return DBConnection.exec(stmt, DBBeanSQLResultHandler.createList(Trigger.class, db) );
     }
 
 

src/se/hal/struct/TriggerFlow.java

@@ -1,21 +1,14 @@
 package se.hal.struct;
 
-import se.hal.HalContext;
-import se.hal.intf.HalAction;
-import se.hal.intf.HalTrigger;
 import zutil.db.DBConnection;
 import zutil.db.bean.DBBean;
 import zutil.db.bean.DBBeanSQLResultHandler;
 import zutil.log.LogUtil;
-import zutil.parser.DataNode;
-import zutil.parser.json.JSONParser;
-import zutil.parser.json.JSONWriter;
 
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.logging.Level;
 import java.util.logging.Logger;
 
 /**
@@ -26,8 +19,10 @@ import java.util.logging.Logger;
 public class TriggerFlow extends DBBean {
     private static final Logger logger = LogUtil.getLogger();
 
-    private transient List<Trigger> triggerList = new ArrayList<>();
+    @DBLinkTable(beanClass=Trigger.class, table="trigger", idColumn = "flow_id")
-    private transient List<Action> actionList = new ArrayList<>();
+    private List<Trigger> triggerList = new ArrayList<>();
+    @DBLinkTable(beanClass=Action.class, table="action", idColumn = "flow_id")
+    private List<Action> actionList = new ArrayList<>();
 
 
 
@@ -40,16 +35,13 @@ public class TriggerFlow extends DBBean {
     }
 
 
-
     @Override
-    protected void postUpdateAction() {
+    public void delete(DBConnection db) throws SQLException {
-        DBConnection db = HalContext.getDB();
+        for(Trigger trigger : triggerList)
-
+            trigger.delete(db);
-        triggerList.clear();
+        for(Action action : actionList)
-        triggerList = Trigger.getTriggers(db, this);
+            action.delete(db);
-
+        super.delete(db);
-        actionList.clear();
-        actionList = Action.getActions(db, this);
     }