From 20630c055398ce12e0e33392b0dca35c913175e2 Mon Sep 17 00:00:00 2001 From: pabloFuente Date: Tue, 4 Nov 2025 14:16:16 +0100 Subject: [PATCH] openvidu-server: make some methods public for easier testing in PRO --- .../java/io/openvidu/server/config/SecurityConfig.java | 2 +- .../service/ComposedQuickStartRecordingService.java | 4 ++-- .../recording/service/ComposedRecordingService.java | 8 ++++---- .../server/recording/service/RecordingManager.java | 2 +- .../src/main/resources/aplication-pro-webhook.properties | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/openvidu-server/src/main/java/io/openvidu/server/config/SecurityConfig.java b/openvidu-server/src/main/java/io/openvidu/server/config/SecurityConfig.java index efba73dc1..7b3404540 100644 --- a/openvidu-server/src/main/java/io/openvidu/server/config/SecurityConfig.java +++ b/openvidu-server/src/main/java/io/openvidu/server/config/SecurityConfig.java @@ -37,7 +37,6 @@ import org.springframework.web.filter.CorsFilter; import io.openvidu.server.rest.RequestMappings; @Configuration() -@ConditionalOnMissingBean(name = "securityConfigPro") @Order(Ordered.LOWEST_PRECEDENCE) public class SecurityConfig { @@ -48,6 +47,7 @@ public class SecurityConfig { protected Environment environment; @Bean + @ConditionalOnMissingBean(name = "securityConfigPro") public SecurityFilterChain filterChain(HttpSecurity http) throws Exception { // Configure CORS and CSRF configureHttpSecurity(http); diff --git a/openvidu-server/src/main/java/io/openvidu/server/recording/service/ComposedQuickStartRecordingService.java b/openvidu-server/src/main/java/io/openvidu/server/recording/service/ComposedQuickStartRecordingService.java index 85b753fe5..e0bdad4ed 100644 --- a/openvidu-server/src/main/java/io/openvidu/server/recording/service/ComposedQuickStartRecordingService.java +++ b/openvidu-server/src/main/java/io/openvidu/server/recording/service/ComposedQuickStartRecordingService.java @@ -64,7 +64,7 @@ public class ComposedQuickStartRecordingService extends ComposedRecordingService } @Override - protected Recording startRecordingWithVideo(Session session, Recording recording, RecordingProperties properties) + public Recording startRecordingWithVideo(Session session, Recording recording, RecordingProperties properties) throws OpenViduException { log.info("Starting COMPOSED_QUICK_START ({}) recording {} of session {}", @@ -117,7 +117,7 @@ public class ComposedQuickStartRecordingService extends ComposedRecordingService } @Override - protected Recording stopRecordingWithVideo(Session session, Recording recording, EndReason reason) { + public Recording stopRecordingWithVideo(Session session, Recording recording, EndReason reason) { log.info("Stopping COMPOSED_QUICK_START ({}) recording {} of session {}. Reason: {}", recording.hasAudio() ? "video + audio" : "audio-only", recording.getId(), recording.getSessionId(), RecordingManager.finalReason(reason)); 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 00353416a..b94f8d752 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 @@ -128,7 +128,7 @@ public class ComposedRecordingService extends RecordingService { compositeWrapper.disconnectPublisherEndpoint(streamId); } - protected Recording startRecordingWithVideo(Session session, Recording recording, RecordingProperties properties) + public Recording startRecordingWithVideo(Session session, Recording recording, RecordingProperties properties) throws OpenViduException { log.info("Starting composed ({}) recording {} of session {}", @@ -217,7 +217,7 @@ public class ComposedRecordingService extends RecordingService { return recording; } - protected Recording stopRecordingWithVideo(Session session, Recording recording, EndReason reason) { + public Recording stopRecordingWithVideo(Session session, Recording recording, EndReason reason) { log.info("Stopping composed ({}) recording {} of session {}. Reason: {}", recording.hasAudio() ? "video + audio" : "video-only", recording.getId(), recording.getSessionId(), @@ -396,7 +396,7 @@ public class ComposedRecordingService extends RecordingService { dockerManager.removeContainer(recording.getRecordingProperties().mediaNode(), containerId, false); } - protected void updateRecordingAttributes(Recording recording) { + public void updateRecordingAttributes(Recording recording) { String infoFilePath = this.openviduConfig.getOpenViduRecordingPath() + recording.getId() + "/" + recording.getId() + RecordingService.COMPOSED_INFO_FILE_EXTENSION; @@ -457,7 +457,7 @@ public class ComposedRecordingService extends RecordingService { throw e; } - protected void downloadComposedRecording(final Session session, final Recording recording, final EndReason reason) { + public void downloadComposedRecording(final Session session, final Recording recording, final EndReason reason) { try { this.recordingDownloader.downloadRecording(recording, null, () -> { diff --git a/openvidu-server/src/main/java/io/openvidu/server/recording/service/RecordingManager.java b/openvidu-server/src/main/java/io/openvidu/server/recording/service/RecordingManager.java index c863e035b..f707e218f 100644 --- a/openvidu-server/src/main/java/io/openvidu/server/recording/service/RecordingManager.java +++ b/openvidu-server/src/main/java/io/openvidu/server/recording/service/RecordingManager.java @@ -775,7 +775,7 @@ public class RecordingManager { } } - protected void checkRecordingPaths(String openviduRecordingPath, String openviduRecordingCustomLayout) + public void checkRecordingPaths(String openviduRecordingPath, String openviduRecordingCustomLayout) throws OpenViduException { log.info("Initializing recording paths"); diff --git a/openvidu-test-browsers/src/main/resources/aplication-pro-webhook.properties b/openvidu-test-browsers/src/main/resources/aplication-pro-webhook.properties index 7b56b1bdc..a5001fa51 100644 --- a/openvidu-test-browsers/src/main/resources/aplication-pro-webhook.properties +++ b/openvidu-test-browsers/src/main/resources/aplication-pro-webhook.properties @@ -1,4 +1,4 @@ server.port=7777 server.ssl.enabled=false -management.metrics.export.elastic.enabled=false +management.elastic.metrics.export.enabled=false spring.main.allow-circular-references=true \ No newline at end of file