Skip to content

Commit 6c3dd73

Browse files
author
BitsAdmin
committed
Merge branch 'escloud-Java-2023-01-01-online-1020-2025_03_13_14_20_27' into 'integration_2025-03-20_797631155970'
feat: [development task] ESCloud-1020-Java (1094080) See merge request iaasng/volcengine-java-sdk!418
2 parents 59f46e3 + ccf35b0 commit 6c3dd73

File tree

7 files changed

+186
-126
lines changed

7 files changed

+186
-126
lines changed

‎volcengine-java-sdk-escloud/src/main/java/com/volcengine/escloud/EscloudApi.java‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@
4949
import com.volcengine.escloud.model.ModifyChargeCodeResponse;
5050
import com.volcengine.escloud.model.ModifyDeletionProtectionRequest;
5151
import com.volcengine.escloud.model.ModifyDeletionProtectionResponse;
52-
import com.volcengine.escloud.model.ModifyIpWhitelistRequest;
53-
import com.volcengine.escloud.model.ModifyIpWhitelistResponse;
52+
import com.volcengine.escloud.model.ModifyIpAllowListRequest;
53+
import com.volcengine.escloud.model.ModifyIpAllowListResponse;
5454
import com.volcengine.escloud.model.ModifyMaintenanceSettingRequest;
5555
import com.volcengine.escloud.model.ModifyMaintenanceSettingResponse;
5656
import com.volcengine.escloud.model.ModifyNodeSpecInOneStepRequest;
@@ -1460,18 +1460,18 @@ public void onRequestProgress(long bytesWritten, long contentLength, boolean don
14601460
return call;
14611461
}
14621462
/**
1463-
* Build call for modifyIpWhitelist
1463+
* Build call for modifyIpAllowList
14641464
* @param body (required)
14651465
* @param progressListener Progress listener
14661466
* @param progressRequestListener Progress request listener
14671467
* @return Call to execute
14681468
* @throws ApiException If fail to serialize the request body object
14691469
*/
1470-
public com.squareup.okhttp.Call modifyIpWhitelistCall(ModifyIpWhitelistRequest body, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
1470+
public com.squareup.okhttp.Call modifyIpAllowListCall(ModifyIpAllowListRequest body, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
14711471
Object localVarPostBody = body;
14721472

14731473
// create path and map variables
1474-
String localVarPath = "/ModifyIpWhitelist/2023-01-01/escloud/post/application_json/";
1474+
String localVarPath = "/ModifyIpAllowList/2023-01-01/escloud/post/application_json/";
14751475

14761476
List<Pair> localVarQueryParams = new ArrayList<Pair>();
14771477
List<Pair> localVarCollectionQueryParams = new ArrayList<Pair>();
@@ -1509,13 +1509,13 @@ public com.squareup.okhttp.Response intercept(com.squareup.okhttp.Interceptor.Ch
15091509
}
15101510

15111511
@SuppressWarnings("rawtypes")
1512-
private com.squareup.okhttp.Call modifyIpWhitelistValidateBeforeCall(ModifyIpWhitelistRequest body, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
1512+
private com.squareup.okhttp.Call modifyIpAllowListValidateBeforeCall(ModifyIpAllowListRequest body, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
15131513
// verify the required parameter 'body' is set
15141514
if (body == null) {
1515-
throw new ApiException("Missing the required parameter 'body' when calling modifyIpWhitelist(Async)");
1515+
throw new ApiException("Missing the required parameter 'body' when calling modifyIpAllowList(Async)");
15161516
}
15171517

1518-
com.squareup.okhttp.Call call = modifyIpWhitelistCall(body, progressListener, progressRequestListener);
1518+
com.squareup.okhttp.Call call = modifyIpAllowListCall(body, progressListener, progressRequestListener);
15191519
return call;
15201520

15211521

@@ -1528,24 +1528,24 @@ private com.squareup.okhttp.Call modifyIpWhitelistValidateBeforeCall(ModifyIpWhi
15281528
*
15291529
*
15301530
* @param body (required)
1531-
* @return ModifyIpWhitelistResponse
1531+
* @return ModifyIpAllowListResponse
15321532
* @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
15331533
*/
1534-
public ModifyIpWhitelistResponse modifyIpWhitelist(ModifyIpWhitelistRequest body) throws ApiException {
1535-
ApiResponse<ModifyIpWhitelistResponse> resp = modifyIpWhitelistWithHttpInfo(body);
1534+
public ModifyIpAllowListResponse modifyIpAllowList(ModifyIpAllowListRequest body) throws ApiException {
1535+
ApiResponse<ModifyIpAllowListResponse> resp = modifyIpAllowListWithHttpInfo(body);
15361536
return resp.getData();
15371537
}
15381538

15391539
/**
15401540
*
15411541
*
15421542
* @param body (required)
1543-
* @return ApiResponse&lt;ModifyIpWhitelistResponse&gt;
1543+
* @return ApiResponse&lt;ModifyIpAllowListResponse&gt;
15441544
* @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
15451545
*/
1546-
public ApiResponse<ModifyIpWhitelistResponse> modifyIpWhitelistWithHttpInfo( @NotNull ModifyIpWhitelistRequest body) throws ApiException {
1547-
com.squareup.okhttp.Call call = modifyIpWhitelistValidateBeforeCall(body, null, null);
1548-
Type localVarReturnType = new TypeToken<ModifyIpWhitelistResponse>(){}.getType();
1546+
public ApiResponse<ModifyIpAllowListResponse> modifyIpAllowListWithHttpInfo( @NotNull ModifyIpAllowListRequest body) throws ApiException {
1547+
com.squareup.okhttp.Call call = modifyIpAllowListValidateBeforeCall(body, null, null);
1548+
Type localVarReturnType = new TypeToken<ModifyIpAllowListResponse>(){}.getType();
15491549
return apiClient.execute(call, localVarReturnType);
15501550
}
15511551

@@ -1557,7 +1557,7 @@ public ApiResponse<ModifyIpWhitelistResponse> modifyIpWhitelistWithHttpInfo( @No
15571557
* @return The request call
15581558
* @throws ApiException If fail to process the API call, e.g. serializing the request body object
15591559
*/
1560-
public com.squareup.okhttp.Call modifyIpWhitelistAsync(ModifyIpWhitelistRequest body, final ApiCallback<ModifyIpWhitelistResponse> callback) throws ApiException {
1560+
public com.squareup.okhttp.Call modifyIpAllowListAsync(ModifyIpAllowListRequest body, final ApiCallback<ModifyIpAllowListResponse> callback) throws ApiException {
15611561

15621562
ProgressResponseBody.ProgressListener progressListener = null;
15631563
ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
@@ -1578,8 +1578,8 @@ public void onRequestProgress(long bytesWritten, long contentLength, boolean don
15781578
};
15791579
}
15801580

1581-
com.squareup.okhttp.Call call = modifyIpWhitelistValidateBeforeCall(body, progressListener, progressRequestListener);
1582-
Type localVarReturnType = new TypeToken<ModifyIpWhitelistResponse>(){}.getType();
1581+
com.squareup.okhttp.Call call = modifyIpAllowListValidateBeforeCall(body, progressListener, progressRequestListener);
1582+
Type localVarReturnType = new TypeToken<ModifyIpAllowListResponse>(){}.getType();
15831583
apiClient.executeAsync(call, localVarReturnType, callback);
15841584
return call;
15851585
}

‎volcengine-java-sdk-escloud/src/main/java/com/volcengine/escloud/model/InstanceConfigurationForCreateInstanceInOneStepInput.java‎

Lines changed: 1 addition & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -94,9 +94,6 @@ public ChargeTypeEnum read(final JsonReader jsonReader) throws IOException {
9494
@SerializedName("DeletionProtection")
9595
private Boolean deletionProtection = null;
9696

97-
@SerializedName("EnableCerebro")
98-
private Boolean enableCerebro = null;
99-
10097
@SerializedName("EnableHttps")
10198
private Boolean enableHttps = null;
10299

@@ -272,24 +269,6 @@ public void setDeletionProtection(Boolean deletionProtection) {
272269
this.deletionProtection = deletionProtection;
273270
}
274271

275-
public InstanceConfigurationForCreateInstanceInOneStepInput enableCerebro(Boolean enableCerebro) {
276-
this.enableCerebro = enableCerebro;
277-
return this;
278-
}
279-
280-
/**
281-
* Get enableCerebro
282-
* @return enableCerebro
283-
**/
284-
@Schema(description = "")
285-
public Boolean isEnableCerebro() {
286-
return enableCerebro;
287-
}
288-
289-
public void setEnableCerebro(Boolean enableCerebro) {
290-
this.enableCerebro = enableCerebro;
291-
}
292-
293272
public InstanceConfigurationForCreateInstanceInOneStepInput enableHttps(Boolean enableHttps) {
294273
this.enableHttps = enableHttps;
295274
return this;
@@ -541,7 +520,6 @@ public boolean equals(java.lang.Object o) {
541520
Objects.equals(this.chargeType, instanceConfigurationForCreateInstanceInOneStepInput.chargeType) &&
542521
Objects.equals(this.configurationCode, instanceConfigurationForCreateInstanceInOneStepInput.configurationCode) &&
543522
Objects.equals(this.deletionProtection, instanceConfigurationForCreateInstanceInOneStepInput.deletionProtection) &&
544-
Objects.equals(this.enableCerebro, instanceConfigurationForCreateInstanceInOneStepInput.enableCerebro) &&
545523
Objects.equals(this.enableHttps, instanceConfigurationForCreateInstanceInOneStepInput.enableHttps) &&
546524
Objects.equals(this.enablePureMaster, instanceConfigurationForCreateInstanceInOneStepInput.enablePureMaster) &&
547525
Objects.equals(this.instanceName, instanceConfigurationForCreateInstanceInOneStepInput.instanceName) &&
@@ -558,7 +536,7 @@ public boolean equals(java.lang.Object o) {
558536

559537
@Override
560538
public int hashCode() {
561-
return Objects.hash(adminPassword, autoRenew, chargeType, configurationCode, deletionProtection, enableCerebro, enableHttps, enablePureMaster, instanceName, networkSpecs, nodeSpecsAssigns, period, projectName, regionId, subnet, VPC, version, zoneId);
539+
return Objects.hash(adminPassword, autoRenew, chargeType, configurationCode, deletionProtection, enableHttps, enablePureMaster, instanceName, networkSpecs, nodeSpecsAssigns, period, projectName, regionId, subnet, VPC, version, zoneId);
562540
}
563541

564542

@@ -572,7 +550,6 @@ public String toString() {
572550
sb.append(" chargeType: ").append(toIndentedString(chargeType)).append("\n");
573551
sb.append(" configurationCode: ").append(toIndentedString(configurationCode)).append("\n");
574552
sb.append(" deletionProtection: ").append(toIndentedString(deletionProtection)).append("\n");
575-
sb.append(" enableCerebro: ").append(toIndentedString(enableCerebro)).append("\n");
576553
sb.append(" enableHttps: ").append(toIndentedString(enableHttps)).append("\n");
577554
sb.append(" enablePureMaster: ").append(toIndentedString(enablePureMaster)).append("\n");
578555
sb.append(" instanceName: ").append(toIndentedString(instanceName)).append("\n");

‎volcengine-java-sdk-escloud/src/main/java/com/volcengine/escloud/model/InstanceConfigurationForCreateInstanceInput.java‎

Lines changed: 1 addition & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -94,9 +94,6 @@ public ChargeTypeEnum read(final JsonReader jsonReader) throws IOException {
9494
@SerializedName("DeletionProtection")
9595
private Boolean deletionProtection = null;
9696

97-
@SerializedName("EnableCerebro")
98-
private Boolean enableCerebro = null;
99-
10097
@SerializedName("EnableHttps")
10198
private Boolean enableHttps = null;
10299

@@ -272,24 +269,6 @@ public void setDeletionProtection(Boolean deletionProtection) {
272269
this.deletionProtection = deletionProtection;
273270
}
274271

275-
public InstanceConfigurationForCreateInstanceInput enableCerebro(Boolean enableCerebro) {
276-
this.enableCerebro = enableCerebro;
277-
return this;
278-
}
279-
280-
/**
281-
* Get enableCerebro
282-
* @return enableCerebro
283-
**/
284-
@Schema(description = "")
285-
public Boolean isEnableCerebro() {
286-
return enableCerebro;
287-
}
288-
289-
public void setEnableCerebro(Boolean enableCerebro) {
290-
this.enableCerebro = enableCerebro;
291-
}
292-
293272
public InstanceConfigurationForCreateInstanceInput enableHttps(Boolean enableHttps) {
294273
this.enableHttps = enableHttps;
295274
return this;
@@ -541,7 +520,6 @@ public boolean equals(java.lang.Object o) {
541520
Objects.equals(this.chargeType, instanceConfigurationForCreateInstanceInput.chargeType) &&
542521
Objects.equals(this.configurationCode, instanceConfigurationForCreateInstanceInput.configurationCode) &&
543522
Objects.equals(this.deletionProtection, instanceConfigurationForCreateInstanceInput.deletionProtection) &&
544-
Objects.equals(this.enableCerebro, instanceConfigurationForCreateInstanceInput.enableCerebro) &&
545523
Objects.equals(this.enableHttps, instanceConfigurationForCreateInstanceInput.enableHttps) &&
546524
Objects.equals(this.enablePureMaster, instanceConfigurationForCreateInstanceInput.enablePureMaster) &&
547525
Objects.equals(this.instanceName, instanceConfigurationForCreateInstanceInput.instanceName) &&
@@ -558,7 +536,7 @@ public boolean equals(java.lang.Object o) {
558536

559537
@Override
560538
public int hashCode() {
561-
return Objects.hash(adminPassword, autoRenew, chargeType, configurationCode, deletionProtection, enableCerebro, enableHttps, enablePureMaster, instanceName, networkSpecs, nodeSpecsAssigns, period, projectName, regionId, subnet, VPC, version, zoneId);
539+
return Objects.hash(adminPassword, autoRenew, chargeType, configurationCode, deletionProtection, enableHttps, enablePureMaster, instanceName, networkSpecs, nodeSpecsAssigns, period, projectName, regionId, subnet, VPC, version, zoneId);
562540
}
563541

564542

@@ -572,7 +550,6 @@ public String toString() {
572550
sb.append(" chargeType: ").append(toIndentedString(chargeType)).append("\n");
573551
sb.append(" configurationCode: ").append(toIndentedString(configurationCode)).append("\n");
574552
sb.append(" deletionProtection: ").append(toIndentedString(deletionProtection)).append("\n");
575-
sb.append(" enableCerebro: ").append(toIndentedString(enableCerebro)).append("\n");
576553
sb.append(" enableHttps: ").append(toIndentedString(enableHttps)).append("\n");
577554
sb.append(" enablePureMaster: ").append(toIndentedString(enablePureMaster)).append("\n");
578555
sb.append(" instanceName: ").append(toIndentedString(instanceName)).append("\n");

volcengine-java-sdk-escloud/src/main/java/com/volcengine/escloud/model/ModifyIpWhitelistRequest.java renamed to volcengine-java-sdk-escloud/src/main/java/com/volcengine/escloud/model/ModifyIpAllowListRequest.java

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@
2424
import javax.validation.constraints.*;
2525
import javax.validation.Valid;
2626
/**
27-
* ModifyIpWhitelistRequest
27+
* ModifyIpAllowListRequest
2828
*/
2929

3030

3131

32-
public class ModifyIpWhitelistRequest {
32+
public class ModifyIpAllowListRequest {
3333
@SerializedName("Component")
3434
private String component = null;
3535

@@ -42,7 +42,7 @@ public class ModifyIpWhitelistRequest {
4242
@SerializedName("Type")
4343
private String type = null;
4444

45-
public ModifyIpWhitelistRequest component(String component) {
45+
public ModifyIpAllowListRequest component(String component) {
4646
this.component = component;
4747
return this;
4848
}
@@ -61,7 +61,7 @@ public void setComponent(String component) {
6161
this.component = component;
6262
}
6363

64-
public ModifyIpWhitelistRequest instanceId(String instanceId) {
64+
public ModifyIpAllowListRequest instanceId(String instanceId) {
6565
this.instanceId = instanceId;
6666
return this;
6767
}
@@ -80,7 +80,7 @@ public void setInstanceId(String instanceId) {
8080
this.instanceId = instanceId;
8181
}
8282

83-
public ModifyIpWhitelistRequest ipList(String ipList) {
83+
public ModifyIpAllowListRequest ipList(String ipList) {
8484
this.ipList = ipList;
8585
return this;
8686
}
@@ -99,7 +99,7 @@ public void setIpList(String ipList) {
9999
this.ipList = ipList;
100100
}
101101

102-
public ModifyIpWhitelistRequest type(String type) {
102+
public ModifyIpAllowListRequest type(String type) {
103103
this.type = type;
104104
return this;
105105
}
@@ -127,11 +127,11 @@ public boolean equals(java.lang.Object o) {
127127
if (o == null || getClass() != o.getClass()) {
128128
return false;
129129
}
130-
ModifyIpWhitelistRequest modifyIpWhitelistRequest = (ModifyIpWhitelistRequest) o;
131-
return Objects.equals(this.component, modifyIpWhitelistRequest.component) &&
132-
Objects.equals(this.instanceId, modifyIpWhitelistRequest.instanceId) &&
133-
Objects.equals(this.ipList, modifyIpWhitelistRequest.ipList) &&
134-
Objects.equals(this.type, modifyIpWhitelistRequest.type);
130+
ModifyIpAllowListRequest modifyIpAllowListRequest = (ModifyIpAllowListRequest) o;
131+
return Objects.equals(this.component, modifyIpAllowListRequest.component) &&
132+
Objects.equals(this.instanceId, modifyIpAllowListRequest.instanceId) &&
133+
Objects.equals(this.ipList, modifyIpAllowListRequest.ipList) &&
134+
Objects.equals(this.type, modifyIpAllowListRequest.type);
135135
}
136136

137137
@Override
@@ -143,7 +143,7 @@ public int hashCode() {
143143
@Override
144144
public String toString() {
145145
StringBuilder sb = new StringBuilder();
146-
sb.append("class ModifyIpWhitelistRequest {\n");
146+
sb.append("class ModifyIpAllowListRequest {\n");
147147

148148
sb.append(" component: ").append(toIndentedString(component)).append("\n");
149149
sb.append(" instanceId: ").append(toIndentedString(instanceId)).append("\n");

volcengine-java-sdk-escloud/src/main/java/com/volcengine/escloud/model/ModifyIpWhitelistResponse.java renamed to volcengine-java-sdk-escloud/src/main/java/com/volcengine/escloud/model/ModifyIpAllowListResponse.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,19 +24,19 @@
2424
import javax.validation.constraints.*;
2525
import javax.validation.Valid;
2626
/**
27-
* ModifyIpWhitelistResponse
27+
* ModifyIpAllowListResponse
2828
*/
2929

3030

3131

32-
public class ModifyIpWhitelistResponse extends com.volcengine.model.AbstractResponse {
32+
public class ModifyIpAllowListResponse extends com.volcengine.model.AbstractResponse {
3333
@SerializedName("Message")
3434
private String message = null;
3535

3636
@SerializedName("Status")
3737
private String status = null;
3838

39-
public ModifyIpWhitelistResponse message(String message) {
39+
public ModifyIpAllowListResponse message(String message) {
4040
this.message = message;
4141
return this;
4242
}
@@ -54,7 +54,7 @@ public void setMessage(String message) {
5454
this.message = message;
5555
}
5656

57-
public ModifyIpWhitelistResponse status(String status) {
57+
public ModifyIpAllowListResponse status(String status) {
5858
this.status = status;
5959
return this;
6060
}
@@ -81,9 +81,9 @@ public boolean equals(java.lang.Object o) {
8181
if (o == null || getClass() != o.getClass()) {
8282
return false;
8383
}
84-
ModifyIpWhitelistResponse modifyIpWhitelistResponse = (ModifyIpWhitelistResponse) o;
85-
return Objects.equals(this.message, modifyIpWhitelistResponse.message) &&
86-
Objects.equals(this.status, modifyIpWhitelistResponse.status);
84+
ModifyIpAllowListResponse modifyIpAllowListResponse = (ModifyIpAllowListResponse) o;
85+
return Objects.equals(this.message, modifyIpAllowListResponse.message) &&
86+
Objects.equals(this.status, modifyIpAllowListResponse.status);
8787
}
8888

8989
@Override
@@ -95,7 +95,7 @@ public int hashCode() {
9595
@Override
9696
public String toString() {
9797
StringBuilder sb = new StringBuilder();
98-
sb.append("class ModifyIpWhitelistResponse {\n");
98+
sb.append("class ModifyIpAllowListResponse {\n");
9999

100100
sb.append(" message: ").append(toIndentedString(message)).append("\n");
101101
sb.append(" status: ").append(toIndentedString(status)).append("\n");

0 commit comments

Comments
 (0)