ziver/hal
1
1
Fork 0
Code Pull requests Releases Activity

small refactoring

Browse source 
Former-commit-id: 76cf6d11dc8f67469af705755238d86c77fd3b05
This commit is contained in:
Ziver Koc 2016-01-29 11:11:09 +01:00
parent 51b549528c
commit c2d03347ca
2 changed files with 13 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/se/hal/ControllerManager.java
View file

@ -105,8 +105,6 @@ public class ControllerManager implements HalSensorReportListener,
Sensor sensor = findSensor(sensorData, registeredSensors); Sensor sensor = findSensor(sensorData, registeredSensors);
if (sensor != null) { if (sensor != null) {
sensor.setDeviceData(sensorData); // Set the latest data
PreparedStatement stmt = PreparedStatement stmt =
db.getPreparedStatement("INSERT INTO sensor_data_raw (timestamp, sensor_id, data) VALUES(?, ?, ?)"); db.getPreparedStatement("INSERT INTO sensor_data_raw (timestamp, sensor_id, data) VALUES(?, ?, ?)");
stmt.setLong(1, sensorData.getTimestamp()); stmt.setLong(1, sensorData.getTimestamp());
@ -117,13 +115,14 @@ public class ControllerManager implements HalSensorReportListener,
} }
else { // unknown sensor else { // unknown sensor
logger.finest("Received report from unregistered sensor: "+ sensorData); logger.finest("Received report from unregistered sensor: "+ sensorData);
Sensor detectedSensor = findSensor(sensorData, detectedSensors); sensor = findSensor(sensorData, detectedSensors);
if(detectedSensor == null) { if(sensor == null) {
detectedSensor = new Sensor(); sensor = new Sensor();
detectedSensors.add(detectedSensor); detectedSensors.add(sensor);
} }
detectedSensor.setDeviceData(sensorData);
} }
sensor.setDeviceData(sensorData); // Set the latest data
}catch (SQLException e){ }catch (SQLException e){
logger.log(Level.WARNING, "Unable to store sensor report", e); logger.log(Level.WARNING, "Unable to store sensor report", e);
} }
@ -191,8 +190,6 @@ public class ControllerManager implements HalSensorReportListener,
Event event = findEvent(eventData, registeredEvents); Event event = findEvent(eventData, registeredEvents);
if (event != null) { if (event != null) {
event.setDeviceData(eventData); // Set the latest data
PreparedStatement stmt = PreparedStatement stmt =
db.getPreparedStatement("INSERT INTO event_data_raw (timestamp, event_id, data) VALUES(?, ?, ?)"); db.getPreparedStatement("INSERT INTO event_data_raw (timestamp, event_id, data) VALUES(?, ?, ?)");
stmt.setLong(1, eventData.getTimestamp()); stmt.setLong(1, eventData.getTimestamp());
@ -203,13 +200,14 @@ public class ControllerManager implements HalSensorReportListener,
} }
else { // unknown sensor else { // unknown sensor
logger.info("Received report from unregistered event: "+ eventData); logger.info("Received report from unregistered event: "+ eventData);
Event detectedEvent = findEvent(eventData, detectedEvents); event = findEvent(eventData, detectedEvents);
if(detectedEvent == null) { if(event == null) {
detectedEvent = new Event(); event = new Event();
detectedEvents.add(detectedEvent); detectedEvents.add(event);
} }
detectedEvent.setDeviceData(eventData);
} }
event.setDeviceData(eventData); // Set the latest data
}catch (SQLException e){ }catch (SQLException e){
logger.log(Level.WARNING, "Unable to store event report", e); logger.log(Level.WARNING, "Unable to store event report", e);
} }

2
src/se/hal/struct/AbstractDevice.java
View file

@ -42,7 +42,7 @@ public abstract class AbstractDevice<T> extends DBBean {
return null; return null;
} }
public T getDeviceData() { public T getDeviceData() {
if (deviceData == null) { if (deviceData == null || !deviceData.getClass().getName().equals(type)) {
try { try {
Class c = Class.forName(type); Class c = Class.forName(type);
deviceData = (T) c.newInstance(); deviceData = (T) c.newInstance();