From b0d19484a7b5eea6e8fe89cdf2a1477d102860d9 Mon Sep 17 00:00:00 2001
From: pabloFuente <pablofuenteperez@gmail.com>
Date: Thu, 15 Apr 2021 13:24:28 +0200
Subject: [PATCH] openvidu-java-client: HttpEntity params encoded with UTF-8

---
 .../io/openvidu/java/client/OpenVidu.java     |  4 +--
 .../java/io/openvidu/java/client/Session.java | 31 +++----------------
 2 files changed, 5 insertions(+), 30 deletions(-)

diff --git a/openvidu-java-client/src/main/java/io/openvidu/java/client/OpenVidu.java b/openvidu-java-client/src/main/java/io/openvidu/java/client/OpenVidu.java
index a6cdad04..c4dc2c22 100644
--- a/openvidu-java-client/src/main/java/io/openvidu/java/client/OpenVidu.java
+++ b/openvidu-java-client/src/main/java/io/openvidu/java/client/OpenVidu.java
@@ -18,7 +18,6 @@
 package io.openvidu.java.client;
 
 import java.io.IOException;
-import java.io.UnsupportedEncodingException;
 import java.security.KeyManagementException;
 import java.security.KeyStoreException;
 import java.security.NoSuchAlgorithmException;
@@ -199,8 +198,7 @@ public class OpenVidu {
 		JsonObject json = properties.toJson();
 		json.addProperty("session", sessionId);
 
-		StringEntity params = null;
-		params = new StringEntity(json.toString(), "UTF-8");
+		StringEntity params = new StringEntity(json.toString(), "UTF-8");
 
 		request.setHeader(HttpHeaders.CONTENT_TYPE, "application/json");
 		request.setEntity(params);
diff --git a/openvidu-java-client/src/main/java/io/openvidu/java/client/Session.java b/openvidu-java-client/src/main/java/io/openvidu/java/client/Session.java
index 64d1f76f..c75cd4eb 100644
--- a/openvidu-java-client/src/main/java/io/openvidu/java/client/Session.java
+++ b/openvidu-java-client/src/main/java/io/openvidu/java/client/Session.java
@@ -18,7 +18,6 @@
 package io.openvidu.java.client;
 
 import java.io.IOException;
-import java.io.UnsupportedEncodingException;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
@@ -121,13 +120,7 @@ public class Session {
 		}
 
 		HttpPost request = new HttpPost(this.openVidu.hostname + OpenVidu.API_TOKENS);
-
-		StringEntity params;
-		try {
-			params = new StringEntity(tokenOptions.toJsonObject(sessionId).toString());
-		} catch (UnsupportedEncodingException e1) {
-			throw new OpenViduJavaClientException(e1.getMessage(), e1.getCause());
-		}
+		StringEntity params = new StringEntity(tokenOptions.toJsonObject(sessionId).toString(), "UTF-8");
 
 		request.setHeader(HttpHeaders.CONTENT_TYPE, "application/json");
 		request.setEntity(params);
@@ -190,13 +183,7 @@ public class Session {
 
 		HttpPost request = new HttpPost(
 				this.openVidu.hostname + OpenVidu.API_SESSIONS + "/" + this.sessionId + "/connection");
-
-		StringEntity params;
-		try {
-			params = new StringEntity(connectionProperties.toJson(sessionId).toString());
-		} catch (UnsupportedEncodingException e1) {
-			throw new OpenViduJavaClientException(e1.getMessage(), e1.getCause());
-		}
+		StringEntity params = new StringEntity(connectionProperties.toJson(sessionId).toString(), "UTF-8");
 
 		request.setHeader(HttpHeaders.CONTENT_TYPE, "application/json");
 		request.setEntity(params);
@@ -506,13 +493,8 @@ public class Session {
 
 		HttpPatch request = new HttpPatch(
 				this.openVidu.hostname + OpenVidu.API_SESSIONS + "/" + this.sessionId + "/connection/" + connectionId);
+		StringEntity params = new StringEntity(connectionProperties.toJson(this.sessionId).toString(), "UTF-8");
 
-		StringEntity params;
-		try {
-			params = new StringEntity(connectionProperties.toJson(this.sessionId).toString());
-		} catch (UnsupportedEncodingException e1) {
-			throw new OpenViduJavaClientException(e1.getMessage(), e1.getCause());
-		}
 		request.setHeader(HttpHeaders.CONTENT_TYPE, "application/json");
 		request.setEntity(params);
 
@@ -661,12 +643,7 @@ public class Session {
 		}
 
 		HttpPost request = new HttpPost(this.openVidu.hostname + OpenVidu.API_SESSIONS);
-		StringEntity params = null;
-		try {
-			params = new StringEntity(properties.toJson().toString());
-		} catch (UnsupportedEncodingException e1) {
-			throw new OpenViduJavaClientException(e1.getMessage(), e1.getCause());
-		}
+		StringEntity params = new StringEntity(properties.toJson().toString(), "UTF-8");
 
 		request.setHeader(HttpHeaders.CONTENT_TYPE, "application/json");
 		request.setEntity(params);