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

Resolve itest runbundles for Gson and Commons Lang upgrades and fix JsonParser deprecations (#10345)

Browse Source 
* Resolve itest runbundles for Gson and Commons Lang upgrades
* Fix JsonParser deprecations too
* Fix feature verification

Signed-off-by: Wouter Born <github@maindrain.net>
This commit is contained in:
Wouter Born
2021-03-18 12:15:15 +01:00
committed by GitHub
parent 009208adee
commit 580f293766
86 changed files with 206 additions and 215 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
bundles/org.openhab.io.neeo/src/main/java/org/openhab/io/neeo/internal/NeeoApi.java
View File

@@ -147,8 +147,7 @@ public class NeeoApi implements AutoCloseable {
throw resp.createException();
}
final JsonParser parser = new JsonParser();
final JsonObject root = parser.parse(resp.getContent()).getAsJsonObject();
final JsonObject root = JsonParser.parseString(resp.getContent()).getAsJsonObject();
for (Map.Entry<String, JsonElement> room : root.getAsJsonObject("rooms").entrySet()) {
final JsonObject roomObj = (JsonObject) room.getValue();

3
bundles/org.openhab.io.neeo/src/main/java/org/openhab/io/neeo/internal/NeeoDeviceKeys.java
View File

@@ -83,8 +83,7 @@ public class NeeoDeviceKeys {
uidToKey.clear();
final JsonParser parser = new JsonParser();
final JsonObject root = parser.parse(resp.getContent()).getAsJsonObject();
final JsonObject root = JsonParser.parseString(resp.getContent()).getAsJsonObject();
for (Map.Entry<String, JsonElement> room : root.getAsJsonObject("rooms").entrySet()) {
final JsonObject roomObj = (JsonObject) room.getValue();
for (Map.Entry<String, JsonElement> dev : roomObj.getAsJsonObject("devices").entrySet()) {