diff --git a/openvidu-server/src/main/java/io/openvidu/server/cdr/CDREventParticipant.java b/openvidu-server/src/main/java/io/openvidu/server/cdr/CDREventParticipant.java index 6a33c893..62824807 100644 --- a/openvidu-server/src/main/java/io/openvidu/server/cdr/CDREventParticipant.java +++ b/openvidu-server/src/main/java/io/openvidu/server/cdr/CDREventParticipant.java @@ -27,8 +27,8 @@ public class CDREventParticipant extends CDREventEnd { private Participant participant; // participantJoined - public CDREventParticipant(String sessionId, Participant participant) { - super(CDREventName.participantJoined, sessionId, participant.getCreatedAt()); + public CDREventParticipant(Participant participant) { + super(CDREventName.participantJoined, participant.getSessionId(), participant.getCreatedAt()); this.participant = participant; } diff --git a/openvidu-server/src/main/java/io/openvidu/server/core/FinalUser.java b/openvidu-server/src/main/java/io/openvidu/server/core/FinalUser.java index 87b1cdb3..be2cc4a0 100644 --- a/openvidu-server/src/main/java/io/openvidu/server/core/FinalUser.java +++ b/openvidu-server/src/main/java/io/openvidu/server/core/FinalUser.java @@ -30,28 +30,21 @@ import io.openvidu.server.utils.GeoLocation; public class FinalUser { private String id; - private String sessionId; private GeoLocation location; private String platform; private Map connections = new ConcurrentHashMap<>(); public FinalUser(String id, String sessionId, Participant firstConnection) { this.id = id; - this.sessionId = sessionId; this.location = firstConnection.getLocation(); this.platform = firstConnection.getPlatform(); - this.connections.put(firstConnection.getParticipantPublicId(), - new ParticipantSummary(this.sessionId, firstConnection)); + this.connections.put(firstConnection.getParticipantPublicId(), new ParticipantSummary(firstConnection)); } public String getId() { return id; } - public String getSessionId() { - return sessionId; - } - public GeoLocation getLocation() { return location; } @@ -65,7 +58,7 @@ public class FinalUser { } public void addConnectionIfAbsent(Participant participant) { - this.connections.putIfAbsent(participant.getParticipantPublicId(), new ParticipantSummary(this.sessionId, participant)); + this.connections.putIfAbsent(participant.getParticipantPublicId(), new ParticipantSummary(participant)); } public void setConnection(CDREventParticipant event) { 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 27432af2..19558715 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 @@ -33,8 +33,8 @@ public class ParticipantSummary { private Map publishers = new ConcurrentHashMap<>(); private Map subscribers = new ConcurrentHashMap<>(); - public ParticipantSummary(String sessionId, Participant participant) { - this.eventParticipantEnd = new CDREventParticipant(sessionId, participant); + public ParticipantSummary(Participant participant) { + this.eventParticipantEnd = new CDREventParticipant(participant); } public ParticipantSummary(CDREventParticipant event, ParticipantSummary oldSummary) {