From 6dbaff4444a224859429464f76857c9da379b6cf Mon Sep 17 00:00:00 2001
From: dcollin <dcollin@users.noreply.github.com>
Date: Fri, 4 Dec 2015 09:13:58 +0100
Subject: [PATCH] Some cleanup

Former-commit-id: ce7c102582a25756784b6a230a8654af6e965c77
---
 hal.db                                        | Bin 928768 -> 928768 bytes
 src/se/koc/hal/HALClient.java                 |   4 ----
 src/se/koc/hal/PowerChallenge.java            |   1 -
 .../koc/hal/deamon/DataAggregatorDaemon.java  |  20 +++++-------------
 .../hal/deamon/DataSynchronizationDaemon.java |   1 -
 5 files changed, 5 insertions(+), 21 deletions(-)

diff --git a/hal.db b/hal.db
index 51a9040d5ed2623f38e2b962768891eb61d93d99..c0dbc7cdd4f317edf6fd02dc421cc5e765c8e451 100755
GIT binary patch
delta 842
zcmbu7&ubGw6vt<Fn>5L0tb!$hPEBc0np%Hin^0=CDD9!8bZiU8gW4wXqS0EgVxeyI
zun`nYj5-JfAqt}8pkP`A#bXO%E?$y@c<VuXQ2cSSUB6p8e}OwZc+BVX-aKYDQ;lV+
zv0M|Y5u)EFMEgt#eUfjBx@u(4itkl&J}}G(zB<I6|6BS=XB9?*jfF%oA|nQCZr0;e
zbGbCH=AEG;Ww#S5&UFP%trz3;%8J1PI9LzMsfR4kg3ROSI`kt{jEru}P%(ZjZIbsF
zG5V_fGsIeYkS#0gFctmoIIO{rvPtd@f|V5Oq2lP5H82?H5C+T1t3DPAAxo>Vx-r(N
z)38$cAzRxHbVBy|SfCqOR7o)^lB+iyDSXNH&jN9UqCn*W*$_;99*D~C-i>;?qNGmX
zfdxmp{?ycN;R!w{bO@VUm(V&nP`0)EKriLv&H4vQI!HyL_!Uy3R<->ZNV5tZz~=eC
zXbr(+%Rp!3@MisSCGDePay{fooy^pJK#C}|7ieieT2HR;u-(sqw#YRP3ykA`_^G50
z;P|K`<@#)Y5vZ!rZfv%u&>Di-kOq3EP&*Y9-)5Yu)}-zK2vn4Lw8s6DtdiOw%{_uN
z@j7c8mw_(G$|u9Qe<GB$3%KE}BlW+qSstiMp`BEmtyXY81k-;7s7cPD{wB9LwYX++
z-Qsl?cUjzR@p_AUEbg_qZ-E>2WAyo=XUe#%H74<HzYxFi3m!uc9pTBArVWIDu{6!b
G-uwgaUB3PR

delta 1111
zcmaLUT}V@57zgn8-Rn7SsTFoCb93taN;5ReS|lo2X=X#k)GYEdk+9Nb!$Le_nNfm<
zA=I{<o4WZmH3F%d1f{DW5sF=uiFjoYU08Gx)c>4LS4liPzrD}@IgImi+I_}$pRrdP
zv`7ehK#1xiA=LhG&tYzn>{|_+skQAganwgR`j+8|Y<7`dX03FI)uQs*NmlfqDr1{e
zUqNU{UrlI&NSEolRBRFTVbl7;{wX^Dw_^P@l;hNzSXyYv-q8+o+!aEMlEz@p5FPSP
z6rz<h8uO9QbMj6c5DZFeK#*3tA}?PFQA!$xIc0&!yH7%-l15@qN|8*N|0P5yX$0nY
zTb8_w5cEo_#~iJ$ly{jzxRQor);Ejo^0GqE$+1SG!@PUN@n<P$m4~&ML-Ob3-GC4#
zrSu))trmO~-daf42tL}zR5EL%cde%-r$Sj7y=qN`^;40s+S|%3^n&*sEb*qn0&g%A
zEi`ZP8iwPO`7mQL0U9THm^x7dlP0oc!(rU`Ef_go3d6<^LScM6+&Xpzs>kx6YAl{v
z$j>o9_<ghrejUw#>!VspPYYc0oQ2DtRAv#0&$A7~lDh%Eai4;(-EnZvt%5H{D&X^x
zqtH7N3O&O&pmVqg+J=*1|8OAe9jb@-hfcsdLk8I95@Cz$JT$wEu)!t3I%gBCbe@4?
zxf3@g#ZKIqm<DlUk~^3Qj}7Wzy5lB1<S2nDjsq~!fg6*U0o<7A2l7}M;b#QN=>}O7
z^5E&c_#Vt!g^%)Wx)f)%-NHIZptTY5)*vivpYBB7CO%>85#b-#N!rbb8v1kC2;ut^
zCG938<$aVr!#NRWQ%^HnAbd}$q@72S-fd*>3E!=iv{fTXyk};sIA`Fj@4Un|2;Z42
zY11MJ?2!JG@7RyGAcotVu8Y%Av<l78erOKOqy5opv<AIpmeU2Oim7W>-5AiL3TeV6
b@V@Lix)~S!fnQD6ggF2mI6GkuDt_@BLsA(R

diff --git a/src/se/koc/hal/HALClient.java b/src/se/koc/hal/HALClient.java
index d8336160..79fade1a 100755
--- a/src/se/koc/hal/HALClient.java
+++ b/src/se/koc/hal/HALClient.java
@@ -8,14 +8,10 @@ import se.koc.hal.plugin.tellstick.TellstickProtocol;
 import se.koc.hal.plugin.tellstick.TellstickSerialComm;
 import se.koc.hal.plugin.tellstick.protocols.NexaSelfLearning;
 import se.koc.hal.struct.Switch;
-import se.koc.hal.stt.GoogleSTTClient;
 import se.koc.hal.intf.HalSpeachToText;
 import se.koc.hal.stt.ManualSTTClient;
-import se.koc.hal.stt.Sphinx4STTClient;
 import se.koc.hal.tts.MaryRemoteTTSClient;
-import zutil.log.LogUtil;
 
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
diff --git a/src/se/koc/hal/PowerChallenge.java b/src/se/koc/hal/PowerChallenge.java
index 74afb573..ffb3e165 100755
--- a/src/se/koc/hal/PowerChallenge.java
+++ b/src/se/koc/hal/PowerChallenge.java
@@ -7,7 +7,6 @@ import se.koc.hal.deamon.HalDaemon;
 import se.koc.hal.page.PCConfigureHttpPage;
 import se.koc.hal.page.PCHeatMapHttpPage;
 import se.koc.hal.page.PCOverviewHttpPage;
-import zutil.db.DBConnection;
 import zutil.io.file.FileUtil;
 import zutil.log.CompactLogFormatter;
 import zutil.log.LogUtil;
diff --git a/src/se/koc/hal/deamon/DataAggregatorDaemon.java b/src/se/koc/hal/deamon/DataAggregatorDaemon.java
index c9f10f99..f5b1bac3 100755
--- a/src/se/koc/hal/deamon/DataAggregatorDaemon.java
+++ b/src/se/koc/hal/deamon/DataAggregatorDaemon.java
@@ -3,7 +3,6 @@ package se.koc.hal.deamon;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
-import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.List;
 import java.util.Locale;
@@ -38,26 +37,17 @@ public class DataAggregatorDaemon extends TimerTask implements HalDaemon {
     @Override
     public void run(){
     	try {
-			List<Integer> sensorIdList = HalContext.db.exec("SELECT id FROM sensor", new SQLResultHandler<List<Integer>>(){
-				@Override
-				public List<Integer> handleQueryResult(Statement stmt, ResultSet result) throws SQLException {
-					ArrayList<Integer> list = new ArrayList<>();
-					while(result.next()){
-						list.add(result.getInt("id"));
-					}
-					return list;
-				}
-			});
-			for(int id : sensorIdList){
-				logger.fine("Aggregating sensor_id: " + id);
-				aggregateSensor(id);
+			List<Sensor> sensorList = Sensor.getLocalSensors(HalContext.db);
+			for(Sensor sensor : sensorList){
+				logger.fine("Aggregating sensor_id: " + sensor.getId());
+				aggregateSensor(sensor.getId());
 			}
 		} catch (SQLException e) {
 			e.printStackTrace();
 		}
     }
 
-    public void aggregateSensor(int sensorId) {
+    public void aggregateSensor(long sensorId) {
     	DBConnection db = HalContext.db;
     	try {
     		Long maxDBTimestamp = db.exec("SELECT MAX(timestamp_end) FROM sensor_data_aggr WHERE sensor_id == "+sensorId, new SimpleSQLHandler<Long>());
diff --git a/src/se/koc/hal/deamon/DataSynchronizationDaemon.java b/src/se/koc/hal/deamon/DataSynchronizationDaemon.java
index 99b7fd18..45b9e21f 100644
--- a/src/se/koc/hal/deamon/DataSynchronizationDaemon.java
+++ b/src/se/koc/hal/deamon/DataSynchronizationDaemon.java
@@ -9,7 +9,6 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
 import java.util.ArrayList;
-import java.util.List;
 import java.util.Timer;
 import java.util.logging.Logger;