Skip to content

Commit 9457510

Browse files
author
BitsAdmin
committed
Merge branch 'redis-Java-2020-12-07-online-727-2024_10_31_10_09_41' into 'integration_2024-10-31_519233252354'
feat: [development task] Redis-727-Java (828532) See merge request iaasng/volcengine-java-sdk!279
2 parents 2a3ae86 + 57ccc79 commit 9457510

File tree

7 files changed

+282
-16
lines changed

7 files changed

+282
-16
lines changed

‎volcengine-java-sdk-redis/src/main/java/com/volcengine/redis/model/CreateAllowListRequest.java‎

Lines changed: 67 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,52 @@ public class CreateAllowListRequest {
3333
@SerializedName("AllowList")
3434
private String allowList = null;
3535

36+
/**
37+
* Gets or Sets allowListCategory
38+
*/
39+
@JsonAdapter(AllowListCategoryEnum.Adapter.class)
40+
public enum AllowListCategoryEnum {
41+
@SerializedName("Ordinary")
42+
ORDINARY("Ordinary"),
43+
@SerializedName("Default")
44+
DEFAULT("Default");
45+
46+
private String value;
47+
48+
AllowListCategoryEnum(String value) {
49+
this.value = value;
50+
}
51+
public String getValue() {
52+
return value;
53+
}
54+
55+
@Override
56+
public String toString() {
57+
return String.valueOf(value);
58+
}
59+
public static AllowListCategoryEnum fromValue(String input) {
60+
for (AllowListCategoryEnum b : AllowListCategoryEnum.values()) {
61+
if (b.value.equals(input)) {
62+
return b;
63+
}
64+
}
65+
return null;
66+
}
67+
public static class Adapter extends TypeAdapter<AllowListCategoryEnum> {
68+
@Override
69+
public void write(final JsonWriter jsonWriter, final AllowListCategoryEnum enumeration) throws IOException {
70+
jsonWriter.value(String.valueOf(enumeration.getValue()));
71+
}
72+
73+
@Override
74+
public AllowListCategoryEnum read(final JsonReader jsonReader) throws IOException {
75+
Object value = jsonReader.nextString();
76+
return AllowListCategoryEnum.fromValue((String)(value));
77+
}
78+
}
79+
} @SerializedName("AllowListCategory")
80+
private AllowListCategoryEnum allowListCategory = null;
81+
3682
@SerializedName("AllowListDesc")
3783
private String allowListDesc = null;
3884

@@ -64,6 +110,24 @@ public void setAllowList(String allowList) {
64110
this.allowList = allowList;
65111
}
66112

113+
public CreateAllowListRequest allowListCategory(AllowListCategoryEnum allowListCategory) {
114+
this.allowListCategory = allowListCategory;
115+
return this;
116+
}
117+
118+
/**
119+
* Get allowListCategory
120+
* @return allowListCategory
121+
**/
122+
@Schema(description = "")
123+
public AllowListCategoryEnum getAllowListCategory() {
124+
return allowListCategory;
125+
}
126+
127+
public void setAllowListCategory(AllowListCategoryEnum allowListCategory) {
128+
this.allowListCategory = allowListCategory;
129+
}
130+
67131
public CreateAllowListRequest allowListDesc(String allowListDesc) {
68132
this.allowListDesc = allowListDesc;
69133
return this;
@@ -148,6 +212,7 @@ public boolean equals(java.lang.Object o) {
148212
}
149213
CreateAllowListRequest createAllowListRequest = (CreateAllowListRequest) o;
150214
return Objects.equals(this.allowList, createAllowListRequest.allowList) &&
215+
Objects.equals(this.allowListCategory, createAllowListRequest.allowListCategory) &&
151216
Objects.equals(this.allowListDesc, createAllowListRequest.allowListDesc) &&
152217
Objects.equals(this.allowListName, createAllowListRequest.allowListName) &&
153218
Objects.equals(this.allowListType, createAllowListRequest.allowListType) &&
@@ -156,7 +221,7 @@ public boolean equals(java.lang.Object o) {
156221

157222
@Override
158223
public int hashCode() {
159-
return Objects.hash(allowList, allowListDesc, allowListName, allowListType, clientToken);
224+
return Objects.hash(allowList, allowListCategory, allowListDesc, allowListName, allowListType, clientToken);
160225
}
161226

162227

@@ -166,6 +231,7 @@ public String toString() {
166231
sb.append("class CreateAllowListRequest {\n");
167232

168233
sb.append(" allowList: ").append(toIndentedString(allowList)).append("\n");
234+
sb.append(" allowListCategory: ").append(toIndentedString(allowListCategory)).append("\n");
169235
sb.append(" allowListDesc: ").append(toIndentedString(allowListDesc)).append("\n");
170236
sb.append(" allowListName: ").append(toIndentedString(allowListName)).append("\n");
171237
sb.append(" allowListType: ").append(toIndentedString(allowListType)).append("\n");

‎volcengine-java-sdk-redis/src/main/java/com/volcengine/redis/model/CreateEnterpriseDBInstanceRequest.java‎

Lines changed: 27 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,9 @@ public class CreateEnterpriseDBInstanceRequest {
4949
@SerializedName("ConfigureNodes")
5050
private List<ConfigureNodeForCreateEnterpriseDBInstanceInput> configureNodes = null;
5151

52+
@SerializedName("DataLayout")
53+
private String dataLayout = null;
54+
5255
@SerializedName("DeletionProtection")
5356
private String deletionProtection = null;
5457

@@ -126,8 +129,7 @@ public CreateEnterpriseDBInstanceRequest autoRenew(Boolean autoRenew) {
126129
* Get autoRenew
127130
* @return autoRenew
128131
**/
129-
@NotNull
130-
@Schema(required = true, description = "")
132+
@Schema(description = "")
131133
public Boolean isAutoRenew() {
132134
return autoRenew;
133135
}
@@ -200,6 +202,25 @@ public void setConfigureNodes(List<ConfigureNodeForCreateEnterpriseDBInstanceInp
200202
this.configureNodes = configureNodes;
201203
}
202204

205+
public CreateEnterpriseDBInstanceRequest dataLayout(String dataLayout) {
206+
this.dataLayout = dataLayout;
207+
return this;
208+
}
209+
210+
/**
211+
* Get dataLayout
212+
* @return dataLayout
213+
**/
214+
@NotNull
215+
@Schema(required = true, description = "")
216+
public String getDataLayout() {
217+
return dataLayout;
218+
}
219+
220+
public void setDataLayout(String dataLayout) {
221+
this.dataLayout = dataLayout;
222+
}
223+
203224
public CreateEnterpriseDBInstanceRequest deletionProtection(String deletionProtection) {
204225
this.deletionProtection = deletionProtection;
205226
return this;
@@ -344,8 +365,7 @@ public CreateEnterpriseDBInstanceRequest purchaseMonths(Integer purchaseMonths)
344365
* Get purchaseMonths
345366
* @return purchaseMonths
346367
**/
347-
@NotNull
348-
@Schema(required = true, description = "")
368+
@Schema(description = "")
349369
public Integer getPurchaseMonths() {
350370
return purchaseMonths;
351371
}
@@ -491,6 +511,7 @@ public boolean equals(java.lang.Object o) {
491511
Objects.equals(this.chargeType, createEnterpriseDBInstanceRequest.chargeType) &&
492512
Objects.equals(this.clientToken, createEnterpriseDBInstanceRequest.clientToken) &&
493513
Objects.equals(this.configureNodes, createEnterpriseDBInstanceRequest.configureNodes) &&
514+
Objects.equals(this.dataLayout, createEnterpriseDBInstanceRequest.dataLayout) &&
494515
Objects.equals(this.deletionProtection, createEnterpriseDBInstanceRequest.deletionProtection) &&
495516
Objects.equals(this.flashPerShard, createEnterpriseDBInstanceRequest.flashPerShard) &&
496517
Objects.equals(this.instanceName, createEnterpriseDBInstanceRequest.instanceName) &&
@@ -509,7 +530,7 @@ public boolean equals(java.lang.Object o) {
509530

510531
@Override
511532
public int hashCode() {
512-
return Objects.hash(allowListIds, autoRenew, chargeType, clientToken, configureNodes, deletionProtection, flashPerShard, instanceName, modules, multiAZ, password, projectName, purchaseMonths, ramPerShard, regionId, shardNumber, subnetId, tags, vpcId);
533+
return Objects.hash(allowListIds, autoRenew, chargeType, clientToken, configureNodes, dataLayout, deletionProtection, flashPerShard, instanceName, modules, multiAZ, password, projectName, purchaseMonths, ramPerShard, regionId, shardNumber, subnetId, tags, vpcId);
513534
}
514535

515536

@@ -523,6 +544,7 @@ public String toString() {
523544
sb.append(" chargeType: ").append(toIndentedString(chargeType)).append("\n");
524545
sb.append(" clientToken: ").append(toIndentedString(clientToken)).append("\n");
525546
sb.append(" configureNodes: ").append(toIndentedString(configureNodes)).append("\n");
547+
sb.append(" dataLayout: ").append(toIndentedString(dataLayout)).append("\n");
526548
sb.append(" deletionProtection: ").append(toIndentedString(deletionProtection)).append("\n");
527549
sb.append(" flashPerShard: ").append(toIndentedString(flashPerShard)).append("\n");
528550
sb.append(" instanceName: ").append(toIndentedString(instanceName)).append("\n");

‎volcengine-java-sdk-redis/src/main/java/com/volcengine/redis/model/DescribeAllowListDetailResponse.java‎

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,9 @@ public class DescribeAllowListDetailResponse extends com.volcengine.model.Abstra
3636
@SerializedName("AllowList")
3737
private String allowList = null;
3838

39+
@SerializedName("AllowListCategory")
40+
private String allowListCategory = null;
41+
3942
@SerializedName("AllowListDesc")
4043
private String allowListDesc = null;
4144

@@ -69,6 +72,24 @@ public void setAllowList(String allowList) {
6972
this.allowList = allowList;
7073
}
7174

75+
public DescribeAllowListDetailResponse allowListCategory(String allowListCategory) {
76+
this.allowListCategory = allowListCategory;
77+
return this;
78+
}
79+
80+
/**
81+
* Get allowListCategory
82+
* @return allowListCategory
83+
**/
84+
@Schema(description = "")
85+
public String getAllowListCategory() {
86+
return allowListCategory;
87+
}
88+
89+
public void setAllowListCategory(String allowListCategory) {
90+
this.allowListCategory = allowListCategory;
91+
}
92+
7293
public DescribeAllowListDetailResponse allowListDesc(String allowListDesc) {
7394
this.allowListDesc = allowListDesc;
7495
return this;
@@ -179,6 +200,7 @@ public boolean equals(java.lang.Object o) {
179200
}
180201
DescribeAllowListDetailResponse describeAllowListDetailResponse = (DescribeAllowListDetailResponse) o;
181202
return Objects.equals(this.allowList, describeAllowListDetailResponse.allowList) &&
203+
Objects.equals(this.allowListCategory, describeAllowListDetailResponse.allowListCategory) &&
182204
Objects.equals(this.allowListDesc, describeAllowListDetailResponse.allowListDesc) &&
183205
Objects.equals(this.allowListId, describeAllowListDetailResponse.allowListId) &&
184206
Objects.equals(this.allowListName, describeAllowListDetailResponse.allowListName) &&
@@ -188,7 +210,7 @@ public boolean equals(java.lang.Object o) {
188210

189211
@Override
190212
public int hashCode() {
191-
return Objects.hash(allowList, allowListDesc, allowListId, allowListName, allowListType, associatedInstances);
213+
return Objects.hash(allowList, allowListCategory, allowListDesc, allowListId, allowListName, allowListType, associatedInstances);
192214
}
193215

194216

@@ -198,6 +220,7 @@ public String toString() {
198220
sb.append("class DescribeAllowListDetailResponse {\n");
199221

200222
sb.append(" allowList: ").append(toIndentedString(allowList)).append("\n");
223+
sb.append(" allowListCategory: ").append(toIndentedString(allowListCategory)).append("\n");
201224
sb.append(" allowListDesc: ").append(toIndentedString(allowListDesc)).append("\n");
202225
sb.append(" allowListId: ").append(toIndentedString(allowListId)).append("\n");
203226
sb.append(" allowListName: ").append(toIndentedString(allowListName)).append("\n");

‎volcengine-java-sdk-redis/src/main/java/com/volcengine/redis/model/DescribeAllowListsRequest.java‎

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,9 @@ public class DescribeAllowListsRequest {
3333
@SerializedName("InstanceId")
3434
private String instanceId = null;
3535

36+
@SerializedName("QueryDefault")
37+
private Boolean queryDefault = null;
38+
3639
@SerializedName("RegionId")
3740
private String regionId = null;
3841

@@ -54,6 +57,24 @@ public void setInstanceId(String instanceId) {
5457
this.instanceId = instanceId;
5558
}
5659

60+
public DescribeAllowListsRequest queryDefault(Boolean queryDefault) {
61+
this.queryDefault = queryDefault;
62+
return this;
63+
}
64+
65+
/**
66+
* Get queryDefault
67+
* @return queryDefault
68+
**/
69+
@Schema(description = "")
70+
public Boolean isQueryDefault() {
71+
return queryDefault;
72+
}
73+
74+
public void setQueryDefault(Boolean queryDefault) {
75+
this.queryDefault = queryDefault;
76+
}
77+
5778
public DescribeAllowListsRequest regionId(String regionId) {
5879
this.regionId = regionId;
5980
return this;
@@ -84,12 +105,13 @@ public boolean equals(java.lang.Object o) {
84105
}
85106
DescribeAllowListsRequest describeAllowListsRequest = (DescribeAllowListsRequest) o;
86107
return Objects.equals(this.instanceId, describeAllowListsRequest.instanceId) &&
108+
Objects.equals(this.queryDefault, describeAllowListsRequest.queryDefault) &&
87109
Objects.equals(this.regionId, describeAllowListsRequest.regionId);
88110
}
89111

90112
@Override
91113
public int hashCode() {
92-
return Objects.hash(instanceId, regionId);
114+
return Objects.hash(instanceId, queryDefault, regionId);
93115
}
94116

95117

@@ -99,6 +121,7 @@ public String toString() {
99121
sb.append("class DescribeAllowListsRequest {\n");
100122

101123
sb.append(" instanceId: ").append(toIndentedString(instanceId)).append("\n");
124+
sb.append(" queryDefault: ").append(toIndentedString(queryDefault)).append("\n");
102125
sb.append(" regionId: ").append(toIndentedString(regionId)).append("\n");
103126
sb.append("}");
104127
return sb.toString();

‎volcengine-java-sdk-redis/src/main/java/com/volcengine/redis/model/DescribeDBInstancesRequest.java‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -177,8 +177,7 @@ public DescribeDBInstancesRequest pageNumber(Integer pageNumber) {
177177
* Get pageNumber
178178
* @return pageNumber
179179
**/
180-
@NotNull
181-
@Schema(required = true, description = "")
180+
@Schema(description = "")
182181
public Integer getPageNumber() {
183182
return pageNumber;
184183
}
@@ -196,8 +195,7 @@ public DescribeDBInstancesRequest pageSize(Integer pageSize) {
196195
* Get pageSize
197196
* @return pageSize
198197
**/
199-
@NotNull
200-
@Schema(required = true, description = "")
198+
@Schema(description = "")
201199
public Integer getPageSize() {
202200
return pageSize;
203201
}
@@ -233,8 +231,7 @@ public DescribeDBInstancesRequest regionId(String regionId) {
233231
* Get regionId
234232
* @return regionId
235233
**/
236-
@NotNull
237-
@Schema(required = true, description = "")
234+
@Schema(description = "")
238235
public String getRegionId() {
239236
return regionId;
240237
}

0 commit comments

Comments
 (0)