Skip to content

Commit d1b3fc5

Browse files
author
BitsAdmin
committed
Merge 'vpc-Java-2020-04-01-online-2030-2026_01_12_22_25_46' into 'integration_2026-01-22_1106838080770'
feat: [development task] vpc-2030-Java (2054028) See merge request: !868
2 parents 0994c19 + e4d6d41 commit d1b3fc5

File tree

4 files changed

+38
-6
lines changed

4 files changed

+38
-6
lines changed

volcengine-java-sdk-core/src/main/java/com/volcengine/endpoint/DefaultEndpointProvider.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -722,6 +722,14 @@ public class DefaultEndpointProvider implements EndpointResolver {
722722
ENDPOINT,
723723
createRegionEndpointMap()
724724
));
725+
726+
DEFAULT_ENDPOINT_MAP.put("livesaas", new ServiceEndpointInfo(
727+
"livesaas",
728+
true,
729+
"",
730+
ENDPOINT,
731+
createRegionEndpointMap()
732+
));
725733
}
726734

727735
// 创建区域端点映射的辅助方法

volcengine-java-sdk-core/src/main/java/com/volcengine/endpoint/StandardEndpointProvider.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -255,6 +255,7 @@ private static String renderTemplate(String format, Variables v) {
255255
SERVICE_INFOS.put("vms", new ServiceInfo("vms", false));
256256
SERVICE_INFOS.put("eco_partner", new ServiceInfo("eco_partner", true));
257257
SERVICE_INFOS.put("smc", new ServiceInfo("smc", true));
258+
SERVICE_INFOS.put("livesaas", new ServiceInfo("livesaas", true));
258259

259260
// -------- Region 匹配器(白名单 + 正则) --------
260261
Map<String, RegionInfo> white = new HashMap<>();

volcengine-java-sdk-vpc/src/main/java/com/volcengine/vpc/model/Ipv6AddressBandwidthForDescribeIpv6AddressBandwidthsOutput.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public class Ipv6AddressBandwidthForDescribeIpv6AddressBandwidthsOutput {
3737
private String allocationId = null;
3838

3939
@SerializedName("Bandwidth")
40-
private String bandwidth = null;
40+
private Integer bandwidth = null;
4141

4242
@SerializedName("BandwidthPackageId")
4343
private String bandwidthPackageId = null;
@@ -111,7 +111,7 @@ public void setAllocationId(String allocationId) {
111111
this.allocationId = allocationId;
112112
}
113113

114-
public Ipv6AddressBandwidthForDescribeIpv6AddressBandwidthsOutput bandwidth(String bandwidth) {
114+
public Ipv6AddressBandwidthForDescribeIpv6AddressBandwidthsOutput bandwidth(Integer bandwidth) {
115115
this.bandwidth = bandwidth;
116116
return this;
117117
}
@@ -121,11 +121,11 @@ public Ipv6AddressBandwidthForDescribeIpv6AddressBandwidthsOutput bandwidth(Stri
121121
* @return bandwidth
122122
**/
123123
@Schema(description = "")
124-
public String getBandwidth() {
124+
public Integer getBandwidth() {
125125
return bandwidth;
126126
}
127127

128-
public void setBandwidth(String bandwidth) {
128+
public void setBandwidth(Integer bandwidth) {
129129
this.bandwidth = bandwidth;
130130
}
131131

volcengine-java-sdk-vpc/src/main/java/com/volcengine/vpc/model/UnassignPrivateIpAddressesRequest.java

Lines changed: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,33 @@
3232

3333

3434
public class UnassignPrivateIpAddressesRequest {
35+
@SerializedName("ClientToken")
36+
private String clientToken = null;
37+
3538
@SerializedName("NetworkInterfaceId")
3639
private String networkInterfaceId = null;
3740

3841
@SerializedName("PrivateIpAddress")
3942
private List<String> privateIpAddress = null;
4043

44+
public UnassignPrivateIpAddressesRequest clientToken(String clientToken) {
45+
this.clientToken = clientToken;
46+
return this;
47+
}
48+
49+
/**
50+
* Get clientToken
51+
* @return clientToken
52+
**/
53+
@Schema(description = "")
54+
public String getClientToken() {
55+
return clientToken;
56+
}
57+
58+
public void setClientToken(String clientToken) {
59+
this.clientToken = clientToken;
60+
}
61+
4162
public UnassignPrivateIpAddressesRequest networkInterfaceId(String networkInterfaceId) {
4263
this.networkInterfaceId = networkInterfaceId;
4364
return this;
@@ -93,13 +114,14 @@ public boolean equals(java.lang.Object o) {
93114
return false;
94115
}
95116
UnassignPrivateIpAddressesRequest unassignPrivateIpAddressesRequest = (UnassignPrivateIpAddressesRequest) o;
96-
return Objects.equals(this.networkInterfaceId, unassignPrivateIpAddressesRequest.networkInterfaceId) &&
117+
return Objects.equals(this.clientToken, unassignPrivateIpAddressesRequest.clientToken) &&
118+
Objects.equals(this.networkInterfaceId, unassignPrivateIpAddressesRequest.networkInterfaceId) &&
97119
Objects.equals(this.privateIpAddress, unassignPrivateIpAddressesRequest.privateIpAddress);
98120
}
99121

100122
@Override
101123
public int hashCode() {
102-
return Objects.hash(networkInterfaceId, privateIpAddress);
124+
return Objects.hash(clientToken, networkInterfaceId, privateIpAddress);
103125
}
104126

105127

@@ -108,6 +130,7 @@ public String toString() {
108130
StringBuilder sb = new StringBuilder();
109131
sb.append("class UnassignPrivateIpAddressesRequest {\n");
110132

133+
sb.append(" clientToken: ").append(toIndentedString(clientToken)).append("\n");
111134
sb.append(" networkInterfaceId: ").append(toIndentedString(networkInterfaceId)).append("\n");
112135
sb.append(" privateIpAddress: ").append(toIndentedString(privateIpAddress)).append("\n");
113136
sb.append("}");

0 commit comments

Comments
 (0)