ambiser
/
openvidu
mirror of https://github.com/OpenVidu/openvidu.git
8
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

openvidu-server: ParticipantSummary simplified

pull/370/head
pabloFuente 2019-10-08 09:36:48 +02:00
parent d3270ca2a1
commit 97ff8426ab
3 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openvidu-server/src/main/java/io/openvidu/server/cdr/CDREventParticipant.java
View File

@ -27,8 +27,8 @@ public class CDREventParticipant extends CDREventEnd {
private Participant participant; private Participant participant;
// participantJoined // participantJoined
public CDREventParticipant(String sessionId, Participant participant) { public CDREventParticipant(Participant participant) {
super(CDREventName.participantJoined, sessionId, participant.getCreatedAt()); super(CDREventName.participantJoined, participant.getSessionId(), participant.getCreatedAt());
this.participant = participant; this.participant = participant;
} }

11
openvidu-server/src/main/java/io/openvidu/server/core/FinalUser.java
View File

@ -30,28 +30,21 @@ import io.openvidu.server.utils.GeoLocation;
public class FinalUser { public class FinalUser {
private String id; private String id;
private String sessionId;
private GeoLocation location; private GeoLocation location;
private String platform; private String platform;
private Map<String, ParticipantSummary> connections = new ConcurrentHashMap<>(); private Map<String, ParticipantSummary> connections = new ConcurrentHashMap<>();
public FinalUser(String id, String sessionId, Participant firstConnection) { public FinalUser(String id, String sessionId, Participant firstConnection) {
this.id = id; this.id = id;
this.sessionId = sessionId;
this.location = firstConnection.getLocation(); this.location = firstConnection.getLocation();
this.platform = firstConnection.getPlatform(); this.platform = firstConnection.getPlatform();
this.connections.put(firstConnection.getParticipantPublicId(), this.connections.put(firstConnection.getParticipantPublicId(), new ParticipantSummary(firstConnection));
new ParticipantSummary(this.sessionId, firstConnection));
} }
public String getId() { public String getId() {
return id; return id;
} }
public String getSessionId() {
return sessionId;
}
public GeoLocation getLocation() { public GeoLocation getLocation() {
return location; return location;
} }
@ -65,7 +58,7 @@ public class FinalUser {
} }
public void addConnectionIfAbsent(Participant participant) { 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) { public void setConnection(CDREventParticipant event) {

4
openvidu-server/src/main/java/io/openvidu/server/summary/ParticipantSummary.java
View File

@ -33,8 +33,8 @@ public class ParticipantSummary {
private Map<String, CDREventWebrtcConnection> publishers = new ConcurrentHashMap<>(); private Map<String, CDREventWebrtcConnection> publishers = new ConcurrentHashMap<>();
private Map<String, CDREventWebrtcConnection> subscribers = new ConcurrentHashMap<>(); private Map<String, CDREventWebrtcConnection> subscribers = new ConcurrentHashMap<>();
public ParticipantSummary(String sessionId, Participant participant) { public ParticipantSummary(Participant participant) {
this.eventParticipantEnd = new CDREventParticipant(sessionId, participant); this.eventParticipantEnd = new CDREventParticipant(participant);
} }
public ParticipantSummary(CDREventParticipant event, ParticipantSummary oldSummary) { public ParticipantSummary(CDREventParticipant event, ParticipantSummary oldSummary) {