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

openvidu-java-client: allow http and https URI protocols on rtspUri parameter

pull/750/head
pabloFuente 2022-10-04 13:11:36 +02:00
parent f886eb217c
commit 4e299f1ae6
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openvidu-java-client/src/main/java/io/openvidu/java/client/ConnectionProperties.java
View File

@ -684,7 +684,7 @@ public class ConnectionProperties {
public static URI checkRtspUri(String rtspUri) throws MalformedURLException { public static URI checkRtspUri(String rtspUri) throws MalformedURLException {
try { try {
URI uri = new URI(rtspUri); URI uri = new URI(rtspUri);
List<String> allowedSchemes = Arrays.asList("file", "rtsp", "rtsps"); List<String> allowedSchemes = Arrays.asList("file", "rtsp", "rtsps", "http", "https");
if (!allowedSchemes.contains(uri.getScheme())) { if (!allowedSchemes.contains(uri.getScheme())) {
throw new MalformedURLException( throw new MalformedURLException(
"RTSP URI does not contain a valid protocol " + allowedSchemes.toString()); "RTSP URI does not contain a valid protocol " + allowedSchemes.toString());

6
openvidu-java-client/src/test/java/io/openvidu/java/client/test/ConnectionPropertiesTest.java
View File

@ -51,6 +51,12 @@ public class ConnectionPropertiesTest extends TestCase {
jsonString = "{'type':'IPCAM','rtspUri':'file://your.camera.ip.sdp'}"; jsonString = "{'type':'IPCAM','rtspUri':'file://your.camera.ip.sdp'}";
ConnectionProperties.fromJson(mapFromJsonString(jsonString)).build(); ConnectionProperties.fromJson(mapFromJsonString(jsonString)).build();
jsonString = "{'type':'IPCAM','rtspUri':'http://your.camera.ip.sdp'}";
ConnectionProperties.fromJson(mapFromJsonString(jsonString)).build();
jsonString = "{'type':'IPCAM','rtspUri':'https://your.camera.ip.sdp'}";
ConnectionProperties.fromJson(mapFromJsonString(jsonString)).build();
} }
public void testFromJsonError() { public void testFromJsonError() {