Merge pull request #552 from QN-zhangzhuo/QRTC-1875-format

QRTC-1875 format code

Author: longbai

src/main/java/com/qiniu/rtc/model/MediaConfig.java

@@ -99,14 +99,14 @@ public void setStretchMode(StretchModeEnum stretchMode) {
 
     @Override
     public String toString() {
-        return "MediaConfig{" +
-                "fps=" + fps +
-                ", kbps=" + kbps +
-                ", width=" + width +
-                ", height=" + height +
-                ", holdLastFrame=" + holdLastFrame +
-                ", audioOnly=" + audioOnly +
-                ", stretchMode=" + stretchMode +
-                '}';
+        return "MediaConfig{"
+                + "fps=" + fps
+                + ", kbps=" + kbps
+                + ", width=" + width
+                + ", height=" + height
+                + ", holdLastFrame=" + holdLastFrame
+                + ", audioOnly=" + audioOnly
+                + ", stretchMode=" + stretchMode
+                + '}';
     }
 }

src/main/java/com/qiniu/rtc/model/MediaInput.java

@@ -88,13 +88,13 @@ public void setPosition(MediaPosition position) {
 
     @Override
     public String toString() {
-        return "MediaInput{" +
-                "userId='" + userId + '\'' +
-                ", tag='" + tag + '\'' +
-                ", url='" + url + '\'' +
-                ", kind='" + kind + '\'' +
-                ", stretchMode=" + stretchMode +
-                ", position=" + position +
-                '}';
+        return "MediaInput{"
+                + "kind='" + kind + '\''
+                + ", userId='" + userId + '\''
+                + ", url='" + url + '\''
+                + ", tag='" + tag + '\''
+                + ", position=" + position
+                + ", stretchMode=" + stretchMode
+                + '}';
     }
 }

src/main/java/com/qiniu/rtc/model/MediaOutput.java

@@ -42,9 +42,9 @@ public void setUrl(String url) {
 
     @Override
     public String toString() {
-        return "MediaOutput{" +
-                "type='" + type + '\'' +
-                ", url='" + url + '\'' +
-                '}';
+        return "MediaOutput{"
+                + "type='" + type + '\''
+                + ", url='" + url + '\''
+                + '}';
     }
 }

src/main/java/com/qiniu/rtc/model/MediaPosition.java

@@ -78,12 +78,12 @@ public void setZ(int z) {
 
     @Override
     public String toString() {
-        return "MediaPosition{" +
-                "x=" + x +
-                ", y=" + y +
-                ", w=" + w +
-                ", h=" + h +
-                ", z=" + z +
-                '}';
+        return "MediaPosition{"
+                + "x=" + x
+                + ", y=" + y
+                + ", w=" + w
+                + ", h=" + h
+                + ", z=" + z
+                + '}';
     }
 }

src/main/java/com/qiniu/rtc/model/MergeJob.java

@@ -71,12 +71,12 @@ public void setConfig(MediaConfig config) {
 
     @Override
     public String toString() {
-        return "MergeJob{" +
-                "id='" + id + '\'' +
-                ", type='" + type + '\'' +
-                ", inputs=" + inputs +
-                ", outputs=" + outputs +
-                ", config=" + config +
-                '}';
+        return "MergeJob{"
+                + "id='" + id + '\''
+                + ", type='" + type + '\''
+                + ", inputs=" + inputs
+                + ", outputs=" + outputs
+                + ", config=" + config
+                + '}';
     }
 }

src/main/java/com/qiniu/rtc/service/MergeServiceV4.java

@@ -4,13 +4,15 @@
 import com.qiniu.util.Auth;
 import com.qiniu.http.Response;
 import com.qiniu.common.QiniuException;
+import com.qiniu.util.StringUtils;
 
 import java.util.HashMap;
 import java.util.Map;
 
 public class MergeServiceV4 extends AbstractService {
     /**
      * 初始化
+     *
      * @param auth
      */
     public MergeServiceV4(Auth auth) {
@@ -19,7 +21,8 @@ public MergeServiceV4(Auth auth) {
 
     /**
      * 创建合流任务
-     * @param job 任务信息
+     *
+     * @param job      任务信息
      * @param appId
      * @param roomName
      * @return
@@ -32,26 +35,34 @@ public Response createMergeJob(MergeJob job, String appId, String roomName) thro
 
     /**
      * 更新合流任务
+     *
      * @param job
      * @param appId
      * @param roomName
      * @return
      * @throws QiniuException
      */
     public Response updateMergeJob(MergeJob job, String appId, String roomName) throws QiniuException {
+        if (job == null || StringUtils.isNullOrEmpty(job.getId())) {
+            throw new IllegalArgumentException("");
+        }
         String urlPattern = "/v4/apps/%s/rooms/%s/jobs/update";
-        return postCall(job,urlPattern, appId, roomName);
+        return postCall(job, urlPattern, appId, roomName);
     }
 
     /**
      * 删除合流任务
-     * @param jobId 合流任务ID
+     *
+     * @param jobId    合流任务ID
      * @param appId
      * @param roomName
      * @return
      * @throws QiniuException
      */
     public Response stopMergeJob(String jobId, String appId, String roomName) throws QiniuException {
+        if (StringUtils.isNullOrEmpty(jobId)) {
+            throw new IllegalArgumentException("");
+        }
         String urlPattern = "/v4/apps/%s/rooms/%s/jobs/stop";
         Map<String, String> params = new HashMap<>();
         params.put("id", jobId);

src/test/java/test/com/qiniu/rtc/MergeServiceV4Test.java

@@ -6,14 +6,10 @@
 import com.qiniu.rtc.model.*;
 import com.qiniu.util.StringUtils;
 
-import com.qiniu.util.UrlSafeBase64;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import test.com.qiniu.TestConfig;
 
-import javax.crypto.Mac;
-import javax.crypto.SecretKey;
-import javax.crypto.spec.SecretKeySpec;
 import java.util.*;
 
 class MergeServiceV4Test {
@@ -27,7 +23,7 @@ static void setUp() {
     }
 
     @Test
-    void MergeJob() throws Exception {
+    void mergeJob() throws Exception {
         MergeJob mergeJob = new MergeJob();
         mergeJob.setType("basic");
 
@@ -47,7 +43,7 @@ void MergeJob() throws Exception {
 
         MediaOutput mediaOutput1 = new MediaOutput();
         mediaOutput1.setType("rtmp");
-        mediaOutput1.setUrl("rtmp://pili-publish.qnsdk.com/sdk-live/zhuozi001?expire=1650964845&token=Zk7Ku-e90IVu2gsVItS2e7b2rR8=");
+        mediaOutput1.setUrl("rtmp://pili-publish.qnsdk.com/sdk-live/zhuozi0001?expire=1651139796&token=XWZ8aS4vTaI13QsS0YUWy1HhJB4=");
 
         List<MediaOutput> outputs = new ArrayList<>();
         outputs.add(mediaOutput1);
@@ -114,4 +110,4 @@ void MergeJob() throws Exception {
         assert mergeResult.getStatus().equals("OK");
         assert !StringUtils.isNullOrEmpty(mergeResult.getId());
     }
-}
+}