Skip to content

Commit 478c552

Browse files
seymourtangseymourtang
committed
Refactor StartResourceReq class to improve naming consistency and enhance WebRecordingScenario for better readability
1 parent 75fb0b4 commit 478c552

File tree

2 files changed

+60
-53
lines changed

2 files changed

+60
-53
lines changed

‎agora-rest-client-core/src/main/java/io/agora/rest/services/cloudrecording/api/req/StartResourceReq.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2417,7 +2417,7 @@ public ExtensionService build() {
24172417
* @brief The CDN address to which you push the stream.
24182418
* @since v0.4.0
24192419
*/
2420-
public static class Outputs {
2420+
public static class Output {
24212421
/**
24222422
* The CDN address to which you push the stream.(Required)
24232423
*/
@@ -2428,7 +2428,7 @@ public static Builder builder() {
24282428
return new Builder();
24292429
}
24302430

2431-
private Outputs(Builder builder) {
2431+
private Output(Builder builder) {
24322432
setRtmpUrl(builder.rtmpUrl);
24332433
}
24342434

@@ -2458,8 +2458,8 @@ public Builder rtmpUrl(String val) {
24582458
return this;
24592459
}
24602460

2461-
public Outputs build() {
2462-
return new Outputs(this);
2461+
public Output build() {
2462+
return new Output(this);
24632463
}
24642464
}
24652465
}
@@ -2820,7 +2820,7 @@ public static class RtmpPublishServiceParam implements ServiceParam {
28202820
* The array of CDN addresses to which you push the stream.(Required)
28212821
*/
28222822
@JsonProperty("outputs")
2823-
private List<Outputs> outputs;
2823+
private List<Output> outputs;
28242824

28252825
public static Builder builder() {
28262826
return new Builder();
@@ -2830,11 +2830,11 @@ private RtmpPublishServiceParam(Builder builder) {
28302830
setOutputs(builder.outputs);
28312831
}
28322832

2833-
public List<Outputs> getOutputs() {
2833+
public List<Output> getOutputs() {
28342834
return outputs;
28352835
}
28362836

2837-
public void setOutputs(List<Outputs> outputs) {
2837+
public void setOutputs(List<Output> outputs) {
28382838
this.outputs = outputs;
28392839
}
28402840

@@ -2847,12 +2847,12 @@ public String toString() {
28472847

28482848
public static final class Builder {
28492849

2850-
private List<Outputs> outputs;
2850+
private List<Output> outputs;
28512851

28522852
private Builder() {
28532853
}
28542854

2855-
public Builder outputs(List<Outputs> val) {
2855+
public Builder outputs(List<Output> val) {
28562856
outputs = val;
28572857
return this;
28582858
}

‎examples/cloudrecording/src/main/java/io/agora/rest/examples/cloudrecording/scenario/WebRecordingScenario.java‎

Lines changed: 51 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@ public void runWebRecorder(StartResourceReq.StorageConfig storageConfig) {
3636
.webScenario()
3737
.acquire(cname, uid, AcquireWebRecordingResourceClientReq.builder()
3838
.resourceExpiredHour(1)
39-
.build()).block();
39+
.build())
40+
.block();
4041
} catch (AgoraException e) {
4142
logger.error("Failed to acquire resource,err:{}", e.getMessage());
4243
return;
@@ -66,17 +67,19 @@ public void runWebRecorder(StartResourceReq.StorageConfig storageConfig) {
6667
.storageConfig(storageConfig)
6768
.extensionServiceConfig(StartResourceReq.ExtensionServiceConfig.builder()
6869
.errorHandlePolicy("error_abort")
69-
.extensionServices(Collections.singletonList(StartResourceReq.ExtensionService.builder()
70-
.serviceName("web_recorder_service")
71-
.errorHandlePolicy("error_abort")
72-
.serviceParam(StartResourceReq.WebRecordingServiceParam.builder()
73-
.url("https://live.bilibili.com/")
74-
.audioProfile(2)
75-
.videoWidth(1280)
76-
.videoHeight(720)
77-
.maxRecordingHour(1)
78-
.build())
79-
.build()))
70+
.extensionServices(Collections
71+
.singletonList(StartResourceReq.ExtensionService.builder()
72+
.serviceName("web_recorder_service")
73+
.errorHandlePolicy("error_abort")
74+
.serviceParam(
75+
StartResourceReq.WebRecordingServiceParam.builder()
76+
.url("https://live.bilibili.com/")
77+
.audioProfile(2)
78+
.videoWidth(1280)
79+
.videoHeight(720)
80+
.maxRecordingHour(1)
81+
.build())
82+
.build()))
8083
.build())
8184
.build())
8285
.block();
@@ -96,7 +99,6 @@ public void runWebRecorder(StartResourceReq.StorageConfig storageConfig) {
9699

97100
logger.info("Start resource successfully,startResourceResp:{}", startResourceRes);
98101

99-
100102
// query resource detail
101103
for (int i = 0; i < 3; i++) {
102104
QueryWebRecordingResourceRes queryWebRecordingResourceRes;
@@ -131,11 +133,13 @@ public void runWebRecorder(StartResourceReq.StorageConfig storageConfig) {
131133
try {
132134
updateResourceRes = this.cloudRecordingClient
133135
.webScenario()
134-
.update(cname, uid, acquireResourceRes.getResourceId(), startResourceRes.getSid(), UpdateWebRecordingResourceClientReq.builder()
135-
.webRecordingConfig(UpdateResourceReq.WebRecordingConfig.builder()
136-
.onHold(false)
136+
.update(cname, uid, acquireResourceRes.getResourceId(), startResourceRes.getSid(),
137+
UpdateWebRecordingResourceClientReq.builder()
138+
.webRecordingConfig(UpdateResourceReq.WebRecordingConfig.builder()
139+
.onHold(false)
140+
.build())
137141
.build())
138-
.build()).block();
142+
.block();
139143

140144
} catch (AgoraException e) {
141145
logger.error("Failed to update resource,err:{}", e.getMessage());
@@ -212,7 +216,8 @@ public void runWebRecorderAndRtmpPublish(StartResourceReq.StorageConfig storageC
212216
.webScenario()
213217
.acquire(cname, uid, AcquireWebRecordingResourceClientReq.builder()
214218
.resourceExpiredHour(1)
215-
.build()).block();
219+
.build())
220+
.block();
216221
} catch (AgoraException e) {
217222
logger.error("Failed to acquire resource,err:{}", e.getMessage());
218223
return;
@@ -243,26 +248,28 @@ public void runWebRecorderAndRtmpPublish(StartResourceReq.StorageConfig storageC
243248
.extensionServiceConfig(StartResourceReq.ExtensionServiceConfig.builder()
244249
.errorHandlePolicy("error_abort")
245250
.extensionServices(Arrays.asList(StartResourceReq.ExtensionService.builder()
246-
.serviceName("web_recorder_service")
247-
.errorHandlePolicy("error_abort")
248-
.serviceParam(StartResourceReq.WebRecordingServiceParam.builder()
249-
.url("https://live.bilibili.com/")
250-
.audioProfile(2)
251-
.videoWidth(1280)
252-
.videoHeight(720)
253-
.maxRecordingHour(1)
254-
.build())
255-
.build(),
251+
.serviceName("web_recorder_service")
252+
.errorHandlePolicy("error_abort")
253+
.serviceParam(StartResourceReq.WebRecordingServiceParam.builder()
254+
.url("https://live.bilibili.com/")
255+
.audioProfile(2)
256+
.videoWidth(1280)
257+
.videoHeight(720)
258+
.maxRecordingHour(1)
259+
.build())
260+
.build(),
256261
StartResourceReq.ExtensionService.builder()
257262
.serviceName("rtmp_publish_service")
258263
.errorHandlePolicy("error_ignore")
259-
.serviceParam(StartResourceReq.RtmpPublishServiceParam.builder()
260-
.outputs(Collections.singletonList(StartResourceReq.Outputs.builder()
261-
.rtmpUrl("rtmp://xxx.xxx.xxx.xxx:1935/live/test")
262-
.build()))
264+
.serviceParam(StartResourceReq.RtmpPublishServiceParam
265+
.builder()
266+
.outputs(Collections.singletonList(
267+
StartResourceReq.Output.builder()
268+
.rtmpUrl(
269+
"rtmp://xxx.xxx.xxx.xxx:1935/live/test")
270+
.build()))
263271
.build())
264-
.build()
265-
))
272+
.build()))
266273
.build())
267274
.build())
268275
.block();
@@ -282,7 +289,6 @@ public void runWebRecorderAndRtmpPublish(StartResourceReq.StorageConfig storageC
282289

283290
logger.info("Start resource successfully,startResourceResp:{}", startResourceRes);
284291

285-
286292
// query resource detail
287293
for (int i = 0; i < 3; i++) {
288294
QueryWebRecordingResourceRes queryWebRecordingResourceRes;
@@ -317,16 +323,17 @@ public void runWebRecorderAndRtmpPublish(StartResourceReq.StorageConfig storageC
317323
try {
318324
updateResourceRes = this.cloudRecordingClient
319325
.webScenario()
320-
.update(cname, uid, acquireResourceRes.getResourceId(), startResourceRes.getSid(), UpdateWebRecordingResourceClientReq.builder()
321-
.webRecordingConfig(UpdateResourceReq.WebRecordingConfig.builder()
322-
.onHold(false)
323-
.build())
324-
.rtmpPublishConfig(UpdateResourceReq.RtmpPublishConfig.builder()
325-
.outputs(Collections.singletonList(UpdateResourceReq.UpdateOutput.builder()
326-
.rtmpURL("rtmp://yyy.yyy.yyy.yyy:1935/live/test")
326+
.update(cname, uid, acquireResourceRes.getResourceId(), startResourceRes.getSid(),
327+
UpdateWebRecordingResourceClientReq.builder()
328+
.webRecordingConfig(UpdateResourceReq.WebRecordingConfig.builder()
329+
.onHold(false)
327330
.build())
328-
).build())
329-
.build())
331+
.rtmpPublishConfig(UpdateResourceReq.RtmpPublishConfig.builder()
332+
.outputs(Collections.singletonList(UpdateResourceReq.UpdateOutput.builder()
333+
.rtmpURL("rtmp://yyy.yyy.yyy.yyy:1935/live/test")
334+
.build()))
335+
.build())
336+
.build())
330337
.block();
331338

332339
} catch (AgoraException e) {

0 commit comments

Comments
 (0)