Skip to content

Commit bfcf14c

Browse files
author
codezhang
committed
调整pom依赖，移除common中的JSONComparator，更新DescribeUDdisk
1 parent c10ea37 commit bfcf14c

129 files changed

Lines changed: 429 additions & 201 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎pom.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@
7575
<lang.version>3.8</lang.version>
7676
<codec.version>1.9</codec.version>
7777
<slf4j.version>1.7.25</slf4j.version>
78+
<jsonassert.version>1.5.0</jsonassert.version>
7879
</properties>
7980

8081
<dependencyManagement>
@@ -90,7 +91,7 @@
9091
<dependency>
9192
<groupId>org.skyscreamer</groupId>
9293
<artifactId>jsonassert</artifactId>
93-
<version>1.5.0</version>
94+
<version>${jsonassert.version}</version>
9495
<scope>test</scope>
9596
</dependency>
9697

‎ucloud-sdk-java-common/pom.xml‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,6 @@
1313
<version>0.6.3.1-release</version>
1414

1515
<dependencies>
16-
<dependency>
17-
<groupId>junit</groupId>
18-
<artifactId>junit</artifactId>
19-
<scope>provided</scope>
20-
</dependency>
2116

2217
<dependency>
2318
<groupId>org.hibernate</groupId>
@@ -34,12 +29,6 @@
3429
<artifactId>slf4j-api</artifactId>
3530
</dependency>
3631

37-
<dependency>
38-
<groupId>org.slf4j</groupId>
39-
<artifactId>slf4j-simple</artifactId>
40-
<scope>provided</scope>
41-
</dependency>
42-
4332
<dependency>
4433
<groupId>org.apache.httpcomponents</groupId>
4534
<artifactId>httpclient</artifactId>
@@ -56,11 +45,22 @@
5645
</dependency>
5746

5847
<dependency>
59-
<groupId>org.skyscreamer</groupId>
60-
<artifactId>jsonassert</artifactId>
48+
<groupId>junit</groupId>
49+
<artifactId>junit</artifactId>
50+
<scope>test</scope>
51+
</dependency>
52+
53+
<dependency>
54+
<groupId>org.slf4j</groupId>
55+
<artifactId>slf4j-simple</artifactId>
6156
<scope>provided</scope>
6257
</dependency>
6358

59+
<dependency>
60+
<groupId>org.skyscreamer</groupId>
61+
<artifactId>jsonassert</artifactId>
62+
<scope>test</scope>
63+
</dependency>
6464
</dependencies>
6565

6666
</project>

‎ucloud-sdk-java-pathx/pom.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<dependency>
3232
<groupId>junit</groupId>
3333
<artifactId>junit</artifactId>
34-
<scope>provided</scope>
34+
<scope>test</scope>
3535
</dependency>
3636

3737
<dependency>
@@ -48,6 +48,7 @@
4848
<dependency>
4949
<groupId>org.skyscreamer</groupId>
5050
<artifactId>jsonassert</artifactId>
51+
<scope>test</scope>
5152
</dependency>
5253
</dependencies>
5354

‎ucloud-sdk-java-pathx/src/main/java/cn/ucloud/pathx/model/GetGlobalSSHMetricResult.java‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
import cn.ucloud.common.pojo.BaseResponseResult;
44
import com.google.gson.annotations.SerializedName;
55

6+
import java.util.List;
7+
68

79
/**
810
* @Description : 获取GlobalSSH出入带宽数据 结果类
@@ -14,4 +16,13 @@ public class GetGlobalSSHMetricResult extends BaseResponseResult {
1416
* 相关指标，如带宽等
1517
*/
1618
@SerializedName("Metrics")
19+
private List<GlobalSSHMetric> metrics;
20+
21+
public List<GlobalSSHMetric> getMetrics() {
22+
return metrics;
23+
}
24+
25+
public void setMetrics(List<GlobalSSHMetric> metrics) {
26+
this.metrics = metrics;
27+
}
1728
}

‎ucloud-sdk-java-pathx/src/main/java/cn/ucloud/pathx/model/GetGlobalSSHPriceResult.java‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,13 @@ public class GetGlobalSSHPriceResult extends BaseResponseResult {
1414
* 价格,返回单位为元
1515
*/
1616
@SerializedName("Price")
17+
private Double price;
18+
19+
public Double getPrice() {
20+
return price;
21+
}
22+
23+
public void setPrice(Double price) {
24+
this.price = price;
25+
}
1726
}

‎ucloud-sdk-java-pathx/src/main/java/cn/ucloud/pathx/model/GlobalSSHMetric.java‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,19 @@ public class GlobalSSHMetric {
2222
@SerializedName("NetworkIn")
2323
private List<MatricPoint> networkIn;
2424

25+
public List<MatricPoint> getNetworkOut() {
26+
return networkOut;
27+
}
2528

29+
public void setNetworkOut(List<MatricPoint> networkOut) {
30+
this.networkOut = networkOut;
31+
}
32+
33+
public List<MatricPoint> getNetworkIn() {
34+
return networkIn;
35+
}
36+
37+
public void setNetworkIn(List<MatricPoint> networkIn) {
38+
this.networkIn = networkIn;
39+
}
2640
}

‎ucloud-sdk-java-pathx/src/test/java/cn/ucloud/pathx/client/BindPathXSSLTest.java‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@
99
import org.junit.Before;
1010
import org.junit.Test;
1111

12+
import java.util.ArrayList;
13+
import java.util.List;
14+
1215
import static org.junit.Assert.assertNull;
1316

1417

@@ -31,7 +34,8 @@ public void setUp() throws Exception {
3134
System.getenv("UcloudPublicKey"))));
3235
String sSLId = "cn-sh2";
3336
String uGAId = "cn-sh2";
34-
param = new BindPathXSSLParam(sSLId, uGAId);
37+
List<Integer> ports = new ArrayList<>();
38+
param = new BindPathXSSLParam(sSLId, uGAId,ports);
3539
param.setProjectId("org-izug1m");
3640
}
3741

‎ucloud-sdk-java-pathx/src/test/java/cn/ucloud/pathx/client/GetPathXMetricTest.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,8 @@ public void setUp() throws Exception {
3535
Integer endTime = 1;
3636
String resourceType = "cn-sh2";
3737
String lineId = "cn-sh2";
38-
param = new GetPathXMetricParam(projectId, resourceId, beginTime, endTime, resourceType, lineId);
38+
String metricNames= "";
39+
param = new GetPathXMetricParam(projectId, resourceId, beginTime, endTime, resourceType, lineId,metricNames);
3940
param.setProjectId("org-izug1m");
4041
}
4142

‎ucloud-sdk-java-pathx/src/test/java/cn/ucloud/pathx/client/InsertPathXWhitelistTest.java‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@
99
import org.junit.Before;
1010
import org.junit.Test;
1111

12+
import java.util.ArrayList;
13+
import java.util.List;
14+
1215
import static org.junit.Assert.assertNull;
1316

1417

@@ -31,7 +34,8 @@ public void setUp() throws Exception {
3134
System.getenv("UcloudPublicKey"))));
3235
String projectId = "cn-sh2";
3336
String instanceId = "cn-sh2";
34-
param = new InsertPathXWhitelistParam(projectId, instanceId);
37+
List<String> whiteList = new ArrayList<>();
38+
param = new InsertPathXWhitelistParam(projectId, instanceId,whiteList);
3539
param.setProjectId("org-izug1m");
3640
}
3741

‎ucloud-sdk-java-pathx/src/test/java/cn/ucloud/pathx/client/UnBindPathXSSLTest.java‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@
99
import org.junit.Before;
1010
import org.junit.Test;
1111

12+
import java.util.ArrayList;
13+
import java.util.List;
14+
1215
import static org.junit.Assert.assertNull;
1316

1417

@@ -31,7 +34,8 @@ public void setUp() throws Exception {
3134
System.getenv("UcloudPublicKey"))));
3235
String uGAId = "cn-sh2";
3336
String sSLId = "cn-sh2";
34-
param = new UnBindPathXSSLParam(uGAId, sSLId);
37+
List<Integer> ports = new ArrayList<>();
38+
param = new UnBindPathXSSLParam(uGAId, sSLId,ports);
3539
param.setProjectId("org-izug1m");
3640
}
3741

0 commit comments

Comments
 (0)