ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

config service: handle fromJson() returning null

Browse Source 
Treat it the same as handling a json syntax exception
This commit is contained in:
Adam
2021-01-09 17:05:20 -05:00
parent fa43ca94db
commit 266fee2067
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
http-service/src/main/java/net/runelite/http/service/config/ConfigService.java
View File

@@ -233,8 +233,11 @@ public class ConfigService
try try
{ {
jsonValue = RuneLiteAPI.GSON.fromJson(value, Object.class); jsonValue = RuneLiteAPI.GSON.fromJson(value, Object.class);
if (jsonValue == null)
if (jsonValue instanceof Double || jsonValue instanceof Float) {
return value;
}
else if (jsonValue instanceof Double || jsonValue instanceof Float)
{ {
Number number = (Number) jsonValue; Number number = (Number) jsonValue;
if (Math.floor(number.doubleValue()) == number.doubleValue() && !Double.isInfinite(number.doubleValue())) if (Math.floor(number.doubleValue()) == number.doubleValue() && !Double.isInfinite(number.doubleValue()))
@@ -272,6 +275,10 @@ public class ConfigService
{ {
// I couldn't figure out a better way to do this than a second json parse // I couldn't figure out a better way to do this than a second json parse
JsonElement jsonElement = RuneLiteAPI.GSON.fromJson(value, JsonElement.class); JsonElement jsonElement = RuneLiteAPI.GSON.fromJson(value, JsonElement.class);
if (jsonElement == null)
{
return value.length() < MAX_VALUE_LENGTH;
}
return validateObject(jsonElement, 1); return validateObject(jsonElement, 1);
} }
catch (JsonSyntaxException ex) catch (JsonSyntaxException ex)

1
http-service/src/test/java/net/runelite/http/service/config/ConfigServiceTest.java
View File

@@ -51,5 +51,6 @@ public class ConfigServiceTest
assertTrue(ConfigService.validateJson("\"test\"")); assertTrue(ConfigService.validateJson("\"test\""));
assertTrue(ConfigService.validateJson("key:value")); assertTrue(ConfigService.validateJson("key:value"));
assertTrue(ConfigService.validateJson("{\"key\": \"value\"}")); assertTrue(ConfigService.validateJson("{\"key\": \"value\"}"));
assertTrue(ConfigService.validateJson("\n"));
} }
} }