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.km200/src/main/java/org/openhab/binding/km200/internal/KM200Device.java
View File

@@ -40,7 +40,6 @@ import com.google.gson.JsonParser;
public class KM200Device {
private final Logger logger = LoggerFactory.getLogger(KM200Device.class);
private final JsonParser jsonParser = new JsonParser();
private final KM200Cryption comCryption;
private final KM200Comm<KM200Device> deviceCommunicator;
@@ -360,7 +359,7 @@ public class KM200Device {
logger.debug("{}: SERVICE NOT AVAILABLE", service);
return null;
} else {
nodeRoot = (JsonObject) jsonParser.parse(decodedData);
nodeRoot = (JsonObject) JsonParser.parseString(decodedData);
}
} else {
logger.debug("Get empty reply");

3
bundles/org.openhab.binding.km200/src/main/java/org/openhab/binding/km200/internal/handler/KM200DataHandler.java
View File

@@ -48,7 +48,6 @@ import com.google.gson.JsonParser;
@NonNullByDefault
public class KM200DataHandler {
private final Logger logger = LoggerFactory.getLogger(KM200DataHandler.class);
private final JsonParser jsonParser = new JsonParser();
private final KM200Device remoteDevice;
@@ -539,7 +538,7 @@ public class KM200DataHandler {
/* The JSONArray of switch items can be send directly */
try {
/* Check whether this input string is a valid JSONArray */
JsonArray userArray = (JsonArray) jsonParser.parse(val);
JsonArray userArray = (JsonArray) JsonParser.parseString(val);
newObject = userArray.getAsJsonObject();
} catch (JsonParseException e) {
logger.warn("The input for the switchProgram is not a valid JSONArray : {}",