From 51e246970153452ff2bac87426e3f671c85823c5 Mon Sep 17 00:00:00 2001
From: pabloFuente <pablofuenteperez@gmail.com>
Date: Tue, 2 Feb 2021 16:37:45 +0100
Subject: [PATCH] openvidu-server: "connection" to "connectionId"

---
 .../main/java/io/openvidu/server/kurento/endpoint/KmsEvent.java | 2 ++
 .../java/io/openvidu/server/kurento/endpoint/MediaEndpoint.java | 1 +
 .../java/io/openvidu/server/summary/ParticipantSummary.java     | 2 ++
 3 files changed, 5 insertions(+)

diff --git a/openvidu-server/src/main/java/io/openvidu/server/kurento/endpoint/KmsEvent.java b/openvidu-server/src/main/java/io/openvidu/server/kurento/endpoint/KmsEvent.java
index 9c15e34a..7d2341b4 100644
--- a/openvidu-server/src/main/java/io/openvidu/server/kurento/endpoint/KmsEvent.java
+++ b/openvidu-server/src/main/java/io/openvidu/server/kurento/endpoint/KmsEvent.java
@@ -49,7 +49,9 @@ public class KmsEvent {
 		json.addProperty("timestamp", timestamp);
 		json.addProperty("sessionId", participant.getSessionId());
 		json.addProperty("user", participant.getFinalUserId());
+		// TODO: remove deprecated "connection" when possible
 		json.addProperty("connection", participant.getParticipantPublicId());
+		json.addProperty("connectionId", participant.getParticipantPublicId());
 		json.addProperty("endpoint", this.endpoint);
 		json.addProperty("msSinceEndpointCreation", msSinceCreation);
 		return json;
diff --git a/openvidu-server/src/main/java/io/openvidu/server/kurento/endpoint/MediaEndpoint.java b/openvidu-server/src/main/java/io/openvidu/server/kurento/endpoint/MediaEndpoint.java
index 8c68e41a..201c8acf 100644
--- a/openvidu-server/src/main/java/io/openvidu/server/kurento/endpoint/MediaEndpoint.java
+++ b/openvidu-server/src/main/java/io/openvidu/server/kurento/endpoint/MediaEndpoint.java
@@ -638,6 +638,7 @@ public abstract class MediaEndpoint {
 			j.remove("sessionId");
 			j.remove("user");
 			j.remove("connection");
+			j.remove("connectionId");
 			j.remove("endpoint");
 			j.remove("timestampMillis");
 			jsonArray.add(j);
diff --git a/openvidu-server/src/main/java/io/openvidu/server/summary/ParticipantSummary.java b/openvidu-server/src/main/java/io/openvidu/server/summary/ParticipantSummary.java
index 2fa00963..771d14e7 100644
--- a/openvidu-server/src/main/java/io/openvidu/server/summary/ParticipantSummary.java
+++ b/openvidu-server/src/main/java/io/openvidu/server/summary/ParticipantSummary.java
@@ -87,6 +87,7 @@ public class ParticipantSummary {
 			JsonObject j = cdrEvent.toJson();
 			j.remove("participantId");
 			j.remove("connection");
+			j.remove("connectionId");
 			jsonArrayPublishers.add(j);
 		});
 		publishersJson.add("content", jsonArrayPublishers);
@@ -100,6 +101,7 @@ public class ParticipantSummary {
 			JsonObject j = cdrEvent.toJson();
 			j.remove("participantId");
 			j.remove("connection");
+			j.remove("connectionId");
 			jsonArraySubscribers.add(j);
 		});
 		subscribersJson.add("content", jsonArraySubscribers);