Skip to content

Commit 4f1c23f

Browse files
author
BitsAdmin
committed
Merge 'vpn-Java-2020-04-01-online-2272-2026_02_10_20_20_48' into 'integration_2026-02-27_1118642807554'
feat: [development task] vpn-2272-Java (2132285) See merge request: !895
2 parents e90f527 + a2359e7 commit 4f1c23f

File tree

45 files changed

+3246
-1150
lines changed

Some content is hidden

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

45 files changed

+3246
-1150
lines changed

volcengine-java-sdk-vpn/src/main/java/com/volcengine/vpn/model/AsPathForDescribeVpnGatewayRouteAttributesOutput.java

Lines changed: 5 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -35,51 +35,8 @@ public class AsPathForDescribeVpnGatewayRouteAttributesOutput {
3535
@SerializedName("Numbers")
3636
private List<Integer> numbers = null;
3737

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

8441
public AsPathForDescribeVpnGatewayRouteAttributesOutput numbers(List<Integer> numbers) {
8542
this.numbers = numbers;
@@ -107,7 +64,7 @@ public void setNumbers(List<Integer> numbers) {
10764
this.numbers = numbers;
10865
}
10966

110-
public AsPathForDescribeVpnGatewayRouteAttributesOutput type(TypeEnum type) {
67+
public AsPathForDescribeVpnGatewayRouteAttributesOutput type(String type) {
11168
this.type = type;
11269
return this;
11370
}
@@ -117,11 +74,11 @@ public AsPathForDescribeVpnGatewayRouteAttributesOutput type(TypeEnum type) {
11774
* @return type
11875
**/
11976
@Schema(description = "")
120-
public TypeEnum getType() {
77+
public String getType() {
12178
return type;
12279
}
12380

124-
public void setType(TypeEnum type) {
81+
public void setType(String type) {
12582
this.type = type;
12683
}
12784

volcengine-java-sdk-vpn/src/main/java/com/volcengine/vpn/model/AsPathForDescribeVpnGatewayRoutesOutput.java

Lines changed: 5 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -35,51 +35,8 @@ public class AsPathForDescribeVpnGatewayRoutesOutput {
3535
@SerializedName("Numbers")
3636
private List<Integer> numbers = null;
3737

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

8441
public AsPathForDescribeVpnGatewayRoutesOutput numbers(List<Integer> numbers) {
8542
this.numbers = numbers;
@@ -107,7 +64,7 @@ public void setNumbers(List<Integer> numbers) {
10764
this.numbers = numbers;
10865
}
10966

110-
public AsPathForDescribeVpnGatewayRoutesOutput type(TypeEnum type) {
67+
public AsPathForDescribeVpnGatewayRoutesOutput type(String type) {
11168
this.type = type;
11269
return this;
11370
}
@@ -117,11 +74,11 @@ public AsPathForDescribeVpnGatewayRoutesOutput type(TypeEnum type) {
11774
* @return type
11875
**/
11976
@Schema(description = "")
120-
public TypeEnum getType() {
77+
public String getType() {
12178
return type;
12279
}
12380

124-
public void setType(TypeEnum type) {
81+
public void setType(String type) {
12582
this.type = type;
12683
}
12784

volcengine-java-sdk-vpn/src/main/java/com/volcengine/vpn/model/BGPConfigForModifyVpnConnectionTunnelAttributesInput.java

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

3131

3232
public class BGPConfigForModifyVpnConnectionTunnelAttributesInput {
33+
@SerializedName("LocalBgpIP")
34+
private String localBgpIP = null;
35+
3336
@SerializedName("LocalBgpIp")
3437
private String localBgpIp = null;
3538

3639
@SerializedName("TunnelCidr")
3740
private String tunnelCidr = null;
3841

42+
public BGPConfigForModifyVpnConnectionTunnelAttributesInput localBgpIP(String localBgpIP) {
43+
this.localBgpIP = localBgpIP;
44+
return this;
45+
}
46+
47+
/**
48+
* Get localBgpIP
49+
* @return localBgpIP
50+
**/
51+
@Schema(description = "")
52+
public String getLocalBgpIP() {
53+
return localBgpIP;
54+
}
55+
56+
public void setLocalBgpIP(String localBgpIP) {
57+
this.localBgpIP = localBgpIP;
58+
}
59+
3960
public BGPConfigForModifyVpnConnectionTunnelAttributesInput localBgpIp(String localBgpIp) {
4061
this.localBgpIp = localBgpIp;
4162
return this;
@@ -82,13 +103,14 @@ public boolean equals(java.lang.Object o) {
82103
return false;
83104
}
84105
BGPConfigForModifyVpnConnectionTunnelAttributesInput bgPConfigForModifyVpnConnectionTunnelAttributesInput = (BGPConfigForModifyVpnConnectionTunnelAttributesInput) o;
85-
return Objects.equals(this.localBgpIp, bgPConfigForModifyVpnConnectionTunnelAttributesInput.localBgpIp) &&
106+
return Objects.equals(this.localBgpIP, bgPConfigForModifyVpnConnectionTunnelAttributesInput.localBgpIP) &&
107+
Objects.equals(this.localBgpIp, bgPConfigForModifyVpnConnectionTunnelAttributesInput.localBgpIp) &&
86108
Objects.equals(this.tunnelCidr, bgPConfigForModifyVpnConnectionTunnelAttributesInput.tunnelCidr);
87109
}
88110

89111
@Override
90112
public int hashCode() {
91-
return Objects.hash(localBgpIp, tunnelCidr);
113+
return Objects.hash(localBgpIP, localBgpIp, tunnelCidr);
92114
}
93115

94116

@@ -97,6 +119,7 @@ public String toString() {
97119
StringBuilder sb = new StringBuilder();
98120
sb.append("class BGPConfigForModifyVpnConnectionTunnelAttributesInput {\n");
99121

122+
sb.append(" localBgpIP: ").append(toIndentedString(localBgpIP)).append("\n");
100123
sb.append(" localBgpIp: ").append(toIndentedString(localBgpIp)).append("\n");
101124
sb.append(" tunnelCidr: ").append(toIndentedString(tunnelCidr)).append("\n");
102125
sb.append("}");

volcengine-java-sdk-vpn/src/main/java/com/volcengine/vpn/model/ConvertBgpConfigForModifyVpnConnectionAttributesInput.java renamed to volcengine-java-sdk-vpn/src/main/java/com/volcengine/vpn/model/BgpConfigForModifyVpnConnectionAttributesInput.java

Lines changed: 10 additions & 10 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-
* ConvertBgpConfigForModifyVpnConnectionAttributesInput
27+
* BgpConfigForModifyVpnConnectionAttributesInput
2828
*/
2929

3030

3131

32-
public class ConvertBgpConfigForModifyVpnConnectionAttributesInput {
32+
public class BgpConfigForModifyVpnConnectionAttributesInput {
3333
@SerializedName("EnableBgp")
3434
private Boolean enableBgp = null;
3535

@@ -39,7 +39,7 @@ public class ConvertBgpConfigForModifyVpnConnectionAttributesInput {
3939
@SerializedName("TunnelCidr")
4040
private String tunnelCidr = null;
4141

42-
public ConvertBgpConfigForModifyVpnConnectionAttributesInput enableBgp(Boolean enableBgp) {
42+
public BgpConfigForModifyVpnConnectionAttributesInput enableBgp(Boolean enableBgp) {
4343
this.enableBgp = enableBgp;
4444
return this;
4545
}
@@ -57,7 +57,7 @@ public void setEnableBgp(Boolean enableBgp) {
5757
this.enableBgp = enableBgp;
5858
}
5959

60-
public ConvertBgpConfigForModifyVpnConnectionAttributesInput localBgpIp(String localBgpIp) {
60+
public BgpConfigForModifyVpnConnectionAttributesInput localBgpIp(String localBgpIp) {
6161
this.localBgpIp = localBgpIp;
6262
return this;
6363
}
@@ -75,7 +75,7 @@ public void setLocalBgpIp(String localBgpIp) {
7575
this.localBgpIp = localBgpIp;
7676
}
7777

78-
public ConvertBgpConfigForModifyVpnConnectionAttributesInput tunnelCidr(String tunnelCidr) {
78+
public BgpConfigForModifyVpnConnectionAttributesInput tunnelCidr(String tunnelCidr) {
7979
this.tunnelCidr = tunnelCidr;
8080
return this;
8181
}
@@ -102,10 +102,10 @@ public boolean equals(java.lang.Object o) {
102102
if (o == null || getClass() != o.getClass()) {
103103
return false;
104104
}
105-
ConvertBgpConfigForModifyVpnConnectionAttributesInput convertBgpConfigForModifyVpnConnectionAttributesInput = (ConvertBgpConfigForModifyVpnConnectionAttributesInput) o;
106-
return Objects.equals(this.enableBgp, convertBgpConfigForModifyVpnConnectionAttributesInput.enableBgp) &&
107-
Objects.equals(this.localBgpIp, convertBgpConfigForModifyVpnConnectionAttributesInput.localBgpIp) &&
108-
Objects.equals(this.tunnelCidr, convertBgpConfigForModifyVpnConnectionAttributesInput.tunnelCidr);
105+
BgpConfigForModifyVpnConnectionAttributesInput bgpConfigForModifyVpnConnectionAttributesInput = (BgpConfigForModifyVpnConnectionAttributesInput) o;
106+
return Objects.equals(this.enableBgp, bgpConfigForModifyVpnConnectionAttributesInput.enableBgp) &&
107+
Objects.equals(this.localBgpIp, bgpConfigForModifyVpnConnectionAttributesInput.localBgpIp) &&
108+
Objects.equals(this.tunnelCidr, bgpConfigForModifyVpnConnectionAttributesInput.tunnelCidr);
109109
}
110110

111111
@Override
@@ -117,7 +117,7 @@ public int hashCode() {
117117
@Override
118118
public String toString() {
119119
StringBuilder sb = new StringBuilder();
120-
sb.append("class ConvertBgpConfigForModifyVpnConnectionAttributesInput {\n");
120+
sb.append("class BgpConfigForModifyVpnConnectionAttributesInput {\n");
121121

122122
sb.append(" enableBgp: ").append(toIndentedString(enableBgp)).append("\n");
123123
sb.append(" localBgpIp: ").append(toIndentedString(localBgpIp)).append("\n");

volcengine-java-sdk-vpn/src/main/java/com/volcengine/vpn/model/ConvertBGPConfigForCreateVpnConnectionInput.java

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

3131

3232
public class ConvertBGPConfigForCreateVpnConnectionInput {
33+
@SerializedName("LocalBgpIP")
34+
private String localBgpIP = null;
35+
3336
@SerializedName("LocalBgpIp")
3437
private String localBgpIp = null;
3538

3639
@SerializedName("TunnelCidr")
3740
private String tunnelCidr = null;
3841

42+
public ConvertBGPConfigForCreateVpnConnectionInput localBgpIP(String localBgpIP) {
43+
this.localBgpIP = localBgpIP;
44+
return this;
45+
}
46+
47+
/**
48+
* Get localBgpIP
49+
* @return localBgpIP
50+
**/
51+
@Schema(description = "")
52+
public String getLocalBgpIP() {
53+
return localBgpIP;
54+
}
55+
56+
public void setLocalBgpIP(String localBgpIP) {
57+
this.localBgpIP = localBgpIP;
58+
}
59+
3960
public ConvertBGPConfigForCreateVpnConnectionInput localBgpIp(String localBgpIp) {
4061
this.localBgpIp = localBgpIp;
4162
return this;
@@ -82,13 +103,14 @@ public boolean equals(java.lang.Object o) {
82103
return false;
83104
}
84105
ConvertBGPConfigForCreateVpnConnectionInput convertBGPConfigForCreateVpnConnectionInput = (ConvertBGPConfigForCreateVpnConnectionInput) o;
85-
return Objects.equals(this.localBgpIp, convertBGPConfigForCreateVpnConnectionInput.localBgpIp) &&
106+
return Objects.equals(this.localBgpIP, convertBGPConfigForCreateVpnConnectionInput.localBgpIP) &&
107+
Objects.equals(this.localBgpIp, convertBGPConfigForCreateVpnConnectionInput.localBgpIp) &&
86108
Objects.equals(this.tunnelCidr, convertBGPConfigForCreateVpnConnectionInput.tunnelCidr);
87109
}
88110

89111
@Override
90112
public int hashCode() {
91-
return Objects.hash(localBgpIp, tunnelCidr);
113+
return Objects.hash(localBgpIP, localBgpIp, tunnelCidr);
92114
}
93115

94116

@@ -97,6 +119,7 @@ public String toString() {
97119
StringBuilder sb = new StringBuilder();
98120
sb.append("class ConvertBGPConfigForCreateVpnConnectionInput {\n");
99121

122+
sb.append(" localBgpIP: ").append(toIndentedString(localBgpIP)).append("\n");
100123
sb.append(" localBgpIp: ").append(toIndentedString(localBgpIp)).append("\n");
101124
sb.append(" tunnelCidr: ").append(toIndentedString(tunnelCidr)).append("\n");
102125
sb.append("}");

0 commit comments

Comments
 (0)