Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[verisure] Keep refreshing after RuntimeException #11397

Merged
merged 2 commits into from
Oct 31, 2021
Merged

[verisure] Keep refreshing after RuntimeException #11397

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
54db5f2
Fix that binding stops refreshing after RuntimException (#11396)
jannegpriv Oct 16, 2021
f57631f
Updated after review comments
jannegpriv Oct 31, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
228 changes: 118 additions & 110 deletions ...binding.verisure/src/main/java/org/openhab/binding/verisure/internal/VerisureSession.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ public VerisureSession(HttpClient httpClient) {

public boolean initialize(@Nullable String authstring, @Nullable String pinCode, String userName, String password) {
if (authstring != null) {
this.authstring = authstring.substring(0);
this.authstring = authstring;
this.pinCode = pinCode;
this.userName = userName;
this.password = password;
Expand All @@ -124,17 +124,12 @@ public boolean initialize(@Nullable String authstring, @Nullable String pinCode,
}

public boolean refresh() {
try {
if (logIn()) {
if (updateStatus()) {
return true;
}
if (logIn()) {
if (updateStatus()) {
return true;
}
return false;
} catch (HttpResponseException e) {
logger.warn("Failed to do a refresh {}", e.getMessage());
return false;
}
return false;
}

public int sendCommand(String url, String data, BigDecimal installationId) {
Expand Down Expand Up @@ -550,7 +545,8 @@ private synchronized boolean logIn() {
} else {
return true;
}
} catch (ExecutionException | InterruptedException | TimeoutException | URISyntaxException e) {
} catch (ExecutionException | InterruptedException | TimeoutException | URISyntaxException
| HttpResponseException e) {
logger.warn("Failed to login {}", e.getMessage());
}
return false;
Expand Down Expand Up @@ -654,33 +650,34 @@ private synchronized void updateSmartLockStatus(VerisureInstallation installatio
VerisureSmartLocksDTO thing = postJSONVerisureAPI(url, queryQLSmartLock, VerisureSmartLocksDTO.class);
logger.debug("REST Response ({})", thing);
List<VerisureSmartLocksDTO.Doorlock> doorLockList = thing.getData().getInstallation().getDoorlocks();
doorLockList.forEach(doorLock -> {
VerisureSmartLocksDTO slThing = new VerisureSmartLocksDTO();
VerisureSmartLocksDTO.Installation inst = new VerisureSmartLocksDTO.Installation();
inst.setDoorlocks(Collections.singletonList(doorLock));
VerisureSmartLocksDTO.Data data = new VerisureSmartLocksDTO.Data();
data.setInstallation(inst);
slThing.setData(data);
// Set unique deviceID
String deviceId = doorLock.getDevice().getDeviceLabel();
if (deviceId != null) {
// Set location
slThing.setLocation(doorLock.getDevice().getArea());
slThing.setDeviceId(deviceId);

// Fetch more info from old endpoint
try {
VerisureSmartLockDTO smartLockThing = getJSONVerisureAPI(SMARTLOCK_PATH + slThing.getDeviceId(),
VerisureSmartLockDTO.class);
logger.debug("REST Response ({})", smartLockThing);
slThing.setSmartLockJSON(smartLockThing);
} catch (ExecutionException | InterruptedException | TimeoutException | JsonSyntaxException e) {
logger.warn("Failed to query for smartlock status: {}", e.getMessage());
}
notifyListenersIfChanged(slThing, installation, deviceId);
}
});
if (doorLockList != null) {
doorLockList.forEach(doorLock -> {
VerisureSmartLocksDTO slThing = new VerisureSmartLocksDTO();
VerisureSmartLocksDTO.Installation inst = new VerisureSmartLocksDTO.Installation();
inst.setDoorlocks(Collections.singletonList(doorLock));
VerisureSmartLocksDTO.Data data = new VerisureSmartLocksDTO.Data();
data.setInstallation(inst);
slThing.setData(data);
// Set unique deviceID
String deviceId = doorLock.getDevice().getDeviceLabel();
if (deviceId != null) {
// Set location
slThing.setLocation(doorLock.getDevice().getArea());
slThing.setDeviceId(deviceId);

// Fetch more info from old endpoint
try {
VerisureSmartLockDTO smartLockThing = getJSONVerisureAPI(
SMARTLOCK_PATH + slThing.getDeviceId(), VerisureSmartLockDTO.class);
logger.debug("REST Response ({})", smartLockThing);
slThing.setSmartLockJSON(smartLockThing);
} catch (ExecutionException | InterruptedException | TimeoutException | JsonSyntaxException e) {
logger.warn("Failed to query for smartlock status: {}", e.getMessage());
}
notifyListenersIfChanged(slThing, installation, deviceId);
}
});
}
} catch (ExecutionException | InterruptedException | TimeoutException | JsonSyntaxException
| PostToAPIException e) {
logger.warn("Failed to send a POST to the API {}", e.getMessage());
Expand All @@ -702,21 +699,23 @@ private synchronized void updateSmartPlugStatus(VerisureInstallation installatio
VerisureSmartPlugsDTO thing = postJSONVerisureAPI(url, queryQLSmartPlug, VerisureSmartPlugsDTO.class);
logger.debug("REST Response ({})", thing);
List<VerisureSmartPlugsDTO.Smartplug> smartPlugList = thing.getData().getInstallation().getSmartplugs();
smartPlugList.forEach(smartPlug -> {
VerisureSmartPlugsDTO spThing = new VerisureSmartPlugsDTO();
VerisureSmartPlugsDTO.Installation inst = new VerisureSmartPlugsDTO.Installation();
inst.setSmartplugs(Collections.singletonList(smartPlug));
VerisureSmartPlugsDTO.Data data = new VerisureSmartPlugsDTO.Data();
data.setInstallation(inst);
spThing.setData(data);
// Set unique deviceID
String deviceId = smartPlug.getDevice().getDeviceLabel();
if (deviceId != null) {
// Set location
spThing.setLocation(smartPlug.getDevice().getArea());
notifyListenersIfChanged(spThing, installation, deviceId);
}
});
if (smartPlugList != null) {
smartPlugList.forEach(smartPlug -> {
VerisureSmartPlugsDTO spThing = new VerisureSmartPlugsDTO();
VerisureSmartPlugsDTO.Installation inst = new VerisureSmartPlugsDTO.Installation();
inst.setSmartplugs(Collections.singletonList(smartPlug));
VerisureSmartPlugsDTO.Data data = new VerisureSmartPlugsDTO.Data();
data.setInstallation(inst);
spThing.setData(data);
// Set unique deviceID
String deviceId = smartPlug.getDevice().getDeviceLabel();
if (deviceId != null) {
// Set location
spThing.setLocation(smartPlug.getDevice().getArea());
notifyListenersIfChanged(spThing, installation, deviceId);
}
});
}
} catch (ExecutionException | InterruptedException | TimeoutException | JsonSyntaxException
| PostToAPIException e) {
logger.warn("Failed to send a POST to the API {}", e.getMessage());
Expand Down Expand Up @@ -821,32 +820,35 @@ private synchronized void updateDoorWindowStatus(VerisureInstallation installati
VerisureDoorWindowsDTO thing = postJSONVerisureAPI(url, queryQLDoorWindow, VerisureDoorWindowsDTO.class);
logger.debug("REST Response ({})", thing);
List<VerisureDoorWindowsDTO.DoorWindow> doorWindowList = thing.getData().getInstallation().getDoorWindows();
doorWindowList.forEach(doorWindow -> {
VerisureDoorWindowsDTO dThing = new VerisureDoorWindowsDTO();
VerisureDoorWindowsDTO.Installation inst = new VerisureDoorWindowsDTO.Installation();
inst.setDoorWindows(Collections.singletonList(doorWindow));
VerisureDoorWindowsDTO.Data data = new VerisureDoorWindowsDTO.Data();
data.setInstallation(inst);
dThing.setData(data);
// Set unique deviceID
String deviceId = doorWindow.getDevice().getDeviceLabel();
if (deviceId != null) {
try {
VerisureBatteryStatusDTO[] batteryStatusThingArray = getJSONVerisureAPI(BATTERY_STATUS,
VerisureBatteryStatusDTO[].class);
VerisureBatteryStatusDTO batteryStatus = getBatteryStatus(deviceId, batteryStatusThingArray);
if (batteryStatus != null) {
logger.debug("REST Response ({})", batteryStatus);
dThing.setBatteryStatus(batteryStatus);
if (doorWindowList != null) {
doorWindowList.forEach(doorWindow -> {
VerisureDoorWindowsDTO dThing = new VerisureDoorWindowsDTO();
VerisureDoorWindowsDTO.Installation inst = new VerisureDoorWindowsDTO.Installation();
inst.setDoorWindows(Collections.singletonList(doorWindow));
VerisureDoorWindowsDTO.Data data = new VerisureDoorWindowsDTO.Data();
data.setInstallation(inst);
dThing.setData(data);
// Set unique deviceID
String deviceId = doorWindow.getDevice().getDeviceLabel();
if (deviceId != null) {
try {
VerisureBatteryStatusDTO[] batteryStatusThingArray = getJSONVerisureAPI(BATTERY_STATUS,
VerisureBatteryStatusDTO[].class);
VerisureBatteryStatusDTO batteryStatus = getBatteryStatus(deviceId,
batteryStatusThingArray);
if (batteryStatus != null) {
logger.debug("REST Response ({})", batteryStatus);
dThing.setBatteryStatus(batteryStatus);
}
} catch (ExecutionException | InterruptedException | TimeoutException | JsonSyntaxException e) {
logger.warn("Failed to query for door&window status: {}", e.getMessage());
}
} catch (ExecutionException | InterruptedException | TimeoutException | JsonSyntaxException e) {
logger.warn("Failed to query for door&window status: {}", e.getMessage());
// Set location
dThing.setLocation(doorWindow.getDevice().getArea());
notifyListenersIfChanged(dThing, installation, deviceId);
}
// Set location
dThing.setLocation(doorWindow.getDevice().getArea());
notifyListenersIfChanged(dThing, installation, deviceId);
}
});
});
}
} catch (ExecutionException | InterruptedException | TimeoutException | JsonSyntaxException
| PostToAPIException e) {
logger.warn("Failed to send a POST to the API {}", e.getMessage());
Expand Down Expand Up @@ -896,20 +898,22 @@ private synchronized void updateUserPresenceStatus(VerisureInstallation installa
logger.debug("REST Response ({})", thing);
List<VerisureUserPresencesDTO.UserTracking> userTrackingList = thing.getData().getInstallation()
.getUserTrackings();
userTrackingList.forEach(userTracking -> {
String localUserTrackingStatus = userTracking.getStatus();
if ("ACTIVE".equals(localUserTrackingStatus)) {
VerisureUserPresencesDTO upThing = new VerisureUserPresencesDTO();
VerisureUserPresencesDTO.Installation inst = new VerisureUserPresencesDTO.Installation();
inst.setUserTrackings(Collections.singletonList(userTracking));
VerisureUserPresencesDTO.Data data = new VerisureUserPresencesDTO.Data();
data.setInstallation(inst);
upThing.setData(data);
// Set unique deviceID
String deviceId = "up" + userTracking.getWebAccount() + installationId;
notifyListenersIfChanged(upThing, installation, deviceId);
}
});
if (userTrackingList != null) {
userTrackingList.forEach(userTracking -> {
String localUserTrackingStatus = userTracking.getStatus();
if ("ACTIVE".equals(localUserTrackingStatus)) {
VerisureUserPresencesDTO upThing = new VerisureUserPresencesDTO();
VerisureUserPresencesDTO.Installation inst = new VerisureUserPresencesDTO.Installation();
inst.setUserTrackings(Collections.singletonList(userTracking));
VerisureUserPresencesDTO.Data data = new VerisureUserPresencesDTO.Data();
data.setInstallation(inst);
upThing.setData(data);
// Set unique deviceID
String deviceId = "up" + userTracking.getWebAccount() + installationId;
notifyListenersIfChanged(upThing, installation, deviceId);
}
});
}
} catch (ExecutionException | InterruptedException | TimeoutException | JsonSyntaxException
| PostToAPIException e) {
logger.warn("Failed to send a POST to the API {}", e.getMessage());
Expand All @@ -933,22 +937,24 @@ private synchronized void updateMiceDetectionStatus(VerisureInstallation install
VerisureMiceDetectionDTO.class);
logger.debug("REST Response ({})", thing);
List<VerisureMiceDetectionDTO.Mouse> miceList = thing.getData().getInstallation().getMice();
miceList.forEach(mouse -> {
VerisureMiceDetectionDTO miceThing = new VerisureMiceDetectionDTO();
VerisureMiceDetectionDTO.Installation inst = new VerisureMiceDetectionDTO.Installation();
inst.setMice(Collections.singletonList(mouse));
VerisureMiceDetectionDTO.Data data = new VerisureMiceDetectionDTO.Data();
data.setInstallation(inst);
miceThing.setData(data);
// Set unique deviceID
String deviceId = mouse.getDevice().getDeviceLabel();
logger.debug("Mouse id: {} for thing: {}", deviceId, mouse);
if (deviceId != null) {
// Set location
miceThing.setLocation(mouse.getDevice().getArea());
notifyListenersIfChanged(miceThing, installation, deviceId);
}
});
if (miceList != null) {
miceList.forEach(mouse -> {
VerisureMiceDetectionDTO miceThing = new VerisureMiceDetectionDTO();
VerisureMiceDetectionDTO.Installation inst = new VerisureMiceDetectionDTO.Installation();
inst.setMice(Collections.singletonList(mouse));
VerisureMiceDetectionDTO.Data data = new VerisureMiceDetectionDTO.Data();
data.setInstallation(inst);
miceThing.setData(data);
// Set unique deviceID
String deviceId = mouse.getDevice().getDeviceLabel();
logger.debug("Mouse id: {} for thing: {}", deviceId, mouse);
if (deviceId != null) {
// Set location
miceThing.setLocation(mouse.getDevice().getArea());
notifyListenersIfChanged(miceThing, installation, deviceId);
}
});
}
} catch (ExecutionException | InterruptedException | TimeoutException | JsonSyntaxException
| PostToAPIException e) {
logger.warn("Failed to send a POST to the API {}", e.getMessage());
Expand Down Expand Up @@ -1006,10 +1012,12 @@ private synchronized void updateGatewayStatus(VerisureInstallation installation)
logger.debug("REST Response ({})", thing);
// Set unique deviceID
List<CommunicationState> communicationStateList = thing.getData().getInstallation().getCommunicationState();
if (!communicationStateList.isEmpty()) {
String deviceId = communicationStateList.get(0).getDevice().getDeviceLabel();
if (deviceId != null) {
notifyListenersIfChanged(thing, installation, deviceId);
if (communicationStateList != null) {
if (!communicationStateList.isEmpty()) {
String deviceId = communicationStateList.get(0).getDevice().getDeviceLabel();
if (deviceId != null) {
notifyListenersIfChanged(thing, installation, deviceId);
}
}
}
} catch (ExecutionException | InterruptedException | TimeoutException | JsonSyntaxException
Expand Down
12 changes: 6 additions & 6 deletions ...erisure/src/main/java/org/openhab/binding/verisure/internal/dto/VerisureBaseThingDTO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ public void setClimates(List<Climate> climates) {
this.climates = climates;
}

public List<DoorWindow> getDoorWindows() {
public @Nullable List<DoorWindow> getDoorWindows() {
return doorWindows;
}

Expand All @@ -284,35 +284,35 @@ public EventLog getEventLog() {
return eventLog;
}

public List<CommunicationState> getCommunicationState() {
public @Nullable List<CommunicationState> getCommunicationState() {
return communicationState;
}

public List<Mouse> getMice() {
public @Nullable List<Mouse> getMice() {
return mice;
}

public void setMice(List<Mouse> mice) {
this.mice = mice;
}

public List<Doorlock> getDoorlocks() {
public @Nullable List<Doorlock> getDoorlocks() {
return doorlocks;
}

public void setDoorlocks(List<Doorlock> doorlocks) {
this.doorlocks = doorlocks;
}

public List<Smartplug> getSmartplugs() {
public @Nullable List<Smartplug> getSmartplugs() {
return smartplugs;
}

public void setSmartplugs(List<Smartplug> smartplugs) {
this.smartplugs = smartplugs;
}

public List<UserTracking> getUserTrackings() {
public @Nullable List<UserTracking> getUserTrackings() {
return userTrackings;
}

Expand Down
Loading