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

Rename OpenViduBuildConfig to OpenViduBuildInfo

pull/431/head
micaelgallego 2020-04-06 04:02:11 +02:00
parent 69e75b9b1a
commit 4e73ecc577
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openvidu-server/src/main/java/io/openvidu/server/config/OpenviduBuildConfig.java → openvidu-server/src/main/java/io/openvidu/server/config/OpenviduBuildInfo.java
View File

@ -22,7 +22,7 @@ import org.springframework.boot.info.BuildProperties;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
@Component @Component
public class OpenviduBuildConfig { public class OpenviduBuildInfo {
@Autowired @Autowired
private BuildProperties buildProperties; private BuildProperties buildProperties;

4
openvidu-server/src/main/java/io/openvidu/server/core/TokenGeneratorDefault.java
View File

@ -22,7 +22,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import io.openvidu.java.client.OpenViduRole; import io.openvidu.java.client.OpenViduRole;
import io.openvidu.server.OpenViduServer; import io.openvidu.server.OpenViduServer;
import io.openvidu.server.config.OpenviduBuildConfig; import io.openvidu.server.config.OpenviduBuildInfo;
import io.openvidu.server.config.OpenviduConfig; import io.openvidu.server.config.OpenviduConfig;
import io.openvidu.server.coturn.CoturnCredentialsService; import io.openvidu.server.coturn.CoturnCredentialsService;
import io.openvidu.server.coturn.TurnCredentials; import io.openvidu.server.coturn.TurnCredentials;
@ -37,7 +37,7 @@ public class TokenGeneratorDefault implements TokenGenerator {
protected OpenviduConfig openviduConfig; protected OpenviduConfig openviduConfig;
@Autowired @Autowired
protected OpenviduBuildConfig openviduBuildConfig; protected OpenviduBuildInfo openviduBuildConfig;
@Override @Override
public Token generateToken(String sessionId, OpenViduRole role, String serverMetadata, public Token generateToken(String sessionId, OpenViduRole role, String serverMetadata,

8
openvidu-server/src/main/java/io/openvidu/server/rest/ConfigRestController.java
View File

@ -34,7 +34,7 @@ import com.google.gson.JsonArray;
import com.google.gson.JsonObject; import com.google.gson.JsonObject;
import io.openvidu.server.cdr.CDREventName; import io.openvidu.server.cdr.CDREventName;
import io.openvidu.server.config.OpenviduBuildConfig; import io.openvidu.server.config.OpenviduBuildInfo;
import io.openvidu.server.config.OpenviduConfig; import io.openvidu.server.config.OpenviduConfig;
/** /**
@ -52,14 +52,14 @@ public class ConfigRestController {
private OpenviduConfig openviduConfig; private OpenviduConfig openviduConfig;
@Autowired @Autowired
private OpenviduBuildConfig openviduBuildConfig; private OpenviduBuildInfo openviduBuildInfo;
@RequestMapping(value = "/openvidu-version", method = RequestMethod.GET) @RequestMapping(value = "/openvidu-version", method = RequestMethod.GET)
public String getOpenViduServerVersion() { public String getOpenViduServerVersion() {
log.info("REST API: GET /config/openvidu-version"); log.info("REST API: GET /config/openvidu-version");
return openviduBuildConfig.getOpenViduServerVersion(); return openviduBuildInfo.getOpenViduServerVersion();
} }
@RequestMapping(value = "/openvidu-publicurl", method = RequestMethod.GET) @RequestMapping(value = "/openvidu-publicurl", method = RequestMethod.GET)
@ -100,7 +100,7 @@ public class ConfigRestController {
log.info("REST API: GET /config"); log.info("REST API: GET /config");
JsonObject json = new JsonObject(); JsonObject json = new JsonObject();
json.addProperty("version", openviduBuildConfig.getVersion()); json.addProperty("version", openviduBuildInfo.getVersion());
JsonArray kmsUris = new JsonArray(); JsonArray kmsUris = new JsonArray();
openviduConfig.getKmsUris().forEach(uri -> kmsUris.add(uri)); openviduConfig.getKmsUris().forEach(uri -> kmsUris.add(uri));
json.add("kmsUris", kmsUris); json.add("kmsUris", kmsUris);