public/openhab-addons
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[tibber] Fix NPE on server issues (#14273)

Browse Source 
* Fix NPE

Signed-off-by: lsiepel <leosiepel@gmail.com>
This commit is contained in:
lsiepel 2023-01-29 10:24:26 +01:00 committed by GitHub
parent 9ba3c07d3e
commit a58f1269ec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 33 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
bundles/org.openhab.binding.tibber/src/main/java/org/openhab/binding/tibber/internal/handler/TibberHandler.java
View File

@ -57,6 +57,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import com.google.gson.JsonArray; import com.google.gson.JsonArray;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject; import com.google.gson.JsonObject;
import com.google.gson.JsonParser; import com.google.gson.JsonParser;
import com.google.gson.JsonSyntaxException; import com.google.gson.JsonSyntaxException;
@ -129,8 +130,19 @@ public class TibberHandler extends BaseThingHandler {
REQUEST_TIMEOUT); REQUEST_TIMEOUT);
JsonObject object = (JsonObject) JsonParser.parseString(jsonResponse); JsonObject object = (JsonObject) JsonParser.parseString(jsonResponse);
rtEnabled = object.getAsJsonObject("data").getAsJsonObject("viewer").getAsJsonObject("home") JsonObject dObject = object.getAsJsonObject("data");
.getAsJsonObject("features").get("realTimeConsumptionEnabled").toString(); if (dObject != null) {
JsonObject viewerObject = dObject.getAsJsonObject("viewer");
if (viewerObject != null) {
JsonObject homeObject = viewerObject.getAsJsonObject("home");
if (homeObject != null) {
JsonObject featuresObject = homeObject.getAsJsonObject("features");
if (featuresObject != null) {
rtEnabled = featuresObject.get("realTimeConsumptionEnabled").toString();
}
}
}
}
if ("true".equals(rtEnabled)) { if ("true".equals(rtEnabled)) {
logger.debug("Pulse associated with HomeId: Live stream will be started"); logger.debug("Pulse associated with HomeId: Live stream will be started");
@ -139,11 +151,25 @@ public class TibberHandler extends BaseThingHandler {
String wsResponse = HttpUtil.executeUrl("POST", BASE_URL, httpHeader, wsURL, null, REQUEST_TIMEOUT); String wsResponse = HttpUtil.executeUrl("POST", BASE_URL, httpHeader, wsURL, null, REQUEST_TIMEOUT);
JsonObject wsobject = (JsonObject) JsonParser.parseString(wsResponse); JsonObject wsobject = (JsonObject) JsonParser.parseString(wsResponse);
subscriptionURL = wsobject.getAsJsonObject("data").getAsJsonObject("viewer") JsonObject dataObject = wsobject.getAsJsonObject("data");
.get("websocketSubscriptionUrl").toString().replaceAll("^\"|\"$", ""); if (dataObject != null) {
JsonObject viewerObject = dataObject.getAsJsonObject("viewer");
if (viewerObject != null) {
JsonElement subscriptionElement = viewerObject.get("websocketSubscriptionUrl");
if (subscriptionElement != null) {
subscriptionURL = subscriptionElement.toString().replaceAll("^\"|\"$", "");
}
}
}
String url = subscriptionURL;
if (url == null || url.isBlank()) {
logger.trace("Unexpected result from the server: {}", jsonResponse);
updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.COMMUNICATION_ERROR,
"Unexpected result from the server");
} else {
logger.debug("Subscribing to: {}", subscriptionURL); logger.debug("Subscribing to: {}", subscriptionURL);
open(); open();
}
} else { } else {
logger.debug("No Pulse associated with HomeId: No live stream will be started"); logger.debug("No Pulse associated with HomeId: No live stream will be started");
} }