From bcc4133a31390c05ec630d8fe5abbf8e196758c0 Mon Sep 17 00:00:00 2001
From: Ziver Koc <ziver@koc.se>
Date: Mon, 12 Jul 2021 00:35:25 +0200
Subject: [PATCH] Fixed some zigbee bugs

---
 .../resource/resource/hal-zigbee-reference.db | Bin 25600 -> 25600 bytes
 .../hal/plugin/zigbee/ZigBeeHalDataStore.java |  16 ++++++++++------
 .../zigbee/ZigbeeHalDatabaseUpgrade.java      |   3 ++-
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/plugins/hal-zigbee/resource/resource/hal-zigbee-reference.db b/plugins/hal-zigbee/resource/resource/hal-zigbee-reference.db
index f906645d1dacc4d076e3afa34a5d3634ac9fb77f..2a3559b666140d613d65e082fce60c0f8cfaebba 100644
GIT binary patch
delta 223
zcmZoT!Pszuae}nqaRvqkNgx&lVqpdbM&pS(#*D`|CM@IT%3)w$$MlM6HB-)H0iOR{
zOz{k-#P#(Vn`|cs@TfDgPk!KHIe8v0_vC{-o|Dh<@-beTtiY!;nUhb5l@n-KKagi9
z!U1G;12KcG8=H8bttXJso?Pf6F}ambft}OV1Bov%`3j!^H%FtRJG;2HHe-|J<oA5a
zKx>5gouF25Z(hf5&%&s_`JJ#3%OV+`O)Abhyj(!T*?^cCh?zDEvTR^p6e0isPv$lJ

delta 189
zcmZoT!Pszuae}nqF$M+(Ngx&lVqpdbM*WF8#*D`{CM@ITN@rkR$MlqG8B_XX0iOSp
zy?JyPnI=2(x=h}~<2U&nFCXLC$qIZrlR5c>SlNKOyMR19Ze}2>4Tu?R-6rSp*)X%&
zx&mpP$v61~xS1Q>T-e36wHce7Cx78n2AU?p?*uiCd-FPedlp8u&F_STST=F6uxw_L
Zu{Ysm2b#nM#GF9Pv00F11M{K~0RSP*EN=h+

diff --git a/plugins/hal-zigbee/src/se/hal/plugin/zigbee/ZigBeeHalDataStore.java b/plugins/hal-zigbee/src/se/hal/plugin/zigbee/ZigBeeHalDataStore.java
index f55d54e6..d3bf26f7 100644
--- a/plugins/hal-zigbee/src/se/hal/plugin/zigbee/ZigBeeHalDataStore.java
+++ b/plugins/hal-zigbee/src/se/hal/plugin/zigbee/ZigBeeHalDataStore.java
@@ -41,12 +41,15 @@ import java.sql.SQLException;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
+import java.util.logging.Level;
 import java.util.logging.Logger;
 
 
 public class ZigBeeHalDataStore implements ZigBeeNetworkDataStore {
     private static final Logger logger = LogUtil.getLogger();
 
+    private static final String ZIGBEE_NODE_TABLE = "hal_zigbee_node";
+
     private DBConnection db;
 
 
@@ -60,14 +63,14 @@ public class ZigBeeHalDataStore implements ZigBeeNetworkDataStore {
         Set<IeeeAddress> ieeeAddresses = new HashSet<>();
 
         try {
-            PreparedStatement stmt = db.getPreparedStatement( "SELECT address FROM zigbee_node" );
+            PreparedStatement stmt = db.getPreparedStatement( "SELECT address FROM " +ZIGBEE_NODE_TABLE);
             List<String> strAddresses = DBConnection.exec(stmt, new ListSQLResult<String>());
 
             for (String address : strAddresses) {
                 ieeeAddresses.add(new IeeeAddress(address));
             }
         } catch (SQLException e) {
-            e.printStackTrace();
+            logger.log(Level.SEVERE, "Unable to read Zigbee Nodes from DB.", e);
         }
 
         return ieeeAddresses;
@@ -80,7 +83,7 @@ public class ZigBeeHalDataStore implements ZigBeeNetworkDataStore {
             if (dso != null)
                 return dso.getConfig();
         } catch (SQLException e) {
-            e.printStackTrace();
+            logger.log(Level.SEVERE, "Unable to read Zigbee Node from DB.", e);
         }
         return null;
     }
@@ -106,7 +109,7 @@ public class ZigBeeHalDataStore implements ZigBeeNetworkDataStore {
             dso.save(db);
 
         } catch (SQLException e) {
-            e.printStackTrace();
+            logger.log(Level.SEVERE, "Unable to updated Zigbee Node in DB.", e);
         }
     }
 
@@ -119,20 +122,21 @@ public class ZigBeeHalDataStore implements ZigBeeNetworkDataStore {
             if (dso != null)
                 dso.delete(db);
         } catch (SQLException e) {
-            e.printStackTrace();
+            logger.log(Level.SEVERE, "Unable to remove Zigbee Node from DB.", e);
         }
     }
 
     /**
      * A private data storage object connected to the DB schema.
      */
+    @DBBean.DBTable(ZIGBEE_NODE_TABLE)
     private static class ZigbeeNodeDSO extends DBBean {
         protected String address;
         protected String config;
 
 
         public static ZigbeeNodeDSO load(DBConnection db, String address) throws SQLException{
-            PreparedStatement stmt = db.getPreparedStatement( "SELECT * FROM zigbee_node WHERE ? == zigbee_node.address" );
+            PreparedStatement stmt = db.getPreparedStatement( "SELECT * FROM " + ZIGBEE_NODE_TABLE + " WHERE ? == address" );
             stmt.setString(1, address);
             return DBConnection.exec(stmt, DBBeanSQLResultHandler.create(ZigbeeNodeDSO.class, db));
         }
diff --git a/plugins/hal-zigbee/src/se/hal/plugin/zigbee/ZigbeeHalDatabaseUpgrade.java b/plugins/hal-zigbee/src/se/hal/plugin/zigbee/ZigbeeHalDatabaseUpgrade.java
index 3c5f630b..b48d1dc9 100644
--- a/plugins/hal-zigbee/src/se/hal/plugin/zigbee/ZigbeeHalDatabaseUpgrade.java
+++ b/plugins/hal-zigbee/src/se/hal/plugin/zigbee/ZigbeeHalDatabaseUpgrade.java
@@ -1,5 +1,6 @@
 package se.hal.plugin.zigbee;
 
+import se.hal.HalContext;
 import se.hal.intf.HalDatabaseUpgrade;
 import zutil.db.DBConnection;
 import zutil.log.LogUtil;
@@ -12,7 +13,7 @@ import java.util.logging.Logger;
  */
 public class ZigbeeHalDatabaseUpgrade extends HalDatabaseUpgrade {
     private static final int    REFERENCE_DB_VERSION = 1;
-    private static final String REFERENCE_DB_PATH = "resource/hal-zigbee-reference.db";
+    private static final String REFERENCE_DB_PATH = HalContext.RESOURCE_ROOT + "/resource/hal-zigbee-reference.db";
 
 
     public ZigbeeHalDatabaseUpgrade() {