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 f825b384..7ef11811 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 @@ -763,7 +763,6 @@ public class SessionRestController { String rtspUri; Boolean adaptativeBitrate; Boolean onlyPlayWithSubscribers; - String networkCacheStr; Integer networkCache; String data; try { @@ -771,11 +770,7 @@ public class SessionRestController { rtspUri = (String) params.get("rtspUri"); adaptativeBitrate = (Boolean) params.get("adaptativeBitrate"); onlyPlayWithSubscribers = (Boolean) params.get("onlyPlayWithSubscribers"); - networkCacheStr = (String) params.get("networkCache"); - if (networkCacheStr != null) - networkCache = Integer.parseInt(networkCacheStr); - else - networkCache = null; + networkCache = (Integer) params.get("networkCache"); data = (String) params.get("data"); } catch (ClassCastException e) { return this.generateErrorResponse("Type error in some parameter", diff --git a/openvidu-test-e2e/src/test/java/io/openvidu/test/e2e/OpenViduTestAppE2eTest.java b/openvidu-test-e2e/src/test/java/io/openvidu/test/e2e/OpenViduTestAppE2eTest.java index d114b130..5f9986c1 100644 --- a/openvidu-test-e2e/src/test/java/io/openvidu/test/e2e/OpenViduTestAppE2eTest.java +++ b/openvidu-test-e2e/src/test/java/io/openvidu/test/e2e/OpenViduTestAppE2eTest.java @@ -3088,7 +3088,7 @@ public class OpenViduTestAppE2eTest { HttpStatus.SC_BAD_REQUEST); // Publish IP camera. Dummy URL because no user will subscribe to it [200] - String ipCamBody = "{'type':'IPCAM','rtspUri':'rtsp://dummyurl.com','adaptativeBitrate':true,'onlyPlayWithSubscribers':true,'data':'MY_IP_CAMERA'}"; + String ipCamBody = "{'type':'IPCAM','rtspUri':'rtsp://dummyurl.com','adaptativeBitrate':true,'onlyPlayWithSubscribers':true,'networkCache':1000,'data':'MY_IP_CAMERA'}"; JsonObject response = restClient.rest(HttpMethod.POST, "/api/sessions/IP_CAM_SESSION/connection", ipCamBody, HttpStatus.SC_OK, true, "{'connectionId':'STR','createdAt':0,'location':'STR','platform':'STR','role':'STR','serverData':'STR','clientData':'STR','publishers':[],'subscribers':[]}"); @@ -3108,7 +3108,7 @@ public class OpenViduTestAppE2eTest { Assert.assertEquals("Wrong rtspUri property", "rtsp://dummyurl.com", ipCamPublisher.get("rtspUri").getAsString()); JsonObject mediaOptions = ipCamPublisher.get("mediaOptions").getAsJsonObject(); - Assert.assertEquals("Wrong number of properties in MediaOptions", 10, mediaOptions.size()); + Assert.assertEquals("Wrong number of properties in MediaOptions", 11, mediaOptions.size()); Assert.assertTrue("Wrong adaptativeBitrate property", mediaOptions.get("adaptativeBitrate").getAsBoolean()); Assert.assertTrue("Wrong onlyPlayWithSubscribers property", mediaOptions.get("onlyPlayWithSubscribers").getAsBoolean()); @@ -3185,7 +3185,7 @@ public class OpenViduTestAppE2eTest { recPath = recPath.endsWith("/") ? recPath : (recPath + "/"); String fullRecordingPath = "file://" + recPath + "TestSession/audioVideo.mp4"; ipCamBody = "{'type':'IPCAM','rtspUri':'" + fullRecordingPath - + "','adaptativeBitrate':true,'onlyPlayWithSubscribers':true,'data':'MY_IP_CAMERA'}"; + + "','adaptativeBitrate':true,'onlyPlayWithSubscribers':true,'networkCache':1000,'data':'MY_IP_CAMERA'}"; restClient.rest(HttpMethod.POST, "/api/sessions/TestSession/connection", ipCamBody, HttpStatus.SC_OK, true, "{'connectionId':'STR','createdAt':0,'location':'STR','platform':'STR','role':'STR','serverData':'STR','clientData':'STR','publishers':[],'subscribers':[]}");