From c31f80c2c72918207a606e305278f72e12dd2543 Mon Sep 17 00:00:00 2001 From: pabloFuente Date: Mon, 5 Oct 2020 18:43:42 +0200 Subject: [PATCH] openvidu-server: prepare SessionRestController to be inheritable --- .../io/openvidu/server/rest/SessionRestController.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) 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 7fc8c41a..7cc2bac3 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 @@ -28,6 +28,7 @@ import org.apache.commons.lang3.RandomStringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.CrossOrigin; @@ -73,19 +74,20 @@ import io.openvidu.server.utils.RestUtils; */ @RestController @CrossOrigin +@ConditionalOnMissingBean(name = "sessionRestControllerPro") @RequestMapping(RequestMappings.API) public class SessionRestController { private static final Logger log = LoggerFactory.getLogger(SessionRestController.class); @Autowired - private SessionManager sessionManager; + protected SessionManager sessionManager; @Autowired - private RecordingManager recordingManager; + protected RecordingManager recordingManager; @Autowired - private OpenviduConfig openviduConfig; + protected OpenviduConfig openviduConfig; @RequestMapping(value = "/sessions", method = RequestMethod.POST) public ResponseEntity getSessionId(@RequestBody(required = false) Map params) { @@ -849,7 +851,7 @@ public class SessionRestController { } } - private ResponseEntity generateErrorResponse(String errorMessage, String path, HttpStatus status) { + protected ResponseEntity generateErrorResponse(String errorMessage, String path, HttpStatus status) { JsonObject responseJson = new JsonObject(); responseJson.addProperty("timestamp", System.currentTimeMillis()); responseJson.addProperty("status", status.value());