dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix + refactoring

Browse Source
This commit is contained in:
Bohdan Smetaniuk 2020-07-14 17:06:21 +03:00
parent 2b14fa3634
commit 37cb35c99b
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/adaptor/JsonConverter.java
View File

@ -133,15 +133,21 @@ public class JsonConverter {
.build(); .build();
} }
public static PostAttributeMsg convertToAttributesProto(JsonElement jsonObject) throws JsonSyntaxException { public static PostAttributeMsg convertToAttributesProto(JsonElement jsonElement) throws JsonSyntaxException {
if (jsonObject.isJsonObject()) { if (jsonElement.isJsonObject()) {
PostAttributeMsg.Builder result = PostAttributeMsg.newBuilder(); PostAttributeMsg.Builder result = PostAttributeMsg.newBuilder();
List<KeyValueProto> keyValueList = parseProtoValues(jsonObject.getAsJsonObject().getAsJsonObject("kv")); List<KeyValueProto> keyValueList = null;
JsonObject jsonObject = jsonElement.getAsJsonObject();
if (jsonObject.has("kv") && jsonObject.has("scope")) {
keyValueList = parseProtoValues(jsonObject.getAsJsonObject("kv"));
result.setScope(jsonObject.getAsJsonPrimitive("scope").getAsString());
} else {
keyValueList = parseProtoValues(jsonObject);
}
result.addAllKv(keyValueList); result.addAllKv(keyValueList);
result.setScope(jsonObject.getAsJsonObject().getAsJsonPrimitive("scope").getAsString());
return result.build(); return result.build();
} else { } else {
throw new JsonSyntaxException(CAN_T_PARSE_VALUE + jsonObject); throw new JsonSyntaxException(CAN_T_PARSE_VALUE + jsonElement);
} }
} }