diff --git a/openvidu-server/src/main/java/io/openvidu/server/config/OpenviduConfig.java b/openvidu-server/src/main/java/io/openvidu/server/config/OpenviduConfig.java index 00c27ad5..38b100d1 100644 --- a/openvidu-server/src/main/java/io/openvidu/server/config/OpenviduConfig.java +++ b/openvidu-server/src/main/java/io/openvidu/server/config/OpenviduConfig.java @@ -753,8 +753,7 @@ public class OpenviduConfig { } private List
checkWebhookHeaders(String headers) throws Exception { - JsonParser parser = new JsonParser(); - JsonElement elem = parser.parse(headers); + JsonElement elem = JsonParser.parseString(headers); JsonArray headersJsonArray = elem.getAsJsonArray(); List
headerList = new ArrayList<>(); @@ -781,8 +780,7 @@ public class OpenviduConfig { } private List checkWebhookEvents(String events) throws Exception { - JsonParser parser = new JsonParser(); - JsonElement elem = parser.parse(events); + JsonElement elem = JsonParser.parseString(events); JsonArray eventsJsonArray = elem.getAsJsonArray(); List eventList = new ArrayList<>(); diff --git a/openvidu-server/src/main/java/io/openvidu/server/core/SessionManager.java b/openvidu-server/src/main/java/io/openvidu/server/core/SessionManager.java index d13247f8..d0f06209 100644 --- a/openvidu-server/src/main/java/io/openvidu/server/core/SessionManager.java +++ b/openvidu-server/src/main/java/io/openvidu/server/core/SessionManager.java @@ -106,7 +106,7 @@ public abstract class SessionManager { public void sendMessage(String message, String sessionId) { try { - JsonObject messageJson = new JsonParser().parse(message).getAsJsonObject(); + JsonObject messageJson = JsonParser.parseString(message).getAsJsonObject(); sessionEventsHandler.onSendMessage(null, messageJson, getParticipants(sessionId), null, null); } catch (JsonSyntaxException | IllegalStateException e) { throw new OpenViduException(Code.SIGNAL_FORMAT_INVALID_ERROR_CODE, @@ -116,7 +116,7 @@ public abstract class SessionManager { public void sendMessage(Participant participant, String message, Integer transactionId) { try { - JsonObject messageJson = new JsonParser().parse(message).getAsJsonObject(); + JsonObject messageJson = JsonParser.parseString(message).getAsJsonObject(); sessionEventsHandler.onSendMessage(participant, messageJson, getParticipants(participant.getSessionId()), transactionId, null); } catch (JsonSyntaxException | IllegalStateException e) { diff --git a/openvidu-server/src/main/java/io/openvidu/server/rest/SessionRestController.java b/openvidu-server/src/main/java/io/openvidu/server/rest/SessionRestController.java index 48a79e15..30f56d88 100644 --- a/openvidu-server/src/main/java/io/openvidu/server/rest/SessionRestController.java +++ b/openvidu-server/src/main/java/io/openvidu/server/rest/SessionRestController.java @@ -338,7 +338,7 @@ public class SessionRestController { if (params.get("kurentoOptions") != null) { try { - kurentoOptions = new JsonParser().parse(params.get("kurentoOptions").toString()).getAsJsonObject(); + kurentoOptions = JsonParser.parseString(params.get("kurentoOptions").toString()).getAsJsonObject(); } catch (Exception e) { return this.generateErrorResponse("Error in parameter 'kurentoOptions'. It is not a valid JSON object", "/api/tokens", HttpStatus.BAD_REQUEST); diff --git a/openvidu-server/src/main/java/io/openvidu/server/rpc/RpcHandler.java b/openvidu-server/src/main/java/io/openvidu/server/rpc/RpcHandler.java index 47358a1f..f02c2edd 100644 --- a/openvidu-server/src/main/java/io/openvidu/server/rpc/RpcHandler.java +++ b/openvidu-server/src/main/java/io/openvidu/server/rpc/RpcHandler.java @@ -477,7 +477,7 @@ public class RpcHandler extends DefaultJsonRpcHandler { && participant.getToken().getKurentoTokenOptions().isFilterAllowed(filterType))) { JsonObject filterOptions; try { - filterOptions = new JsonParser().parse(getStringParam(request, ProtocolElements.FILTER_OPTIONS_PARAM)) + filterOptions = JsonParser.parseString(getStringParam(request, ProtocolElements.FILTER_OPTIONS_PARAM)) .getAsJsonObject(); } catch (JsonSyntaxException e) { throw new OpenViduException(Code.FILTER_NOT_APPLIED_ERROR_CODE, @@ -525,7 +525,7 @@ public class RpcHandler extends DefaultJsonRpcHandler { } String streamId = getStringParam(request, ProtocolElements.FILTER_STREAMID_PARAM); String filterMethod = getStringParam(request, ProtocolElements.FILTER_METHOD_PARAM); - JsonObject filterParams = new JsonParser().parse(getStringParam(request, ProtocolElements.FILTER_PARAMS_PARAM)) + JsonObject filterParams = JsonParser.parseString(getStringParam(request, ProtocolElements.FILTER_PARAMS_PARAM)) .getAsJsonObject(); boolean isModerator = this.sessionManager.isModeratorInSession(rpcConnection.getSessionId(), participant); diff --git a/openvidu-server/src/main/java/io/openvidu/server/utils/JsonUtils.java b/openvidu-server/src/main/java/io/openvidu/server/utils/JsonUtils.java index d51c0160..353a1b1c 100644 --- a/openvidu-server/src/main/java/io/openvidu/server/utils/JsonUtils.java +++ b/openvidu-server/src/main/java/io/openvidu/server/utils/JsonUtils.java @@ -57,7 +57,6 @@ public class JsonUtils { public JsonElement fromFileToJsonElement(String filePath) throws IOException, FileNotFoundException, JsonParseException, IllegalStateException { JsonElement json = null; - JsonParser parser = new JsonParser(); FileReader reader = null; try { reader = new FileReader(filePath); @@ -65,7 +64,7 @@ public class JsonUtils { throw e; } try { - json = parser.parse(reader); + json = JsonParser.parseReader(reader); } catch (JsonParseException | IllegalStateException exception) { throw exception; } finally {