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

Formatting cleanup

Browse source
This commit is contained in:
Ziver Koc 2021-03-23 21:54:29 +01:00
parent c7e286f51e
commit 5a1be3c2e4
50 changed files with 283 additions and 282 deletions
Download patch file Download diff file Expand all files Collapse all files

16
plugins/hal-powerchallenge/src/se/hal/plugin/powerchallenge/daemon/PCDataSynchronizationClient.java
View file

@ -67,8 +67,8 @@ public class PCDataSynchronizationClient implements HalDaemon {
try {
DBConnection db = HalContext.getDB();
List<User> users = User.getExternalUsers(db);
for(User user : users){
if(user.getHostname() == null){
for (User user : users){
if (user.getHostname() == null){
logger.fine("Hostname not defined for user: "+ user.getUsername());
continue;
}
@ -80,7 +80,7 @@ public class PCDataSynchronizationClient implements HalDaemon {
// Check server protocol version
int version = in.readInt();
if(version != PCDataSynchronizationDaemon.PROTOCOL_VERSION){
if (version != PCDataSynchronizationDaemon.PROTOCOL_VERSION){
logger.warning("Protocol version do not match, skipping user. " +
"(local v"+PCDataSynchronizationDaemon.PROTOCOL_VERSION+" != remote v"+version+")");
out.writeObject(null); // Tell server we are disconnecting
@ -96,10 +96,10 @@ public class PCDataSynchronizationClient implements HalDaemon {
user.setAddress(peerData.address);
user.save(db);
for(SensorDTO sensorDTO : peerData.sensors){
for (SensorDTO sensorDTO : peerData.sensors){
try { // We might not have the sensor plugin installed
Sensor sensor = Sensor.getExternalSensor(db, user, sensorDTO.sensorId);
if(sensor == null) { // new sensor
if (sensor == null) { // new sensor
sensor = new Sensor();
logger.fine("Created new external sensor with external_id: "+ sensorDTO.sensorId);
}
@ -120,8 +120,8 @@ public class PCDataSynchronizationClient implements HalDaemon {
// Request sensor data
List<Sensor> sensors = Sensor.getSensors(db, user);
for(Sensor sensor : sensors){
if(sensor.isSynced()) {
for (Sensor sensor : sensors){
if (sensor.isSynced()) {
SensorDataReqDTO req = new SensorDataReqDTO();
req.sensorId = sensor.getExternalId();
req.offsetSequenceId = Sensor.getHighestSequenceId(sensor.getId());
@ -129,7 +129,7 @@ public class PCDataSynchronizationClient implements HalDaemon {
out.writeObject(req);
SensorDataListDTO dataList = (SensorDataListDTO) in.readObject();
if(dataList.aggregationVersion != sensor.getAggregationVersion()){
if (dataList.aggregationVersion != sensor.getAggregationVersion()){
logger.fine("The peer has modified its aggregated data, clearing aggregate data. oldAggregationVersion:"+sensor.getAggregationVersion()+" , newAggregationVersion:"+dataList.aggregationVersion);
//clear old aggregated data for sensor

18
plugins/hal-powerchallenge/src/se/hal/plugin/powerchallenge/daemon/PCDataSynchronizationDaemon.java
View file

@ -101,8 +101,8 @@ public class PCDataSynchronizationDaemon extends ThreadedTCPNetworkServer implem
Object obj = null;
out.writeInt(PROTOCOL_VERSION); // send our protocol version to client
out.flush();
while((obj = in.readObject()) != null){
if(obj instanceof PeerDataReqDTO){
while ((obj = in.readObject()) != null){
if (obj instanceof PeerDataReqDTO){
logger.fine("Client requesting peer data");
PeerDataRspDTO rsp = new PeerDataRspDTO();
User localUser = User.getLocalUser(db);
@ -111,8 +111,8 @@ public class PCDataSynchronizationDaemon extends ThreadedTCPNetworkServer implem
rsp.address = localUser.getAddress();
rsp.sensors = new ArrayList<>();
for(Sensor sensor : Sensor.getLocalSensors(db)){
if(sensor.isSynced()) {
for (Sensor sensor : Sensor.getLocalSensors(db)){
if (sensor.isSynced()) {
SensorDTO dto = new SensorDTO();
dto.sensorId = sensor.getId();
dto.name = sensor.getName();
@ -123,17 +123,17 @@ public class PCDataSynchronizationDaemon extends ThreadedTCPNetworkServer implem
}
out.writeObject(rsp);
}
if(obj instanceof SensorDataReqDTO){
if (obj instanceof SensorDataReqDTO){
SensorDataReqDTO req = (SensorDataReqDTO) obj;
Sensor sensor = Sensor.getSensor(db, req.sensorId);
if(sensor.isSynced()) {
if (sensor.isSynced()) {
PreparedStatement stmt = db.getPreparedStatement("SELECT * FROM sensor_data_aggr WHERE sensor_id == ? AND sequence_id > ?");
stmt.setLong(1, sensor.getId());
logger.fine("Client requesting sensor data: sensorId: " + req.sensorId + ", offset: " + req.offsetSequenceId + ", " + req.aggregationVersion);
if(req.aggregationVersion != sensor.getAggregationVersion()){
if (req.aggregationVersion != sensor.getAggregationVersion()){
logger.fine("The requested aggregation version does not match the local version: " + sensor.getAggregationVersion() + ". Will re-send all aggregated data.");
stmt.setLong(2, 0); //0 since we want to re-send all data to the peer
}else{
} else {
stmt.setLong(2, req.offsetSequenceId);
}
@ -157,7 +157,7 @@ public class PCDataSynchronizationDaemon extends ThreadedTCPNetworkServer implem
logger.fine("Sending " + rsp.size() + " sensor data items to client");
out.writeObject(rsp);
}
else{
else {
logger.warning("Client requesting non synced sensor data: sensorId: " + req.sensorId + ", offset: " + req.offsetSequenceId);
SensorDataListDTO rsp = new SensorDataListDTO();
out.writeObject(rsp);