From 06a602cf62b9ca51ebbd56a1358d4c217240bef8 Mon Sep 17 00:00:00 2001 From: pabloFuente Date: Mon, 19 Oct 2020 14:21:49 +0200 Subject: [PATCH] openvidu-server: ConnectionType transferred to openvidu-java-client --- .../openvidu/java/client/ConnectionType.java | 20 +++++++++++++++++++ .../openvidu/server/core/ConnectionType.java | 5 ----- .../io/openvidu/server/core/Participant.java | 1 + .../openvidu/server/core/SessionManager.java | 1 + .../java/io/openvidu/server/core/Token.java | 1 + .../server/rest/SessionRestController.java | 2 +- 6 files changed, 24 insertions(+), 6 deletions(-) create mode 100644 openvidu-java-client/src/main/java/io/openvidu/java/client/ConnectionType.java delete mode 100644 openvidu-server/src/main/java/io/openvidu/server/core/ConnectionType.java diff --git a/openvidu-java-client/src/main/java/io/openvidu/java/client/ConnectionType.java b/openvidu-java-client/src/main/java/io/openvidu/java/client/ConnectionType.java new file mode 100644 index 00000000..11c1d2a8 --- /dev/null +++ b/openvidu-java-client/src/main/java/io/openvidu/java/client/ConnectionType.java @@ -0,0 +1,20 @@ +package io.openvidu.java.client; + +/** + * See + * {@link io.openvidu.java.client.Session#createConnection(ConnectionProperties)} + */ +public enum ConnectionType { + + /** + * WebRTC connection. This is the normal type of Connection for a regular user + * connecting to a session from an application. + */ + WEBRTC, + + /** + * IP camera connection. This is the type of Connection used by IP cameras to + * connect to a session. + */ + IPCAM +} diff --git a/openvidu-server/src/main/java/io/openvidu/server/core/ConnectionType.java b/openvidu-server/src/main/java/io/openvidu/server/core/ConnectionType.java deleted file mode 100644 index a5206826..00000000 --- a/openvidu-server/src/main/java/io/openvidu/server/core/ConnectionType.java +++ /dev/null @@ -1,5 +0,0 @@ -package io.openvidu.server.core; - -public enum ConnectionType { - WEBRTC, IPCAM -} \ No newline at end of file diff --git a/openvidu-server/src/main/java/io/openvidu/server/core/Participant.java b/openvidu-server/src/main/java/io/openvidu/server/core/Participant.java index b20f0220..4acc2671 100644 --- a/openvidu-server/src/main/java/io/openvidu/server/core/Participant.java +++ b/openvidu-server/src/main/java/io/openvidu/server/core/Participant.java @@ -22,6 +22,7 @@ import java.util.concurrent.locks.ReentrantLock; import com.google.gson.JsonObject; +import io.openvidu.java.client.ConnectionType; import io.openvidu.server.kurento.endpoint.EndpointType; import io.openvidu.server.utils.GeoLocation; 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 e6f4fcaf..e51dd190 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 @@ -45,6 +45,7 @@ import com.google.gson.JsonSyntaxException; import io.openvidu.client.OpenViduException; import io.openvidu.client.OpenViduException.Code; import io.openvidu.client.internal.ProtocolElements; +import io.openvidu.java.client.ConnectionType; import io.openvidu.java.client.OpenViduRole; import io.openvidu.java.client.Recording; import io.openvidu.java.client.SessionProperties; diff --git a/openvidu-server/src/main/java/io/openvidu/server/core/Token.java b/openvidu-server/src/main/java/io/openvidu/server/core/Token.java index 85411ce1..b0fe7d30 100644 --- a/openvidu-server/src/main/java/io/openvidu/server/core/Token.java +++ b/openvidu-server/src/main/java/io/openvidu/server/core/Token.java @@ -21,6 +21,7 @@ import org.apache.commons.lang3.RandomStringUtils; import com.google.gson.JsonObject; +import io.openvidu.java.client.ConnectionType; import io.openvidu.java.client.OpenViduRole; import io.openvidu.server.core.Participant.ParticipantStatus; import io.openvidu.server.coturn.TurnCredentials; 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 ca3ef2dc..4b7dea45 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 @@ -50,6 +50,7 @@ import com.google.gson.JsonParser; import io.openvidu.client.OpenViduException; import io.openvidu.client.internal.ProtocolElements; +import io.openvidu.java.client.ConnectionType; import io.openvidu.java.client.MediaMode; import io.openvidu.java.client.OpenViduRole; import io.openvidu.java.client.Recording.OutputMode; @@ -58,7 +59,6 @@ import io.openvidu.java.client.RecordingMode; import io.openvidu.java.client.RecordingProperties; import io.openvidu.java.client.SessionProperties; import io.openvidu.server.config.OpenviduConfig; -import io.openvidu.server.core.ConnectionType; import io.openvidu.server.core.EndReason; import io.openvidu.server.core.IdentifierPrefixes; import io.openvidu.server.core.Participant;