From 7ad12b88842292dc8c02cf3c089df49e84da1c38 Mon Sep 17 00:00:00 2001 From: jucyfer <502223422@qq.com> Date: Sun, 31 May 2020 23:59:13 +0800 Subject: [PATCH 01/16] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/ucloud/unet/client/UnetClient.java | 1 + 1 file changed, 1 insertion(+) diff --git a/ucloud-sdk-java-unet/src/main/java/cn/ucloud/unet/client/UnetClient.java b/ucloud-sdk-java-unet/src/main/java/cn/ucloud/unet/client/UnetClient.java index 7785138d..bbd4aa15 100755 --- a/ucloud-sdk-java-unet/src/main/java/cn/ucloud/unet/client/UnetClient.java +++ b/ucloud-sdk-java-unet/src/main/java/cn/ucloud/unet/client/UnetClient.java @@ -1,3 +1,4 @@ +//不知道从哪里开始吐槽 package cn.ucloud.unet.client; import cn.ucloud.common.client.UcloudClient; From 4bdc5cf71e1ecba00e7394f4e8a893f68c90818b Mon Sep 17 00:00:00 2001 From: jucyfer <502223422@qq.com> Date: Mon, 1 Jun 2020 01:05:09 +0800 Subject: [PATCH 02/16] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E4=BA=86Rule?= =?UTF-8?q?=E5=86=85=E9=83=A8=E7=B1=BB=E7=9A=84=E5=AD=97=E6=AE=B5=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=EF=BC=88=E4=BB=A5=E5=8F=8A=E7=9B=B8=E5=BA=94=E7=9A=84?= =?UTF-8?q?getter=E5=92=8Csetter=EF=BC=89=EF=BC=8C=E4=BB=8EInteger?= =?UTF-8?q?=E6=94=B9=E4=B8=BAString=EF=BC=8C=E4=BB=A5=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E7=AB=AF=E5=8F=A3=E5=8C=BA=E9=97=B4=E7=9A=84=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=EF=BC=9B=202.=E4=B8=8E=E7=AC=AC1=E7=82=B9=E7=9B=B8=E9=85=8D?= =?UTF-8?q?=E5=A5=97=EF=BC=8C=E4=BF=AE=E6=94=B9=E4=BA=86UpdateFireWallPara?= =?UTF-8?q?m=E7=9A=84=E7=AC=AC57=E8=A1=8C=EF=BC=9A=E4=BB=8E=E7=AE=80?= =?UTF-8?q?=E5=8D=95=E7=9A=84<0=E5=88=A4=E6=96=AD=E5=8F=98=E6=88=90?= =?UTF-8?q?=E4=BA=86=E6=AD=A3=E5=88=99=E5=88=A4=E6=96=AD=EF=BC=8C=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E7=A9=BA=E5=AD=97=E7=AC=A6=E4=B8=B2=E3=80=81=E7=BA=AF?= =?UTF-8?q?=E6=95=B0=E5=AD=97=E3=80=81=E7=AB=AF=E5=8F=A3=E5=8C=BA=E9=97=B4?= =?UTF-8?q?=E7=9A=84=E8=AF=86=E5=88=AB=EF=BC=88=E6=9A=82=E6=9C=AA=E5=AE=9E?= =?UTF-8?q?=E7=8E=B0a-b=E4=B8=ADa>=3Db=E7=9A=84=E6=83=85=E5=86=B5=EF=BC=89?= =?UTF-8?q?=E3=80=82=203.=E4=BF=AE=E6=94=B9=E4=BA=86=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E7=94=A8=E4=BE=8BUpdateFireWallTest=E7=9A=84=E7=AC=AC31?= =?UTF-8?q?=E8=A1=8C=EF=BC=8C=E5=B0=86Rule=E7=9A=84=E6=9E=84=E9=80=A0?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E4=BB=8E=E6=95=B0=E5=AD=9724=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=E5=8C=BA=E9=97=B4"24-25"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/ucloud/unet/model/UpdateFirewallParam.java | 14 +++++++------- .../cn/ucloud/unet/client/UpdateFirewallTest.java | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ucloud-sdk-java-unet/src/main/java/cn/ucloud/unet/model/UpdateFirewallParam.java b/ucloud-sdk-java-unet/src/main/java/cn/ucloud/unet/model/UpdateFirewallParam.java index a58c46cf..c4ce7768 100755 --- a/ucloud-sdk-java-unet/src/main/java/cn/ucloud/unet/model/UpdateFirewallParam.java +++ b/ucloud-sdk-java-unet/src/main/java/cn/ucloud/unet/model/UpdateFirewallParam.java @@ -54,8 +54,8 @@ public List checkFirewallRule() throws ValidatorException { if (StringUtils.isBlank(rule.getProtocol())) { throw new ValidatorException(String.format(exceptionFormat, i, "protocol can not be empty")); } - if (rule.getPort() == null || rule.getPort() <= 0) { - throw new ValidatorException(String.format(exceptionFormat, i, "port can not be null or value <= 0")); + if (rule.getPort() == null || !rule.getPort().matches("^$|^[1-9][0-9]*$|^[1-9][0-9]*-[1-9][0-9]*$")) { + throw new ValidatorException(String.format(exceptionFormat, i, "port can not be null or port illegal")); } if (StringUtils.isBlank(rule.getIp())) { throw new ValidatorException(String.format(exceptionFormat, i, "ip can not be empty")); @@ -107,7 +107,7 @@ public void setRule(List rule) { public static class Rule { @SuppressWarnings("squid:S1170") - private final String ruleFormat = "%s|%d|%s|%s|%s"; + private final String ruleFormat = "%s|%s|%s|%s|%s"; @SuppressWarnings("squid:S1700") private String rule; @@ -121,7 +121,7 @@ public static class Rule { * 端口号 */ @NotNull(message = "port can not be null") - private Integer port; + private String port; /** * IP @@ -142,7 +142,7 @@ public static class Rule { private String priority; public Rule(@NotEmpty(message = "protocol can not be empty") String protocol, - @NotNull(message = "port can not be null") Integer port, + @NotNull(message = "port can not be null") String port, @NotEmpty(message = "ip can not be empty") String ip, @NotEmpty(message = "acceptOrNot can not be empty") String acceptOrNot, @NotEmpty(message = "priority can not be empty") String priority) { @@ -168,11 +168,11 @@ public void setProtocol(String protocol) { this.protocol = protocol; } - public Integer getPort() { + public String getPort() { return port; } - public void setPort(Integer port) { + public void setPort(String port) { this.port = port; } diff --git a/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/UpdateFirewallTest.java b/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/UpdateFirewallTest.java index 319f0b1d..1d839fbf 100755 --- a/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/UpdateFirewallTest.java +++ b/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/UpdateFirewallTest.java @@ -28,7 +28,7 @@ public void initData() { System.getenv("UCloudPublicKey")))); List rules = new ArrayList<>(); - rules.add(new UpdateFirewallParam.Rule("TCP", 24, "0.0.0.0/0", "ACCEPT", "MEDIUM")); + rules.add(new UpdateFirewallParam.Rule("TCP", "24-25", "0.0.0.0/0", "ACCEPT", "MEDIUM")); param = new UpdateFirewallParam("cn-sh2", "firewall-yzb2r03v", rules); } From abad465c84a4581618f334080672f67e21843243 Mon Sep 17 00:00:00 2001 From: jucyfer <502223422@qq.com> Date: Mon, 1 Jun 2020 01:08:04 +0800 Subject: [PATCH 03/16] =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=BA=86=E4=B9=8B?= =?UTF-8?q?=E5=89=8D=E7=9A=84=E6=B5=8B=E8=AF=95=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/ucloud/unet/client/UnetClient.java | 1 - 1 file changed, 1 deletion(-) diff --git a/ucloud-sdk-java-unet/src/main/java/cn/ucloud/unet/client/UnetClient.java b/ucloud-sdk-java-unet/src/main/java/cn/ucloud/unet/client/UnetClient.java index bbd4aa15..7785138d 100755 --- a/ucloud-sdk-java-unet/src/main/java/cn/ucloud/unet/client/UnetClient.java +++ b/ucloud-sdk-java-unet/src/main/java/cn/ucloud/unet/client/UnetClient.java @@ -1,4 +1,3 @@ -//不知道从哪里开始吐槽 package cn.ucloud.unet.client; import cn.ucloud.common.client.UcloudClient; From 26f2e693e4386c1134476e6691a5eab37bde0e39 Mon Sep 17 00:00:00 2001 From: jucyfer <502223422@qq.com> Date: Mon, 1 Jun 2020 09:01:49 +0800 Subject: [PATCH 04/16] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=86setPort?= =?UTF-8?q?=E6=96=B9=E6=B3=95=E5=9B=A0=E5=8F=82=E6=95=B0=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=EF=BC=88int->String=EF=BC=89=E5=8F=98=E5=8C=96=E4=BA=A7?= =?UTF-8?q?=E7=94=9F=E7=9A=84=E5=90=91=E5=90=8E=E5=85=BC=E5=AE=B9=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/ucloud/unet/model/UpdateFirewallParam.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ucloud-sdk-java-unet/src/main/java/cn/ucloud/unet/model/UpdateFirewallParam.java b/ucloud-sdk-java-unet/src/main/java/cn/ucloud/unet/model/UpdateFirewallParam.java index c4ce7768..5914857d 100755 --- a/ucloud-sdk-java-unet/src/main/java/cn/ucloud/unet/model/UpdateFirewallParam.java +++ b/ucloud-sdk-java-unet/src/main/java/cn/ucloud/unet/model/UpdateFirewallParam.java @@ -176,6 +176,10 @@ public void setPort(String port) { this.port = port; } + public void setPort(int port) { + this.port = Integer.toString(port); + } + public String getIp() { return ip; } From 0566981a95419593d6a867b3db899dd29f426399 Mon Sep 17 00:00:00 2001 From: jucyfer <502223422@qq.com> Date: Mon, 1 Jun 2020 11:27:14 +0800 Subject: [PATCH 05/16] =?UTF-8?q?=E5=B0=9D=E8=AF=95=E6=96=B0=E5=A2=9EFirew?= =?UTF-8?q?allRule=E7=B1=BB=EF=BC=8C=E7=94=A8=E4=BA=8E=E5=85=BC=E5=AE=B9?= =?UTF-8?q?=E5=8E=9F=E6=9C=ACdescribe=E5=92=8Cupdate=E4=B8=AD=E7=9A=84?= =?UTF-8?q?=E4=B8=A4=E4=B8=AA=E5=86=85=E9=83=A8=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/ucloud/unet/pojo/FirewallRule.java | 182 ++++++++++++++++++ 1 file changed, 182 insertions(+) create mode 100644 ucloud-sdk-java-unet/src/main/java/cn/ucloud/unet/pojo/FirewallRule.java diff --git a/ucloud-sdk-java-unet/src/main/java/cn/ucloud/unet/pojo/FirewallRule.java b/ucloud-sdk-java-unet/src/main/java/cn/ucloud/unet/pojo/FirewallRule.java new file mode 100644 index 00000000..c3f99877 --- /dev/null +++ b/ucloud-sdk-java-unet/src/main/java/cn/ucloud/unet/pojo/FirewallRule.java @@ -0,0 +1,182 @@ +package cn.ucloud.unet.pojo; + +import cn.ucloud.common.annotation.UcloudParam; +import com.google.gson.annotations.SerializedName; + +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; + +public class FirewallRule { + //---------------以下是DescribeFirewallResult.Rule的字段------------------ + /** + * 目标端口 + */ + @SerializedName("DstPort") + private String dstPort; + /** + * 优先级 + */ + @SerializedName("Priority") + private String piority; + + /** + * 协议类型 + */ + @SerializedName("ProtocolType") + private String protocolType; + /** + * 防火墙动作 + */ + @SerializedName("RuleAction") + private String ruleAction; + /** + * 源地址 + */ + @SerializedName("SrcIP") + private String srcIP; + + /** + * 备注 + */ + @SerializedName("Remark") + private String remark; + + //-----------------以下是UpdateFirewallParam.Rule的字段------------------- + @SuppressWarnings("squid:S1170") + private final String ruleFormat = "%s|%s|%s|%s|%s"; + @SuppressWarnings("squid:S1700") + private String rule; + + /** + * 协议: TCP, UDP, ... + */ + @NotEmpty(message = "protocol can not be empty") + private String protocol; + + /** + * 端口号 + */ + @NotNull(message = "port can not be null") + private String port; + + /** + * IP + */ + @NotEmpty(message = "ip can not be empty") + private String ip; + + /** + * ACCEPT（接受）, DROP（拒绝） + */ + @NotEmpty(message = "acceptOrNot can not be empty") + private String acceptOrNot; + + /** + * 优先级：HIGH（高），MEDIUM（中），LOW（低） + */ + @NotEmpty(message = "priority can not be empty") + private String priority; + + //------------------describe的getter&setter-------------------------- + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getDstPort() { + return dstPort; + } + + public void setDstPort(String dstPort) { + this.dstPort = dstPort; + } + + public String getPiority() { + return piority; + } + + public void setPiority(String piority) { + this.piority = piority; + } + + public String getProtocolType() { + return protocolType; + } + + public void setProtocolType(String protocolType) { + this.protocolType = protocolType; + } + + public String getRuleAction() { + return ruleAction; + } + + public void setRuleAction(String ruleAction) { + this.ruleAction = ruleAction; + } + + public String getSrcIP() { + return srcIP; + } + + public void setSrcIP(String srcIP) { + this.srcIP = srcIP; + } + + //------------------update的getter&setter-------------------------- + + @NotEmpty(message = "rule can not be empty") + @UcloudParam("Rule") + public String getRule() { + rule = String.format(ruleFormat, protocol, port, ip, acceptOrNot, priority); + return rule; + } + + public String getProtocol() { + return protocol; + } + + public void setProtocol(String protocol) { + this.protocol = protocol; + } + + public String getPort() { + return port; + } + + public void setPort(String port) { + this.port = port; + } + + public void setPort(int port) { + this.port = Integer.toString(port); + } + + public String getIp() { + return ip; + } + + public void setIp(String ip) { + this.ip = ip; + } + + public String getAcceptOrNot() { + return acceptOrNot; + } + + public void setAcceptOrNot(String acceptOrNot) { + this.acceptOrNot = acceptOrNot; + } + + public String getPriority() { + return priority; + } + + public void setPriority(String priority) { + this.priority = priority; + } + +} From af3e87898d8aa01b8355f6d78c572944f5b27042 Mon Sep 17 00:00:00 2001 From: jucyfer <502223422@qq.com> Date: Mon, 1 Jun 2020 12:04:10 +0800 Subject: [PATCH 06/16] =?UTF-8?q?1.=E6=96=B0=E5=A2=9E=E4=BA=86UnetClient?= =?UTF-8?q?=E7=9A=84=E5=B7=A5=E5=8E=82=E7=B1=BB=E5=8F=8A=E6=96=B9=E6=B3=95?= =?UTF-8?q?=EF=BC=8C=E7=AE=80=E5=8C=96=E5=88=9B=E5=BB=BA=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=EF=BC=9B=202.=E6=96=B0=E5=A2=9E=E4=BA=86UpdateFirewallParam.Ru?= =?UTF-8?q?le=E7=9A=84remark=E5=AD=97=E6=AE=B5=EF=BC=8C=E7=8E=B0=E5=9C=A8?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=96=B0=E5=A2=9E=E8=A7=84=E5=88=99=E6=97=B6?= =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E9=80=89=E6=8B=A9=E4=BF=9D=E7=95=99=E6=88=96?= =?UTF-8?q?=E6=9B=B4=E6=94=B9=E5=B7=B2=E5=AD=98=E5=9C=A8=E7=9A=84=E8=A7=84?= =?UTF-8?q?=E5=88=99=E5=A4=87=E6=B3=A8=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/ucloud/unet/client/UnetClients.java | 42 +++++++++++++++++++ .../unet/model/UpdateFirewallParam.java | 32 +++++++++++++- 2 files changed, 72 insertions(+), 2 deletions(-) create mode 100644 ucloud-sdk-java-unet/src/main/java/cn/ucloud/unet/client/UnetClients.java diff --git a/ucloud-sdk-java-unet/src/main/java/cn/ucloud/unet/client/UnetClients.java b/ucloud-sdk-java-unet/src/main/java/cn/ucloud/unet/client/UnetClients.java new file mode 100644 index 00000000..443b5910 --- /dev/null +++ b/ucloud-sdk-java-unet/src/main/java/cn/ucloud/unet/client/UnetClients.java @@ -0,0 +1,42 @@ +package cn.ucloud.unet.client; + +import cn.ucloud.common.pojo.Account; +import cn.ucloud.unet.pojo.UnetConfig; + +/** + * UnetClient的工厂类 + * + * @author jucyfer + */ +public abstract class UnetClients { + /** + * * 工厂方法，生成一个默认的UnetClient实现 + * + * @param account Account对象，包含publicKey和privateKey + * @return 当前采用DefaultUnetClient默认实现 + */ + public static UnetClient getDefaultInstance(Account account) { + return new DefaultUnetClient(new UnetConfig(account)); + } + + /** + * * 工厂方法，生成一个默认的UnetClient实现 + * + * @param privateKey privateKey字符串 + * @param publicKey privateKey字符串 + * @return 当前采用DefaultUnetClient默认实现 + */ + public static UnetClient getDefaultInstance(String privateKey, String publicKey) { + return new DefaultUnetClient(new UnetConfig(new Account(privateKey, publicKey))); + } + + /** + * * 工厂方法，生成一个默认的UnetClient实现 + * + * @param config UnetConfig对象 + * @return 当前采用DefaultUnetClient默认实现 + */ + public static UnetClient getDefaultInstance(UnetConfig config) { + return new DefaultUnetClient(config); + } +} diff --git a/ucloud-sdk-java-unet/src/main/java/cn/ucloud/unet/model/UpdateFirewallParam.java b/ucloud-sdk-java-unet/src/main/java/cn/ucloud/unet/model/UpdateFirewallParam.java index 5914857d..b6c4e1dc 100755 --- a/ucloud-sdk-java-unet/src/main/java/cn/ucloud/unet/model/UpdateFirewallParam.java +++ b/ucloud-sdk-java-unet/src/main/java/cn/ucloud/unet/model/UpdateFirewallParam.java @@ -107,7 +107,7 @@ public void setRule(List rule) { public static class Rule { @SuppressWarnings("squid:S1170") - private final String ruleFormat = "%s|%s|%s|%s|%s"; + private final String ruleFormat = "%s|%s|%s|%s|%s|%s"; @SuppressWarnings("squid:S1700") private String rule; @@ -141,6 +141,11 @@ public static class Rule { @NotEmpty(message = "priority can not be empty") private String priority; + /** + * 备注：用户自定义备注 + */ + private String remark; + public Rule(@NotEmpty(message = "protocol can not be empty") String protocol, @NotNull(message = "port can not be null") String port, @NotEmpty(message = "ip can not be empty") String ip, @@ -151,12 +156,27 @@ public Rule(@NotEmpty(message = "protocol can not be empty") String protocol, this.ip = ip; this.acceptOrNot = acceptOrNot; this.priority = priority; + this.remark = ""; + } + + public Rule(@NotEmpty(message = "protocol can not be empty") String protocol, + @NotNull(message = "port can not be null") String port, + @NotEmpty(message = "ip can not be empty") String ip, + @NotEmpty(message = "acceptOrNot can not be empty") String acceptOrNot, + @NotEmpty(message = "priority can not be empty") String priority, + String remark) { + this.protocol = protocol; + this.port = port; + this.ip = ip; + this.acceptOrNot = acceptOrNot; + this.priority = priority; + this.remark = remark == null ? "" : remark; } @NotEmpty(message = "rule can not be empty") @UcloudParam("Rule") public String getRule() { - rule = String.format(ruleFormat, protocol, port, ip, acceptOrNot, priority); + rule = String.format(ruleFormat, protocol, port, ip, acceptOrNot, priority, remark); return rule; } @@ -203,5 +223,13 @@ public String getPriority() { public void setPriority(String priority) { this.priority = priority; } + + public String getRemark(){ + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } } } From 8e3e18a333d858e0624208e8f55e7a5a54d3ae2a Mon Sep 17 00:00:00 2001 From: jucyfer <502223422@qq.com> Date: Mon, 1 Jun 2020 12:22:25 +0800 Subject: [PATCH 07/16] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86UpdateFirewall?= =?UTF-8?q?Test=E6=B5=8B=E8=AF=95=E7=94=A8=E4=BE=8B=EF=BC=8C=E9=85=8D?= =?UTF-8?q?=E5=90=88=E4=B9=8B=E5=89=8D=E7=9A=84=E6=9B=B4=E6=94=B9=EF=BC=8C?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BA=86remark=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/test/java/cn/ucloud/unet/client/UpdateFirewallTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/UpdateFirewallTest.java b/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/UpdateFirewallTest.java index 1d839fbf..9f205f84 100755 --- a/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/UpdateFirewallTest.java +++ b/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/UpdateFirewallTest.java @@ -28,7 +28,7 @@ public void initData() { System.getenv("UCloudPublicKey")))); List rules = new ArrayList<>(); - rules.add(new UpdateFirewallParam.Rule("TCP", "24-25", "0.0.0.0/0", "ACCEPT", "MEDIUM")); + rules.add(new UpdateFirewallParam.Rule("TCP", "24-25", "0.0.0.0/0", "ACCEPT", "MEDIUM","TestRemark")); param = new UpdateFirewallParam("cn-sh2", "firewall-yzb2r03v", rules); } From 7dfc9eada704b9d22d19d853b0beb2e8ef0d6922 Mon Sep 17 00:00:00 2001 From: jucyfer <502223422@qq.com> Date: Mon, 1 Jun 2020 12:25:19 +0800 Subject: [PATCH 08/16] no comments --- .../src/main/java/cn/ucloud/unet/pojo/FirewallRule.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/ucloud-sdk-java-unet/src/main/java/cn/ucloud/unet/pojo/FirewallRule.java b/ucloud-sdk-java-unet/src/main/java/cn/ucloud/unet/pojo/FirewallRule.java index c3f99877..73c58b52 100644 --- a/ucloud-sdk-java-unet/src/main/java/cn/ucloud/unet/pojo/FirewallRule.java +++ b/ucloud-sdk-java-unet/src/main/java/cn/ucloud/unet/pojo/FirewallRule.java @@ -6,6 +6,10 @@ import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; +/** + * 计划用来替代Firewall中describe和update的pojo + */ +@Deprecated public class FirewallRule { //---------------以下是DescribeFirewallResult.Rule的字段------------------ /** @@ -43,7 +47,7 @@ public class FirewallRule { //-----------------以下是UpdateFirewallParam.Rule的字段------------------- @SuppressWarnings("squid:S1170") - private final String ruleFormat = "%s|%s|%s|%s|%s"; + private final String ruleFormat = "%s|%s|%s|%s|%s|%s"; @SuppressWarnings("squid:S1700") private String rule; @@ -53,6 +57,7 @@ public class FirewallRule { @NotEmpty(message = "protocol can not be empty") private String protocol; + /** * 端口号 */ From f86091a3b3d06c01aeb0f5253783f50a96786743 Mon Sep 17 00:00:00 2001 From: jucyfer <502223422@qq.com> Date: Mon, 1 Jun 2020 17:56:03 +0800 Subject: [PATCH 09/16] =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=BA=86=E4=B8=A4?= =?UTF-8?q?=E4=B8=AA=E8=A1=8C=E4=B8=BA=E4=B8=8E=E5=8E=9F=E8=AE=BE=E8=AE=A1?= =?UTF-8?q?=E4=B8=8D=E4=B8=80=E8=87=B4=E7=9A=84=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/ucloud/unet/client/UnetClients.java | 42 ---- .../cn/ucloud/unet/pojo/FirewallRule.java | 187 ------------------ 2 files changed, 229 deletions(-) delete mode 100644 ucloud-sdk-java-unet/src/main/java/cn/ucloud/unet/client/UnetClients.java delete mode 100644 ucloud-sdk-java-unet/src/main/java/cn/ucloud/unet/pojo/FirewallRule.java diff --git a/ucloud-sdk-java-unet/src/main/java/cn/ucloud/unet/client/UnetClients.java b/ucloud-sdk-java-unet/src/main/java/cn/ucloud/unet/client/UnetClients.java deleted file mode 100644 index 443b5910..00000000 --- a/ucloud-sdk-java-unet/src/main/java/cn/ucloud/unet/client/UnetClients.java +++ /dev/null @@ -1,42 +0,0 @@ -package cn.ucloud.unet.client; - -import cn.ucloud.common.pojo.Account; -import cn.ucloud.unet.pojo.UnetConfig; - -/** - * UnetClient的工厂类 - * - * @author jucyfer - */ -public abstract class UnetClients { - /** - * * 工厂方法，生成一个默认的UnetClient实现 - * - * @param account Account对象，包含publicKey和privateKey - * @return 当前采用DefaultUnetClient默认实现 - */ - public static UnetClient getDefaultInstance(Account account) { - return new DefaultUnetClient(new UnetConfig(account)); - } - - /** - * * 工厂方法，生成一个默认的UnetClient实现 - * - * @param privateKey privateKey字符串 - * @param publicKey privateKey字符串 - * @return 当前采用DefaultUnetClient默认实现 - */ - public static UnetClient getDefaultInstance(String privateKey, String publicKey) { - return new DefaultUnetClient(new UnetConfig(new Account(privateKey, publicKey))); - } - - /** - * * 工厂方法，生成一个默认的UnetClient实现 - * - * @param config UnetConfig对象 - * @return 当前采用DefaultUnetClient默认实现 - */ - public static UnetClient getDefaultInstance(UnetConfig config) { - return new DefaultUnetClient(config); - } -} diff --git a/ucloud-sdk-java-unet/src/main/java/cn/ucloud/unet/pojo/FirewallRule.java b/ucloud-sdk-java-unet/src/main/java/cn/ucloud/unet/pojo/FirewallRule.java deleted file mode 100644 index 73c58b52..00000000 --- a/ucloud-sdk-java-unet/src/main/java/cn/ucloud/unet/pojo/FirewallRule.java +++ /dev/null @@ -1,187 +0,0 @@ -package cn.ucloud.unet.pojo; - -import cn.ucloud.common.annotation.UcloudParam; -import com.google.gson.annotations.SerializedName; - -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; - -/** - * 计划用来替代Firewall中describe和update的pojo - */ -@Deprecated -public class FirewallRule { - //---------------以下是DescribeFirewallResult.Rule的字段------------------ - /** - * 目标端口 - */ - @SerializedName("DstPort") - private String dstPort; - /** - * 优先级 - */ - @SerializedName("Priority") - private String piority; - - /** - * 协议类型 - */ - @SerializedName("ProtocolType") - private String protocolType; - /** - * 防火墙动作 - */ - @SerializedName("RuleAction") - private String ruleAction; - /** - * 源地址 - */ - @SerializedName("SrcIP") - private String srcIP; - - /** - * 备注 - */ - @SerializedName("Remark") - private String remark; - - //-----------------以下是UpdateFirewallParam.Rule的字段------------------- - @SuppressWarnings("squid:S1170") - private final String ruleFormat = "%s|%s|%s|%s|%s|%s"; - @SuppressWarnings("squid:S1700") - private String rule; - - /** - * 协议: TCP, UDP, ... - */ - @NotEmpty(message = "protocol can not be empty") - private String protocol; - - - /** - * 端口号 - */ - @NotNull(message = "port can not be null") - private String port; - - /** - * IP - */ - @NotEmpty(message = "ip can not be empty") - private String ip; - - /** - * ACCEPT（接受）, DROP（拒绝） - */ - @NotEmpty(message = "acceptOrNot can not be empty") - private String acceptOrNot; - - /** - * 优先级：HIGH（高），MEDIUM（中），LOW（低） - */ - @NotEmpty(message = "priority can not be empty") - private String priority; - - //------------------describe的getter&setter-------------------------- - public String getRemark() { - return remark; - } - - public void setRemark(String remark) { - this.remark = remark; - } - - public String getDstPort() { - return dstPort; - } - - public void setDstPort(String dstPort) { - this.dstPort = dstPort; - } - - public String getPiority() { - return piority; - } - - public void setPiority(String piority) { - this.piority = piority; - } - - public String getProtocolType() { - return protocolType; - } - - public void setProtocolType(String protocolType) { - this.protocolType = protocolType; - } - - public String getRuleAction() { - return ruleAction; - } - - public void setRuleAction(String ruleAction) { - this.ruleAction = ruleAction; - } - - public String getSrcIP() { - return srcIP; - } - - public void setSrcIP(String srcIP) { - this.srcIP = srcIP; - } - - //------------------update的getter&setter-------------------------- - - @NotEmpty(message = "rule can not be empty") - @UcloudParam("Rule") - public String getRule() { - rule = String.format(ruleFormat, protocol, port, ip, acceptOrNot, priority); - return rule; - } - - public String getProtocol() { - return protocol; - } - - public void setProtocol(String protocol) { - this.protocol = protocol; - } - - public String getPort() { - return port; - } - - public void setPort(String port) { - this.port = port; - } - - public void setPort(int port) { - this.port = Integer.toString(port); - } - - public String getIp() { - return ip; - } - - public void setIp(String ip) { - this.ip = ip; - } - - public String getAcceptOrNot() { - return acceptOrNot; - } - - public void setAcceptOrNot(String acceptOrNot) { - this.acceptOrNot = acceptOrNot; - } - - public String getPriority() { - return priority; - } - - public void setPriority(String priority) { - this.priority = priority; - } - -} From f13c3c24a1c82301e5f67423f450050b6d963635 Mon Sep 17 00:00:00 2001 From: jucyfer <502223422@qq.com> Date: Tue, 2 Jun 2020 22:01:45 +0800 Subject: [PATCH 10/16] =?UTF-8?q?1.=E4=B8=BACreateFirewallParam=E5=92=8CUp?= =?UTF-8?q?dateFirewallParam=E5=88=9B=E5=BB=BA=E4=BA=86=E6=96=B0=E7=9A=84?= =?UTF-8?q?=E6=9E=84=E9=80=A0=E6=96=B9=E6=B3=95=EF=BC=8C=E5=8F=AF=E4=BB=A5?= =?UTF-8?q?=E6=8E=A5=E5=8F=97=E4=B8=80=E4=B8=AADescribeFirewallResult.Fire?= =?UTF-8?q?wallData=E5=AF=B9=E8=B1=A1=EF=BC=8C=E6=9D=A5=E5=AE=9E=E7=8E=B0?= =?UTF-8?q?=E8=87=AA=E5=8A=A8=E8=BD=AC=E6=8D=A2=EF=BC=9B=E6=AD=A4=E5=A4=96?= =?UTF-8?q?=EF=BC=8C=E5=81=9A=E4=BA=86=E4=B8=AA=E6=8D=B7=E5=BE=84=E6=96=B9?= =?UTF-8?q?=E6=B3=95=EF=BC=8C=E5=8F=AF=E4=BB=A5=E7=9B=B4=E6=8E=A5=E5=AF=B9?= =?UTF-8?q?=E4=B8=A4=E4=B8=AAFirewallParam=E8=BF=9B=E8=A1=8CaddRule?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=E3=80=82=202.=E4=B8=BACreateFirewallParam.Ru?= =?UTF-8?q?le=E5=A2=9E=E5=8A=A0=E4=BA=86remark=E5=AD=97=E6=AE=B5=EF=BC=8C?= =?UTF-8?q?=E5=B9=B6=E5=B0=86port=E4=BB=8EInteger=E6=94=B9=E6=88=90String?= =?UTF-8?q?=EF=BC=8C=E4=B8=8EUpdateFirewallParam=E9=87=8C=E7=9A=84?= =?UTF-8?q?=E8=A1=8C=E4=B8=BA=E4=BF=9D=E6=8C=81=E4=B8=80=E8=87=B4=E3=80=82?= =?UTF-8?q?=203.=E5=85=B6=E4=BB=96=E5=90=91=E5=90=8E=E5=85=BC=E5=AE=B9?= =?UTF-8?q?=E6=80=A7=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../unet/model/CreateFirewallParam.java | 75 ++++++++++++++++--- .../unet/model/UpdateFirewallParam.java | 33 +++++++- 2 files changed, 97 insertions(+), 11 deletions(-) diff --git a/ucloud-sdk-java-unet/src/main/java/cn/ucloud/unet/model/CreateFirewallParam.java b/ucloud-sdk-java-unet/src/main/java/cn/ucloud/unet/model/CreateFirewallParam.java index a050f39c..6a0f16c4 100755 --- a/ucloud-sdk-java-unet/src/main/java/cn/ucloud/unet/model/CreateFirewallParam.java +++ b/ucloud-sdk-java-unet/src/main/java/cn/ucloud/unet/model/CreateFirewallParam.java @@ -10,6 +10,7 @@ import javax.validation.constraints.NotNull; import java.util.ArrayList; import java.util.List; +import java.util.stream.Collectors; /** * @description: 创建防火墙 参数类 @@ -68,6 +69,9 @@ public List checkFirewallRule() throws ValidatorException { if (StringUtils.isBlank(rule.getProtocol())) { throw new ValidatorException(String.format(exceptionFormat, i, "protocol can not be empty")); } + if (rule.getPort() == null || !rule.getPort().matches("^$|^[1-9][0-9]*$|^[1-9][0-9]*-[1-9][0-9]*$")) { + throw new ValidatorException(String.format(exceptionFormat, i, "illegal port")); + } if (StringUtils.isBlank(rule.getIp())) { throw new ValidatorException(String.format(exceptionFormat, i, "ip can not be empty")); } @@ -93,6 +97,25 @@ public CreateFirewallParam(String region, this.name = name; } + public CreateFirewallParam(String region, DescribeFirewallResult.FirewallData firewallData) { + super("CreateFirewall"); + this.region = region; + this.rule = this.rule = firewallData + .getRule() + .parallelStream() + .map(rule -> + new Rule( + rule.getProtocolType(), + rule.getDstPort(), + rule.getSrcIP(), + rule.getRuleAction(), + rule.getPiority(), + rule.getRemark() + ) + ) + .collect(Collectors.toList()); + } + public String getRegion() { return region; } @@ -133,10 +156,17 @@ public void setRule(List rule) { this.rule = rule; } + public void addRule(Rule rule){ + this.rule.add(rule); + } + + public void addRule(String protocol,String port,String ip,String action,String priority,String remark){ + this.rule.add(new Rule(protocol,port,ip,action,priority,remark)); + } public static class Rule { @SuppressWarnings("squid:S1170") - private final String ruleFormatWithPort = "%s|%d|%s|%s|%s"; + private final String ruleFormatWithPort = "%s|%s|%s|%s|%s"; @SuppressWarnings("squid:S1170") private final String ruleFormatWithoutPort = "%s||%s|%s|%s"; @SuppressWarnings("squid:S1700") @@ -150,7 +180,7 @@ public static class Rule { /** * 端口号 */ - private Integer port; + private String port; /** * IP @@ -167,8 +197,13 @@ public static class Rule { */ private String priority; + /** + * 用户备注 + */ + private String remark; + public Rule(String protocol, - Integer port, + String port, String ip, String acceptOrNot, String priority) { @@ -177,13 +212,28 @@ public Rule(String protocol, this.ip = ip; this.acceptOrNot = acceptOrNot; this.priority = priority; + this.remark = ""; + } + + public Rule(String protocol, + String port, + String ip, + String acceptOrNot, + String priority, + String remark) { + this.protocol = protocol; + this.port = port; + this.ip = ip; + this.acceptOrNot = acceptOrNot; + this.priority = priority; + this.remark = remark; } public String getRule() { - if (port == null){ - rule = String.format(ruleFormatWithoutPort, protocol, ip, acceptOrNot, priority); - }else { - rule = String.format(ruleFormatWithPort, protocol, port, ip, acceptOrNot, priority); + if (port == null) { + rule = String.format(ruleFormatWithoutPort, protocol, ip, acceptOrNot, priority, remark); + } else { + rule = String.format(ruleFormatWithPort, protocol, port, ip, acceptOrNot, priority, remark); } return rule; } @@ -196,11 +246,11 @@ public void setProtocol(String protocol) { this.protocol = protocol; } - public Integer getPort() { + public String getPort() { return port; } - public void setPort(Integer port) { + public void setPort(String port) { this.port = port; } @@ -228,5 +278,12 @@ public void setPriority(String priority) { this.priority = priority; } + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } } } diff --git a/ucloud-sdk-java-unet/src/main/java/cn/ucloud/unet/model/UpdateFirewallParam.java b/ucloud-sdk-java-unet/src/main/java/cn/ucloud/unet/model/UpdateFirewallParam.java index b6c4e1dc..8a2fe507 100755 --- a/ucloud-sdk-java-unet/src/main/java/cn/ucloud/unet/model/UpdateFirewallParam.java +++ b/ucloud-sdk-java-unet/src/main/java/cn/ucloud/unet/model/UpdateFirewallParam.java @@ -10,6 +10,7 @@ import javax.validation.constraints.NotNull; import java.util.ArrayList; import java.util.List; +import java.util.stream.Collectors; /** * @description: 更新防火墙 @@ -55,7 +56,7 @@ public List checkFirewallRule() throws ValidatorException { throw new ValidatorException(String.format(exceptionFormat, i, "protocol can not be empty")); } if (rule.getPort() == null || !rule.getPort().matches("^$|^[1-9][0-9]*$|^[1-9][0-9]*-[1-9][0-9]*$")) { - throw new ValidatorException(String.format(exceptionFormat, i, "port can not be null or port illegal")); + throw new ValidatorException(String.format(exceptionFormat, i, "illegal port")); } if (StringUtils.isBlank(rule.getIp())) { throw new ValidatorException(String.format(exceptionFormat, i, "ip can not be empty")); @@ -81,6 +82,26 @@ public UpdateFirewallParam(@NotEmpty(message = "region can not be empty") String this.rule = rule; } + public UpdateFirewallParam(String region, DescribeFirewallResult.FirewallData firewallData) { + super("UpdateFirewall"); + this.region = region; + this.fwId = firewallData.getFwId(); + this.rule = firewallData + .getRule() + .parallelStream() + .map(rule -> + new Rule( + rule.getProtocolType(), + rule.getDstPort(), + rule.getSrcIP(), + rule.getRuleAction(), + rule.getPiority(), + rule.getRemark() + ) + ) + .collect(Collectors.toList()); + } + public String getRegion() { return region; } @@ -105,6 +126,14 @@ public void setRule(List rule) { this.rule = rule; } + public void addRule(Rule rule){ + this.rule.add(rule); + } + + public void addRule(String protocol,String port,String ip,String action,String priority,String remark){ + this.rule.add(new Rule(protocol,port,ip,action,priority,remark)); + } + public static class Rule { @SuppressWarnings("squid:S1170") private final String ruleFormat = "%s|%s|%s|%s|%s|%s"; @@ -224,7 +253,7 @@ public void setPriority(String priority) { this.priority = priority; } - public String getRemark(){ + public String getRemark() { return remark; } From 12ead56b909ae85c5e87fd5992e3eb4d55ff7fa9 Mon Sep 17 00:00:00 2001 From: jucyfer <502223422@qq.com> Date: Tue, 2 Jun 2020 22:05:42 +0800 Subject: [PATCH 11/16] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E4=B8=80?= =?UTF-8?q?=E5=A4=84=E5=B0=8Fbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/ucloud/unet/model/CreateFirewallParam.java | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/ucloud-sdk-java-unet/src/main/java/cn/ucloud/unet/model/CreateFirewallParam.java b/ucloud-sdk-java-unet/src/main/java/cn/ucloud/unet/model/CreateFirewallParam.java index 6a0f16c4..d8bd2da0 100755 --- a/ucloud-sdk-java-unet/src/main/java/cn/ucloud/unet/model/CreateFirewallParam.java +++ b/ucloud-sdk-java-unet/src/main/java/cn/ucloud/unet/model/CreateFirewallParam.java @@ -156,19 +156,17 @@ public void setRule(List rule) { this.rule = rule; } - public void addRule(Rule rule){ + public void addRule(Rule rule) { this.rule.add(rule); } - public void addRule(String protocol,String port,String ip,String action,String priority,String remark){ - this.rule.add(new Rule(protocol,port,ip,action,priority,remark)); + public void addRule(String protocol, String port, String ip, String action, String priority, String remark) { + this.rule.add(new Rule(protocol, port, ip, action, priority, remark)); } public static class Rule { @SuppressWarnings("squid:S1170") private final String ruleFormatWithPort = "%s|%s|%s|%s|%s"; - @SuppressWarnings("squid:S1170") - private final String ruleFormatWithoutPort = "%s||%s|%s|%s"; @SuppressWarnings("squid:S1700") private String rule; @@ -230,11 +228,7 @@ public Rule(String protocol, } public String getRule() { - if (port == null) { - rule = String.format(ruleFormatWithoutPort, protocol, ip, acceptOrNot, priority, remark); - } else { - rule = String.format(ruleFormatWithPort, protocol, port, ip, acceptOrNot, priority, remark); - } + rule = String.format(ruleFormatWithPort, protocol, port, ip, acceptOrNot, priority, remark); return rule; } From b2bd8b8c1c8613751c6a94b5fea2cdf27c26e40e Mon Sep 17 00:00:00 2001 From: jucyfer <502223422@qq.com> Date: Tue, 2 Jun 2020 22:19:15 +0800 Subject: [PATCH 12/16] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86README?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 62e54fc6..e4bf298f 100755 --- a/README.md +++ b/README.md @@ -1,5 +1,7 @@ ## ucloud-sdk-java ucloud开发者工具套件（SDK）。
+jyf-custom分支，二次开发自ucloud的0.8.3.0-release版本。
+不排除重构可能
面向UCloud的多个产品服务，目前包括： - uhost - udisk From e77dd3c90fb8ce242f7d1194b3bbff6a47aa7905 Mon Sep 17 00:00:00 2001 From: jucyfer <502223422@qq.com> Date: Tue, 2 Jun 2020 22:44:39 +0800 Subject: [PATCH 13/16] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E4=BD=9C?= =?UTF-8?q?=E8=80=85=E4=BF=A1=E6=81=AF=E5=92=8Cmd?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- .../main/java/cn/ucloud/unet/model/CreateFirewallParam.java | 4 ++-- .../main/java/cn/ucloud/unet/model/UpdateFirewallParam.java | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index e4bf298f..4b03cc54 100755 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ ## ucloud-sdk-java ucloud开发者工具套件（SDK）。
-jyf-custom分支，二次开发自ucloud的0.8.3.0-release版本。
+jyf-custom分支，基于ucloud主分支的0.8.3.0-release版本进行的二次开发。
不排除重构可能
面向UCloud的多个产品服务，目前包括： - uhost diff --git a/ucloud-sdk-java-unet/src/main/java/cn/ucloud/unet/model/CreateFirewallParam.java b/ucloud-sdk-java-unet/src/main/java/cn/ucloud/unet/model/CreateFirewallParam.java index d8bd2da0..fb5ce6b0 100755 --- a/ucloud-sdk-java-unet/src/main/java/cn/ucloud/unet/model/CreateFirewallParam.java +++ b/ucloud-sdk-java-unet/src/main/java/cn/ucloud/unet/model/CreateFirewallParam.java @@ -14,8 +14,8 @@ /** * @description: 创建防火墙 参数类 - * @author: joshua - * @E-mail: joshua.yin@ucloud.cn + * @author: joshua jucyfer + * @E-mail: joshua.yin@ucloud.cn 502223422@qq.com * @date: 2018/9/27 11:31 */ public class CreateFirewallParam extends BaseRequestParam { diff --git a/ucloud-sdk-java-unet/src/main/java/cn/ucloud/unet/model/UpdateFirewallParam.java b/ucloud-sdk-java-unet/src/main/java/cn/ucloud/unet/model/UpdateFirewallParam.java index 8a2fe507..ad40509f 100755 --- a/ucloud-sdk-java-unet/src/main/java/cn/ucloud/unet/model/UpdateFirewallParam.java +++ b/ucloud-sdk-java-unet/src/main/java/cn/ucloud/unet/model/UpdateFirewallParam.java @@ -14,8 +14,8 @@ /** * @description: 更新防火墙 - * @author: joshua - * @E-mail: joshua.yin@ucloud.cn + * @author: joshua jucyfer + * @E-mail: joshua.yin@ucloud.cn 502223422@qq.com * @date: 2018/9/27 15:43 */ public class UpdateFirewallParam extends BaseRequestParam { From bd687e6ea266365486bc5988f90fa14adaa912a9 Mon Sep 17 00:00:00 2001 From: jucyfer <502223422@qq.com> Date: Tue, 2 Jun 2020 22:55:55 +0800 Subject: [PATCH 14/16] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BA=86UnetClient?= =?UTF-8?q?=E7=9A=84=E9=BB=98=E8=AE=A4=E5=B7=A5=E5=8E=82=E7=B1=BB=EF=BC=8C?= =?UTF-8?q?=E6=8F=90=E4=BE=9B=E4=BA=863=E4=B8=AAshortcut=E6=96=B9=E6=B3=95?= =?UTF-8?q?=EF=BC=8C=E9=9A=90=E8=97=8F=E4=BA=86=E5=AF=B9DefaultUnetClient?= =?UTF-8?q?=E7=9A=84=E7=9B=B4=E6=8E=A5=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/ucloud/unet/client/UnetClients.java | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 ucloud-sdk-java-unet/src/main/java/cn/ucloud/unet/client/UnetClients.java diff --git a/ucloud-sdk-java-unet/src/main/java/cn/ucloud/unet/client/UnetClients.java b/ucloud-sdk-java-unet/src/main/java/cn/ucloud/unet/client/UnetClients.java new file mode 100644 index 00000000..4ab08880 --- /dev/null +++ b/ucloud-sdk-java-unet/src/main/java/cn/ucloud/unet/client/UnetClients.java @@ -0,0 +1,38 @@ +package cn.ucloud.unet.client; + +import cn.ucloud.common.pojo.Account; +import cn.ucloud.unet.pojo.UnetConfig; + +/** + * UnetClient的工厂类 + * @author jucyfer + */ +public abstract class UnetClients { + /** + * 根据公私钥创建默认实现 + * @param privateKey 私钥 + * @param publicKey 公钥 + * @return + */ + public static UnetClient getDefaultInstance(String privateKey,String publicKey){ + return new DefaultUnetClient(new UnetConfig(new Account(privateKey,publicKey))); + } + + /** + * 根据指定Account创建默认实现 + * @param account {@link cn.ucloud.common.pojo.Account}对象 + * @return + */ + public static UnetClient getDefaultInstance(Account account){ + return new DefaultUnetClient(new UnetConfig(account)); + } + + /** + * 根据指定UnetConfig创建默认实现 + * @param unetConfig {@link cn.ucloud.unet.pojo.UnetConfig}对象 + * @return + */ + public static UnetClient getDefaultInstance(UnetConfig unetConfig){ + return new DefaultUnetClient(unetConfig); + } +} From 64c18e9372385636d2a03f4e12c639d122e21a97 Mon Sep 17 00:00:00 2001 From: jucyfer <502223422@qq.com> Date: Tue, 2 Jun 2020 22:57:08 +0800 Subject: [PATCH 15/16] =?UTF-8?q?=E8=A1=A5=E5=85=A8=E4=BA=86=E7=9B=B8?= =?UTF-8?q?=E5=BA=94=E6=B3=A8=E9=87=8A=E6=96=87=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/ucloud/unet/client/UnetClients.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ucloud-sdk-java-unet/src/main/java/cn/ucloud/unet/client/UnetClients.java b/ucloud-sdk-java-unet/src/main/java/cn/ucloud/unet/client/UnetClients.java index 4ab08880..2837ea5e 100644 --- a/ucloud-sdk-java-unet/src/main/java/cn/ucloud/unet/client/UnetClients.java +++ b/ucloud-sdk-java-unet/src/main/java/cn/ucloud/unet/client/UnetClients.java @@ -12,7 +12,7 @@ public abstract class UnetClients { * 根据公私钥创建默认实现 * @param privateKey 私钥 * @param publicKey 公钥 - * @return + * @return {@link cn.ucloud.unet.client.UnetClient}实例 */ public static UnetClient getDefaultInstance(String privateKey,String publicKey){ return new DefaultUnetClient(new UnetConfig(new Account(privateKey,publicKey))); @@ -21,7 +21,7 @@ public static UnetClient getDefaultInstance(String privateKey,String publicKey){ /** * 根据指定Account创建默认实现 * @param account {@link cn.ucloud.common.pojo.Account}对象 - * @return + * @return {@link cn.ucloud.unet.client.UnetClient}实例 */ public static UnetClient getDefaultInstance(Account account){ return new DefaultUnetClient(new UnetConfig(account)); @@ -30,7 +30,7 @@ public static UnetClient getDefaultInstance(Account account){ /** * 根据指定UnetConfig创建默认实现 * @param unetConfig {@link cn.ucloud.unet.pojo.UnetConfig}对象 - * @return + * @return {@link cn.ucloud.unet.client.UnetClient}实例 */ public static UnetClient getDefaultInstance(UnetConfig unetConfig){ return new DefaultUnetClient(unetConfig); From e5581ce91f31795453822e49aacd92ccb4b4f55f Mon Sep 17 00:00:00 2001 From: jucyfer <502223422@qq.com> Date: Tue, 2 Jun 2020 23:08:14 +0800 Subject: [PATCH 16/16] =?UTF-8?q?=E6=89=B9=E9=87=8F=E6=9B=B4=E6=94=B9?= =?UTF-8?q?=E4=BA=86=E6=89=80=E6=9C=89=E7=9A=84Unet=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E6=B5=8B=E8=AF=95=E7=94=A8=E4=BE=8B=E4=B8=AD=E6=9A=B4=E9=9C=B2?= =?UTF-8?q?=E7=9A=84DefaultUnetClient=E7=B1=BB=EF=BC=8C=E6=94=B9=E4=B8=BA?= =?UTF-8?q?=E7=94=B1UnetClients=E7=9A=84=E5=B7=A5=E5=8E=82=E6=96=B9?= =?UTF-8?q?=E6=B3=95=E6=9D=A5=E5=AE=9E=E7=8E=B0=E5=88=9B=E5=BB=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/test/java/cn/ucloud/unet/client/AllocateEIPTest.java | 2 +- .../cn/ucloud/unet/client/AllocateShareBandwidthTest.java | 2 +- .../src/test/java/cn/ucloud/unet/client/AllocateVIPTest.java | 2 +- .../unet/client/AssociateEIPWithShareBandwidthTest.java | 2 +- .../src/test/java/cn/ucloud/unet/client/BindEIPTest.java | 2 +- .../cn/ucloud/unet/client/CreateBandwidthPackageTest.java | 2 +- .../test/java/cn/ucloud/unet/client/CreateFirewallTest.java | 4 ++-- .../cn/ucloud/unet/client/DeleteBandwidthPackageTest.java | 2 +- .../test/java/cn/ucloud/unet/client/DeleteFirewallTest.java | 2 +- .../cn/ucloud/unet/client/DescribeBandwidthPackageTest.java | 2 +- .../cn/ucloud/unet/client/DescribeBandwidthUsageTest.java | 2 +- .../src/test/java/cn/ucloud/unet/client/DescribeEIPTest.java | 2 +- .../cn/ucloud/unet/client/DescribeFirewallResourceTest.java | 2 +- .../test/java/cn/ucloud/unet/client/DescribeFirewallTest.java | 2 +- .../cn/ucloud/unet/client/DescribeShareBandwidthTest.java | 2 +- .../src/test/java/cn/ucloud/unet/client/DescribeVIPTest.java | 2 +- .../unet/client/DisassociateEIPWithShareBandwidthTest.java | 2 +- .../test/java/cn/ucloud/unet/client/GetEIPPayModeTest.java | 2 +- .../src/test/java/cn/ucloud/unet/client/GetEIPPriceTest.java | 2 +- .../java/cn/ucloud/unet/client/GetEIPUpgradePriceTest.java | 2 +- .../test/java/cn/ucloud/unet/client/GrantFirewallTest.java | 2 +- .../java/cn/ucloud/unet/client/ModifyEIPBandwidthTest.java | 2 +- .../test/java/cn/ucloud/unet/client/ModifyEIPWeightTest.java | 2 +- .../src/test/java/cn/ucloud/unet/client/ReleaseEIPTest.java | 2 +- .../java/cn/ucloud/unet/client/ReleaseShareBandwidthTest.java | 2 +- .../src/test/java/cn/ucloud/unet/client/ReleaseVIPTest.java | 2 +- .../java/cn/ucloud/unet/client/ResizeShareBandwidthTest.java | 2 +- .../test/java/cn/ucloud/unet/client/SetEIPPayModeTest.java | 2 +- .../src/test/java/cn/ucloud/unet/client/UnBindEIPTest.java | 2 +- .../java/cn/ucloud/unet/client/UpdateEIPAttributeTest.java | 2 +- .../cn/ucloud/unet/client/UpdateFirewallAttributeTest.java | 2 +- .../test/java/cn/ucloud/unet/client/UpdateFirewallTest.java | 2 +- 32 files changed, 33 insertions(+), 33 deletions(-) diff --git a/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/AllocateEIPTest.java b/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/AllocateEIPTest.java index 9fd662b2..eeaf9aef 100755 --- a/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/AllocateEIPTest.java +++ b/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/AllocateEIPTest.java @@ -20,7 +20,7 @@ public class AllocateEIPTest { @Before public void initData() { - client = new DefaultUnetClient(new UnetConfig( + client = UnetClients.getDefaultInstance(new UnetConfig( new Account(System.getenv("UCloudPrivateKey"), System.getenv("UCloudPublicKey")))); param = new AllocateEIPParam("cn-sh2", "Bgp", 2); diff --git a/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/AllocateShareBandwidthTest.java b/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/AllocateShareBandwidthTest.java index 3fa72544..9ef3244f 100755 --- a/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/AllocateShareBandwidthTest.java +++ b/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/AllocateShareBandwidthTest.java @@ -20,7 +20,7 @@ public class AllocateShareBandwidthTest { @Before public void initData() { - client = new DefaultUnetClient(new UnetConfig( + client = UnetClients.getDefaultInstance(new UnetConfig( new Account(System.getenv("UCloudPrivateKey"), System.getenv("UCloudPublicKey")))); param = new AllocateShareBandwidthParam("cn-sh2", "ucloud-sdk-java-shareBandwidth", "Dynamic", 24); diff --git a/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/AllocateVIPTest.java b/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/AllocateVIPTest.java index 6813be11..a59d7b3d 100755 --- a/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/AllocateVIPTest.java +++ b/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/AllocateVIPTest.java @@ -20,7 +20,7 @@ public class AllocateVIPTest { @Before public void initData() { - client = new DefaultUnetClient(new UnetConfig( + client = UnetClients.getDefaultInstance(new UnetConfig( new Account(System.getenv("UCloudPrivateKey"), System.getenv("UCloudPublicKey")))); param = new AllocateVIPParam("cn-sh2", "uvnet-3fy3r4", "subnet-orq0th"); diff --git a/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/AssociateEIPWithShareBandwidthTest.java b/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/AssociateEIPWithShareBandwidthTest.java index 6c86bfb8..0373f009 100755 --- a/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/AssociateEIPWithShareBandwidthTest.java +++ b/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/AssociateEIPWithShareBandwidthTest.java @@ -23,7 +23,7 @@ public class AssociateEIPWithShareBandwidthTest { @Before public void initData() { - client = new DefaultUnetClient(new UnetConfig( + client = UnetClients.getDefaultInstance(new UnetConfig( new Account(System.getenv("UCloudPrivateKey"), System.getenv("UCloudPublicKey")))); diff --git a/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/BindEIPTest.java b/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/BindEIPTest.java index e7d9e985..5313823b 100755 --- a/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/BindEIPTest.java +++ b/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/BindEIPTest.java @@ -20,7 +20,7 @@ public class BindEIPTest { @Before public void initData() { - client = new DefaultUnetClient(new UnetConfig( + client = UnetClients.getDefaultInstance(new UnetConfig( new Account(System.getenv("UCloudPrivateKey"), System.getenv("UCloudPublicKey")))); param = new BindEIPParam("cn-sh2", "eip-vcsnbgi4", "uhost", "uhost-dwomflqt"); diff --git a/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/CreateBandwidthPackageTest.java b/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/CreateBandwidthPackageTest.java index f4c6c4f1..bb6509c8 100755 --- a/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/CreateBandwidthPackageTest.java +++ b/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/CreateBandwidthPackageTest.java @@ -20,7 +20,7 @@ public class CreateBandwidthPackageTest { @Before public void initData() { - client = new DefaultUnetClient(new UnetConfig( + client = UnetClients.getDefaultInstance(new UnetConfig( new Account(System.getenv("UCloudPrivateKey"), System.getenv("UCloudPublicKey")))); param = new CreateBandwidthPackageParam("cn-sh2", "eip-vcsnbgi4", 6, 1); diff --git a/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/CreateFirewallTest.java b/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/CreateFirewallTest.java index 72cd9be2..66fd7eaf 100755 --- a/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/CreateFirewallTest.java +++ b/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/CreateFirewallTest.java @@ -23,12 +23,12 @@ public class CreateFirewallTest { @Before public void initData() { - client = new DefaultUnetClient(new UnetConfig( + client = UnetClients.getDefaultInstance(new UnetConfig( new Account(System.getenv("UCloudPrivateKey"), System.getenv("UCloudPublicKey")))); List rules = new ArrayList<>(); - rules.add(new CreateFirewallParam.Rule("TCP", 22, "120.132.8.183", "ACCEPT", "LOW")); + rules.add(new CreateFirewallParam.Rule("TCP", "22", "120.132.8.183", "ACCEPT", "LOW","TEST_REMARK")); param = new CreateFirewallParam("cn-sh2", rules, "Firewall-test"); } diff --git a/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/DeleteBandwidthPackageTest.java b/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/DeleteBandwidthPackageTest.java index c75f5490..805c31f6 100755 --- a/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/DeleteBandwidthPackageTest.java +++ b/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/DeleteBandwidthPackageTest.java @@ -21,7 +21,7 @@ public class DeleteBandwidthPackageTest { @Before public void initData() { - client = new DefaultUnetClient(new UnetConfig( + client = UnetClients.getDefaultInstance(new UnetConfig( new Account(System.getenv("UCloudPrivateKey"), System.getenv("UCloudPublicKey")))); param = new DeleteBandwidthPackageParam("cn-sh2", "bwpack-z13014dl"); diff --git a/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/DeleteFirewallTest.java b/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/DeleteFirewallTest.java index c7f59949..01abc7ba 100755 --- a/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/DeleteFirewallTest.java +++ b/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/DeleteFirewallTest.java @@ -20,7 +20,7 @@ public class DeleteFirewallTest { @Before public void initData() { - client = new DefaultUnetClient(new UnetConfig( + client = UnetClients.getDefaultInstance(new UnetConfig( new Account(System.getenv("UCloudPrivateKey"), System.getenv("UCloudPublicKey")))); diff --git a/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/DescribeBandwidthPackageTest.java b/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/DescribeBandwidthPackageTest.java index 146e594f..f04943da 100755 --- a/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/DescribeBandwidthPackageTest.java +++ b/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/DescribeBandwidthPackageTest.java @@ -20,7 +20,7 @@ public class DescribeBandwidthPackageTest { @Before public void initData() { - client = new DefaultUnetClient(new UnetConfig( + client = UnetClients.getDefaultInstance(new UnetConfig( new Account(System.getenv("UCloudPrivateKey"), System.getenv("UCloudPublicKey")))); param = new DescribeBandwidthPackageParam("cn-sh2"); diff --git a/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/DescribeBandwidthUsageTest.java b/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/DescribeBandwidthUsageTest.java index 081579a5..6de663a8 100755 --- a/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/DescribeBandwidthUsageTest.java +++ b/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/DescribeBandwidthUsageTest.java @@ -23,7 +23,7 @@ public class DescribeBandwidthUsageTest { @Before public void initData() { - client = new DefaultUnetClient(new UnetConfig( + client = UnetClients.getDefaultInstance(new UnetConfig( new Account(System.getenv("UCloudPrivateKey"), System.getenv("UCloudPublicKey")))); diff --git a/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/DescribeEIPTest.java b/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/DescribeEIPTest.java index 684d364f..723330a4 100755 --- a/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/DescribeEIPTest.java +++ b/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/DescribeEIPTest.java @@ -20,7 +20,7 @@ public class DescribeEIPTest { @Before public void initData() { - client = new DefaultUnetClient(new UnetConfig( + client = UnetClients.getDefaultInstance(new UnetConfig( new Account(System.getenv("UCloudPrivateKey"), System.getenv("UCloudPublicKey")))); param = new DescribeEIPParam("cn-sh2"); diff --git a/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/DescribeFirewallResourceTest.java b/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/DescribeFirewallResourceTest.java index a3e1e384..376e7a3b 100755 --- a/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/DescribeFirewallResourceTest.java +++ b/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/DescribeFirewallResourceTest.java @@ -20,7 +20,7 @@ public class DescribeFirewallResourceTest { @Before public void initData() { - client = new DefaultUnetClient(new UnetConfig( + client = UnetClients.getDefaultInstance(new UnetConfig( new Account(System.getenv("UCloudPrivateKey"), System.getenv("UCloudPublicKey")))); diff --git a/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/DescribeFirewallTest.java b/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/DescribeFirewallTest.java index 22613799..f7c6bd43 100755 --- a/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/DescribeFirewallTest.java +++ b/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/DescribeFirewallTest.java @@ -20,7 +20,7 @@ public class DescribeFirewallTest { @Before public void initData() { - client = new DefaultUnetClient(new UnetConfig( + client = UnetClients.getDefaultInstance(new UnetConfig( new Account(System.getenv("UCloudPrivateKey"), System.getenv("UCloudPublicKey")))); diff --git a/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/DescribeShareBandwidthTest.java b/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/DescribeShareBandwidthTest.java index 3bf0666f..b773acd6 100755 --- a/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/DescribeShareBandwidthTest.java +++ b/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/DescribeShareBandwidthTest.java @@ -20,7 +20,7 @@ public class DescribeShareBandwidthTest { @Before public void initData() { - client = new DefaultUnetClient(new UnetConfig( + client = UnetClients.getDefaultInstance(new UnetConfig( new Account(System.getenv("UCloudPrivateKey"), System.getenv("UCloudPublicKey")))); param = new DescribeShareBandwidthParam("cn-sh2"); diff --git a/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/DescribeVIPTest.java b/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/DescribeVIPTest.java index f742f8dd..78ff3cc9 100755 --- a/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/DescribeVIPTest.java +++ b/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/DescribeVIPTest.java @@ -20,7 +20,7 @@ public class DescribeVIPTest { @Before public void initData() { - client = new DefaultUnetClient(new UnetConfig( + client = UnetClients.getDefaultInstance(new UnetConfig( new Account(System.getenv("UCloudPrivateKey"), System.getenv("UCloudPublicKey")))); param = new DescribeVIPParam("cn-sh2"); diff --git a/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/DisassociateEIPWithShareBandwidthTest.java b/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/DisassociateEIPWithShareBandwidthTest.java index 92061b3d..80e2dacd 100755 --- a/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/DisassociateEIPWithShareBandwidthTest.java +++ b/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/DisassociateEIPWithShareBandwidthTest.java @@ -23,7 +23,7 @@ public class DisassociateEIPWithShareBandwidthTest { @Before public void initData() { - client = new DefaultUnetClient(new UnetConfig( + client = UnetClients.getDefaultInstance(new UnetConfig( new Account(System.getenv("UCloudPrivateKey"), System.getenv("UCloudPublicKey")))); diff --git a/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/GetEIPPayModeTest.java b/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/GetEIPPayModeTest.java index 63eca439..6f297b83 100755 --- a/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/GetEIPPayModeTest.java +++ b/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/GetEIPPayModeTest.java @@ -23,7 +23,7 @@ public class GetEIPPayModeTest { @Before public void initData() { - client = new DefaultUnetClient(new UnetConfig( + client = UnetClients.getDefaultInstance(new UnetConfig( new Account(System.getenv("UCloudPrivateKey"), System.getenv("UCloudPublicKey")))); param = new GetEIPPayModeParam("cn-sh2"); diff --git a/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/GetEIPPriceTest.java b/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/GetEIPPriceTest.java index 1c76ec02..8c4c683a 100755 --- a/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/GetEIPPriceTest.java +++ b/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/GetEIPPriceTest.java @@ -20,7 +20,7 @@ public class GetEIPPriceTest { @Before public void initData() { - client = new DefaultUnetClient(new UnetConfig( + client = UnetClients.getDefaultInstance(new UnetConfig( new Account(System.getenv("UCloudPrivateKey"), System.getenv("UCloudPublicKey")))); param = new GetEIPPriceParam("cn-sh2", "Bgp", 2); diff --git a/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/GetEIPUpgradePriceTest.java b/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/GetEIPUpgradePriceTest.java index 370464ca..55d58c33 100755 --- a/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/GetEIPUpgradePriceTest.java +++ b/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/GetEIPUpgradePriceTest.java @@ -20,7 +20,7 @@ public class GetEIPUpgradePriceTest { @Before public void initData() { - client = new DefaultUnetClient(new UnetConfig( + client = UnetClients.getDefaultInstance(new UnetConfig( new Account(System.getenv("UCloudPrivateKey"), System.getenv("UCloudPublicKey")))); param = new GetEIPUpgradePriceParam("cn-sh2", "eip-vcsnbgi4", 10); diff --git a/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/GrantFirewallTest.java b/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/GrantFirewallTest.java index 8e1e9f0d..8aacc82b 100755 --- a/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/GrantFirewallTest.java +++ b/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/GrantFirewallTest.java @@ -20,7 +20,7 @@ public class GrantFirewallTest { @Before public void initData() { - client = new DefaultUnetClient(new UnetConfig( + client = UnetClients.getDefaultInstance(new UnetConfig( new Account(System.getenv("UCloudPrivateKey"), System.getenv("UCloudPublicKey")))); diff --git a/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/ModifyEIPBandwidthTest.java b/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/ModifyEIPBandwidthTest.java index 5bc6ceca..9dc9a438 100755 --- a/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/ModifyEIPBandwidthTest.java +++ b/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/ModifyEIPBandwidthTest.java @@ -20,7 +20,7 @@ public class ModifyEIPBandwidthTest { @Before public void initData() { - client = new DefaultUnetClient(new UnetConfig( + client = UnetClients.getDefaultInstance(new UnetConfig( new Account(System.getenv("UCloudPrivateKey"), System.getenv("UCloudPublicKey")))); param = new ModifyEIPBandwidthParam("cn-sh2", "eip-vcsnbgi4", 4); diff --git a/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/ModifyEIPWeightTest.java b/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/ModifyEIPWeightTest.java index 92dff30a..835b74a3 100755 --- a/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/ModifyEIPWeightTest.java +++ b/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/ModifyEIPWeightTest.java @@ -20,7 +20,7 @@ public class ModifyEIPWeightTest { @Before public void initData() { - client = new DefaultUnetClient(new UnetConfig( + client = UnetClients.getDefaultInstance(new UnetConfig( new Account(System.getenv("UCloudPrivateKey"), System.getenv("UCloudPublicKey")))); param = new ModifyEIPWeightParam("cn-bj2", "eip-vcsnbgi4", 100); diff --git a/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/ReleaseEIPTest.java b/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/ReleaseEIPTest.java index 19e94c21..7e14897c 100755 --- a/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/ReleaseEIPTest.java +++ b/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/ReleaseEIPTest.java @@ -21,7 +21,7 @@ public class ReleaseEIPTest { @Before public void initData() { - client = new DefaultUnetClient(new UnetConfig( + client = UnetClients.getDefaultInstance(new UnetConfig( new Account(System.getenv("UCloudPrivateKey"), System.getenv("UCloudPublicKey")))); param = new ReleaseEIPParam("cn-sh2", "eip-243oe1tx"); diff --git a/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/ReleaseShareBandwidthTest.java b/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/ReleaseShareBandwidthTest.java index 01d18c51..90e11dfb 100755 --- a/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/ReleaseShareBandwidthTest.java +++ b/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/ReleaseShareBandwidthTest.java @@ -20,7 +20,7 @@ public class ReleaseShareBandwidthTest { @Before public void initData() { - client = new DefaultUnetClient(new UnetConfig( + client = UnetClients.getDefaultInstance(new UnetConfig( new Account(System.getenv("UCloudPrivateKey"), System.getenv("UCloudPublicKey")))); diff --git a/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/ReleaseVIPTest.java b/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/ReleaseVIPTest.java index 2d74fea0..516c4caf 100755 --- a/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/ReleaseVIPTest.java +++ b/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/ReleaseVIPTest.java @@ -20,7 +20,7 @@ public class ReleaseVIPTest { @Before public void initData() { - client = new DefaultUnetClient(new UnetConfig( + client = UnetClients.getDefaultInstance(new UnetConfig( new Account(System.getenv("UCloudPrivateKey"), System.getenv("UCloudPublicKey")))); param = new ReleaseVIPParam("cn-sh2", "vip-utxslh2t"); diff --git a/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/ResizeShareBandwidthTest.java b/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/ResizeShareBandwidthTest.java index ad17955f..edbaafbe 100755 --- a/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/ResizeShareBandwidthTest.java +++ b/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/ResizeShareBandwidthTest.java @@ -21,7 +21,7 @@ public class ResizeShareBandwidthTest { @Before public void initData() { - client = new DefaultUnetClient(new UnetConfig( + client = UnetClients.getDefaultInstance(new UnetConfig( new Account(System.getenv("UCloudPrivateKey"), System.getenv("UCloudPublicKey")))); param = new ResizeShareBandwidthParam("cn-sh2", 20, "bwshare-cybkx5q2"); diff --git a/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/SetEIPPayModeTest.java b/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/SetEIPPayModeTest.java index 3e67a87e..1a673503 100755 --- a/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/SetEIPPayModeTest.java +++ b/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/SetEIPPayModeTest.java @@ -20,7 +20,7 @@ public class SetEIPPayModeTest { @Before public void initData() { - client = new DefaultUnetClient(new UnetConfig( + client = UnetClients.getDefaultInstance(new UnetConfig( new Account(System.getenv("UCloudPrivateKey"), System.getenv("UCloudPublicKey")))); param = new SetEIPPayModeParam("cn-sh2", "eip-vcsnbgi4", "Traffic", 4); diff --git a/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/UnBindEIPTest.java b/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/UnBindEIPTest.java index 9b5e9a42..af56a681 100755 --- a/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/UnBindEIPTest.java +++ b/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/UnBindEIPTest.java @@ -20,7 +20,7 @@ public class UnBindEIPTest { @Before public void initData() { - client = new DefaultUnetClient(new UnetConfig( + client = UnetClients.getDefaultInstance(new UnetConfig( new Account(System.getenv("UCloudPrivateKey"), System.getenv("UCloudPublicKey")))); param = new UnBindEIPParam("cn-sh2", "eip-vcsnbgi4", "uhost", "uhost-dwomflqt"); diff --git a/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/UpdateEIPAttributeTest.java b/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/UpdateEIPAttributeTest.java index c772d24b..f0a7b58c 100755 --- a/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/UpdateEIPAttributeTest.java +++ b/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/UpdateEIPAttributeTest.java @@ -20,7 +20,7 @@ public class UpdateEIPAttributeTest { @Before public void initData() { - client = new DefaultUnetClient(new UnetConfig( + client = UnetClients.getDefaultInstance(new UnetConfig( new Account(System.getenv("UCloudPrivateKey"), System.getenv("UCloudPublicKey")))); param = new UpdateEIPAttributeParam("cn-sh2", "eip-vcsnbgi4"); diff --git a/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/UpdateFirewallAttributeTest.java b/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/UpdateFirewallAttributeTest.java index 624bb16d..504af490 100755 --- a/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/UpdateFirewallAttributeTest.java +++ b/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/UpdateFirewallAttributeTest.java @@ -20,7 +20,7 @@ public class UpdateFirewallAttributeTest { @Before public void initData() { - client = new DefaultUnetClient(new UnetConfig( + client = UnetClients.getDefaultInstance(new UnetConfig( new Account(System.getenv("UCloudPrivateKey"), System.getenv("UCloudPublicKey")))); diff --git a/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/UpdateFirewallTest.java b/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/UpdateFirewallTest.java index 9f205f84..5a4108ec 100755 --- a/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/UpdateFirewallTest.java +++ b/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/UpdateFirewallTest.java @@ -23,7 +23,7 @@ public class UpdateFirewallTest { @Before public void initData() { - client = new DefaultUnetClient(new UnetConfig( + client = UnetClients.getDefaultInstance(new UnetConfig( new Account(System.getenv("UCloudPrivateKey"), System.getenv("UCloudPublicKey"))));