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

5
bundles/org.openhab.binding.tesla/src/main/java/org/openhab/binding/tesla/internal/handler/TeslaAccountHandler.java
View File

@@ -100,7 +100,6 @@ public class TeslaAccountHandler extends BaseBridgeHandler {
protected ReentrantLock lock;
private final Gson gson = new Gson();
private final JsonParser parser = new JsonParser();
private TokenResponse logonToken;
private final Set<VehicleListener> vehicleListeners = new HashSet<>();
@@ -215,7 +214,7 @@ public class TeslaAccountHandler extends BaseBridgeHandler {
return null;
}
JsonObject jsonObject = parser.parse(response.readEntity(String.class)).getAsJsonObject();
JsonObject jsonObject = JsonParser.parseString(response.readEntity(String.class)).getAsJsonObject();
Vehicle[] vehicleArray = gson.fromJson(jsonObject.getAsJsonArray("response"), Vehicle[].class);
for (Vehicle vehicle : vehicleArray) {
@@ -343,7 +342,7 @@ public class TeslaAccountHandler extends BaseBridgeHandler {
}
try {
JsonObject jsonObject = parser.parse(response.readEntity(String.class)).getAsJsonObject();
JsonObject jsonObject = JsonParser.parseString(response.readEntity(String.class)).getAsJsonObject();
logger.trace("Request : {}:{}:{} yields {}", command, payLoad, target, jsonObject.get("response"));
return jsonObject.get("response").toString();
} catch (Exception e) {

5
bundles/org.openhab.binding.tesla/src/main/java/org/openhab/binding/tesla/internal/handler/TeslaVehicleHandler.java
View File

@@ -137,7 +137,6 @@ public class TeslaVehicleHandler extends BaseThingHandler {
protected ScheduledFuture<?> slowStateJob;
private final Gson gson = new Gson();
private final JsonParser parser = new JsonParser();
public TeslaVehicleHandler(Thing thing, ClientBuilder clientBuilder) {
super(thing);
@@ -711,7 +710,7 @@ public class TeslaVehicleHandler extends BaseThingHandler {
return null;
}
JsonObject jsonObject = parser.parse(response.readEntity(String.class)).getAsJsonObject();
JsonObject jsonObject = JsonParser.parseString(response.readEntity(String.class)).getAsJsonObject();
Vehicle[] vehicleArray = gson.fromJson(jsonObject.getAsJsonArray("response"), Vehicle[].class);
for (Vehicle vehicle : vehicleArray) {
@@ -831,7 +830,7 @@ public class TeslaVehicleHandler extends BaseThingHandler {
break;
}
default: {
jsonObject = parser.parse(result).getAsJsonObject();
jsonObject = JsonParser.parseString(result).getAsJsonObject();
break;
}
}