diff --git a/README.md b/README.md
index f9da92e..10fab6c 100644
--- a/README.md
+++ b/README.md
@@ -4,6 +4,7 @@
+
@@ -53,15 +54,15 @@ API 接口的包装和内部实现，可以帮助开发者更加方便的集成
package com.company.example;
import io.agora.rest.AgoraException;
-import io.agora.rest.AgoraService;
-import io.agora.rest.core.AgoraProperty;
+import io.agora.rest.core.AgoraConfig;
import io.agora.rest.core.BasicAuthCredential;
import io.agora.rest.core.Credential;
-import io.agora.rest.core.RegionArea;
+import io.agora.rest.core.DomainArea;
import io.agora.rest.services.cloudrecording.api.req.StartResourceReq;
import io.agora.rest.services.cloudrecording.api.res.AcquireResourceRes;
import io.agora.rest.services.cloudrecording.api.res.StartResourceRes;
import io.agora.rest.services.cloudrecording.api.res.StopResourceRes;
+import io.agora.rest.services.cloudrecording.CloudRecordingClient;
import io.agora.rest.services.cloudrecording.scenario.mix.req.AcquireMixRecordingResourceClientReq;
import io.agora.rest.services.cloudrecording.scenario.mix.req.StartMixRecordingResourceClientReq;
import io.agora.rest.services.cloudrecording.scenario.mix.res.QueryMixHLSAndMP4RecordingResourceRes;
@@ -94,26 +95,28 @@ public class Main {
public static void main(String[] args) throws Exception {
- Credential basicAuthCredential = new BasicAuthCredential(username, password);
+ Credential credential = new BasicAuthCredential(username, password);
- // Initialize AgoraService
- AgoraService agoraService = new AgoraService(
- AgoraProperty.builder()
- .appId(appId)
- .credential(basicAuthCredential)
- // Specify the region where the server is located.
- // Optional values are CN, NA, EU, AP, and the client will automatically
- // switch to use the best domain name according to the configured region
- .regionArea(RegionArea.CNRegionArea)
- .build()
- );
+ // Initialize AgoraConfig
+ AgoraConfig agoraConfig = AgoraConfig.builder()
+ .appId(appId)
+ .credential(credential)
+ // Specify the region where the server is located.
+ // Optional values are CN, US, EU, AP, and the client will automatically
+ // switch to use the best domain name according to the configured region
+ .domainArea(DomainArea.)
+ .build();
+
+ // Initialize CloudRecordingClient
+
+ CloudRecordingClient cloudRecordingClient = CloudRecordingClient.create(agoraConfig);
AcquireResourceRes acquireResourceRes;
// Acquire resource
try {
- acquireResourceRes = agoraService.cloudRecording()
+ acquireResourceRes = cloudRecordingClient
.mixScenario()
.acquire(cname, uid, AcquireMixRecordingResourceClientReq.builder()
.build())
@@ -176,7 +179,7 @@ public class Main {
// Start resource
try {
- startResourceRes = agoraService.cloudRecording()
+ startResourceRes = cloudRecordingClient
.mixScenario()
.start(cname, uid,
acquireResourceRes.getResourceId(),
@@ -203,11 +206,11 @@ public class Main {
Thread.sleep(3000);
- QueryMixHLSAndMP4RecordingResourceRes queryResourceResp;
+ QueryMixHLSAndMP4RecordingResourceRes queryResourceRes;
// Query resource
try {
- queryResourceRes = agoraService.cloudRecording()
+ queryResourceRes = cloudRecordingClient
.mixScenario()
.queryHLSAndMP4(startResourceRes.getResourceId(), startResourceRes.getSid())
.block();
@@ -220,7 +223,7 @@ public class Main {
return;
}
- if (queryResourceRes == null || queryResourceResp.getServerResponse() == null) {
+ if (queryResourceRes == null || queryResourceRes.getServerResponse() == null) {
System.out.println("failed to query resource");
return;
}
@@ -233,7 +236,7 @@ public class Main {
// Stop resource
try {
- stopResourceRes = agoraService.cloudRecording()
+ stopResourceRes = cloudRecordingClient
.mixScenario()
.stop(cname, uid, startResourceRes.getResourceId(), startResourceRes.getSid(),
true)
@@ -256,7 +259,6 @@ public class Main {
}
}
-
```
更多的示例可在 [Example](./examples) 查看
diff --git a/agora-rest-client-core/src/main/java/io/agora/rest/AgoraService.java b/agora-rest-client-core/src/main/java/io/agora/rest/AgoraService.java
deleted file mode 100644
index 0700d42..0000000
--- a/agora-rest-client-core/src/main/java/io/agora/rest/AgoraService.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package io.agora.rest;
-
-import io.agora.rest.core.AgoraProperty;
-import io.agora.rest.core.Context;
-import io.agora.rest.core.DefaultContext;
-import io.agora.rest.services.cloudrecording.CloudRecordingApi;
-
-public class AgoraService {
-
- private final AgoraProperty agoraProperty;
-
- private final Context context;
-
- private final CloudRecordingApi cloudRecordingApi;
-
- public AgoraService(AgoraProperty agoraProperty) {
- this.agoraProperty = agoraProperty;
- this.context = new DefaultContext(agoraProperty);
- this.cloudRecordingApi = new CloudRecordingApi(context);
- }
-
- public Context context() {
- return context;
- }
-
-
- public AgoraProperty getAgoraProperty() {
- return agoraProperty;
- }
-
- public CloudRecordingApi cloudRecording() {
- return cloudRecordingApi;
- }
-}
diff --git a/agora-rest-client-core/src/main/java/io/agora/rest/core/AgoraProperty.java b/agora-rest-client-core/src/main/java/io/agora/rest/core/AgoraConfig.java
similarity index 74%
rename from agora-rest-client-core/src/main/java/io/agora/rest/core/AgoraProperty.java
rename to agora-rest-client-core/src/main/java/io/agora/rest/core/AgoraConfig.java
index a8a0cb5..5e9fded 100644
--- a/agora-rest-client-core/src/main/java/io/agora/rest/core/AgoraProperty.java
+++ b/agora-rest-client-core/src/main/java/io/agora/rest/core/AgoraConfig.java
@@ -1,18 +1,18 @@
package io.agora.rest.core;
-public class AgoraProperty {
+public class AgoraConfig {
private final String appId;
private final Credential credential;
- private final RegionArea regionArea;
+ private final DomainArea domainArea;
private final HttpProperty httpProperty;
- private AgoraProperty(Builder builder) {
+ private AgoraConfig(Builder builder) {
this.appId = builder.appId;
this.credential = builder.credential;
- this.regionArea = builder.regionArea;
+ this.domainArea = builder.domainArea;
this.httpProperty = builder.httpProperty;
}
@@ -28,8 +28,8 @@ public Credential getCredential() {
return credential;
}
- public RegionArea getRegionArea() {
- return regionArea;
+ public DomainArea getDomainArea() {
+ return domainArea;
}
public HttpProperty getHttpProperty() {
@@ -38,10 +38,10 @@ public HttpProperty getHttpProperty() {
@Override
public String toString() {
- return "AgoraProperty{" +
+ return "AgoraConfig{" +
"appId='" + appId + '\'' +
", credential=" + credential +
- ", regionArea=" + regionArea +
+ ", domainArea=" + domainArea +
", httpProperty=" + httpProperty +
'}';
}
@@ -52,7 +52,7 @@ public static class Builder {
private Credential credential;
- private RegionArea regionArea;
+ private DomainArea domainArea;
private HttpProperty httpProperty;
@@ -69,8 +69,8 @@ public Builder credential(Credential credential) {
return this;
}
- public Builder regionArea(RegionArea regionArea) {
- this.regionArea = regionArea;
+ public Builder domainArea(DomainArea domainArea) {
+ this.domainArea = domainArea;
return this;
}
@@ -79,11 +79,11 @@ private Builder httpProperty(HttpProperty httpProperty) {
return this;
}
- public AgoraProperty build() {
+ public AgoraConfig build() {
if (httpProperty == null) {
this.httpProperty = HttpProperty.builder().build();
}
- return new AgoraProperty(this);
+ return new AgoraConfig(this);
}
}
}
diff --git a/agora-rest-client-core/src/main/java/io/agora/rest/core/Context.java b/agora-rest-client-core/src/main/java/io/agora/rest/core/Context.java
index 2f67669..0a41a46 100644
--- a/agora-rest-client-core/src/main/java/io/agora/rest/core/Context.java
+++ b/agora-rest-client-core/src/main/java/io/agora/rest/core/Context.java
@@ -7,5 +7,5 @@ public interface Context {
Mono sendRequest(String path, HttpMethod method, Object requestBody, Class clazz);
- AgoraProperty getProperty();
+ AgoraConfig getAgoraConfig();
}
diff --git a/agora-rest-client-core/src/main/java/io/agora/rest/core/DefaultContext.java b/agora-rest-client-core/src/main/java/io/agora/rest/core/DefaultContext.java
index 6017160..5575841 100644
--- a/agora-rest-client-core/src/main/java/io/agora/rest/core/DefaultContext.java
+++ b/agora-rest-client-core/src/main/java/io/agora/rest/core/DefaultContext.java
@@ -16,7 +16,7 @@ public class DefaultContext implements Context {
private static final Logger logger = LoggerFactory.getLogger(DefaultContext.class);
- private final AgoraProperty property;
+ private final AgoraConfig agoraConfig;
private final HttpClient httpClient;
@@ -24,10 +24,10 @@ public class DefaultContext implements Context {
private final DomainPool domainPool;
- public DefaultContext(AgoraProperty property) {
- this.property = property;
- this.httpClient = HttpClientFactory.createHttpClient(property);
- this.domainPool = new DomainPool(property.getRegionArea());
+ public DefaultContext(AgoraConfig agoraConfig) {
+ this.agoraConfig = agoraConfig;
+ this.httpClient = HttpClientFactory.createHttpClient(agoraConfig);
+ this.domainPool = new DomainPool(agoraConfig.getDomainArea());
this.codec = new JsonCodec();
}
@@ -73,7 +73,7 @@ public Mono sendRequest(String path, HttpMethod method, Object requestBod
}
@Override
- public AgoraProperty getProperty() {
- return this.property;
+ public AgoraConfig getAgoraConfig() {
+ return this.agoraConfig;
}
}
diff --git a/agora-rest-client-core/src/main/java/io/agora/rest/core/RegionArea.java b/agora-rest-client-core/src/main/java/io/agora/rest/core/DomainArea.java
similarity index 76%
rename from agora-rest-client-core/src/main/java/io/agora/rest/core/RegionArea.java
rename to agora-rest-client-core/src/main/java/io/agora/rest/core/DomainArea.java
index 32293a6..80a56c2 100644
--- a/agora-rest-client-core/src/main/java/io/agora/rest/core/RegionArea.java
+++ b/agora-rest-client-core/src/main/java/io/agora/rest/core/DomainArea.java
@@ -4,37 +4,37 @@
import java.util.Collections;
import java.util.List;
-public enum RegionArea {
+public enum DomainArea {
/**
- * Unknown region area
+ * Unknown domain area
*/
- UnkonwnRegionArea(Collections.emptyList(), Collections.emptyList()),
+ Unknown(Collections.emptyList(), Collections.emptyList()),
/**
- * US region area
+ * US domain area
*/
- USRegionArea(
+ US(
Arrays.asList("api-us-west-1", "api-us-east-1"),
Arrays.asList("agora.io", "sd-rtn.com")),
/**
- * EU region area
+ * EU domain area
*/
- EURegionArea(
+ EU(
Arrays.asList("api-eu-west-1", "api-eu-central-1"),
Arrays.asList("agora.io", "sd-rtn.com")),
/**
- * AP region area
+ * AP domain area
*/
- APRegionArea(
+ AP(
Arrays.asList("api-ap-southeast-1", "api-ap-northeast-1"),
Arrays.asList("agora.io", "sd-rtn.com")),
/**
- * CN region area
+ * CN domain area
*/
- CNRegionArea(
+ CN(
Arrays.asList("api-cn-east-1", "api-cn-north-1"),
Arrays.asList("sd-rtn.com", "agora.io"));
@@ -42,7 +42,7 @@ public enum RegionArea {
private final List majorDomainSuffixes;
- RegionArea(List regionDomainPrefixes, List majorDomainSuffixes) {
+ DomainArea(List regionDomainPrefixes, List majorDomainSuffixes) {
this.regionDomainPrefixes = Collections.unmodifiableList(regionDomainPrefixes);
this.majorDomainSuffixes = Collections.unmodifiableList(majorDomainSuffixes);
}
diff --git a/agora-rest-client-core/src/main/java/io/agora/rest/core/DomainPool.java b/agora-rest-client-core/src/main/java/io/agora/rest/core/DomainPool.java
index c0d4dcf..50f496d 100644
--- a/agora-rest-client-core/src/main/java/io/agora/rest/core/DomainPool.java
+++ b/agora-rest-client-core/src/main/java/io/agora/rest/core/DomainPool.java
@@ -30,8 +30,8 @@ public class DomainPool {
private final Logger logger = LoggerFactory.getLogger(DomainPool.class);
- public DomainPool(RegionArea domainArea) {
- if (domainArea == null || domainArea == RegionArea.UnkonwnRegionArea) {
+ public DomainPool(DomainArea domainArea) {
+ if (domainArea == null || domainArea == DomainArea.Unknown) {
throw new AgoraInvalidArgumentException("invalid domain area");
}
diff --git a/agora-rest-client-core/src/main/java/io/agora/rest/core/HttpClientFactory.java b/agora-rest-client-core/src/main/java/io/agora/rest/core/HttpClientFactory.java
index 24d196b..0d1fd3f 100644
--- a/agora-rest-client-core/src/main/java/io/agora/rest/core/HttpClientFactory.java
+++ b/agora-rest-client-core/src/main/java/io/agora/rest/core/HttpClientFactory.java
@@ -13,14 +13,14 @@ public class HttpClientFactory {
private static final Logger logger = LoggerFactory.getLogger(HttpClientFactory.class);
- public static HttpClient createHttpClient(AgoraProperty agoraProperty) {
+ public static HttpClient createHttpClient(AgoraConfig agoraConfig) {
ConnectionProvider connectionProvider = ConnectionProvider.builder("agora-rest-client")
- .maxConnections(agoraProperty.getHttpProperty().getHttpConnectionPoolSize())
- .pendingAcquireTimeout(Duration.ofMillis(agoraProperty.getHttpProperty().getHttpConnectionPendingAcquireTimout()))
- .maxIdleTime(Duration.ofMillis(agoraProperty.getHttpProperty().getHttpConnectionMaxIdleTime()))
- .maxLifeTime(Duration.ofMillis(agoraProperty.getHttpProperty().getHttpConnectionMaxLifeTime()))
- .evictInBackground(Duration.ofMillis(agoraProperty.getHttpProperty().getHttpConnectionEvictInBackground()))
- .pendingAcquireMaxCount(agoraProperty.getHttpProperty().getHttpConnectionPendingAcquireMaxCount())
+ .maxConnections(agoraConfig.getHttpProperty().getHttpConnectionPoolSize())
+ .pendingAcquireTimeout(Duration.ofMillis(agoraConfig.getHttpProperty().getHttpConnectionPendingAcquireTimout()))
+ .maxIdleTime(Duration.ofMillis(agoraConfig.getHttpProperty().getHttpConnectionMaxIdleTime()))
+ .maxLifeTime(Duration.ofMillis(agoraConfig.getHttpProperty().getHttpConnectionMaxLifeTime()))
+ .evictInBackground(Duration.ofMillis(agoraConfig.getHttpProperty().getHttpConnectionEvictInBackground()))
+ .pendingAcquireMaxCount(agoraConfig.getHttpProperty().getHttpConnectionPendingAcquireMaxCount())
.lifo()
.build();
@@ -32,11 +32,11 @@ public static HttpClient createHttpClient(AgoraProperty agoraProperty) {
System.getProperty("os.arch"),
System.getProperty("os.name"),
AgoraVersion.getVersion()));
- if (agoraProperty.getCredential() != null) {
- agoraProperty.getCredential().setAuthorization(h);
+ if (agoraConfig.getCredential() != null) {
+ agoraConfig.getCredential().setAuthorization(h);
}
})
- .wiretap("io.agora.rest.core.http", LogLevel.DEBUG, agoraProperty.getHttpProperty().getHttpLogFormat())
+ .wiretap("io.agora.rest.core.http", LogLevel.DEBUG, agoraConfig.getHttpProperty().getHttpLogFormat())
.doOnRequestError((req, t) -> logger.error("request error:{}", t.getMessage()));
}
diff --git a/agora-rest-client-core/src/main/java/io/agora/rest/services/cloudrecording/CloudRecordingApi.java b/agora-rest-client-core/src/main/java/io/agora/rest/services/cloudrecording/CloudRecordingClient.java
similarity index 91%
rename from agora-rest-client-core/src/main/java/io/agora/rest/services/cloudrecording/CloudRecordingApi.java
rename to agora-rest-client-core/src/main/java/io/agora/rest/services/cloudrecording/CloudRecordingClient.java
index f0fd0b8..abe7a56 100644
--- a/agora-rest-client-core/src/main/java/io/agora/rest/services/cloudrecording/CloudRecordingApi.java
+++ b/agora-rest-client-core/src/main/java/io/agora/rest/services/cloudrecording/CloudRecordingClient.java
@@ -1,6 +1,8 @@
package io.agora.rest.services.cloudrecording;
+import io.agora.rest.core.AgoraConfig;
import io.agora.rest.core.Context;
+import io.agora.rest.core.DefaultContext;
import io.agora.rest.services.cloudrecording.api.*;
import io.agora.rest.services.cloudrecording.api.req.*;
import io.agora.rest.services.cloudrecording.api.res.*;
@@ -10,7 +12,7 @@
import io.agora.rest.services.cloudrecording.scenario.web.WebScenario;
import reactor.core.publisher.Mono;
-public class CloudRecordingApi {
+public class CloudRecordingClient {
private final AcquireResourceAPI acquireResourceAPI;
@@ -28,7 +30,11 @@ public class CloudRecordingApi {
private final MixScenario mixScenario;
- public CloudRecordingApi(Context context) {
+ public static CloudRecordingClient create(AgoraConfig agoraConfig) {
+ return new CloudRecordingClient(new DefaultContext(agoraConfig));
+ }
+
+ protected CloudRecordingClient(Context context) {
this.acquireResourceAPI = new AcquireResourceAPI(context);
this.queryResourceAPI = new QueryResourceAPI(context);
this.startResourceAPI = new StartResourceAPI(context);
diff --git a/agora-rest-client-core/src/main/java/io/agora/rest/services/cloudrecording/README.md b/agora-rest-client-core/src/main/java/io/agora/rest/services/cloudrecording/README.md
index 390f4bf..f54a35f 100644
--- a/agora-rest-client-core/src/main/java/io/agora/rest/services/cloudrecording/README.md
+++ b/agora-rest-client-core/src/main/java/io/agora/rest/services/cloudrecording/README.md
@@ -26,7 +26,7 @@
> 
> 
-## API V1 接口调用示例
+## API 接口调用示例
### 获取云端录制资源
> 在开始云端录制之前，你需要调用 acquire 方法获取一个 Resource ID。一个 Resource ID 只能用于一次云端录制服务。
@@ -38,7 +38,7 @@
- uid: 用户 UID
- 更多 clientRequest中的参数见 [Acquire](https://doc.shengwang.cn/doc/cloud-recording/restful/cloud-recording/operations/post-v1-apps-appid-cloud_recording-acquire) 接口文档
-通过调用`Acquire().Do`方法来实现获取云端录制资源
+通过调用`acquire`方法来实现获取云端录制资源
```java
String appId = "";
String cname = "";
@@ -47,13 +47,20 @@
String password = "";
Credential basicAuthCredential = new BasicAuthCredential(username, password);
- AgoraService agoraService = new AgoraService(
- AgoraProperty.builder()
- .appId(appId)
- .credential(basicAuthCredential)
- .regionArea(RegionArea.CNRegionArea)
- .build()
- );
+
+ // Initialize AgoraConfig
+ AgoraConfig agoraConfig = AgoraConfig.builder()
+ .appId(appId)
+ .credential(credential)
+ // Specify the region where the server is located.
+ // Optional values are CN, US, EU, AP, and the client will automatically
+ // switch to use the best domain name according to the configured region
+ .domainArea(DomainArea.CN)
+ .build();
+
+ // Initialize CloudRecordingClient
+
+ CloudRecordingClient cloudRecordingClient = CloudRecordingClient.create(agoraConfig);
AcquireResourceReq acquireResourceReq = AcquireResourceReq.builder().cname(cname).uid(uid)
.clientRequest(AcquireResourceReq.ClientRequest.builder().scene(1)
@@ -64,7 +71,7 @@
AcquireResourceRes acquireResourceRes = null;
try {
- acquireResourceRes = agoraService.cloudRecording().acquire(acquireResourceReq).block();
+ acquireResourceRes = cloudRecordingClient.acquire(acquireResourceReq).block();
assertNotNull(acquireResourceResp);
logger.info("acquire resource response:{}", acquireResourceRes);
@@ -146,7 +153,7 @@
StartResourceRes startResourceRes = null;
try {
- startResourceRes = agoraService.cloudRecording()
+ startResourceRes = cloudRecordingClient
.start(resourceId,mode, startResourceReq)
.block();
logger.info("start resource response:{}", startResourceRes);
@@ -184,7 +191,7 @@
StopResourceRes stopResourceRes;
try {
- stopResourceRes = agoraService.cloudRecording()
+ stopResourceRes = cloudRecordingClient
.stop(resourceId, sid, mode, stopResourceReq)
.block();
logger.info("stop resource response:{}", stopResourceRes);
@@ -214,7 +221,7 @@
QueryResourceRes queryResourceRes = null;
try {
- queryResourceRes = agoraService.cloudRecording()
+ queryResourceRes = cloudRecordingClient
.query(resourceId, sid,mode)
.block();
@@ -284,7 +291,7 @@
UpdateResourceRes updateResourceRes;
try {
- updateResourceRes = agoraService.cloudRecording()
+ updateResourceRes = cloudRecordingClient
.update(resourceId, sid, mode, updateResourceReq)
.block();
logger.info("update resource response:{}", updateResourceRes);
diff --git a/agora-rest-client-core/src/main/java/io/agora/rest/services/cloudrecording/api/AcquireResourceAPI.java b/agora-rest-client-core/src/main/java/io/agora/rest/services/cloudrecording/api/AcquireResourceAPI.java
index e269c84..ac080c8 100644
--- a/agora-rest-client-core/src/main/java/io/agora/rest/services/cloudrecording/api/AcquireResourceAPI.java
+++ b/agora-rest-client-core/src/main/java/io/agora/rest/services/cloudrecording/api/AcquireResourceAPI.java
@@ -16,7 +16,7 @@ public AcquireResourceAPI(Context context) {
public Mono handle(AcquireResourceReq request) {
String path = String.format("/v1/apps/%s/cloud_recording/acquire",
- this.context.getProperty().getAppId());
+ this.context.getAgoraConfig().getAppId());
return this.context.sendRequest(path, HttpMethod.POST, request, AcquireResourceRes.class);
}
}
diff --git a/agora-rest-client-core/src/main/java/io/agora/rest/services/cloudrecording/api/QueryResourceAPI.java b/agora-rest-client-core/src/main/java/io/agora/rest/services/cloudrecording/api/QueryResourceAPI.java
index 63774b0..cef8b48 100644
--- a/agora-rest-client-core/src/main/java/io/agora/rest/services/cloudrecording/api/QueryResourceAPI.java
+++ b/agora-rest-client-core/src/main/java/io/agora/rest/services/cloudrecording/api/QueryResourceAPI.java
@@ -21,7 +21,7 @@ public QueryResourceAPI(Context context) {
public Mono handle(String resourceId, String sid, CloudRecordingModeEnum mode) {
String path = String.format("/v1/apps/%s/cloud_recording/resourceid/%s/sid/%s/mode/%s/query",
- this.context.getProperty().getAppId(), resourceId, sid, mode.getMode());
+ this.context.getAgoraConfig().getAppId(), resourceId, sid, mode.getMode());
return this.context.sendRequest(path, HttpMethod.GET, null, QueryResourceRes.class)
.handle((resp, sink) -> {
try {
diff --git a/agora-rest-client-core/src/main/java/io/agora/rest/services/cloudrecording/api/StartResourceAPI.java b/agora-rest-client-core/src/main/java/io/agora/rest/services/cloudrecording/api/StartResourceAPI.java
index cc9b65f..74a60d3 100644
--- a/agora-rest-client-core/src/main/java/io/agora/rest/services/cloudrecording/api/StartResourceAPI.java
+++ b/agora-rest-client-core/src/main/java/io/agora/rest/services/cloudrecording/api/StartResourceAPI.java
@@ -30,7 +30,7 @@ public StartResourceAPI(Context context) {
public Mono handle(String resourceId, CloudRecordingModeEnum mode, StartResourceReq request) {
String path = String.format("/v1/apps/%s/cloud_recording/resourceid/%s/mode/%s/start",
- this.context.getProperty().getAppId(), resourceId, mode.getMode());
+ this.context.getAgoraConfig().getAppId(), resourceId, mode.getMode());
return this.context.sendRequest(path, HttpMethod.POST, request, StartResourceRes.class)
.retryWhen(customRetry(MAX_ATTEMPTS, e -> e instanceof AgoraNeedRetryException));
diff --git a/agora-rest-client-core/src/main/java/io/agora/rest/services/cloudrecording/api/StopResourceAPI.java b/agora-rest-client-core/src/main/java/io/agora/rest/services/cloudrecording/api/StopResourceAPI.java
index d3d9774..2e165ba 100644
--- a/agora-rest-client-core/src/main/java/io/agora/rest/services/cloudrecording/api/StopResourceAPI.java
+++ b/agora-rest-client-core/src/main/java/io/agora/rest/services/cloudrecording/api/StopResourceAPI.java
@@ -18,7 +18,7 @@ public StopResourceAPI(Context context) {
public Mono handle(String resourceId, String sid, CloudRecordingModeEnum mode,
StopResourceReq request) {
String path = String.format("/v1/apps/%s/cloud_recording/resourceid/%s/sid/%s/mode/%s/stop",
- this.context.getProperty().getAppId(), resourceId, sid, mode.getMode());
+ this.context.getAgoraConfig().getAppId(), resourceId, sid, mode.getMode());
return this.context.sendRequest(path, HttpMethod.POST, request, StopResourceRes.class);
}
}
diff --git a/agora-rest-client-core/src/main/java/io/agora/rest/services/cloudrecording/api/UpdateResourceAPI.java b/agora-rest-client-core/src/main/java/io/agora/rest/services/cloudrecording/api/UpdateResourceAPI.java
index eb60572..a5b1116 100644
--- a/agora-rest-client-core/src/main/java/io/agora/rest/services/cloudrecording/api/UpdateResourceAPI.java
+++ b/agora-rest-client-core/src/main/java/io/agora/rest/services/cloudrecording/api/UpdateResourceAPI.java
@@ -20,7 +20,7 @@ public UpdateResourceAPI(Context context) {
public Mono handle(String resourceId, String sid, CloudRecordingModeEnum mode,
UpdateResourceReq request) {
String path = String.format("/v1/apps/%s/cloud_recording/resourceid/%s/sid/%s/mode/%s/update",
- this.context.getProperty().getAppId(),
+ this.context.getAgoraConfig().getAppId(),
resourceId,
sid,
mode.getMode());
@@ -30,7 +30,7 @@ public Mono handle(String resourceId, String sid, CloudRecord
public Mono handleLayout(String resourceId, String sid, CloudRecordingModeEnum mode,
UpdateLayoutResourceReq request) {
String path = String.format("/v1/apps/%s/cloud_recording/resourceid/%s/sid/%s/mode/%s/updateLayout",
- this.context.getProperty().getAppId(),
+ this.context.getAgoraConfig().getAppId(),
resourceId,
sid,
mode.getMode());
diff --git a/agora-rest-client-core/src/main/java/io/agora/rest/services/cloudrecording/api/res/QueryResourceRes.java b/agora-rest-client-core/src/main/java/io/agora/rest/services/cloudrecording/api/res/QueryResourceRes.java
index c755e53..a8494bd 100644
--- a/agora-rest-client-core/src/main/java/io/agora/rest/services/cloudrecording/api/res/QueryResourceRes.java
+++ b/agora-rest-client-core/src/main/java/io/agora/rest/services/cloudrecording/api/res/QueryResourceRes.java
@@ -360,6 +360,14 @@ public Long getSliceStartTime() {
public void setSliceStartTime(Long sliceStartTime) {
this.sliceStartTime = sliceStartTime;
}
+
+ @Override
+ public String toString() {
+ return "QueryIndividualVideoScreenshotServerResponse{" +
+ "status=" + status +
+ ", sliceStartTime=" + sliceStartTime +
+ '}';
+ }
}
public static class MixRecordingHLSServerResponse {
diff --git a/agora-rest-client-core/src/test/java/io/agora/rest/core/DomainDNSResolverTest.java b/agora-rest-client-core/src/test/java/io/agora/rest/core/DomainDNSResolverTest.java
index 7b9cf2e..95b9443 100644
--- a/agora-rest-client-core/src/test/java/io/agora/rest/core/DomainDNSResolverTest.java
+++ b/agora-rest-client-core/src/test/java/io/agora/rest/core/DomainDNSResolverTest.java
@@ -18,9 +18,9 @@ public void testDomainDNSResolver() {
assertNotNull(resolver);
String domain = resolver.resolve(Arrays.asList("agora.io", "sd-rtn.com"),
- RegionArea.CNRegionArea.getRegionDomainPrefixes().get(0)).block();
+ DomainArea.CN.getRegionDomainPrefixes().get(0)).block();
logger.info("Domain: {}", domain);
assertNotNull(domain);
}
-}
\ No newline at end of file
+}
diff --git a/examples/cloudrecording/src/main/java/io/agora/rest/examples/cloudrecording/Main.java b/examples/cloudrecording/src/main/java/io/agora/rest/examples/cloudrecording/Main.java
index 6a5f35b..32e8619 100644
--- a/examples/cloudrecording/src/main/java/io/agora/rest/examples/cloudrecording/Main.java
+++ b/examples/cloudrecording/src/main/java/io/agora/rest/examples/cloudrecording/Main.java
@@ -1,7 +1,7 @@
package io.agora.rest.examples.cloudrecording;
import io.agora.rest.core.BasicAuthCredential;
-import io.agora.rest.core.RegionArea;
+import io.agora.rest.core.DomainArea;
import io.agora.rest.examples.cloudrecording.scenario.IndividualRecordingScenario;
import io.agora.rest.examples.cloudrecording.scenario.MixRecordingScenario;
import io.agora.rest.examples.cloudrecording.scenario.WebRecordingScenario;
@@ -31,7 +31,7 @@ public class Main implements Callable {
private String token;
- private final RegionArea region = RegionArea.CNRegionArea;
+ private final DomainArea region = DomainArea.CN;
private StartResourceReq.StorageConfig storageConfig;
diff --git a/examples/cloudrecording/src/main/java/io/agora/rest/examples/cloudrecording/scenario/BaseScenario.java b/examples/cloudrecording/src/main/java/io/agora/rest/examples/cloudrecording/scenario/BaseScenario.java
index 8ad7b0f..6e363ea 100644
--- a/examples/cloudrecording/src/main/java/io/agora/rest/examples/cloudrecording/scenario/BaseScenario.java
+++ b/examples/cloudrecording/src/main/java/io/agora/rest/examples/cloudrecording/scenario/BaseScenario.java
@@ -1,9 +1,9 @@
package io.agora.rest.examples.cloudrecording.scenario;
-import io.agora.rest.AgoraService;
-import io.agora.rest.core.AgoraProperty;
+import io.agora.rest.core.AgoraConfig;
import io.agora.rest.core.Credential;
-import io.agora.rest.core.RegionArea;
+import io.agora.rest.core.DomainArea;
+import io.agora.rest.services.cloudrecording.CloudRecordingClient;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -11,7 +11,7 @@ public class BaseScenario {
private static final Logger logger = LoggerFactory.getLogger(BaseScenario.class);
- protected final RegionArea region;
+ protected final DomainArea domainArea;
protected final String appId;
@@ -21,23 +21,23 @@ public class BaseScenario {
protected final Credential credential;
- protected final AgoraService agoraService;
+ protected final CloudRecordingClient cloudRecordingClient;
- public BaseScenario(RegionArea region, String appId, String cname, String uid, Credential credential) {
- this.region = region;
+ public BaseScenario(DomainArea domainArea, String appId, String cname, String uid, Credential credential) {
+ this.domainArea = domainArea;
this.appId = appId;
this.cname = cname;
this.uid = uid;
this.credential = credential;
- AgoraProperty agoraProperty = AgoraProperty.builder()
+ AgoraConfig agoraConfig = AgoraConfig.builder()
.appId(appId)
.credential(credential)
- .regionArea(region)
+ .domainArea(domainArea)
.build();
- logger.info("AgoraProperty: {}", agoraProperty);
+ logger.info("AgoraConfig: {}", agoraConfig);
- this.agoraService = new AgoraService(agoraProperty);
+ this.cloudRecordingClient = CloudRecordingClient.create(agoraConfig);
}
}
diff --git a/examples/cloudrecording/src/main/java/io/agora/rest/examples/cloudrecording/scenario/IndividualRecordingScenario.java b/examples/cloudrecording/src/main/java/io/agora/rest/examples/cloudrecording/scenario/IndividualRecordingScenario.java
index 055d1b0..6f1884c 100644
--- a/examples/cloudrecording/src/main/java/io/agora/rest/examples/cloudrecording/scenario/IndividualRecordingScenario.java
+++ b/examples/cloudrecording/src/main/java/io/agora/rest/examples/cloudrecording/scenario/IndividualRecordingScenario.java
@@ -2,7 +2,7 @@
import io.agora.rest.AgoraException;
import io.agora.rest.core.Credential;
-import io.agora.rest.core.RegionArea;
+import io.agora.rest.core.DomainArea;
import io.agora.rest.services.cloudrecording.api.req.StartResourceReq;
import io.agora.rest.services.cloudrecording.api.req.UpdateResourceReq;
import io.agora.rest.services.cloudrecording.api.res.AcquireResourceRes;
@@ -22,15 +22,15 @@
public class IndividualRecordingScenario extends BaseScenario {
private static final Logger logger = LoggerFactory.getLogger(IndividualRecordingScenario.class);
- public IndividualRecordingScenario(RegionArea region, String appId, String cname, String uid, Credential credential) {
- super(region, appId, cname, uid, credential);
+ public IndividualRecordingScenario(DomainArea domainArea, String appId, String cname, String uid, Credential credential) {
+ super(domainArea, appId, cname, uid, credential);
}
public void runRecording(String token, StartResourceReq.StorageConfig storageConfig) {
// acquire
AcquireResourceRes acquireResourceRes;
try {
- acquireResourceRes = this.agoraService.cloudRecording()
+ acquireResourceRes = this.cloudRecordingClient
.individualScenario()
.acquire(cname, uid, false, AcquireIndividualResourceClientReq.builder()
.resourceExpiredHour(1)
@@ -55,7 +55,7 @@ public void runRecording(String token, StartResourceReq.StorageConfig storageCon
StartResourceRes startResourceRes;
try {
- startResourceRes = this.agoraService.cloudRecording()
+ startResourceRes = this.cloudRecordingClient
.individualScenario()
.start(cname, uid, acquireResourceRes.getResourceId(), StartIndividualRecordingClientReq.builder()
.token(token)
@@ -92,7 +92,7 @@ public void runRecording(String token, StartResourceReq.StorageConfig storageCon
for (int i = 0; i < 3; i++) {
QueryIndividualRecordingResourceRes queryIndividualRecordingResourceRes;
try {
- queryIndividualRecordingResourceRes = this.agoraService.cloudRecording()
+ queryIndividualRecordingResourceRes = this.cloudRecordingClient
.individualScenario()
.query(acquireResourceRes.getResourceId(), startResourceRes.getSid())
.block();
@@ -120,7 +120,7 @@ public void runRecording(String token, StartResourceReq.StorageConfig storageCon
UpdateResourceRes updateResourceRes;
try {
- updateResourceRes = this.agoraService.cloudRecording()
+ updateResourceRes = this.cloudRecordingClient
.individualScenario()
.update(cname, uid, acquireResourceRes.getResourceId(), startResourceRes.getSid(), UpdateIndividualRecordingResourceClientReq.builder()
.streamSubscribe(UpdateResourceReq.StreamSubscribe.builder()
@@ -153,7 +153,7 @@ public void runRecording(String token, StartResourceReq.StorageConfig storageCon
for (int i = 0; i < 3; i++) {
QueryIndividualRecordingResourceRes queryIndividualRecordingResourceRes;
try {
- queryIndividualRecordingResourceRes = this.agoraService.cloudRecording()
+ queryIndividualRecordingResourceRes = this.cloudRecordingClient
.individualScenario()
.query(acquireResourceRes.getResourceId(), startResourceRes.getSid())
.block();
@@ -179,7 +179,7 @@ public void runRecording(String token, StartResourceReq.StorageConfig storageCon
StopResourceRes stopResourceRes;
try {
- stopResourceRes = this.agoraService.cloudRecording()
+ stopResourceRes = this.cloudRecordingClient
.individualScenario()
.stop(cname, uid, startResourceRes.getResourceId(), startResourceRes.getSid(), false)
.block();
@@ -205,7 +205,7 @@ public void runSnapshot(String token, StartResourceReq.StorageConfig storageConf
// acquire
AcquireResourceRes acquireResourceRes;
try {
- acquireResourceRes = this.agoraService.cloudRecording()
+ acquireResourceRes = this.cloudRecordingClient
.individualScenario()
.acquire(cname, uid, false, AcquireIndividualResourceClientReq.builder()
.resourceExpiredHour(1)
@@ -229,7 +229,7 @@ public void runSnapshot(String token, StartResourceReq.StorageConfig storageConf
StartResourceRes startResourceRes;
try {
- startResourceRes = this.agoraService.cloudRecording()
+ startResourceRes = this.cloudRecordingClient
.individualScenario()
.start(cname, uid, acquireResourceRes.getResourceId(), StartIndividualRecordingClientReq.builder()
.token(token)
@@ -267,7 +267,7 @@ public void runSnapshot(String token, StartResourceReq.StorageConfig storageConf
for (int i = 0; i < 3; i++) {
QueryIndividualRecordingVideoScreenshotResourceRes queryIndividualRecordingVideoScreenshotResourceRes;
try {
- queryIndividualRecordingVideoScreenshotResourceRes = this.agoraService.cloudRecording()
+ queryIndividualRecordingVideoScreenshotResourceRes = this.cloudRecordingClient
.individualScenario()
.queryVideoScreenshot(acquireResourceRes.getResourceId(), startResourceRes.getSid())
.block();
@@ -295,7 +295,7 @@ public void runSnapshot(String token, StartResourceReq.StorageConfig storageConf
UpdateResourceRes updateResourceRes;
try {
- updateResourceRes = this.agoraService.cloudRecording()
+ updateResourceRes = this.cloudRecordingClient
.individualScenario()
.update(cname, uid, acquireResourceRes.getResourceId(), startResourceRes.getSid(), UpdateIndividualRecordingResourceClientReq.builder()
.streamSubscribe(UpdateResourceReq.StreamSubscribe.builder()
@@ -328,7 +328,7 @@ public void runSnapshot(String token, StartResourceReq.StorageConfig storageConf
for (int i = 0; i < 3; i++) {
QueryIndividualRecordingVideoScreenshotResourceRes queryIndividualRecordingVideoScreenshotResourceRes;
try {
- queryIndividualRecordingVideoScreenshotResourceRes = this.agoraService.cloudRecording()
+ queryIndividualRecordingVideoScreenshotResourceRes = this.cloudRecordingClient
.individualScenario()
.queryVideoScreenshot(acquireResourceRes.getResourceId(), startResourceRes.getSid())
.block();
@@ -354,7 +354,7 @@ public void runSnapshot(String token, StartResourceReq.StorageConfig storageConf
StopResourceRes stopResourceRes;
try {
- stopResourceRes = this.agoraService.cloudRecording()
+ stopResourceRes = this.cloudRecordingClient
.individualScenario()
.stop(cname, uid, startResourceRes.getResourceId(), startResourceRes.getSid(), false)
.block();
@@ -380,7 +380,7 @@ public void runRecordingAndSnapshot(String token, StartResourceReq.StorageConfig
// acquire
AcquireResourceRes acquireResourceRes;
try {
- acquireResourceRes = this.agoraService.cloudRecording()
+ acquireResourceRes = this.cloudRecordingClient
.individualScenario()
.acquire(cname, uid, false, AcquireIndividualResourceClientReq.builder()
.resourceExpiredHour(1)
@@ -404,7 +404,7 @@ public void runRecordingAndSnapshot(String token, StartResourceReq.StorageConfig
StartResourceRes startResourceRes;
try {
- startResourceRes = this.agoraService.cloudRecording()
+ startResourceRes = this.cloudRecordingClient
.individualScenario()
.start(cname, uid, acquireResourceRes.getResourceId(), StartIndividualRecordingClientReq.builder()
.token(token)
@@ -445,7 +445,7 @@ public void runRecordingAndSnapshot(String token, StartResourceReq.StorageConfig
for (int i = 0; i < 3; i++) {
QueryIndividualRecordingResourceRes queryIndividualRecordingResourceRes;
try {
- queryIndividualRecordingResourceRes = this.agoraService.cloudRecording()
+ queryIndividualRecordingResourceRes = this.cloudRecordingClient
.individualScenario()
.query(acquireResourceRes.getResourceId(), startResourceRes.getSid())
.block();
@@ -473,7 +473,7 @@ public void runRecordingAndSnapshot(String token, StartResourceReq.StorageConfig
UpdateResourceRes updateResourceRes;
try {
- updateResourceRes = this.agoraService.cloudRecording()
+ updateResourceRes = this.cloudRecordingClient
.individualScenario()
.update(cname, uid, acquireResourceRes.getResourceId(), startResourceRes.getSid(), UpdateIndividualRecordingResourceClientReq.builder()
.streamSubscribe(UpdateResourceReq.StreamSubscribe.builder()
@@ -506,7 +506,7 @@ public void runRecordingAndSnapshot(String token, StartResourceReq.StorageConfig
for (int i = 0; i < 3; i++) {
QueryIndividualRecordingResourceRes queryIndividualRecordingResourceRes;
try {
- queryIndividualRecordingResourceRes = this.agoraService.cloudRecording()
+ queryIndividualRecordingResourceRes = this.cloudRecordingClient
.individualScenario()
.query(acquireResourceRes.getResourceId(), startResourceRes.getSid())
.block();
@@ -532,7 +532,7 @@ public void runRecordingAndSnapshot(String token, StartResourceReq.StorageConfig
StopResourceRes stopResourceRes;
try {
- stopResourceRes = this.agoraService.cloudRecording()
+ stopResourceRes = this.cloudRecordingClient
.individualScenario()
.stop(cname, uid, startResourceRes.getResourceId(), startResourceRes.getSid(), false)
.block();
@@ -558,7 +558,7 @@ public void runRecordingAndPostponeTranscoding(String token, StartResourceReq.St
// acquire
AcquireResourceRes acquireResourceRes;
try {
- acquireResourceRes = this.agoraService.cloudRecording()
+ acquireResourceRes = this.cloudRecordingClient
.individualScenario()
.acquire(cname, uid, true, AcquireIndividualResourceClientReq.builder()
.resourceExpiredHour(1)
@@ -582,7 +582,7 @@ public void runRecordingAndPostponeTranscoding(String token, StartResourceReq.St
StartResourceRes startResourceRes;
try {
- startResourceRes = this.agoraService.cloudRecording()
+ startResourceRes = this.cloudRecordingClient
.individualScenario()
.start(cname, uid, acquireResourceRes.getResourceId(), StartIndividualRecordingClientReq.builder()
.token(token)
@@ -630,7 +630,7 @@ public void runRecordingAndPostponeTranscoding(String token, StartResourceReq.St
for (int i = 0; i < 3; i++) {
QueryIndividualRecordingResourceRes queryIndividualRecordingResourceRes;
try {
- queryIndividualRecordingResourceRes = this.agoraService.cloudRecording()
+ queryIndividualRecordingResourceRes = this.cloudRecordingClient
.individualScenario()
.query(acquireResourceRes.getResourceId(), startResourceRes.getSid())
.block();
@@ -658,7 +658,7 @@ public void runRecordingAndPostponeTranscoding(String token, StartResourceReq.St
UpdateResourceRes updateResourceRes;
try {
- updateResourceRes = this.agoraService.cloudRecording()
+ updateResourceRes = this.cloudRecordingClient
.individualScenario()
.update(cname, uid, acquireResourceRes.getResourceId(), startResourceRes.getSid(), UpdateIndividualRecordingResourceClientReq.builder()
.streamSubscribe(UpdateResourceReq.StreamSubscribe.builder()
@@ -691,7 +691,7 @@ public void runRecordingAndPostponeTranscoding(String token, StartResourceReq.St
for (int i = 0; i < 3; i++) {
QueryIndividualRecordingResourceRes queryIndividualRecordingResourceRes;
try {
- queryIndividualRecordingResourceRes = this.agoraService.cloudRecording()
+ queryIndividualRecordingResourceRes = this.cloudRecordingClient
.individualScenario()
.query(acquireResourceRes.getResourceId(), startResourceRes.getSid())
.block();
@@ -717,7 +717,7 @@ public void runRecordingAndPostponeTranscoding(String token, StartResourceReq.St
StopResourceRes stopResourceRes;
try {
- stopResourceRes = this.agoraService.cloudRecording()
+ stopResourceRes = this.cloudRecordingClient
.individualScenario()
.stop(cname, uid, startResourceRes.getResourceId(), startResourceRes.getSid(), false)
.block();
@@ -743,7 +743,7 @@ public void runRecordingAndAudioMix(String token, StartResourceReq.StorageConfig
// acquire
AcquireResourceRes acquireResourceRes;
try {
- acquireResourceRes = this.agoraService.cloudRecording()
+ acquireResourceRes = this.cloudRecordingClient
.individualScenario()
.acquire(cname, uid, true, AcquireIndividualResourceClientReq.builder()
.resourceExpiredHour(1)
@@ -767,7 +767,7 @@ public void runRecordingAndAudioMix(String token, StartResourceReq.StorageConfig
StartResourceRes startResourceRes;
try {
- startResourceRes = this.agoraService.cloudRecording()
+ startResourceRes = this.cloudRecordingClient
.individualScenario()
.start(cname, uid, acquireResourceRes.getResourceId(), StartIndividualRecordingClientReq.builder()
.token(token)
@@ -820,7 +820,7 @@ public void runRecordingAndAudioMix(String token, StartResourceReq.StorageConfig
for (int i = 0; i < 3; i++) {
QueryIndividualRecordingResourceRes queryIndividualRecordingResourceRes;
try {
- queryIndividualRecordingResourceRes = this.agoraService.cloudRecording()
+ queryIndividualRecordingResourceRes = this.cloudRecordingClient
.individualScenario()
.query(acquireResourceRes.getResourceId(), startResourceRes.getSid())
.block();
@@ -848,7 +848,7 @@ public void runRecordingAndAudioMix(String token, StartResourceReq.StorageConfig
UpdateResourceRes updateResourceRes;
try {
- updateResourceRes = this.agoraService.cloudRecording()
+ updateResourceRes = this.cloudRecordingClient
.individualScenario()
.update(cname, uid, acquireResourceRes.getResourceId(), startResourceRes.getSid(), UpdateIndividualRecordingResourceClientReq.builder()
.streamSubscribe(UpdateResourceReq.StreamSubscribe.builder()
@@ -877,7 +877,7 @@ public void runRecordingAndAudioMix(String token, StartResourceReq.StorageConfig
for (int i = 0; i < 3; i++) {
QueryIndividualRecordingResourceRes queryIndividualRecordingResourceRes;
try {
- queryIndividualRecordingResourceRes = this.agoraService.cloudRecording()
+ queryIndividualRecordingResourceRes = this.cloudRecordingClient
.individualScenario()
.query(acquireResourceRes.getResourceId(), startResourceRes.getSid())
.block();
@@ -903,7 +903,7 @@ public void runRecordingAndAudioMix(String token, StartResourceReq.StorageConfig
StopResourceRes stopResourceRes;
try {
- stopResourceRes = this.agoraService.cloudRecording()
+ stopResourceRes = this.cloudRecordingClient
.individualScenario()
.stop(cname, uid, startResourceRes.getResourceId(), startResourceRes.getSid(), false)
.block();
diff --git a/examples/cloudrecording/src/main/java/io/agora/rest/examples/cloudrecording/scenario/MixRecordingScenario.java b/examples/cloudrecording/src/main/java/io/agora/rest/examples/cloudrecording/scenario/MixRecordingScenario.java
index 9fa3886..e141015 100644
--- a/examples/cloudrecording/src/main/java/io/agora/rest/examples/cloudrecording/scenario/MixRecordingScenario.java
+++ b/examples/cloudrecording/src/main/java/io/agora/rest/examples/cloudrecording/scenario/MixRecordingScenario.java
@@ -2,7 +2,7 @@
import io.agora.rest.AgoraException;
import io.agora.rest.core.Credential;
-import io.agora.rest.core.RegionArea;
+import io.agora.rest.core.DomainArea;
import io.agora.rest.services.cloudrecording.api.req.StartResourceReq;
import io.agora.rest.services.cloudrecording.api.req.UpdateResourceReq;
import io.agora.rest.services.cloudrecording.api.res.*;
@@ -21,8 +21,8 @@
public class MixRecordingScenario extends BaseScenario {
private static final Logger logger = LoggerFactory.getLogger(MixRecordingScenario.class);
- public MixRecordingScenario(RegionArea region, String appId, String cname, String uid, Credential credential) {
- super(region, appId, cname, uid, credential);
+ public MixRecordingScenario(DomainArea domainArea, String appId, String cname, String uid, Credential credential) {
+ super(domainArea, appId, cname, uid, credential);
}
public void runHLS(String token, StartResourceReq.StorageConfig storageConfig) {
@@ -31,7 +31,7 @@ public void runHLS(String token, StartResourceReq.StorageConfig storageConfig) {
// acquire
AcquireResourceRes acquireResourceRes;
try {
- acquireResourceRes = this.agoraService.cloudRecording()
+ acquireResourceRes = this.cloudRecordingClient
.mixScenario()
.acquire(cname, uid, AcquireMixRecordingResourceClientReq.builder()
.resourceExpiredHour(1)
@@ -55,7 +55,7 @@ public void runHLS(String token, StartResourceReq.StorageConfig storageConfig) {
StartResourceRes startResourceRes;
try {
- startResourceRes = this.agoraService.cloudRecording()
+ startResourceRes = this.cloudRecordingClient
.mixScenario()
.start(cname, uid, acquireResourceRes.getResourceId(), StartMixRecordingResourceClientReq.builder()
.token(token)
@@ -102,7 +102,7 @@ public void runHLS(String token, StartResourceReq.StorageConfig storageConfig) {
for (int i = 0; i < 3; i++) {
QueryMixHLSRecordingResourceRes queryMixHLSRecordingResourceRes;
try {
- queryMixHLSRecordingResourceRes = this.agoraService.cloudRecording()
+ queryMixHLSRecordingResourceRes = this.cloudRecordingClient
.mixScenario()
.queryHLS(acquireResourceRes.getResourceId(), startResourceRes.getSid())
.block();
@@ -130,7 +130,7 @@ public void runHLS(String token, StartResourceReq.StorageConfig storageConfig) {
UpdateResourceRes updateResourceRes;
try {
- updateResourceRes = this.agoraService.cloudRecording()
+ updateResourceRes = this.cloudRecordingClient
.mixScenario()
.update(cname, uid, acquireResourceRes.getResourceId(), startResourceRes.getSid(), UpdateMixRecordingResourceClientReq.builder()
.streamSubscribe(UpdateResourceReq.StreamSubscribe.builder()
@@ -163,7 +163,7 @@ public void runHLS(String token, StartResourceReq.StorageConfig storageConfig) {
UpdateLayoutResourceRes updateLayoutResourceRes;
try {
- updateLayoutResourceRes = this.agoraService.cloudRecording()
+ updateLayoutResourceRes = this.cloudRecordingClient
.mixScenario()
.updateLayout(cname, uid, acquireResourceRes.getResourceId(), startResourceRes.getSid(), UpdateLayoutMixRecordingResourceClientReq.builder()
.mixedVideoLayout(1)
@@ -189,7 +189,7 @@ public void runHLS(String token, StartResourceReq.StorageConfig storageConfig) {
for (int i = 0; i < 3; i++) {
QueryMixHLSRecordingResourceRes queryMixHLSRecordingResourceRes;
try {
- queryMixHLSRecordingResourceRes = this.agoraService.cloudRecording()
+ queryMixHLSRecordingResourceRes = this.cloudRecordingClient
.mixScenario()
.queryHLS(acquireResourceRes.getResourceId(), startResourceRes.getSid())
.block();
@@ -215,7 +215,7 @@ public void runHLS(String token, StartResourceReq.StorageConfig storageConfig) {
StopResourceRes stopResourceRes;
try {
- stopResourceRes = this.agoraService.cloudRecording()
+ stopResourceRes = this.cloudRecordingClient
.mixScenario()
.stop(cname, uid, startResourceRes.getResourceId(), startResourceRes.getSid(), false)
.block();
@@ -241,7 +241,7 @@ public void runHLSAndMP4(String token, StartResourceReq.StorageConfig storageCon
// acquire
AcquireResourceRes acquireResourceRes;
try {
- acquireResourceRes = this.agoraService.cloudRecording()
+ acquireResourceRes = this.cloudRecordingClient
.mixScenario()
.acquire(cname, uid, AcquireMixRecordingResourceClientReq.builder()
.resourceExpiredHour(1)
@@ -265,7 +265,7 @@ public void runHLSAndMP4(String token, StartResourceReq.StorageConfig storageCon
StartResourceRes startResourceRes;
try {
- startResourceRes = this.agoraService.cloudRecording()
+ startResourceRes = this.cloudRecordingClient
.mixScenario()
.start(cname, uid, acquireResourceRes.getResourceId(), StartMixRecordingResourceClientReq.builder()
.token(token)
@@ -312,7 +312,7 @@ public void runHLSAndMP4(String token, StartResourceReq.StorageConfig storageCon
for (int i = 0; i < 3; i++) {
QueryMixHLSAndMP4RecordingResourceRes queryMixHLSAndMP4RecordingResourceRes;
try {
- queryMixHLSAndMP4RecordingResourceRes = this.agoraService.cloudRecording()
+ queryMixHLSAndMP4RecordingResourceRes = this.cloudRecordingClient
.mixScenario()
.queryHLSAndMP4(acquireResourceRes.getResourceId(), startResourceRes.getSid())
.block();
@@ -340,7 +340,7 @@ public void runHLSAndMP4(String token, StartResourceReq.StorageConfig storageCon
UpdateResourceRes updateResourceRes;
try {
- updateResourceRes = this.agoraService.cloudRecording()
+ updateResourceRes = this.cloudRecordingClient
.mixScenario()
.update(cname, uid, acquireResourceRes.getResourceId(), startResourceRes.getSid(), UpdateMixRecordingResourceClientReq.builder()
.streamSubscribe(UpdateResourceReq.StreamSubscribe.builder()
@@ -373,7 +373,7 @@ public void runHLSAndMP4(String token, StartResourceReq.StorageConfig storageCon
UpdateLayoutResourceRes updateLayoutResourceRes;
try {
- updateLayoutResourceRes = this.agoraService.cloudRecording()
+ updateLayoutResourceRes = this.cloudRecordingClient
.mixScenario()
.updateLayout(cname, uid, acquireResourceRes.getResourceId(), startResourceRes.getSid(), UpdateLayoutMixRecordingResourceClientReq.builder()
.mixedVideoLayout(1)
@@ -399,7 +399,7 @@ public void runHLSAndMP4(String token, StartResourceReq.StorageConfig storageCon
for (int i = 0; i < 3; i++) {
QueryMixHLSAndMP4RecordingResourceRes queryMixHLSAndMP4RecordingResourceRes;
try {
- queryMixHLSAndMP4RecordingResourceRes = this.agoraService.cloudRecording()
+ queryMixHLSAndMP4RecordingResourceRes = this.cloudRecordingClient
.mixScenario()
.queryHLSAndMP4(acquireResourceRes.getResourceId(), startResourceRes.getSid())
.block();
@@ -425,7 +425,7 @@ public void runHLSAndMP4(String token, StartResourceReq.StorageConfig storageCon
StopResourceRes stopResourceRes;
try {
- stopResourceRes = this.agoraService.cloudRecording()
+ stopResourceRes = this.cloudRecordingClient
.mixScenario()
.stop(cname, uid, startResourceRes.getResourceId(), startResourceRes.getSid(), false)
.block();
diff --git a/examples/cloudrecording/src/main/java/io/agora/rest/examples/cloudrecording/scenario/WebRecordingScenario.java b/examples/cloudrecording/src/main/java/io/agora/rest/examples/cloudrecording/scenario/WebRecordingScenario.java
index c29dc66..468034f 100644
--- a/examples/cloudrecording/src/main/java/io/agora/rest/examples/cloudrecording/scenario/WebRecordingScenario.java
+++ b/examples/cloudrecording/src/main/java/io/agora/rest/examples/cloudrecording/scenario/WebRecordingScenario.java
@@ -2,7 +2,7 @@
import io.agora.rest.AgoraException;
import io.agora.rest.core.Credential;
-import io.agora.rest.core.RegionArea;
+import io.agora.rest.core.DomainArea;
import io.agora.rest.services.cloudrecording.api.req.StartResourceReq;
import io.agora.rest.services.cloudrecording.api.req.UpdateResourceReq;
import io.agora.rest.services.cloudrecording.api.res.AcquireResourceRes;
@@ -22,8 +22,8 @@
public class WebRecordingScenario extends BaseScenario {
private static final Logger logger = LoggerFactory.getLogger(WebRecordingScenario.class);
- public WebRecordingScenario(RegionArea region, String appId, String cname, String uid, Credential credential) {
- super(region, appId, cname, uid, credential);
+ public WebRecordingScenario(DomainArea domainArea, String appId, String cname, String uid, Credential credential) {
+ super(domainArea, appId, cname, uid, credential);
}
public void runWebRecorder(StartResourceReq.StorageConfig storageConfig) {
@@ -32,7 +32,7 @@ public void runWebRecorder(StartResourceReq.StorageConfig storageConfig) {
// acquire
AcquireResourceRes acquireResourceRes;
try {
- acquireResourceRes = this.agoraService.cloudRecording()
+ acquireResourceRes = this.cloudRecordingClient
.webScenario()
.acquire(cname, uid, AcquireWebRecordingResourceClientReq.builder()
.resourceExpiredHour(1)
@@ -56,7 +56,7 @@ public void runWebRecorder(StartResourceReq.StorageConfig storageConfig) {
StartResourceRes startResourceRes;
try {
- startResourceRes = this.agoraService.cloudRecording()
+ startResourceRes = this.cloudRecordingClient
.webScenario()
.start(cname, uid, acquireResourceRes.getResourceId(),
StartWebRecordingResourceClientReq.builder()
@@ -101,7 +101,7 @@ public void runWebRecorder(StartResourceReq.StorageConfig storageConfig) {
for (int i = 0; i < 3; i++) {
QueryWebRecordingResourceRes queryWebRecordingResourceRes;
try {
- queryWebRecordingResourceRes = this.agoraService.cloudRecording()
+ queryWebRecordingResourceRes = this.cloudRecordingClient
.webScenario()
.query(acquireResourceRes.getResourceId(), startResourceRes.getSid())
.block();
@@ -129,7 +129,7 @@ public void runWebRecorder(StartResourceReq.StorageConfig storageConfig) {
UpdateResourceRes updateResourceRes;
try {
- updateResourceRes = this.agoraService.cloudRecording()
+ updateResourceRes = this.cloudRecordingClient
.webScenario()
.update(cname, uid, acquireResourceRes.getResourceId(), startResourceRes.getSid(), UpdateWebRecordingResourceClientReq.builder()
.webRecordingConfig(UpdateResourceReq.WebRecordingConfig.builder()
@@ -156,7 +156,7 @@ public void runWebRecorder(StartResourceReq.StorageConfig storageConfig) {
for (int i = 0; i < 3; i++) {
QueryWebRecordingResourceRes queryWebRecordingResourceRes;
try {
- queryWebRecordingResourceRes = this.agoraService.cloudRecording()
+ queryWebRecordingResourceRes = this.cloudRecordingClient
.webScenario()
.query(acquireResourceRes.getResourceId(), startResourceRes.getSid())
.block();
@@ -182,7 +182,7 @@ public void runWebRecorder(StartResourceReq.StorageConfig storageConfig) {
StopResourceRes stopResourceRes;
try {
- stopResourceRes = this.agoraService.cloudRecording()
+ stopResourceRes = this.cloudRecordingClient
.webScenario()
.stop(cname, uid, startResourceRes.getResourceId(), startResourceRes.getSid(), false)
.block();
@@ -208,7 +208,7 @@ public void runWebRecorderAndRtmpPublish(StartResourceReq.StorageConfig storageC
// acquire
AcquireResourceRes acquireResourceRes;
try {
- acquireResourceRes = this.agoraService.cloudRecording()
+ acquireResourceRes = this.cloudRecordingClient
.webScenario()
.acquire(cname, uid, AcquireWebRecordingResourceClientReq.builder()
.resourceExpiredHour(1)
@@ -232,7 +232,7 @@ public void runWebRecorderAndRtmpPublish(StartResourceReq.StorageConfig storageC
StartResourceRes startResourceRes;
try {
- startResourceRes = this.agoraService.cloudRecording()
+ startResourceRes = this.cloudRecordingClient
.webScenario()
.start(cname, uid, acquireResourceRes.getResourceId(),
StartWebRecordingResourceClientReq.builder()
@@ -287,7 +287,7 @@ public void runWebRecorderAndRtmpPublish(StartResourceReq.StorageConfig storageC
for (int i = 0; i < 3; i++) {
QueryWebRecordingResourceRes queryWebRecordingResourceRes;
try {
- queryWebRecordingResourceRes = this.agoraService.cloudRecording()
+ queryWebRecordingResourceRes = this.cloudRecordingClient
.webScenario()
.query(acquireResourceRes.getResourceId(), startResourceRes.getSid())
.block();
@@ -315,7 +315,7 @@ public void runWebRecorderAndRtmpPublish(StartResourceReq.StorageConfig storageC
UpdateResourceRes updateResourceRes;
try {
- updateResourceRes = this.agoraService.cloudRecording()
+ updateResourceRes = this.cloudRecordingClient
.webScenario()
.update(cname, uid, acquireResourceRes.getResourceId(), startResourceRes.getSid(), UpdateWebRecordingResourceClientReq.builder()
.webRecordingConfig(UpdateResourceReq.WebRecordingConfig.builder()
@@ -348,7 +348,7 @@ public void runWebRecorderAndRtmpPublish(StartResourceReq.StorageConfig storageC
for (int i = 0; i < 3; i++) {
QueryWebRecordingResourceRes queryWebRecordingResourceRes;
try {
- queryWebRecordingResourceRes = this.agoraService.cloudRecording()
+ queryWebRecordingResourceRes = this.cloudRecordingClient
.webScenario()
.query(acquireResourceRes.getResourceId(), startResourceRes.getSid())
.block();
@@ -374,7 +374,7 @@ public void runWebRecorderAndRtmpPublish(StartResourceReq.StorageConfig storageC
StopResourceRes stopResourceRes;
try {
- stopResourceRes = this.agoraService.cloudRecording()
+ stopResourceRes = this.cloudRecordingClient
.webScenario()
.stop(cname, uid, startResourceRes.getResourceId(), startResourceRes.getSid(), false)
.block();