From b985776394d169ccd30c0cff324e1775dd318da2 Mon Sep 17 00:00:00 2001
From: Ziver Koc <Ziver@users.noreply.github.com>
Date: Thu, 3 Dec 2015 18:40:57 +0100
Subject: [PATCH] Added some structural classes

Former-commit-id: 5750452adfe6fecd4893130c9e24354c3dae31fe
---
 hal.db                                        | Bin 751616 -> 751616 bytes
 src/se/koc/hal/PowerChallenge.java            |  29 +++++++++++++++++
 .../koc/hal/deamon/DataAggregatorDaemon.java  |  22 +++++++++++++
 src/se/koc/hal/deamon/HalDaemon.java          |  12 +++++++
 src/se/koc/hal/struct/PowerMeterSensor.java   |   7 ++++
 src/se/koc/hal/struct/Sensor.java             |  11 +++++++
 src/se/koc/hal/struct/TemperatureSensor.java  |   7 ++++
 src/se/koc/hal/struct/Trigger.java            |  30 ------------------
 src/se/koc/hal/struct/User.java               |  16 ++++++++++
 9 files changed, 104 insertions(+), 30 deletions(-)
 create mode 100755 src/se/koc/hal/PowerChallenge.java
 create mode 100755 src/se/koc/hal/deamon/DataAggregatorDaemon.java
 create mode 100755 src/se/koc/hal/deamon/HalDaemon.java
 create mode 100755 src/se/koc/hal/struct/PowerMeterSensor.java
 create mode 100755 src/se/koc/hal/struct/Sensor.java
 create mode 100755 src/se/koc/hal/struct/TemperatureSensor.java
 delete mode 100755 src/se/koc/hal/struct/Trigger.java
 create mode 100755 src/se/koc/hal/struct/User.java

diff --git a/hal.db b/hal.db
index c14ec158a5984b70aa3d35e2906272efd50cb67e..bcc25b1ffae4b7e743d59f191c1dcbb44b697be2 100755
GIT binary patch
delta 546
zcmZqppxf|4cY?GaHv<FHJq8BGuRy$;fq@}zqK>g7H-qjoE?yvyl~I6!c`dUdQw!r4
zMgd0diH&i5P15r0P2vjd;^E<p&AgKjFv(6&@L=ILY)k}-85=V;WtJo+<)jv;<`w4`
zrN*ZumL$d}rl%KWrlSc>@AP6(n!d`5#gQ$(xFoTtWby|_vB@$_a$-7MoC(SKd1;v`
zsd>q%37kQ$jy_zP+jTuz^cbfrd9&Qx#KI-AU33QXQRaygESlM6+Sz3oftYDKy9_g9
z&354#%*TN;hTG;av##M~xCQqE!>#FpGnh|sVY=Ulk$w6U4;IVmTfA7zNp;VCZf0o)
zMkYoECLpmLXu~H)USKehW{U!LUjt*|skosbQ&aBbdPYqqhUe4!yjWt<TqudI*Duu9
zHOSMMOS3J2r7eK9Er4xX06TjF<H7A57uc1V7)__^Tw=e@DGZEt5ugpv+j%at12G2>
Mb8hFk%=Kjn0HesBC;$Ke

delta 1382
zcmajfYitx%6bJBo@7(R|&TPB(#dhh^?ot+P=~C7fv?9osZcCxvK2p-ylJo%^LnsPt
z0gWWnDW)X~hGr8cM52c12g4(cjjS<IiN=TsS}BhTwx#7!6)RWUN)-{$!s%x}oXPy=
ze`d~^`7rIm+b+BZ(i6>uupvU|6x7FrkgD$7e21BMZz(1a;jsfvmfGkJa*qv064Ul9
zd?{JBr=~K!x~;jTHMAof+8!%1wyGxJuMN0r{YB*gS5xd-Q^dt8tV*_CoFv<QKH8CQ
zcq(~zBtSEaEtPy_<P|C27z*+Qk)zT&A55yT*VWMu+rtNkx3z9+3$<*2aaTB`m&D7l
zNZ;JntXCvFI)B+%9OQEnNQzC?6Kt~G;h_4i$Qvv?OUZRLm23*NZY*fBlm%-8rGc7k
zLLzQy-v?YtVf0w9l}j{g^Typ|R(QYe;dD6e>rp$Lole^6WG9`Hc{i1e#MS)kURRn~
zlIKwqvHOWJQp&TU{IEoi*{GLD$0awbr=P%SVYlv4^sUa=ZmeT@Y_}XEp^SSNO)?sS
zyfETnjg<6G(nZwrf8WE%T+2rdI?cMYS~*@7mE2^ew7P-szbdIBh?0)nXR4?`v5zt!
zD@W0DD?n>eWV8`F*E~}FgS#4JWiztA4O)%**ZrAE6{V>AOSKVM6(z`j$|)#-y4O4x
zRE+w2XEA6M>aW)~a#a+err&uL#`{rsKYR}cu0;KL<}1*%sHx#G&<fP#l&ryx%V((M
zK==%5B6AIB8S0OM&9L{=sNc(8gJlX)qEQ1qg}M_y3wjdu+urdwRV+n~zh#59m!N*_
z&66}$6d-S(u7rX4s9y%Rf}TMAJh1`fn~~fD%PdCy<m`iid8jep1ZWZJR%tTGi@Lc!
zAC!x_v27h!HL(zRy>lmw$U%+1c@UJ18tFL+dK`7_%K^{=)bN#Qc<6l8kZ^!JGcqj$
z%|i{&ZUAMWe$3kq(&i$s79VDcaDyzgy8g;@pQ^%z(GM>SL6nKnz@7(+$Us~^<W|KT
z?7MWr4}DIIE`HIXigb)F4CoNe#;AY%h$0*hp;g!Sv(HtLhK=X#qtIx_#_zo*Ma)9<
z70p*gD)xO>7l6JLjJ|DsUJ=QNbNXIYBw^p#gYQFMB1YdFJ*|qzFgkPUHjD3~RUFC$
v6&Iyda$Gw-6*c$CS&XI_x##7}mL>4t8iU_QL6@~(hB8B0qSk(8^4<Rcn!R%c

diff --git a/src/se/koc/hal/PowerChallenge.java b/src/se/koc/hal/PowerChallenge.java
new file mode 100755
index 00000000..72d9752f
--- /dev/null
+++ b/src/se/koc/hal/PowerChallenge.java
@@ -0,0 +1,29 @@
+package se.koc.hal;
+
+
+import se.koc.hal.deamon.DataAggregatorDaemon;
+import se.koc.hal.deamon.HalDaemon;
+import zutil.db.DBConnection;
+
+import java.util.Timer;
+
+/**
+ * Created by Ziver on 2015-12-03.
+ */
+public class PowerChallenge {
+    private static HalDaemon[] daemons = new HalDaemon[]{
+            new DataAggregatorDaemon()
+    };
+
+    public static void main(String[] args) throws Exception {
+
+        // init Database
+        final DBConnection db = new DBConnection(DBConnection.DBMS.SQLite, "hal.db");
+
+        // init daemons
+        Timer daemonTimer = new Timer();
+        for(HalDaemon daemon : daemons){
+            daemon.initiate(daemonTimer);
+        }
+    }
+}
diff --git a/src/se/koc/hal/deamon/DataAggregatorDaemon.java b/src/se/koc/hal/deamon/DataAggregatorDaemon.java
new file mode 100755
index 00000000..4ad7544f
--- /dev/null
+++ b/src/se/koc/hal/deamon/DataAggregatorDaemon.java
@@ -0,0 +1,22 @@
+package se.koc.hal.deamon;
+
+import java.util.Timer;
+import java.util.TimerTask;
+
+/**
+ * Created by Ziver on 2015-12-03.
+ */
+public class DataAggregatorDaemon extends TimerTask implements HalDaemon {
+    private static final int FIVE_MINUTES_IN_MS = 5 * 60 * 1000;
+
+
+    public void initiate(Timer timer){
+        timer.schedule(this, FIVE_MINUTES_IN_MS);
+    }
+
+
+    @Override
+    public void run() {
+    
+    }
+}
diff --git a/src/se/koc/hal/deamon/HalDaemon.java b/src/se/koc/hal/deamon/HalDaemon.java
new file mode 100755
index 00000000..82087dda
--- /dev/null
+++ b/src/se/koc/hal/deamon/HalDaemon.java
@@ -0,0 +1,12 @@
+package se.koc.hal.deamon;
+
+import java.util.Timer;
+
+/**
+ * Created by Ziver on 2015-12-03.
+ */
+public interface HalDaemon {
+    public void initiate(Timer timer);
+
+    public void run();
+}
diff --git a/src/se/koc/hal/struct/PowerMeterSensor.java b/src/se/koc/hal/struct/PowerMeterSensor.java
new file mode 100755
index 00000000..13c76a04
--- /dev/null
+++ b/src/se/koc/hal/struct/PowerMeterSensor.java
@@ -0,0 +1,7 @@
+package se.koc.hal.struct;
+
+/**
+ * Created by Ziver on 2015-12-03.
+ */
+public class PowerMeterSensor extends Sensor{
+}
diff --git a/src/se/koc/hal/struct/Sensor.java b/src/se/koc/hal/struct/Sensor.java
new file mode 100755
index 00000000..23d47cb6
--- /dev/null
+++ b/src/se/koc/hal/struct/Sensor.java
@@ -0,0 +1,11 @@
+package se.koc.hal.struct;
+
+import zutil.db.bean.DBBean;
+
+/**
+ * Created by Ziver on 2015-12-03.
+ */
+@DBBean.DBTable("sensor")
+public class Sensor extends DBBean{
+
+}
diff --git a/src/se/koc/hal/struct/TemperatureSensor.java b/src/se/koc/hal/struct/TemperatureSensor.java
new file mode 100755
index 00000000..56d3339a
--- /dev/null
+++ b/src/se/koc/hal/struct/TemperatureSensor.java
@@ -0,0 +1,7 @@
+package se.koc.hal.struct;
+
+/**
+ * Created by Ziver on 2015-12-03.
+ */
+public class TemperatureSensor extends Sensor {
+}
diff --git a/src/se/koc/hal/struct/Trigger.java b/src/se/koc/hal/struct/Trigger.java
deleted file mode 100755
index 4cb84f7a..00000000
--- a/src/se/koc/hal/struct/Trigger.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (c) 2015 Ziver
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-package se.koc.hal.struct;
-
-/**
- * Created by Ziver on 2015-05-07.
- */
-public interface Trigger {
-
-}
diff --git a/src/se/koc/hal/struct/User.java b/src/se/koc/hal/struct/User.java
new file mode 100755
index 00000000..8abd448a
--- /dev/null
+++ b/src/se/koc/hal/struct/User.java
@@ -0,0 +1,16 @@
+package se.koc.hal.struct;
+
+import zutil.db.bean.DBBean;
+
+/**
+ * Created by Ziver on 2015-12-03.
+ */
+@DBBean.DBTable("user")
+public class User extends DBBean{
+
+    private String name;
+    private String address;
+    private boolean external;
+
+
+}