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.binding.pixometer/src/main/java/org/openhab/binding/pixometer/handler/AccountHandler.java
View File

@@ -47,7 +47,6 @@ public class AccountHandler extends BaseBridgeHandler {
private final Logger logger = LoggerFactory.getLogger(this.getClass());
private static final int TOKEN_MIN_DIFF_MS = (int) TimeUnit.DAYS.toMillis(2);
private final JsonParser jsonParser = new JsonParser();
private @NonNullByDefault({}) String authToken;
private int refreshInterval;
@@ -114,7 +113,7 @@ public class AccountHandler extends BaseBridgeHandler {
InputStream content = new ByteArrayInputStream(httpBody.toString().getBytes(StandardCharsets.UTF_8));
String urlResponse = HttpUtil.executeUrl("POST", url, urlHeader, content, "application/json", 2000);
JsonObject responseJson = (JsonObject) jsonParser.parse(urlResponse);
JsonObject responseJson = (JsonObject) JsonParser.parseString(urlResponse);
if (responseJson.has(AUTH_TOKEN)) {
// Store the expire date for automatic token refresh

5
bundles/org.openhab.binding.pixometer/src/main/java/org/openhab/binding/pixometer/handler/MeterHandler.java
View File

@@ -70,7 +70,6 @@ public class MeterHandler extends BaseThingHandler {
private final GsonBuilder gsonBuilder = new GsonBuilder().registerTypeAdapter(ReadingInstance.class,
new CustomReadingInstanceDeserializer());
private final Gson gson = gsonBuilder.create();
private final JsonParser jsonParser = new JsonParser();
private @NonNullByDefault({}) String resourceID;
private @NonNullByDefault({}) String meterID;
@@ -178,7 +177,7 @@ public class MeterHandler extends BaseThingHandler {
urlHeader.put("Authorization", token);
String urlResponse = HttpUtil.executeUrl("GET", url, urlHeader, null, null, 2000);
JsonObject responseJson = (JsonObject) jsonParser.parse(urlResponse);
JsonObject responseJson = (JsonObject) JsonParser.parseString(urlResponse);
if (responseJson.has("meter_id")) {
setMeterID(responseJson.get("meter_id").toString());
@@ -251,7 +250,7 @@ public class MeterHandler extends BaseThingHandler {
String urlResponse = HttpUtil.executeUrl("GET", url, urlHeader, null, null, 2000);
ReadingInstance latestReading = gson.fromJson(new JsonParser().parse(urlResponse), ReadingInstance.class);
ReadingInstance latestReading = gson.fromJson(JsonParser.parseString(urlResponse), ReadingInstance.class);
return new MeterState(Objects.requireNonNull(latestReading));
} catch (IOException e) {