From 86540ab3a88a976b3e7ac8b2c83e62408727dc4b Mon Sep 17 00:00:00 2001 From: pabloFuente Date: Thu, 27 Jun 2019 16:36:21 +0200 Subject: [PATCH] openvidu-server: set ready state to COMPOSED video recordings --- .../service/ComposedRecordingService.java | 4 ++++ .../test/e2e/OpenViduTestAppE2eTest.java | 2 +- .../test/e2e/utils/CustomHttpClient.java | 17 +++++++++++++++-- 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/openvidu-server/src/main/java/io/openvidu/server/recording/service/ComposedRecordingService.java b/openvidu-server/src/main/java/io/openvidu/server/recording/service/ComposedRecordingService.java index b87cb936..eac00ed8 100644 --- a/openvidu-server/src/main/java/io/openvidu/server/recording/service/ComposedRecordingService.java +++ b/openvidu-server/src/main/java/io/openvidu/server/recording/service/ComposedRecordingService.java @@ -325,6 +325,10 @@ public class ComposedRecordingService extends RecordingService { "There was an error generating the metadata report file for the recording"); } + String filesPath = this.openviduConfig.getOpenViduRecordingPath() + recording.getId() + "/"; + recording = this.sealRecordingMetadataFileAsReady(recording, recording.getSize(), recording.getDuration(), + filesPath + RecordingManager.RECORDING_ENTITY_FILE + recording.getId()); + final long timestamp = System.currentTimeMillis(); this.cdr.recordRecordingStopped(recording, reason, timestamp); this.cdr.recordRecordingStatusChanged(recording, reason, timestamp, recording.getStatus()); 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 34cfb820..ebdec314 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 @@ -2582,7 +2582,7 @@ public class OpenViduTestAppE2eTest { restClient.rest(HttpMethod.GET, "/config", null, HttpStatus.SC_OK, true, "{'version':'STR','openviduPublicurl':'STR','openviduCdr':false,'maxRecvBandwidth':0,'minRecvBandwidth':0,'maxSendBandwidth':0,'minSendBandwidth':0,'openviduRecording':false," + "'openviduRecordingVersion':'STR','openviduRecordingPath':'STR','openviduRecordingPublicAccess':false,'openviduRecordingNotification':'STR'," - + "'openviduRecordingCustomLayout':'STR','openviduRecordingAutostopTimeout':0,'openviduWebhook':false,'openviduWebhookEndpoint':'STR','openviduWebhookHeaders':'STR','openviduWebhookEvents':'STR',}"); + + "'openviduRecordingCustomLayout':'STR','openviduRecordingAutostopTimeout':0,'openviduWebhook':false,'openviduWebhookEndpoint':'STR','openviduWebhookHeaders':[],'openviduWebhookEvents':[],}"); } @Test diff --git a/openvidu-test-e2e/src/test/java/io/openvidu/test/e2e/utils/CustomHttpClient.java b/openvidu-test-e2e/src/test/java/io/openvidu/test/e2e/utils/CustomHttpClient.java index 7c094725..e36fc916 100644 --- a/openvidu-test-e2e/src/test/java/io/openvidu/test/e2e/utils/CustomHttpClient.java +++ b/openvidu-test-e2e/src/test/java/io/openvidu/test/e2e/utils/CustomHttpClient.java @@ -110,8 +110,13 @@ public class CustomHttpClient { jsonObjExpected.length(), json.length()); } for (String key : jsonObjExpected.keySet()) { - Assert.assertTrue("Wrong class of property " + key, - jsonObjExpected.get(key).getClass().equals(json.get(key).getClass())); + Class c1 = jsonObjExpected.get(key).getClass(); + Class c2 = json.get(key).getClass(); + + c1 = unifyNumberType(c1); + c2 = unifyNumberType(c2); + + Assert.assertTrue("Wrong class of property " + key, c1.equals(c2)); } return json; } @@ -217,4 +222,12 @@ public class CustomHttpClient { Assert.assertEquals(path + " expected to return status " + status, status, jsonResponse.getStatus()); return json; } + + private Class unifyNumberType(Class myClass) { + if (Number.class.isAssignableFrom(myClass)) { + return Number.class; + } + return myClass; + } + }