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

openvidu-server: prepare SessionRestController to be inheritable

pull/550/head
pabloFuente 2020-10-05 18:43:42 +02:00
parent 412c169b1b
commit c31f80c2c7
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
openvidu-server/src/main/java/io/openvidu/server/rest/SessionRestController.java
View File

@ -28,6 +28,7 @@ import org.apache.commons.lang3.RandomStringUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.CrossOrigin; import org.springframework.web.bind.annotation.CrossOrigin;
@ -73,19 +74,20 @@ import io.openvidu.server.utils.RestUtils;
*/ */
@RestController @RestController
@CrossOrigin @CrossOrigin
@ConditionalOnMissingBean(name = "sessionRestControllerPro")
@RequestMapping(RequestMappings.API) @RequestMapping(RequestMappings.API)
public class SessionRestController { public class SessionRestController {
private static final Logger log = LoggerFactory.getLogger(SessionRestController.class); private static final Logger log = LoggerFactory.getLogger(SessionRestController.class);
@Autowired @Autowired
private SessionManager sessionManager; protected SessionManager sessionManager;
@Autowired @Autowired
private RecordingManager recordingManager; protected RecordingManager recordingManager;
@Autowired @Autowired
private OpenviduConfig openviduConfig; protected OpenviduConfig openviduConfig;
@RequestMapping(value = "/sessions", method = RequestMethod.POST) @RequestMapping(value = "/sessions", method = RequestMethod.POST)
public ResponseEntity<?> getSessionId(@RequestBody(required = false) Map<?, ?> params) { public ResponseEntity<?> getSessionId(@RequestBody(required = false) Map<?, ?> params) {
@ -849,7 +851,7 @@ public class SessionRestController {
} }
} }
private ResponseEntity<String> generateErrorResponse(String errorMessage, String path, HttpStatus status) { protected ResponseEntity<String> generateErrorResponse(String errorMessage, String path, HttpStatus status) {
JsonObject responseJson = new JsonObject(); JsonObject responseJson = new JsonObject();
responseJson.addProperty("timestamp", System.currentTimeMillis()); responseJson.addProperty("timestamp", System.currentTimeMillis());
responseJson.addProperty("status", status.value()); responseJson.addProperty("status", status.value());