From 767a2b66b2b96e8272691de8b12aea377a4c9b03 Mon Sep 17 00:00:00 2001 From: Hugo Date: Sun, 28 Nov 2021 23:48:11 +0800 Subject: [PATCH 01/19] qvs add VoiceChat interface --- src/main/java/com/qiniu/qvs/DeviceManager.java | 15 +++++++++++++++ src/main/java/com/qiniu/qvs/model/Device.java | 9 +++++++++ 2 files changed, 24 insertions(+) diff --git a/src/main/java/com/qiniu/qvs/DeviceManager.java b/src/main/java/com/qiniu/qvs/DeviceManager.java index a29470fce..81e3ab7c9 100644 --- a/src/main/java/com/qiniu/qvs/DeviceManager.java +++ b/src/main/java/com/qiniu/qvs/DeviceManager.java @@ -34,6 +34,7 @@ public DeviceManager(Auth auth, String apiServer, Client client) { */ public Response createDevice(String namespaceId, Device device) throws QiniuException { StringMap params = new StringMap(); + params.put("type", device.getType()); params.put("name", device.getName()); params.put("gbId", device.getGbId()); params.putNotNull("username", device.getUsername()); @@ -145,4 +146,18 @@ public Response queryGBRecordHistories(String namespaceId, String gbId, String c url = UrlUtils.composeUrlWithQueries(url, map); return QvsResponse.get(url, client, auth); } + + public Response getVoiceChatUrl(String namespaceId, String gbId, Boolean isV2, String[] channels, String version, String transProtocol) throws QiniuException { + String url = String.format("%s/v1/namespaces/%s/devices/%s/talk", apiServer, namespaceId, gbId); + StringMap params = new StringMap().put("isV2", isV2). + put("channels", channels). + put("version", version). + put("transProtocol", transProtocol); + return QvsResponse.post(url, params, client, auth); + } + + public Response sendVoiceChatData(String url, String base64_pcm) throws QiniuException { + StringMap params = new StringMap().put("base64_pcm", base64_pcm); + return QvsResponse.post(url, params, client, auth); + } } diff --git a/src/main/java/com/qiniu/qvs/model/Device.java b/src/main/java/com/qiniu/qvs/model/Device.java index de891489b..7e5e829c8 100644 --- a/src/main/java/com/qiniu/qvs/model/Device.java +++ b/src/main/java/com/qiniu/qvs/model/Device.java @@ -1,6 +1,7 @@ package com.qiniu.qvs.model; public class Device { + private int type; //可选项为摄像头、平台两类，1：摄像头，2：平台。 private String name; // 设备名称 (可包含 字母、数字、中划线、下划线；1 ~ 100 个字符长) private String username; // 用户名, 4~40位，可包含大写字母、小写字母、数字、中划线，建议与设备国标ID一致 private String password; // 密码, 4~40位，可包含大写字母、小写字母、数字、中划线 @@ -55,4 +56,12 @@ public String getDesc() { public void setDesc(String desc) { this.desc = desc; } + + public int getType() { + return type; + } + + public void setType(int type) { + this.type = type; + } } From 38e3860722a22b422da47fee980bad3650a03a44 Mon Sep 17 00:00:00 2001 From: Hugo Date: Tue, 30 Nov 2021 14:56:16 +0800 Subject: [PATCH 02/19] qvs modify function arguments --- .../java/com/qiniu/qvs/DeviceManager.java | 13 +++--- .../java/com/qiniu/qvs/model/VoiceChat.java | 40 +++++++++++++++++++ 2 files changed, 47 insertions(+), 6 deletions(-) create mode 100644 src/main/java/com/qiniu/qvs/model/VoiceChat.java diff --git a/src/main/java/com/qiniu/qvs/DeviceManager.java b/src/main/java/com/qiniu/qvs/DeviceManager.java index 81e3ab7c9..589b860ba 100644 --- a/src/main/java/com/qiniu/qvs/DeviceManager.java +++ b/src/main/java/com/qiniu/qvs/DeviceManager.java @@ -5,6 +5,7 @@ import com.qiniu.qvs.model.PatchOperation; import com.qiniu.http.Client; import com.qiniu.http.Response; +import com.qiniu.qvs.model.VoiceChat; import com.qiniu.util.Auth; import com.qiniu.util.StringMap; import com.qiniu.util.UrlUtils; @@ -147,17 +148,17 @@ public Response queryGBRecordHistories(String namespaceId, String gbId, String c return QvsResponse.get(url, client, auth); } - public Response getVoiceChatUrl(String namespaceId, String gbId, Boolean isV2, String[] channels, String version, String transProtocol) throws QiniuException { + public Response getVoiceChatUrl(String namespaceId, String gbId, VoiceChat voiceChat) throws QiniuException { String url = String.format("%s/v1/namespaces/%s/devices/%s/talk", apiServer, namespaceId, gbId); - StringMap params = new StringMap().put("isV2", isV2). - put("channels", channels). - put("version", version). - put("transProtocol", transProtocol); + StringMap params = new StringMap().putNotNull("isV2", voiceChat.getV2()). + put("channels", voiceChat.getChannels()). + put("version", voiceChat.getVersion()). + put("transProtocol", voiceChat.getTransProtocol()); return QvsResponse.post(url, params, client, auth); } public Response sendVoiceChatData(String url, String base64_pcm) throws QiniuException { - StringMap params = new StringMap().put("base64_pcm", base64_pcm); + StringMap params = new StringMap().putNotNull("base64_pcm", base64_pcm); return QvsResponse.post(url, params, client, auth); } } diff --git a/src/main/java/com/qiniu/qvs/model/VoiceChat.java b/src/main/java/com/qiniu/qvs/model/VoiceChat.java new file mode 100644 index 000000000..3d948079d --- /dev/null +++ b/src/main/java/com/qiniu/qvs/model/VoiceChat.java @@ -0,0 +1,40 @@ +package com.qiniu.examples.qvs.model; + +public class VoiceChat { + private Boolean isV2;// 该字段为true时，启用低延迟版本，收到返回地址后在发送语音数据 + private String[] channels; // 平台设备指定需要启动的通道国标ID（为空表示启动平台下的所有设备） + private String version; // 对讲国标协议版本，取值"2014"或"2016"，默认为2014，例如大部分大华摄像头为GBT 28181-2014版本对讲模式 + private String transProtocol; // 取值"tcp"或"udp"，流传输模式，默认udp + + public Boolean getV2() { + return isV2; + } + + public void setV2(Boolean v2) { + isV2 = v2; + } + + public String[] getChannels() { + return channels; + } + + public void setChannels(String[] channels) { + this.channels = channels; + } + + public String getVersion() { + return version; + } + + public void setVersion(String version) { + this.version = version; + } + + public String getTransProtocol() { + return transProtocol; + } + + public void setTransProtocol(String transProtocol) { + this.transProtocol = transProtocol; + } +} From faad4dd92e21140480c3b726d072f3af897e8d0d Mon Sep 17 00:00:00 2001 From: Hugo Date: Tue, 30 Nov 2021 15:19:26 +0800 Subject: [PATCH 03/19] qvs modify package name --- src/main/java/com/qiniu/qvs/model/VoiceChat.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/qiniu/qvs/model/VoiceChat.java b/src/main/java/com/qiniu/qvs/model/VoiceChat.java index 3d948079d..1bcc27732 100644 --- a/src/main/java/com/qiniu/qvs/model/VoiceChat.java +++ b/src/main/java/com/qiniu/qvs/model/VoiceChat.java @@ -1,4 +1,4 @@ -package com.qiniu.examples.qvs.model; +package com.qiniu.qvs.model; public class VoiceChat { private Boolean isV2;// 该字段为true时，启用低延迟版本，收到返回地址后在发送语音数据 From 2bad21ded00e84e9c9d57d4e2fab7a1aa1c73f2b Mon Sep 17 00:00:00 2001 From: Hugo Date: Tue, 30 Nov 2021 15:36:13 +0800 Subject: [PATCH 04/19] qvs modify code style --- src/main/java/com/qiniu/qvs/model/VoiceChat.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/qiniu/qvs/model/VoiceChat.java b/src/main/java/com/qiniu/qvs/model/VoiceChat.java index 1bcc27732..b1413f567 100644 --- a/src/main/java/com/qiniu/qvs/model/VoiceChat.java +++ b/src/main/java/com/qiniu/qvs/model/VoiceChat.java @@ -1,7 +1,7 @@ package com.qiniu.qvs.model; public class VoiceChat { - private Boolean isV2;// 该字段为true时，启用低延迟版本，收到返回地址后在发送语音数据 + private Boolean isV2; // 该字段为true时，启用低延迟版本，收到返回地址后在发送语音数据 private String[] channels; // 平台设备指定需要启动的通道国标ID（为空表示启动平台下的所有设备） private String version; // 对讲国标协议版本，取值"2014"或"2016"，默认为2014，例如大部分大华摄像头为GBT 28181-2014版本对讲模式 private String transProtocol; // 取值"tcp"或"udp"，流传输模式，默认udp From abaa9d853f1e9cf4d2bf24e2c3245eddcb862ffe Mon Sep 17 00:00:00 2001 From: Hugo Date: Tue, 30 Nov 2021 17:57:58 +0800 Subject: [PATCH 05/19] qvs modify code style for params --- src/main/java/com/qiniu/qvs/DeviceManager.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/qiniu/qvs/DeviceManager.java b/src/main/java/com/qiniu/qvs/DeviceManager.java index 589b860ba..e6891fc6e 100644 --- a/src/main/java/com/qiniu/qvs/DeviceManager.java +++ b/src/main/java/com/qiniu/qvs/DeviceManager.java @@ -150,10 +150,10 @@ public Response queryGBRecordHistories(String namespaceId, String gbId, String c public Response getVoiceChatUrl(String namespaceId, String gbId, VoiceChat voiceChat) throws QiniuException { String url = String.format("%s/v1/namespaces/%s/devices/%s/talk", apiServer, namespaceId, gbId); - StringMap params = new StringMap().putNotNull("isV2", voiceChat.getV2()). - put("channels", voiceChat.getChannels()). - put("version", voiceChat.getVersion()). - put("transProtocol", voiceChat.getTransProtocol()); + StringMap params = new StringMap().putNotNull("isV2", voiceChat.getV2()); + params.put("channels", voiceChat.getChannels()); + params.put("version", voiceChat.getVersion()); + params.put("transProtocol", voiceChat.getTransProtocol()); return QvsResponse.post(url, params, client, auth); } From 8a26073b196f9213f8f44f82b4a080eb6003682b Mon Sep 17 00:00:00 2001 From: Hugo Date: Thu, 2 Dec 2021 11:07:11 +0800 Subject: [PATCH 06/19] qvs modify isXXX params --- src/main/java/com/qiniu/qvs/DeviceManager.java | 9 +++++++-- src/main/java/com/qiniu/qvs/model/VoiceChat.java | 10 +++++----- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/qiniu/qvs/DeviceManager.java b/src/main/java/com/qiniu/qvs/DeviceManager.java index e6891fc6e..14e16698d 100644 --- a/src/main/java/com/qiniu/qvs/DeviceManager.java +++ b/src/main/java/com/qiniu/qvs/DeviceManager.java @@ -150,11 +150,16 @@ public Response queryGBRecordHistories(String namespaceId, String gbId, String c public Response getVoiceChatUrl(String namespaceId, String gbId, VoiceChat voiceChat) throws QiniuException { String url = String.format("%s/v1/namespaces/%s/devices/%s/talk", apiServer, namespaceId, gbId); - StringMap params = new StringMap().putNotNull("isV2", voiceChat.getV2()); + StringMap params = getStringMap(voiceChat); + return com.qiniu.qvs.QvsResponse.post(url, params, client, auth); + } + + private StringMap getStringMap(VoiceChat voiceChat) { + StringMap params = new StringMap().putNotNull("isV2", voiceChat.getLatency()); params.put("channels", voiceChat.getChannels()); params.put("version", voiceChat.getVersion()); params.put("transProtocol", voiceChat.getTransProtocol()); - return QvsResponse.post(url, params, client, auth); + return params; } public Response sendVoiceChatData(String url, String base64_pcm) throws QiniuException { diff --git a/src/main/java/com/qiniu/qvs/model/VoiceChat.java b/src/main/java/com/qiniu/qvs/model/VoiceChat.java index b1413f567..056999135 100644 --- a/src/main/java/com/qiniu/qvs/model/VoiceChat.java +++ b/src/main/java/com/qiniu/qvs/model/VoiceChat.java @@ -1,17 +1,17 @@ package com.qiniu.qvs.model; public class VoiceChat { - private Boolean isV2; // 该字段为true时，启用低延迟版本，收到返回地址后在发送语音数据 + private Boolean latency; // 该字段为true时，启用低延迟版本，收到返回地址后在发送语音数据 private String[] channels; // 平台设备指定需要启动的通道国标ID（为空表示启动平台下的所有设备） private String version; // 对讲国标协议版本，取值"2014"或"2016"，默认为2014，例如大部分大华摄像头为GBT 28181-2014版本对讲模式 private String transProtocol; // 取值"tcp"或"udp"，流传输模式，默认udp - public Boolean getV2() { - return isV2; + public Boolean getLatency() { + return latency; } - public void setV2(Boolean v2) { - isV2 = v2; + public void setLatency(Boolean latency) { + this.latency = latency; } public String[] getChannels() { From 4a6de25c6782f04fe2cf0f494e225fe5fffe0443 Mon Sep 17 00:00:00 2001 From: Hugo Date: Tue, 7 Dec 2021 12:49:30 +0800 Subject: [PATCH 07/19] qvs simplify code of DeviceManager --- src/main/java/com/qiniu/qvs/DeviceManager.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/qiniu/qvs/DeviceManager.java b/src/main/java/com/qiniu/qvs/DeviceManager.java index 14e16698d..5b2abc2cb 100644 --- a/src/main/java/com/qiniu/qvs/DeviceManager.java +++ b/src/main/java/com/qiniu/qvs/DeviceManager.java @@ -34,6 +34,12 @@ public DeviceManager(Auth auth, String apiServer, Client client) { * 创建设备 */ public Response createDevice(String namespaceId, Device device) throws QiniuException { + StringMap params = getDeviceStringMap(device); + String url = String.format("%s/v1/namespaces/%s/devices", apiServer, namespaceId); + return QvsResponse.post(url, params, client, auth); + } + + private StringMap getDeviceStringMap(Device device) { StringMap params = new StringMap(); params.put("type", device.getType()); params.put("name", device.getName()); @@ -42,9 +48,7 @@ public Response createDevice(String namespaceId, Device device) throws QiniuExce params.putNotNull("password", device.getPassword()); params.put("pullIfRegister", device.isPullIfRegister()); params.put("desc", device.getDesc()); - - String url = String.format("%s/v1/namespaces/%s/devices", apiServer, namespaceId); - return QvsResponse.post(url, params, client, auth); + return params; } /* From ee9102c78f3034fbdd73262bfc0fa653a3032a7f Mon Sep 17 00:00:00 2001 From: code41 Date: Tue, 7 Dec 2021 17:58:13 +0800 Subject: [PATCH 08/19] 1. FIX codeBeat --- src/main/java/com/qiniu/qvs/DeviceManager.java | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/qiniu/qvs/DeviceManager.java b/src/main/java/com/qiniu/qvs/DeviceManager.java index 5b2abc2cb..06dfa0553 100644 --- a/src/main/java/com/qiniu/qvs/DeviceManager.java +++ b/src/main/java/com/qiniu/qvs/DeviceManager.java @@ -41,14 +41,22 @@ public Response createDevice(String namespaceId, Device device) throws QiniuExce private StringMap getDeviceStringMap(Device device) { StringMap params = new StringMap(); + putCommonParam(device, params); + putUserParam(device, params); + return params; + } + + private void putCommonParam(Device device, StringMap params) { params.put("type", device.getType()); params.put("name", device.getName()); params.put("gbId", device.getGbId()); - params.putNotNull("username", device.getUsername()); - params.putNotNull("password", device.getPassword()); params.put("pullIfRegister", device.isPullIfRegister()); params.put("desc", device.getDesc()); - return params; + } + + private void putUserParam(Device device, StringMap params) { + params.putNotNull("username", device.getUsername()); + params.putNotNull("password", device.getPassword()); } /* From 912b1287bb67da567e9dd458f3c99ad3814c62f5 Mon Sep 17 00:00:00 2001 From: code41 Date: Wed, 8 Dec 2021 10:15:42 +0800 Subject: [PATCH 09/19] 1. FIX codeBeat --- .../java/com/qiniu/qvs/DeviceManager.java | 22 +------------------ src/main/java/com/qiniu/qvs/model/Device.java | 19 ++++++++++++++++ 2 files changed, 20 insertions(+), 21 deletions(-) diff --git a/src/main/java/com/qiniu/qvs/DeviceManager.java b/src/main/java/com/qiniu/qvs/DeviceManager.java index 06dfa0553..de3ac191c 100644 --- a/src/main/java/com/qiniu/qvs/DeviceManager.java +++ b/src/main/java/com/qiniu/qvs/DeviceManager.java @@ -34,31 +34,11 @@ public DeviceManager(Auth auth, String apiServer, Client client) { * 创建设备 */ public Response createDevice(String namespaceId, Device device) throws QiniuException { - StringMap params = getDeviceStringMap(device); + StringMap params = device.transferPostParam(); String url = String.format("%s/v1/namespaces/%s/devices", apiServer, namespaceId); return QvsResponse.post(url, params, client, auth); } - private StringMap getDeviceStringMap(Device device) { - StringMap params = new StringMap(); - putCommonParam(device, params); - putUserParam(device, params); - return params; - } - - private void putCommonParam(Device device, StringMap params) { - params.put("type", device.getType()); - params.put("name", device.getName()); - params.put("gbId", device.getGbId()); - params.put("pullIfRegister", device.isPullIfRegister()); - params.put("desc", device.getDesc()); - } - - private void putUserParam(Device device, StringMap params) { - params.putNotNull("username", device.getUsername()); - params.putNotNull("password", device.getPassword()); - } - /* * 删除设备 */ diff --git a/src/main/java/com/qiniu/qvs/model/Device.java b/src/main/java/com/qiniu/qvs/model/Device.java index 7e5e829c8..7b8af8023 100644 --- a/src/main/java/com/qiniu/qvs/model/Device.java +++ b/src/main/java/com/qiniu/qvs/model/Device.java @@ -1,5 +1,7 @@ package com.qiniu.qvs.model; +import com.qiniu.util.StringMap; + public class Device { private int type; //可选项为摄像头、平台两类，1：摄像头，2：平台。 private String name; // 设备名称 (可包含 字母、数字、中划线、下划线；1 ~ 100 个字符长) @@ -64,4 +66,21 @@ public int getType() { public void setType(int type) { this.type = type; } + + /** + * 转换为POST参数对象 + * + * @return POST参数对象 + */ + public StringMap transferPostParam(){ + StringMap params = new StringMap(); + params.put("type", this.getType()); + params.put("name", this.getName()); + params.put("gbId", this.getGbId()); + params.put("pullIfRegister", this.isPullIfRegister()); + params.put("desc", this.getDesc()); + params.putNotNull("username", this.getUsername()); + params.putNotNull("password", this.getPassword()); + return params; + } } From 2c45241cb9d0bdb5a19ba9c7216a961732a29bb3 Mon Sep 17 00:00:00 2001 From: code41 Date: Wed, 8 Dec 2021 11:14:16 +0800 Subject: [PATCH 10/19] 1. FIX codeBeat --- src/main/java/com/qiniu/qvs/model/Device.java | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/qiniu/qvs/model/Device.java b/src/main/java/com/qiniu/qvs/model/Device.java index 7b8af8023..8eb6e9d61 100644 --- a/src/main/java/com/qiniu/qvs/model/Device.java +++ b/src/main/java/com/qiniu/qvs/model/Device.java @@ -1,5 +1,8 @@ package com.qiniu.qvs.model; +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; +import com.qiniu.util.Json; import com.qiniu.util.StringMap; public class Device { @@ -72,15 +75,8 @@ public void setType(int type) { * * @return POST参数对象 */ - public StringMap transferPostParam(){ - StringMap params = new StringMap(); - params.put("type", this.getType()); - params.put("name", this.getName()); - params.put("gbId", this.getGbId()); - params.put("pullIfRegister", this.isPullIfRegister()); - params.put("desc", this.getDesc()); - params.putNotNull("username", this.getUsername()); - params.putNotNull("password", this.getPassword()); - return params; + public StringMap transferPostParam() { + Gson gson = new GsonBuilder().enableComplexMapKeySerialization().create(); + return gson.fromJson(gson.toJson(this), StringMap.class); } } From 555cb6e7e4e72c11cd7dd1e8c0b3f618819714ee Mon Sep 17 00:00:00 2001 From: code41 Date: Wed, 8 Dec 2021 14:39:04 +0800 Subject: [PATCH 11/19] 1. FIX codeBeat --- src/main/java/com/qiniu/qvs/model/Device.java | 67 +++---------------- .../test/com/qiniu/qvs/DeviceManagerTest.java | 17 +++-- 2 files changed, 17 insertions(+), 67 deletions(-) diff --git a/src/main/java/com/qiniu/qvs/model/Device.java b/src/main/java/com/qiniu/qvs/model/Device.java index 8eb6e9d61..96886dcb0 100644 --- a/src/main/java/com/qiniu/qvs/model/Device.java +++ b/src/main/java/com/qiniu/qvs/model/Device.java @@ -2,9 +2,16 @@ import com.google.gson.Gson; import com.google.gson.GsonBuilder; -import com.qiniu.util.Json; import com.qiniu.util.StringMap; - +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Builder +@Data +@NoArgsConstructor +@AllArgsConstructor public class Device { private int type; //可选项为摄像头、平台两类，1：摄像头，2：平台。 private String name; // 设备名称 (可包含 字母、数字、中划线、下划线；1 ~ 100 个字符长) @@ -14,62 +21,6 @@ public class Device { private String desc; // 关于设备的描述信息 private String gbId; // 设备国标ID - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getGbId() { - return gbId; - } - - public void setGbId(String gbId) { - this.gbId = gbId; - } - - public String getUsername() { - return username; - } - - public void setUsername(String username) { - this.username = username; - } - - public String getPassword() { - return password; - } - - public void setPassword(String password) { - this.password = password; - } - - public boolean isPullIfRegister() { - return pullIfRegister; - } - - public void setPullIfRegister(boolean pullIfRegister) { - this.pullIfRegister = pullIfRegister; - } - - public String getDesc() { - return desc; - } - - public void setDesc(String desc) { - this.desc = desc; - } - - public int getType() { - return type; - } - - public void setType(int type) { - this.type = type; - } - /** * 转换为POST参数对象 * diff --git a/src/test/java/test/com/qiniu/qvs/DeviceManagerTest.java b/src/test/java/test/com/qiniu/qvs/DeviceManagerTest.java index 24d9eb7a9..1cea34147 100644 --- a/src/test/java/test/com/qiniu/qvs/DeviceManagerTest.java +++ b/src/test/java/test/com/qiniu/qvs/DeviceManagerTest.java @@ -2,6 +2,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; + import com.qiniu.common.QiniuException; import com.qiniu.http.Response; import com.qiniu.qvs.DeviceManager; @@ -19,7 +20,7 @@ public class DeviceManagerTest { private Response res = null; private final String namespaceId = "2xenzw3lpzpdz"; private final String gbId = "31011500991320000127"; - private final String[] channels = { "31011500991320000127" }; + private final String[] channels = {"31011500991320000127"}; @BeforeEach public void setUp() throws Exception { @@ -29,15 +30,13 @@ public void setUp() throws Exception { @Test @Tag("IntegrationTest") public void testCreateDevice() { - Device device = new Device(); - device.setUsername("admin"); - device.setPassword("QQQNNN111"); + Device device = Device.builder().username("admin").password("QQQNNN111").build(); try { res = deviceManager.createDevice(namespaceId, device); assertNotNull(res); System.out.println(res.bodyString()); } catch (QiniuException e) { - assertEquals("401", res.statusCode); + assertEquals(401, res.statusCode); e.printStackTrace(); } finally { if (res != null) { @@ -54,7 +53,7 @@ public void testQueryDevice() { assertNotNull(res); System.out.println(res.bodyString()); } catch (QiniuException e) { - assertEquals("401", res.statusCode); + assertEquals(401, res.statusCode); e.printStackTrace(); } finally { if (res != null) { @@ -66,13 +65,13 @@ public void testQueryDevice() { @Test @Tag("IntegrationTest") public void testUpdateDevice() { - PatchOperation[] patchOperation = { new PatchOperation("replace", "name", "GBTEST") }; + PatchOperation[] patchOperation = {new PatchOperation("replace", "name", "GBTEST")}; try { res = deviceManager.updateDevice(namespaceId, gbId, patchOperation); assertNotNull(res); System.out.println(res.bodyString()); } catch (QiniuException e) { - assertEquals("401", res.statusCode); + assertEquals(401, res.statusCode); e.printStackTrace(); } finally { if (res != null) { @@ -94,7 +93,7 @@ public void testListDevice() { assertNotNull(res); System.out.println(res.bodyString()); } catch (QiniuException e) { - assertEquals("401", res.statusCode); + assertEquals(401, res.statusCode); e.printStackTrace(); } finally { if (res != null) { From 8d5ac549aab84d9e0944423907f086297188b1c4 Mon Sep 17 00:00:00 2001 From: code41 Date: Wed, 8 Dec 2021 17:30:56 +0800 Subject: [PATCH 12/19] 1. FIX codeStyle --- src/main/java/com/qiniu/rtc/QRTC.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/qiniu/rtc/QRTC.java b/src/main/java/com/qiniu/rtc/QRTC.java index 9762761bc..7b15161cf 100644 --- a/src/main/java/com/qiniu/rtc/QRTC.java +++ b/src/main/java/com/qiniu/rtc/QRTC.java @@ -28,7 +28,7 @@ private QRTC() { } - private volatile static QRTCClient client = null; + private static volatile QRTCClient client = null; private static final Map holder = new ConcurrentHashMap<>(16); From 0da7d3187355aed3af39bd0d9fdbfd8a279b94ba Mon Sep 17 00:00:00 2001 From: Hugo Date: Mon, 13 Dec 2021 21:43:45 +0800 Subject: [PATCH 13/19] qvs modify unittest --- .../test/com/qiniu/qvs/DeviceManagerTest.java | 76 ++++++++++--------- .../test/com/qiniu/qvs/NameSpaceTest.java | 10 ++- src/test/java/test/com/qiniu/qvs/PTZTest.java | 4 +- .../java/test/com/qiniu/qvs/RecordTest.java | 8 +- .../java/test/com/qiniu/qvs/StreamTest.java | 21 ++--- .../java/test/com/qiniu/qvs/TemplateTest.java | 10 +-- 6 files changed, 68 insertions(+), 61 deletions(-) diff --git a/src/test/java/test/com/qiniu/qvs/DeviceManagerTest.java b/src/test/java/test/com/qiniu/qvs/DeviceManagerTest.java index 1cea34147..cfe61b145 100644 --- a/src/test/java/test/com/qiniu/qvs/DeviceManagerTest.java +++ b/src/test/java/test/com/qiniu/qvs/DeviceManagerTest.java @@ -18,9 +18,10 @@ public class DeviceManagerTest { Auth auth = TestConfig.testAuth; private DeviceManager deviceManager; private Response res = null; - private final String namespaceId = "2xenzw3lpzpdz"; - private final String gbId = "31011500991320000127"; - private final String[] channels = {"31011500991320000127"}; + private Response res2 = null; + private final String namespaceId = "3nm4x1e0xw855"; + private final String gbId = "31011500991320007536"; + private final String[] channels = {"31011500991320007536"}; @BeforeEach public void setUp() throws Exception { @@ -102,22 +103,22 @@ public void testListDevice() { } } - @Test - @Tag("IntegrationTest") - public void testListChannels() { - String prefix = "310"; - try { - res = deviceManager.listChannels(namespaceId, gbId, prefix); - assertNotNull(res); - System.out.println(res.bodyString()); - } catch (QiniuException e) { - e.printStackTrace(); - } finally { - if (res != null) { - res.close(); - } - } - } +// @Test +// @Tag("IntegrationTest") +// public void testListChannels() { +// String prefix = "310"; +// try { +// res = deviceManager.listChannels(namespaceId, gbId, prefix);//TODO +// assertNotNull(res); +// System.out.println(res.bodyString()); +// } catch (QiniuException e) { +// e.printStackTrace(); +// } finally { +// if (res != null) { +// res.close(); +// } +// } +// } @Test @Tag("IntegrationTest") @@ -140,6 +141,7 @@ public void testStartDevice() { public void testStopDevice() { try { res = deviceManager.stopDevice(namespaceId, gbId, channels); + res2 = deviceManager.startDevice(namespaceId, gbId, channels); assertNotNull(res); System.out.println(res.bodyString()); } catch (QiniuException e) { @@ -155,7 +157,7 @@ public void testStopDevice() { @Tag("IntegrationTest") public void testFetchCatalog() { try { - res = deviceManager.fetchCatalog("2xenzw5o81ods", "31011500991320000356"); + res = deviceManager.fetchCatalog(namespaceId, gbId); assertNotNull(res); System.out.println(res.bodyString()); } catch (QiniuException e) { @@ -167,28 +169,28 @@ public void testFetchCatalog() { } } - @Test - @Tag("IntegrationTest") - public void testQueryChannel() { - try { - res = deviceManager.queryChannel("3nm4x0vyz7xlu", "31011500991180000270", "34020000001310000020"); - assertNotNull(res); - System.out.println(res.bodyString()); - } catch (QiniuException e) { - e.printStackTrace(); - } finally { - if (res != null) { - res.close(); - } - } - } +// @Test +// @Tag("IntegrationTest") +// public void testQueryChannel() { +// try { +// res = deviceManager.queryChannel(namespaceId, gbId, channels[0]);//TODO +// assertNotNull(res); +// System.out.println(res.bodyString()); +// } catch (QiniuException e) { +// e.printStackTrace(); +// } finally { +// if (res != null) { +// res.close(); +// } +// } +// } @Test @Tag("IntegrationTest") public void testQueryGBRecordHistories() { try { - res = deviceManager.queryGBRecordHistories("3nm4x0vyz7xlu", "31011500991180000270", "34020000001310000020", - 1604817540, 1604903940); + res = deviceManager.queryGBRecordHistories(namespaceId, gbId, channels[0], + 1639379380, 1639379981); assertNotNull(res); System.out.println(res.bodyString()); } catch (QiniuException e) { diff --git a/src/test/java/test/com/qiniu/qvs/NameSpaceTest.java b/src/test/java/test/com/qiniu/qvs/NameSpaceTest.java index e5679a88d..890b456b4 100644 --- a/src/test/java/test/com/qiniu/qvs/NameSpaceTest.java +++ b/src/test/java/test/com/qiniu/qvs/NameSpaceTest.java @@ -15,7 +15,8 @@ public class NameSpaceTest { Auth auth = TestConfig.testAuth; private NameSpaceManager nameSpaceManager; private Response res = null; - private final String namespaceId = "2akrarsj8zp0w"; + private Response res2 = null; + private final String namespaceId = "3nm4x1e0xw855"; @BeforeEach public void setUp() throws Exception { @@ -26,10 +27,10 @@ public void setUp() throws Exception { @Tag("IntegrationTest") public void testCreateNameSpace() { NameSpace nameSpace = new NameSpace(); - nameSpace.setName("hugo002"); + nameSpace.setName("hugo004"); nameSpace.setAccessType("rtmp"); nameSpace.setRtmpUrlType(NameSpace.Static); - nameSpace.setDomains(new String[] { "qtest002.com" }); + nameSpace.setDomains(new String[] { "qnlinking.com" }); try { res = nameSpaceManager.createNameSpace(nameSpace); System.out.println(res.bodyString()); @@ -96,6 +97,7 @@ public void testListNameSpace() { public void testDisableNameSpace() { try { res = nameSpaceManager.disableNameSpace(namespaceId); + res2 = nameSpaceManager.enableNameSpace(namespaceId); System.out.println(res.bodyString()); } catch (QiniuException e) { e.printStackTrace(); @@ -125,7 +127,7 @@ public void testEnableNameSpace() { @Tag("IntegrationTest") public void testDeleteNameSpace() { try { - res = nameSpaceManager.deleteNameSpace(namespaceId); + res = nameSpaceManager.deleteNameSpace("3nm4x1e07mmvz"); System.out.println(res.bodyString()); } catch (QiniuException e) { e.printStackTrace(); diff --git a/src/test/java/test/com/qiniu/qvs/PTZTest.java b/src/test/java/test/com/qiniu/qvs/PTZTest.java index 432f9c56b..4265424e2 100644 --- a/src/test/java/test/com/qiniu/qvs/PTZTest.java +++ b/src/test/java/test/com/qiniu/qvs/PTZTest.java @@ -14,8 +14,8 @@ public class PTZTest { Auth auth = TestConfig.testAuth; private PTZManager ptzManager; private Response res = null; - private final String namespaceId = "2xenzw5o81ods"; - private final String gbId = "31011500991320000382"; + private final String namespaceId = "3nm4x1e0xw855"; + private final String gbId = "31011500991320007536"; private final String chId = ""; @BeforeEach diff --git a/src/test/java/test/com/qiniu/qvs/RecordTest.java b/src/test/java/test/com/qiniu/qvs/RecordTest.java index c7d640b93..994aec3bb 100644 --- a/src/test/java/test/com/qiniu/qvs/RecordTest.java +++ b/src/test/java/test/com/qiniu/qvs/RecordTest.java @@ -15,11 +15,11 @@ public class RecordTest { private RecordManager recordManager; private Response res = null; private Response res2 = null; - private final String namespaceId = "2xenzw5o81ods"; - private final String streamId = "31011500991320000356"; + private final String namespaceId = "3nm4x1e0xw855"; + private final String streamId = "31011500991320007536"; private final String format = "m3u8"; - private final int start = 1605254612; - private final int end = 1605255300; + private final int start = 1639379380; + private final int end = 1639379981; @BeforeEach public void setUp() throws Exception { diff --git a/src/test/java/test/com/qiniu/qvs/StreamTest.java b/src/test/java/test/com/qiniu/qvs/StreamTest.java index 2f2173a95..19909cde6 100644 --- a/src/test/java/test/com/qiniu/qvs/StreamTest.java +++ b/src/test/java/test/com/qiniu/qvs/StreamTest.java @@ -17,12 +17,14 @@ public class StreamTest { Auth auth = TestConfig.testAuth; - Stream stream = new Stream("teststream005"); + Stream stream = new Stream("31011500991320007536"); + Stream createstream = new Stream("31011500991320007539"); private StreamManager streamManager; private Response res = null; - private final String namespaceId = "2akrarsj8zp0w"; - private final int start = 1587975463; - private final int end = 1587976463; + private Response res2 = null; + private final String namespaceId = "3nm4x1e0xw855"; + private final int start = 1639379380; + private final int end = 1639379981; private final int offset = 0; private final int line = 1; private final int qtype = 0; @@ -40,7 +42,7 @@ public void setUp() throws Exception { public void testCreateStream() { // stream.setStreamID("teststream002"); try { - res = streamManager.createStream(namespaceId, stream); + res = streamManager.createStream(namespaceId, createstream); System.out.println(res.bodyString()); } catch (QiniuException e) { e.printStackTrace(); @@ -102,9 +104,9 @@ public void testListStream() { @Test @Tag("IntegrationTest") public void testStaticPublishPlayURL() { - StaticLiveRoute staticLiveRoute = new StaticLiveRoute("qvs-publish.qtest.com", "publishRtmp", 3600); + StaticLiveRoute staticLiveRoute = new StaticLiveRoute("qvs-publish.qnlinking.com", "publishRtmp", 3600); try { - res = streamManager.staticPublishPlayURL(namespaceId, stream.getStreamID(), staticLiveRoute); + res = streamManager.staticPublishPlayURL("2xenzw02ke9s4", "teststream005", staticLiveRoute); System.out.println(res.bodyString()); } catch (QiniuException e) { e.printStackTrace(); @@ -197,6 +199,7 @@ public void testQueryStreamPubHistories() { public void testDisableStream() { try { res = streamManager.disableStream(namespaceId, stream.getStreamID()); + res2 = streamManager.enableStream(namespaceId, stream.getStreamID()); System.out.println(res.bodyString()); } catch (QiniuException e) { e.printStackTrace(); @@ -226,7 +229,7 @@ public void testEnableStream() { @Tag("IntegrationTest") public void testDeleteStream() { try { - res = streamManager.deleteStream(namespaceId, stream.getStreamID()); + res = streamManager.deleteStream(namespaceId, "teststream006"); System.out.println(res.bodyString()); } catch (QiniuException e) { e.printStackTrace(); @@ -241,7 +244,7 @@ public void testDeleteStream() { @Tag("IntegrationTest") public void testOndemandSnap() { try { - res = streamManager.ondemandSnap("2xenzw5o81ods", "31011500991320000356"); + res = streamManager.ondemandSnap(namespaceId, stream.getStreamID()); System.out.println(res.bodyString()); } catch (QiniuException e) { e.printStackTrace(); diff --git a/src/test/java/test/com/qiniu/qvs/TemplateTest.java b/src/test/java/test/com/qiniu/qvs/TemplateTest.java index 4368ac683..640577f42 100644 --- a/src/test/java/test/com/qiniu/qvs/TemplateTest.java +++ b/src/test/java/test/com/qiniu/qvs/TemplateTest.java @@ -16,7 +16,7 @@ public class TemplateTest { Auth auth = TestConfig.testAuth; private TemplateManager templateManager; private Response res = null; - private final String templateId = "2akrarsl22iil"; + private final String templateId = "2xenzwlwgi7mf"; @BeforeEach public void setUp() throws Exception { @@ -27,8 +27,8 @@ public void setUp() throws Exception { @Tag("IntegrationTest") public void testCreateTemplate() { Template template = new Template(); - template.setName("testtemplate002"); - template.setBucket("Testforhugo"); + template.setName("testtemplate003"); + template.setBucket("qiniusdk"); template.setTemplateType(1); template.setJpgOverwriteStatus(true); template.setRecordType(2); @@ -62,7 +62,7 @@ public void testQueryTemplate() { @Test @Tag("IntegrationTest") public void testUpdateTemplate() { - PatchOperation[] patchOperation = { new PatchOperation("replace", "name", "testtemplate002") }; + PatchOperation[] patchOperation = { new PatchOperation("replace", "name", "testtemplate004") }; try { res = templateManager.updateTemplate(templateId, patchOperation); System.out.println(res.bodyString()); @@ -98,7 +98,7 @@ public void testListTemplate() { @Tag("IntegrationTest") public void testDeleteTemplate() { try { - res = templateManager.deleteTemplate(templateId); + res = templateManager.deleteTemplate("3nm4x1e0x1ajc"); System.out.println(res.bodyString()); } catch (QiniuException e) { e.printStackTrace(); From 63a5ea323f0e37f7e9a19240d8e7d410e168e65e Mon Sep 17 00:00:00 2001 From: Hugo Date: Mon, 13 Dec 2021 23:25:14 +0800 Subject: [PATCH 14/19] qvs modify unittest --- src/test/java/test/com/qiniu/qvs/DeviceManagerTest.java | 2 +- src/test/java/test/com/qiniu/qvs/NameSpaceTest.java | 4 ++-- src/test/java/test/com/qiniu/qvs/PTZTest.java | 2 +- src/test/java/test/com/qiniu/qvs/StreamTest.java | 6 +++--- src/test/java/test/com/qiniu/qvs/TemplateTest.java | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/test/java/test/com/qiniu/qvs/DeviceManagerTest.java b/src/test/java/test/com/qiniu/qvs/DeviceManagerTest.java index cfe61b145..0df89ce3b 100644 --- a/src/test/java/test/com/qiniu/qvs/DeviceManagerTest.java +++ b/src/test/java/test/com/qiniu/qvs/DeviceManagerTest.java @@ -66,7 +66,7 @@ public void testQueryDevice() { @Test @Tag("IntegrationTest") public void testUpdateDevice() { - PatchOperation[] patchOperation = {new PatchOperation("replace", "name", "GBTEST")}; + PatchOperation[] patchOperation = {new PatchOperation("replace", "name", "GBTEST001")}; try { res = deviceManager.updateDevice(namespaceId, gbId, patchOperation); assertNotNull(res); diff --git a/src/test/java/test/com/qiniu/qvs/NameSpaceTest.java b/src/test/java/test/com/qiniu/qvs/NameSpaceTest.java index 890b456b4..bf6d7fb92 100644 --- a/src/test/java/test/com/qiniu/qvs/NameSpaceTest.java +++ b/src/test/java/test/com/qiniu/qvs/NameSpaceTest.java @@ -27,10 +27,10 @@ public void setUp() throws Exception { @Tag("IntegrationTest") public void testCreateNameSpace() { NameSpace nameSpace = new NameSpace(); - nameSpace.setName("hugo004"); + nameSpace.setName("hugo005"); nameSpace.setAccessType("rtmp"); nameSpace.setRtmpUrlType(NameSpace.Static); - nameSpace.setDomains(new String[] { "qnlinking.com" }); + nameSpace.setDomains(new String[] { "test.qnlinking.com" }); try { res = nameSpaceManager.createNameSpace(nameSpace); System.out.println(res.bodyString()); diff --git a/src/test/java/test/com/qiniu/qvs/PTZTest.java b/src/test/java/test/com/qiniu/qvs/PTZTest.java index 4265424e2..7007a0fe6 100644 --- a/src/test/java/test/com/qiniu/qvs/PTZTest.java +++ b/src/test/java/test/com/qiniu/qvs/PTZTest.java @@ -75,7 +75,7 @@ public void testIrisControl() { @Tag("IntegrationTest") public void testPresetsControl() { try { - res = ptzManager.presetsControl(namespaceId, gbId, "set", "test", 0, chId); + res = ptzManager.presetsControl(namespaceId, gbId, "set", "test001", 0, chId); assertNotNull(res); System.out.println(res.bodyString()); } catch (QiniuException e) { diff --git a/src/test/java/test/com/qiniu/qvs/StreamTest.java b/src/test/java/test/com/qiniu/qvs/StreamTest.java index 19909cde6..ff3c40831 100644 --- a/src/test/java/test/com/qiniu/qvs/StreamTest.java +++ b/src/test/java/test/com/qiniu/qvs/StreamTest.java @@ -42,7 +42,7 @@ public void setUp() throws Exception { public void testCreateStream() { // stream.setStreamID("teststream002"); try { - res = streamManager.createStream(namespaceId, createstream); + res = streamManager.createStream("2xenzw02ke9s4", createstream); System.out.println(res.bodyString()); } catch (QiniuException e) { e.printStackTrace(); @@ -71,7 +71,7 @@ public void testQueryStream() { @Test @Tag("IntegrationTest") public void testUpdateStream() { - PatchOperation[] patchOperation = { new PatchOperation("replace", "desc", "test") }; + PatchOperation[] patchOperation = { new PatchOperation("replace", "desc", "test001") }; try { res = streamManager.updateStream(namespaceId, stream.getStreamID(), patchOperation); System.out.println(res.bodyString()); @@ -229,7 +229,7 @@ public void testEnableStream() { @Tag("IntegrationTest") public void testDeleteStream() { try { - res = streamManager.deleteStream(namespaceId, "teststream006"); + res = streamManager.deleteStream("2xenzw02ke9s4", "teststream006"); System.out.println(res.bodyString()); } catch (QiniuException e) { e.printStackTrace(); diff --git a/src/test/java/test/com/qiniu/qvs/TemplateTest.java b/src/test/java/test/com/qiniu/qvs/TemplateTest.java index 640577f42..3d18d2690 100644 --- a/src/test/java/test/com/qiniu/qvs/TemplateTest.java +++ b/src/test/java/test/com/qiniu/qvs/TemplateTest.java @@ -27,7 +27,7 @@ public void setUp() throws Exception { @Tag("IntegrationTest") public void testCreateTemplate() { Template template = new Template(); - template.setName("testtemplate003"); + template.setName("testtemplate004"); template.setBucket("qiniusdk"); template.setTemplateType(1); template.setJpgOverwriteStatus(true); @@ -98,7 +98,7 @@ public void testListTemplate() { @Tag("IntegrationTest") public void testDeleteTemplate() { try { - res = templateManager.deleteTemplate("3nm4x1e0x1ajc"); + res = templateManager.deleteTemplate("2xenzwlx661su"); System.out.println(res.bodyString()); } catch (QiniuException e) { e.printStackTrace(); From 5130139bc3144fdaf0d660b8d135121779c5617b Mon Sep 17 00:00:00 2001 From: Hugo Date: Tue, 14 Dec 2021 21:54:36 +0800 Subject: [PATCH 15/19] qvs modify unittest --- .../test/com/qiniu/qvs/DeviceManagerTest.java | 32 +++++----- .../test/com/qiniu/qvs/NameSpaceTest.java | 31 ++++----- src/test/java/test/com/qiniu/qvs/PTZTest.java | 4 +- .../java/test/com/qiniu/qvs/StreamTest.java | 63 ++++++++++--------- .../java/test/com/qiniu/qvs/TemplateTest.java | 34 +++++----- 5 files changed, 85 insertions(+), 79 deletions(-) diff --git a/src/test/java/test/com/qiniu/qvs/DeviceManagerTest.java b/src/test/java/test/com/qiniu/qvs/DeviceManagerTest.java index 0df89ce3b..a7ddb99fb 100644 --- a/src/test/java/test/com/qiniu/qvs/DeviceManagerTest.java +++ b/src/test/java/test/com/qiniu/qvs/DeviceManagerTest.java @@ -136,22 +136,22 @@ public void testStartDevice() { } } - @Test - @Tag("IntegrationTest") - public void testStopDevice() { - try { - res = deviceManager.stopDevice(namespaceId, gbId, channels); - res2 = deviceManager.startDevice(namespaceId, gbId, channels); - assertNotNull(res); - System.out.println(res.bodyString()); - } catch (QiniuException e) { - e.printStackTrace(); - } finally { - if (res != null) { - res.close(); - } - } - } +// @Test +// @Tag("IntegrationTest") +// public void testStopDevice() { +// try { +// res = deviceManager.stopDevice(namespaceId, gbId, channels); +// res2 = deviceManager.startDevice(namespaceId, gbId, channels); +// assertNotNull(res); +// System.out.println(res.bodyString()); +// } catch (QiniuException e) { +// e.printStackTrace(); +// } finally { +// if (res != null) { +// res.close(); +// } +// } +// } @Test @Tag("IntegrationTest") diff --git a/src/test/java/test/com/qiniu/qvs/NameSpaceTest.java b/src/test/java/test/com/qiniu/qvs/NameSpaceTest.java index bf6d7fb92..6dc147b34 100644 --- a/src/test/java/test/com/qiniu/qvs/NameSpaceTest.java +++ b/src/test/java/test/com/qiniu/qvs/NameSpaceTest.java @@ -17,6 +17,7 @@ public class NameSpaceTest { private Response res = null; private Response res2 = null; private final String namespaceId = "3nm4x1e0xw855"; + private final String name = ""+System.currentTimeMillis(); @BeforeEach public void setUp() throws Exception { @@ -27,7 +28,7 @@ public void setUp() throws Exception { @Tag("IntegrationTest") public void testCreateNameSpace() { NameSpace nameSpace = new NameSpace(); - nameSpace.setName("hugo005"); + nameSpace.setName(name); nameSpace.setAccessType("rtmp"); nameSpace.setRtmpUrlType(NameSpace.Static); nameSpace.setDomains(new String[] { "test.qnlinking.com" }); @@ -123,19 +124,19 @@ public void testEnableNameSpace() { } } - @Test - @Tag("IntegrationTest") - public void testDeleteNameSpace() { - try { - res = nameSpaceManager.deleteNameSpace("3nm4x1e07mmvz"); - System.out.println(res.bodyString()); - } catch (QiniuException e) { - e.printStackTrace(); - } finally { - if (res != null) { - res.close(); - } - } - } +// @Test +// @Tag("IntegrationTest") +// public void testDeleteNameSpace() { +// try { +// res = nameSpaceManager.deleteNameSpace("3nm4x1e07mmvz"); +// System.out.println(res.bodyString()); +// } catch (QiniuException e) { +// e.printStackTrace(); +// } finally { +// if (res != null) { +// res.close(); +// } +// } +// } } diff --git a/src/test/java/test/com/qiniu/qvs/PTZTest.java b/src/test/java/test/com/qiniu/qvs/PTZTest.java index 7007a0fe6..f0e98b3fe 100644 --- a/src/test/java/test/com/qiniu/qvs/PTZTest.java +++ b/src/test/java/test/com/qiniu/qvs/PTZTest.java @@ -17,6 +17,7 @@ public class PTZTest { private final String namespaceId = "3nm4x1e0xw855"; private final String gbId = "31011500991320007536"; private final String chId = ""; + private String name = ""+System.currentTimeMillis(); @BeforeEach public void setUp() throws Exception { @@ -74,8 +75,9 @@ public void testIrisControl() { @Test @Tag("IntegrationTest") public void testPresetsControl() { + name = ""+System.currentTimeMillis(); try { - res = ptzManager.presetsControl(namespaceId, gbId, "set", "test001", 0, chId); + res = ptzManager.presetsControl(namespaceId, gbId, "set", name, 0, chId); assertNotNull(res); System.out.println(res.bodyString()); } catch (QiniuException e) { diff --git a/src/test/java/test/com/qiniu/qvs/StreamTest.java b/src/test/java/test/com/qiniu/qvs/StreamTest.java index ff3c40831..45b90bbb7 100644 --- a/src/test/java/test/com/qiniu/qvs/StreamTest.java +++ b/src/test/java/test/com/qiniu/qvs/StreamTest.java @@ -17,8 +17,9 @@ public class StreamTest { Auth auth = TestConfig.testAuth; + private final String streamid = ""+System.currentTimeMillis(); Stream stream = new Stream("31011500991320007536"); - Stream createstream = new Stream("31011500991320007539"); + Stream createstream = new Stream(streamid); private StreamManager streamManager; private Response res = null; private Response res2 = null; @@ -71,7 +72,7 @@ public void testQueryStream() { @Test @Tag("IntegrationTest") public void testUpdateStream() { - PatchOperation[] patchOperation = { new PatchOperation("replace", "desc", "test001") }; + PatchOperation[] patchOperation = { new PatchOperation("replace", "desc", streamid) }; try { res = streamManager.updateStream(namespaceId, stream.getStreamID(), patchOperation); System.out.println(res.bodyString()); @@ -194,21 +195,21 @@ public void testQueryStreamPubHistories() { } } - @Test - @Tag("IntegrationTest") - public void testDisableStream() { - try { - res = streamManager.disableStream(namespaceId, stream.getStreamID()); - res2 = streamManager.enableStream(namespaceId, stream.getStreamID()); - System.out.println(res.bodyString()); - } catch (QiniuException e) { - e.printStackTrace(); - } finally { - if (res != null) { - res.close(); - } - } - } +// @Test +// @Tag("IntegrationTest") +// public void testDisableStream() { +// try { +// res = streamManager.disableStream(namespaceId, stream.getStreamID()); +// res2 = streamManager.enableStream(namespaceId, stream.getStreamID()); +// System.out.println(res.bodyString()); +// } catch (QiniuException e) { +// e.printStackTrace(); +// } finally { +// if (res != null) { +// res.close(); +// } +// } +// } @Test @Tag("IntegrationTest") @@ -225,20 +226,20 @@ public void testEnableStream() { } } - @Test - @Tag("IntegrationTest") - public void testDeleteStream() { - try { - res = streamManager.deleteStream("2xenzw02ke9s4", "teststream006"); - System.out.println(res.bodyString()); - } catch (QiniuException e) { - e.printStackTrace(); - } finally { - if (res != null) { - res.close(); - } - } - } +// @Test +// @Tag("IntegrationTest") +// public void testDeleteStream() { +// try { +// res = streamManager.deleteStream("2xenzw02ke9s4", "teststream006"); +// System.out.println(res.bodyString()); +// } catch (QiniuException e) { +// e.printStackTrace(); +// } finally { +// if (res != null) { +// res.close(); +// } +// } +// } @Test @Tag("IntegrationTest") diff --git a/src/test/java/test/com/qiniu/qvs/TemplateTest.java b/src/test/java/test/com/qiniu/qvs/TemplateTest.java index 3d18d2690..b81fd781c 100644 --- a/src/test/java/test/com/qiniu/qvs/TemplateTest.java +++ b/src/test/java/test/com/qiniu/qvs/TemplateTest.java @@ -17,6 +17,7 @@ public class TemplateTest { private TemplateManager templateManager; private Response res = null; private final String templateId = "2xenzwlwgi7mf"; + private String templateName = ""+System.currentTimeMillis(); @BeforeEach public void setUp() throws Exception { @@ -27,7 +28,7 @@ public void setUp() throws Exception { @Tag("IntegrationTest") public void testCreateTemplate() { Template template = new Template(); - template.setName("testtemplate004"); + template.setName(templateName); template.setBucket("qiniusdk"); template.setTemplateType(1); template.setJpgOverwriteStatus(true); @@ -62,7 +63,8 @@ public void testQueryTemplate() { @Test @Tag("IntegrationTest") public void testUpdateTemplate() { - PatchOperation[] patchOperation = { new PatchOperation("replace", "name", "testtemplate004") }; + templateName = ""+System.currentTimeMillis(); + PatchOperation[] patchOperation = { new PatchOperation("replace", "name", templateName) }; try { res = templateManager.updateTemplate(templateId, patchOperation); System.out.println(res.bodyString()); @@ -94,18 +96,18 @@ public void testListTemplate() { } } - @Test - @Tag("IntegrationTest") - public void testDeleteTemplate() { - try { - res = templateManager.deleteTemplate("2xenzwlx661su"); - System.out.println(res.bodyString()); - } catch (QiniuException e) { - e.printStackTrace(); - } finally { - if (res != null) { - res.close(); - } - } - } +// @Test +// @Tag("IntegrationTest") +// public void testDeleteTemplate() { +// try { +// res = templateManager.deleteTemplate("2xenzwlx661su"); +// System.out.println(res.bodyString()); +// } catch (QiniuException e) { +// e.printStackTrace(); +// } finally { +// if (res != null) { +// res.close(); +// } +// } +// } } From 55018562ae2471cb585a6ebf2504f3ed2331d4e9 Mon Sep 17 00:00:00 2001 From: Hugo Date: Tue, 14 Dec 2021 22:16:56 +0800 Subject: [PATCH 16/19] qvs format code --- src/test/java/test/com/qiniu/qvs/NameSpaceTest.java | 2 +- src/test/java/test/com/qiniu/qvs/PTZTest.java | 4 ++-- src/test/java/test/com/qiniu/qvs/StreamTest.java | 2 +- src/test/java/test/com/qiniu/qvs/TemplateTest.java | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/test/java/test/com/qiniu/qvs/NameSpaceTest.java b/src/test/java/test/com/qiniu/qvs/NameSpaceTest.java index 6dc147b34..103bd6822 100644 --- a/src/test/java/test/com/qiniu/qvs/NameSpaceTest.java +++ b/src/test/java/test/com/qiniu/qvs/NameSpaceTest.java @@ -17,7 +17,7 @@ public class NameSpaceTest { private Response res = null; private Response res2 = null; private final String namespaceId = "3nm4x1e0xw855"; - private final String name = ""+System.currentTimeMillis(); + private final String name = "" + System.currentTimeMillis(); @BeforeEach public void setUp() throws Exception { diff --git a/src/test/java/test/com/qiniu/qvs/PTZTest.java b/src/test/java/test/com/qiniu/qvs/PTZTest.java index f0e98b3fe..8473cc2e6 100644 --- a/src/test/java/test/com/qiniu/qvs/PTZTest.java +++ b/src/test/java/test/com/qiniu/qvs/PTZTest.java @@ -17,7 +17,7 @@ public class PTZTest { private final String namespaceId = "3nm4x1e0xw855"; private final String gbId = "31011500991320007536"; private final String chId = ""; - private String name = ""+System.currentTimeMillis(); + private String name = "" + System.currentTimeMillis(); @BeforeEach public void setUp() throws Exception { @@ -75,7 +75,7 @@ public void testIrisControl() { @Test @Tag("IntegrationTest") public void testPresetsControl() { - name = ""+System.currentTimeMillis(); + name = "" + System.currentTimeMillis(); try { res = ptzManager.presetsControl(namespaceId, gbId, "set", name, 0, chId); assertNotNull(res); diff --git a/src/test/java/test/com/qiniu/qvs/StreamTest.java b/src/test/java/test/com/qiniu/qvs/StreamTest.java index 45b90bbb7..7b3271f3d 100644 --- a/src/test/java/test/com/qiniu/qvs/StreamTest.java +++ b/src/test/java/test/com/qiniu/qvs/StreamTest.java @@ -17,7 +17,7 @@ public class StreamTest { Auth auth = TestConfig.testAuth; - private final String streamid = ""+System.currentTimeMillis(); + private final String streamid = "" + System.currentTimeMillis(); Stream stream = new Stream("31011500991320007536"); Stream createstream = new Stream(streamid); private StreamManager streamManager; diff --git a/src/test/java/test/com/qiniu/qvs/TemplateTest.java b/src/test/java/test/com/qiniu/qvs/TemplateTest.java index b81fd781c..ed5ea192e 100644 --- a/src/test/java/test/com/qiniu/qvs/TemplateTest.java +++ b/src/test/java/test/com/qiniu/qvs/TemplateTest.java @@ -17,7 +17,7 @@ public class TemplateTest { private TemplateManager templateManager; private Response res = null; private final String templateId = "2xenzwlwgi7mf"; - private String templateName = ""+System.currentTimeMillis(); + private String templateName = "" + System.currentTimeMillis(); @BeforeEach public void setUp() throws Exception { @@ -63,7 +63,7 @@ public void testQueryTemplate() { @Test @Tag("IntegrationTest") public void testUpdateTemplate() { - templateName = ""+System.currentTimeMillis(); + templateName = "" + System.currentTimeMillis(); PatchOperation[] patchOperation = { new PatchOperation("replace", "name", templateName) }; try { res = templateManager.updateTemplate(templateId, patchOperation); From 875713274bc5645cc409cfe849ba7341f63ca20e Mon Sep 17 00:00:00 2001 From: Hugo Date: Tue, 14 Dec 2021 23:27:26 +0800 Subject: [PATCH 17/19] qvs modify unittest --- src/test/java/test/com/qiniu/qvs/NameSpaceTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/test/com/qiniu/qvs/NameSpaceTest.java b/src/test/java/test/com/qiniu/qvs/NameSpaceTest.java index 103bd6822..fa6eaa8a6 100644 --- a/src/test/java/test/com/qiniu/qvs/NameSpaceTest.java +++ b/src/test/java/test/com/qiniu/qvs/NameSpaceTest.java @@ -31,7 +31,7 @@ public void testCreateNameSpace() { nameSpace.setName(name); nameSpace.setAccessType("rtmp"); nameSpace.setRtmpUrlType(NameSpace.Static); - nameSpace.setDomains(new String[] { "test.qnlinking.com" }); + nameSpace.setDomains(new String[]{name + ".qnlinking.com"}); try { res = nameSpaceManager.createNameSpace(nameSpace); System.out.println(res.bodyString()); From 91933c645504250d0d95ffb62f7c3a16c2ccc586 Mon Sep 17 00:00:00 2001 From: Hugo Date: Fri, 17 Dec 2021 14:45:39 +0800 Subject: [PATCH 18/19] qvs modify unittest --- .../test/com/qiniu/qvs/DeviceManagerTest.java | 34 +++++++++---------- src/test/java/test/com/qiniu/qvs/PTZTest.java | 30 ++++++++-------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/src/test/java/test/com/qiniu/qvs/DeviceManagerTest.java b/src/test/java/test/com/qiniu/qvs/DeviceManagerTest.java index a7ddb99fb..d978fcfbb 100644 --- a/src/test/java/test/com/qiniu/qvs/DeviceManagerTest.java +++ b/src/test/java/test/com/qiniu/qvs/DeviceManagerTest.java @@ -28,23 +28,23 @@ public void setUp() throws Exception { this.deviceManager = new DeviceManager(auth); } - @Test - @Tag("IntegrationTest") - public void testCreateDevice() { - Device device = Device.builder().username("admin").password("QQQNNN111").build(); - try { - res = deviceManager.createDevice(namespaceId, device); - assertNotNull(res); - System.out.println(res.bodyString()); - } catch (QiniuException e) { - assertEquals(401, res.statusCode); - e.printStackTrace(); - } finally { - if (res != null) { - res.close(); - } - } - } +// @Test +// @Tag("IntegrationTest") +// public void testCreateDevice() { +// Device device = Device.builder().username("admin").password("QQQNNN111").build(); +// try { +// res = deviceManager.createDevice(namespaceId, device); +// assertNotNull(res); +// System.out.println(res.bodyString()); +// } catch (QiniuException e) { +//// assertEquals(401, res.statusCode); +// e.printStackTrace(); +// } finally { +// if (res != null) { +// res.close(); +// } +// } +// } @Test @Tag("IntegrationTest") diff --git a/src/test/java/test/com/qiniu/qvs/PTZTest.java b/src/test/java/test/com/qiniu/qvs/PTZTest.java index 8473cc2e6..db3140f71 100644 --- a/src/test/java/test/com/qiniu/qvs/PTZTest.java +++ b/src/test/java/test/com/qiniu/qvs/PTZTest.java @@ -56,21 +56,21 @@ public void testFocusControl() { } } - @Test - @Tag("IntegrationTest") - public void testIrisControl() { - try { - res = ptzManager.irisControl(namespaceId, gbId, "irisin", 5, chId); - assertNotNull(res); - System.out.println(res.bodyString()); - } catch (QiniuException e) { - e.printStackTrace(); - } finally { - if (res != null) { - res.close(); - } - } - } +// @Test +// @Tag("IntegrationTest") +// public void testIrisControl() { +// try { +// res = ptzManager.irisControl(namespaceId, gbId, "irisin", 5, chId); +// assertNotNull(res); +// System.out.println(res.bodyString()); +// } catch (QiniuException e) { +// e.printStackTrace(); +// } finally { +// if (res != null) { +// res.close(); +// } +// } +// } @Test @Tag("IntegrationTest") From d703a8117a13ce78722c7bb6eaf269c3d835f054 Mon Sep 17 00:00:00 2001 From: Hugo Date: Fri, 17 Dec 2021 14:58:30 +0800 Subject: [PATCH 19/19] qvs format code --- src/test/java/test/com/qiniu/qvs/DeviceManagerTest.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/test/java/test/com/qiniu/qvs/DeviceManagerTest.java b/src/test/java/test/com/qiniu/qvs/DeviceManagerTest.java index d978fcfbb..02f3e2856 100644 --- a/src/test/java/test/com/qiniu/qvs/DeviceManagerTest.java +++ b/src/test/java/test/com/qiniu/qvs/DeviceManagerTest.java @@ -6,7 +6,6 @@ import com.qiniu.common.QiniuException; import com.qiniu.http.Response; import com.qiniu.qvs.DeviceManager; -import com.qiniu.qvs.model.Device; import com.qiniu.qvs.model.PatchOperation; import com.qiniu.util.Auth; import org.junit.jupiter.api.BeforeEach;