Skip to content

Commit 1d2a0ab

Browse files
author
BitsAdmin
committed
Merge branch 'rds_mssql-Java-2022-01-01-online-619-2024_08_13_22_06_48' into 'integration_2024-09-26_456257596674'
feat: [development task] rds_mssql-663-Java (793780) See merge request iaasng/volcengine-java-sdk!259
2 parents cf69b08 + 69da0fe commit 1d2a0ab

File tree

52 files changed

+175
-14
lines changed

Some content is hidden

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

52 files changed

+175
-14
lines changed

volcengine-java-sdk-rdsmssql/src/main/java/com/volcengine/rdsmssql/model/AddressForDescribeDBInstanceDetailOutput.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
*/
2929

3030

31+
3132
public class AddressForDescribeDBInstanceDetailOutput {
3233
@SerializedName("DNSVisibility")
3334
private Boolean dnSVisibility = null;

volcengine-java-sdk-rdsmssql/src/main/java/com/volcengine/rdsmssql/model/BackupDatabaseDetailForDescribeBackupsOutput.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
*/
2929

3030

31+
3132
public class BackupDatabaseDetailForDescribeBackupsOutput {
3233
@SerializedName("BackupDownloadLinkEIP")
3334
private String backupDownloadLinkEIP = null;

volcengine-java-sdk-rdsmssql/src/main/java/com/volcengine/rdsmssql/model/BackupMetaForCreateBackupInput.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
*/
2929

3030

31+
3132
public class BackupMetaForCreateBackupInput {
3233
@SerializedName("DBName")
3334
private String dbName = null;

volcengine-java-sdk-rdsmssql/src/main/java/com/volcengine/rdsmssql/model/BackupsInfoForDescribeBackupsOutput.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
*/
3232

3333

34+
3435
public class BackupsInfoForDescribeBackupsOutput {
3536
@SerializedName("BackupDatabaseDetail")
3637
private List<BackupDatabaseDetailForDescribeBackupsOutput> backupDatabaseDetail = null;

volcengine-java-sdk-rdsmssql/src/main/java/com/volcengine/rdsmssql/model/BasicInfoForDescribeDBInstanceDetailOutput.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
*/
3232

3333

34+
3435
public class BasicInfoForDescribeDBInstanceDetailOutput {
3536
@SerializedName("BackupUse")
3637
private Float backupUse = null;

volcengine-java-sdk-rdsmssql/src/main/java/com/volcengine/rdsmssql/model/ChargeDetailForDescribeDBInstanceDetailOutput.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
*/
2929

3030

31+
3132
public class ChargeDetailForDescribeDBInstanceDetailOutput {
3233
@SerializedName("AutoRenew")
3334
private Boolean autoRenew = null;

volcengine-java-sdk-rdsmssql/src/main/java/com/volcengine/rdsmssql/model/ChargeDetailForDescribeDBInstancesOutput.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
*/
2929

3030

31+
3132
public class ChargeDetailForDescribeDBInstancesOutput {
3233
@SerializedName("AutoRenew")
3334
private Boolean autoRenew = null;

volcengine-java-sdk-rdsmssql/src/main/java/com/volcengine/rdsmssql/model/ChargeInfoForCreateDBInstanceInput.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
*/
2929

3030

31+
3132
public class ChargeInfoForCreateDBInstanceInput {
3233
@SerializedName("AutoRenew")
3334
private Boolean autoRenew = null;

volcengine-java-sdk-rdsmssql/src/main/java/com/volcengine/rdsmssql/model/ConnectionInfoForDescribeDBInstanceDetailOutput.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
*/
3232

3333

34+
3435
public class ConnectionInfoForDescribeDBInstanceDetailOutput {
3536
@SerializedName("Address")
3637
private List<AddressForDescribeDBInstanceDetailOutput> address = null;

volcengine-java-sdk-rdsmssql/src/main/java/com/volcengine/rdsmssql/model/CreateBackupRequest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
*/
3232

3333

34+
3435
public class CreateBackupRequest {
3536
@SerializedName("BackupMeta")
3637
private List<BackupMetaForCreateBackupInput> backupMeta = null;

volcengine-java-sdk-rdsmssql/src/main/java/com/volcengine/rdsmssql/model/CreateBackupResponse.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
*/
2929

3030

31+
3132
public class CreateBackupResponse extends com.volcengine.model.AbstractResponse {
3233
@SerializedName("BackupId")
3334
private String backupId = null;

volcengine-java-sdk-rdsmssql/src/main/java/com/volcengine/rdsmssql/model/CreateDBInstanceRequest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
*/
3333

3434

35+
3536
public class CreateDBInstanceRequest {
3637
@SerializedName("ChargeInfo")
3738
private ChargeInfoForCreateDBInstanceInput chargeInfo = null;

volcengine-java-sdk-rdsmssql/src/main/java/com/volcengine/rdsmssql/model/CreateDBInstanceResponse.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
*/
2929

3030

31+
3132
public class CreateDBInstanceResponse extends com.volcengine.model.AbstractResponse {
3233
@SerializedName("InstanceId")
3334
private String instanceId = null;

volcengine-java-sdk-rdsmssql/src/main/java/com/volcengine/rdsmssql/model/CreateTosRestoreRequest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
*/
3232

3333

34+
3435
public class CreateTosRestoreRequest {
3536
@SerializedName("Databases")
3637
private List<DatabaseForCreateTosRestoreInput> databases = null;

volcengine-java-sdk-rdsmssql/src/main/java/com/volcengine/rdsmssql/model/CreateTosRestoreResponse.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
*/
2929

3030

31+
3132
public class CreateTosRestoreResponse extends com.volcengine.model.AbstractResponse {
3233
@SerializedName("RestoreTaskId")
3334
private String restoreTaskId = null;

volcengine-java-sdk-rdsmssql/src/main/java/com/volcengine/rdsmssql/model/DatabaseForCreateTosRestoreInput.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
*/
2929

3030

31+
3132
public class DatabaseForCreateTosRestoreInput {
3233
@SerializedName("DBName")
3334
private String dbName = null;

volcengine-java-sdk-rdsmssql/src/main/java/com/volcengine/rdsmssql/model/DatabaseForRestoreToExistedInstanceInput.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
*/
2929

3030

31+
3132
public class DatabaseForRestoreToExistedInstanceInput {
3233
@SerializedName("DBName")
3334
private String dbName = null;

volcengine-java-sdk-rdsmssql/src/main/java/com/volcengine/rdsmssql/model/DeleteBackupRequest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
*/
2929

3030

31+
3132
public class DeleteBackupRequest {
3233
@SerializedName("BackupId")
3334
private String backupId = null;

volcengine-java-sdk-rdsmssql/src/main/java/com/volcengine/rdsmssql/model/DeleteBackupResponse.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
*/
2222

2323

24+
2425
public class DeleteBackupResponse extends com.volcengine.model.AbstractResponse {
2526

2627
@Override

volcengine-java-sdk-rdsmssql/src/main/java/com/volcengine/rdsmssql/model/DescribeAvailabilityZonesRequest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
*/
2929

3030

31+
3132
public class DescribeAvailabilityZonesRequest {
3233
@SerializedName("RegionId")
3334
private String regionId = null;

volcengine-java-sdk-rdsmssql/src/main/java/com/volcengine/rdsmssql/model/DescribeAvailabilityZonesResponse.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
*/
3232

3333

34+
3435
public class DescribeAvailabilityZonesResponse extends com.volcengine.model.AbstractResponse {
3536
@SerializedName("RegionId")
3637
private String regionId = null;

volcengine-java-sdk-rdsmssql/src/main/java/com/volcengine/rdsmssql/model/DescribeBackupsRequest.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
*/
2929

3030

31+
3132
public class DescribeBackupsRequest {
3233
@SerializedName("BackupEndTime")
3334
private String backupEndTime = null;
@@ -150,8 +151,7 @@ public DescribeBackupsRequest pageNumber(Integer pageNumber) {
150151
* Get pageNumber
151152
* @return pageNumber
152153
**/
153-
@NotNull
154-
@Schema(required = true, description = "")
154+
@Schema(description = "")
155155
public Integer getPageNumber() {
156156
return pageNumber;
157157
}
@@ -169,8 +169,7 @@ public DescribeBackupsRequest pageSize(Integer pageSize) {
169169
* Get pageSize
170170
* @return pageSize
171171
**/
172-
@NotNull
173-
@Schema(required = true, description = "")
172+
@Schema(description = "")
174173
public Integer getPageSize() {
175174
return pageSize;
176175
}

volcengine-java-sdk-rdsmssql/src/main/java/com/volcengine/rdsmssql/model/DescribeBackupsResponse.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
*/
3232

3333

34+
3435
public class DescribeBackupsResponse extends com.volcengine.model.AbstractResponse {
3536
@SerializedName("BackupsInfo")
3637
private List<BackupsInfoForDescribeBackupsOutput> backupsInfo = null;

volcengine-java-sdk-rdsmssql/src/main/java/com/volcengine/rdsmssql/model/DescribeDBInstanceDetailRequest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
*/
2929

3030

31+
3132
public class DescribeDBInstanceDetailRequest {
3233
@SerializedName("InstanceId")
3334
private String instanceId = null;

volcengine-java-sdk-rdsmssql/src/main/java/com/volcengine/rdsmssql/model/DescribeDBInstanceDetailResponse.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
*/
3535

3636

37+
3738
public class DescribeDBInstanceDetailResponse extends com.volcengine.model.AbstractResponse {
3839
@SerializedName("BasicInfo")
3940
private BasicInfoForDescribeDBInstanceDetailOutput basicInfo = null;

volcengine-java-sdk-rdsmssql/src/main/java/com/volcengine/rdsmssql/model/DescribeDBInstanceParametersRequest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
*/
2929

3030

31+
3132
public class DescribeDBInstanceParametersRequest {
3233
@SerializedName("InstanceId")
3334
private String instanceId = null;

volcengine-java-sdk-rdsmssql/src/main/java/com/volcengine/rdsmssql/model/DescribeDBInstanceParametersResponse.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
*/
3232

3333

34+
3435
public class DescribeDBInstanceParametersResponse extends com.volcengine.model.AbstractResponse {
3536
@SerializedName("DBEngine")
3637
private String dbEngine = null;

volcengine-java-sdk-rdsmssql/src/main/java/com/volcengine/rdsmssql/model/DescribeDBInstancesRequest.java

Lines changed: 48 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
*/
3232

3333

34+
3435
public class DescribeDBInstancesRequest {
3536
@SerializedName("ChargeType")
3637
private String chargeType = null;
@@ -44,6 +45,9 @@ public class DescribeDBInstancesRequest {
4445
@SerializedName("DBEngineVersion")
4546
private String dbEngineVersion = null;
4647

48+
@SerializedName("InstanceCategory")
49+
private String instanceCategory = null;
50+
4751
@SerializedName("InstanceId")
4852
private String instanceId = null;
4953

@@ -62,6 +66,9 @@ public class DescribeDBInstancesRequest {
6266
@SerializedName("PageSize")
6367
private Integer pageSize = null;
6468

69+
@SerializedName("PrimaryInstanceId")
70+
private String primaryInstanceId = null;
71+
6572
@SerializedName("TagFilters")
6673
private List<TagFilterForDescribeDBInstancesInput> tagFilters = null;
6774

@@ -140,6 +147,24 @@ public void setDbEngineVersion(String dbEngineVersion) {
140147
this.dbEngineVersion = dbEngineVersion;
141148
}
142149

150+
public DescribeDBInstancesRequest instanceCategory(String instanceCategory) {
151+
this.instanceCategory = instanceCategory;
152+
return this;
153+
}
154+
155+
/**
156+
* Get instanceCategory
157+
* @return instanceCategory
158+
**/
159+
@Schema(description = "")
160+
public String getInstanceCategory() {
161+
return instanceCategory;
162+
}
163+
164+
public void setInstanceCategory(String instanceCategory) {
165+
this.instanceCategory = instanceCategory;
166+
}
167+
143168
public DescribeDBInstancesRequest instanceId(String instanceId) {
144169
this.instanceId = instanceId;
145170
return this;
@@ -248,6 +273,24 @@ public void setPageSize(Integer pageSize) {
248273
this.pageSize = pageSize;
249274
}
250275

276+
public DescribeDBInstancesRequest primaryInstanceId(String primaryInstanceId) {
277+
this.primaryInstanceId = primaryInstanceId;
278+
return this;
279+
}
280+
281+
/**
282+
* Get primaryInstanceId
283+
* @return primaryInstanceId
284+
**/
285+
@Schema(description = "")
286+
public String getPrimaryInstanceId() {
287+
return primaryInstanceId;
288+
}
289+
290+
public void setPrimaryInstanceId(String primaryInstanceId) {
291+
this.primaryInstanceId = primaryInstanceId;
292+
}
293+
251294
public DescribeDBInstancesRequest tagFilters(List<TagFilterForDescribeDBInstancesInput> tagFilters) {
252295
this.tagFilters = tagFilters;
253296
return this;
@@ -307,19 +350,21 @@ public boolean equals(java.lang.Object o) {
307350
Objects.equals(this.createTimeEnd, describeDBInstancesRequest.createTimeEnd) &&
308351
Objects.equals(this.createTimeStart, describeDBInstancesRequest.createTimeStart) &&
309352
Objects.equals(this.dbEngineVersion, describeDBInstancesRequest.dbEngineVersion) &&
353+
Objects.equals(this.instanceCategory, describeDBInstancesRequest.instanceCategory) &&
310354
Objects.equals(this.instanceId, describeDBInstancesRequest.instanceId) &&
311355
Objects.equals(this.instanceName, describeDBInstancesRequest.instanceName) &&
312356
Objects.equals(this.instanceStatus, describeDBInstancesRequest.instanceStatus) &&
313357
Objects.equals(this.instanceType, describeDBInstancesRequest.instanceType) &&
314358
Objects.equals(this.pageNumber, describeDBInstancesRequest.pageNumber) &&
315359
Objects.equals(this.pageSize, describeDBInstancesRequest.pageSize) &&
360+
Objects.equals(this.primaryInstanceId, describeDBInstancesRequest.primaryInstanceId) &&
316361
Objects.equals(this.tagFilters, describeDBInstancesRequest.tagFilters) &&
317362
Objects.equals(this.zoneId, describeDBInstancesRequest.zoneId);
318363
}
319364

320365
@Override
321366
public int hashCode() {
322-
return Objects.hash(chargeType, createTimeEnd, createTimeStart, dbEngineVersion, instanceId, instanceName, instanceStatus, instanceType, pageNumber, pageSize, tagFilters, zoneId);
367+
return Objects.hash(chargeType, createTimeEnd, createTimeStart, dbEngineVersion, instanceCategory, instanceId, instanceName, instanceStatus, instanceType, pageNumber, pageSize, primaryInstanceId, tagFilters, zoneId);
323368
}
324369

325370

@@ -332,12 +377,14 @@ public String toString() {
332377
sb.append(" createTimeEnd: ").append(toIndentedString(createTimeEnd)).append("\n");
333378
sb.append(" createTimeStart: ").append(toIndentedString(createTimeStart)).append("\n");
334379
sb.append(" dbEngineVersion: ").append(toIndentedString(dbEngineVersion)).append("\n");
380+
sb.append(" instanceCategory: ").append(toIndentedString(instanceCategory)).append("\n");
335381
sb.append(" instanceId: ").append(toIndentedString(instanceId)).append("\n");
336382
sb.append(" instanceName: ").append(toIndentedString(instanceName)).append("\n");
337383
sb.append(" instanceStatus: ").append(toIndentedString(instanceStatus)).append("\n");
338384
sb.append(" instanceType: ").append(toIndentedString(instanceType)).append("\n");
339385
sb.append(" pageNumber: ").append(toIndentedString(pageNumber)).append("\n");
340386
sb.append(" pageSize: ").append(toIndentedString(pageSize)).append("\n");
387+
sb.append(" primaryInstanceId: ").append(toIndentedString(primaryInstanceId)).append("\n");
341388
sb.append(" tagFilters: ").append(toIndentedString(tagFilters)).append("\n");
342389
sb.append(" zoneId: ").append(toIndentedString(zoneId)).append("\n");
343390
sb.append("}");

volcengine-java-sdk-rdsmssql/src/main/java/com/volcengine/rdsmssql/model/DescribeDBInstancesResponse.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
*/
3232

3333

34+
3435
public class DescribeDBInstancesResponse extends com.volcengine.model.AbstractResponse {
3536
@SerializedName("InstancesInfo")
3637
private List<InstancesInfoForDescribeDBInstancesOutput> instancesInfo = null;

volcengine-java-sdk-rdsmssql/src/main/java/com/volcengine/rdsmssql/model/DescribeRegionsRequest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
*/
2222

2323

24+
2425
public class DescribeRegionsRequest {
2526

2627
@Override

volcengine-java-sdk-rdsmssql/src/main/java/com/volcengine/rdsmssql/model/DescribeRegionsResponse.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
*/
3232

3333

34+
3435
public class DescribeRegionsResponse extends com.volcengine.model.AbstractResponse {
3536
@SerializedName("Regions")
3637
private List<RegionForDescribeRegionsOutput> regions = null;

0 commit comments

Comments
 (0)