Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.2.54-release
1.2.55-release
4 changes: 2 additions & 2 deletions examples/generic/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<artifactId>ucloud-sdk-java</artifactId>
<groupId>cn.ucloud</groupId>
<version>1.2.54-release</version>
<version>1.2.55-release</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand All @@ -19,7 +19,7 @@
<dependency>
<groupId>cn.ucloud</groupId>
<artifactId>ucloud-sdk-java-common</artifactId>
<version>1.2.54-release</version>
<version>1.2.55-release</version>
</dependency>
</dependencies>
</project>
4 changes: 2 additions & 2 deletions examples/uhost/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<artifactId>ucloud-sdk-java</artifactId>
<groupId>cn.ucloud</groupId>
<version>1.2.54-release</version>
<version>1.2.55-release</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand All @@ -19,7 +19,7 @@
<dependency>
<groupId>cn.ucloud</groupId>
<artifactId>ucloud-sdk-java-uhost</artifactId>
<version>1.2.54-release</version>
<version>1.2.55-release</version>
</dependency>
</dependencies>
</project>
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<groupId>cn.ucloud</groupId>
<artifactId>ucloud-sdk-java</artifactId>
<packaging>pom</packaging>
<version>1.2.54-release</version>
<version>1.2.55-release</version>
<modules>
<module>ucloud-sdk-java-common</module>
<module>ucloud-sdk-java-cloudwatch</module>
Expand Down
6 changes: 3 additions & 3 deletions ucloud-sdk-java-cloudwatch/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,19 @@
<parent>
<artifactId>ucloud-sdk-java</artifactId>
<groupId>cn.ucloud</groupId>
<version>1.2.54-release</version>
<version>1.2.55-release</version>
</parent>

<modelVersion>4.0.0</modelVersion>
<artifactId>ucloud-sdk-java-cloudwatch</artifactId>
<name>ucloud-sdk-java</name>
<version>1.2.54-release</version>
<version>1.2.55-release</version>

<dependencies>
<dependency>
<groupId>cn.ucloud</groupId>
<artifactId>ucloud-sdk-java-common</artifactId>
<version>1.2.54-release</version>
<version>1.2.55-release</version>
</dependency>

<dependency>
Expand Down
4 changes: 2 additions & 2 deletions ucloud-sdk-java-common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@
<parent>
<artifactId>ucloud-sdk-java</artifactId>
<groupId>cn.ucloud</groupId>
<version>1.2.54-release</version>
<version>1.2.55-release</version>
</parent>

<modelVersion>4.0.0</modelVersion>
<artifactId>ucloud-sdk-java-common</artifactId>
<name>ucloud-sdk-java</name>
<version>1.2.54-release</version>
<version>1.2.55-release</version>

<dependencies>
<dependency>
Expand Down
6 changes: 3 additions & 3 deletions ucloud-sdk-java-cube/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,19 @@
<parent>
<artifactId>ucloud-sdk-java</artifactId>
<groupId>cn.ucloud</groupId>
<version>1.2.54-release</version>
<version>1.2.55-release</version>
</parent>

<modelVersion>4.0.0</modelVersion>
<artifactId>ucloud-sdk-java-cube</artifactId>
<name>ucloud-sdk-java</name>
<version>1.2.54-release</version>
<version>1.2.55-release</version>

<dependencies>
<dependency>
<groupId>cn.ucloud</groupId>
<artifactId>ucloud-sdk-java-common</artifactId>
<version>1.2.54-release</version>
<version>1.2.55-release</version>
</dependency>

<dependency>
Expand Down
6 changes: 3 additions & 3 deletions ucloud-sdk-java-ipsecvpn/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,19 @@
<parent>
<artifactId>ucloud-sdk-java</artifactId>
<groupId>cn.ucloud</groupId>
<version>1.2.54-release</version>
<version>1.2.55-release</version>
</parent>

<modelVersion>4.0.0</modelVersion>
<artifactId>ucloud-sdk-java-ipsecvpn</artifactId>
<name>ucloud-sdk-java</name>
<version>1.2.54-release</version>
<version>1.2.55-release</version>

<dependencies>
<dependency>
<groupId>cn.ucloud</groupId>
<artifactId>ucloud-sdk-java-common</artifactId>
<version>1.2.54-release</version>
<version>1.2.55-release</version>
</dependency>

<dependency>
Expand Down
6 changes: 3 additions & 3 deletions ucloud-sdk-java-label/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,19 @@
<parent>
<artifactId>ucloud-sdk-java</artifactId>
<groupId>cn.ucloud</groupId>
<version>1.2.54-release</version>
<version>1.2.55-release</version>
</parent>

<modelVersion>4.0.0</modelVersion>
<artifactId>ucloud-sdk-java-label</artifactId>
<name>ucloud-sdk-java</name>
<version>1.2.54-release</version>
<version>1.2.55-release</version>

<dependencies>
<dependency>
<groupId>cn.ucloud</groupId>
<artifactId>ucloud-sdk-java-common</artifactId>
<version>1.2.54-release</version>
<version>1.2.55-release</version>
</dependency>

<dependency>
Expand Down
6 changes: 3 additions & 3 deletions ucloud-sdk-java-nlb/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,19 @@
<parent>
<artifactId>ucloud-sdk-java</artifactId>
<groupId>cn.ucloud</groupId>
<version>1.2.54-release</version>
<version>1.2.55-release</version>
</parent>

<modelVersion>4.0.0</modelVersion>
<artifactId>ucloud-sdk-java-nlb</artifactId>
<name>ucloud-sdk-java</name>
<version>1.2.54-release</version>
<version>1.2.55-release</version>

<dependencies>
<dependency>
<groupId>cn.ucloud</groupId>
<artifactId>ucloud-sdk-java-common</artifactId>
<version>1.2.54-release</version>
<version>1.2.55-release</version>
</dependency>

<dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,15 @@ public class CreateNLBListenerRequest extends Request {
@UCloudParam("NLBId")
private String nlbId;

/** 监听协议 限定取值:"TCP"/"UDP" */
@NotEmpty
@UCloudParam("Protocol")
private String protocol;

/** */
@UCloudParam("HealthCheckConfig")
private HealthCheckConfig healthCheckConfig;

/** 监听器的名称 限定字符长度:[1-255] 限定特殊字符,仅支持:-_. 默认值:listener */
@UCloudParam("Name")
private String name;
Expand All @@ -53,10 +62,6 @@ public class CreateNLBListenerRequest extends Request {
@UCloudParam("EndPort")
private Integer endPort;

/** 监听协议 限定取值:"TCP"/"UDP" */
@UCloudParam("Protocol")
private String protocol;

/**
* 负载均衡算法 限定取值:"RoundRobin"/"SourceHash"/"LeastConn"/"WeightLeastConn "/"WeightRoundRobin" 默认值
* "RoundRobin"
Expand All @@ -68,11 +73,7 @@ public class CreateNLBListenerRequest extends Request {
@UCloudParam("StickinessTimeout")
private Integer stickinessTimeout;

/** */
@UCloudParam("HealthCheckConfig")
private HealthCheckConfig healthCheckConfig;

/** 传递源 IP 方法。 限定取值:"" / "None" / "Toa",空字符串和 None 代表关闭。 */
/** 传递源 IP 方法。 限定取值:"" / "None" / "Toa"/"ProxyProto",空字符串和 None 代表关闭。 */
@UCloudParam("ForwardSrcIPMethod")
private String forwardSrcIPMethod;

Expand Down Expand Up @@ -100,6 +101,22 @@ public void setNLBId(String nlbId) {
this.nlbId = nlbId;
}

public String getProtocol() {
return protocol;
}

public void setProtocol(String protocol) {
this.protocol = protocol;
}

public HealthCheckConfig getHealthCheckConfig() {
return healthCheckConfig;
}

public void setHealthCheckConfig(HealthCheckConfig healthCheckConfig) {
this.healthCheckConfig = healthCheckConfig;
}

public String getName() {
return name;
}
Expand Down Expand Up @@ -132,14 +149,6 @@ public void setEndPort(Integer endPort) {
this.endPort = endPort;
}

public String getProtocol() {
return protocol;
}

public void setProtocol(String protocol) {
this.protocol = protocol;
}

public String getScheduler() {
return scheduler;
}
Expand All @@ -156,14 +165,6 @@ public void setStickinessTimeout(Integer stickinessTimeout) {
this.stickinessTimeout = stickinessTimeout;
}

public HealthCheckConfig getHealthCheckConfig() {
return healthCheckConfig;
}

public void setHealthCheckConfig(HealthCheckConfig healthCheckConfig) {
this.healthCheckConfig = healthCheckConfig;
}

public String getForwardSrcIPMethod() {
return forwardSrcIPMethod;
}
Expand All @@ -174,15 +175,16 @@ public void setForwardSrcIPMethod(String forwardSrcIPMethod) {

public static class HealthCheckConfig extends Request {

/** 健康检查探测端口 说明: 限定取值:[1-65535],Ping 探测下,端口可填 0 */
@NotEmpty
@UCloudParam("Port")
private Integer port;

/** 是否开启健康检查功能。暂时不支持关闭,默认 true */
@UCloudParam("Enabled")
private Boolean enabled;

/** 健康检查探测端口 说明: 限定取值:[1-65535] */
@UCloudParam("Port")
private Integer port;

/** 健康检查方式 限定取值:"Port"/"UDP"/"Ping" 默认值:“Port” */
/** 健康检查方式 限定取值:"Port"/"UDP"/"Ping" 默认值:“Port”,Ping 只允许 UDP 协议监听器设置 */
@UCloudParam("Type")
private String type;

Expand All @@ -194,14 +196,6 @@ public static class HealthCheckConfig extends Request {
@UCloudParam("ResMsg")
private String resMsg;

public Boolean getEnabled() {
return enabled;
}

public void setEnabled(Boolean enabled) {
this.enabled = enabled;
}

public Integer getPort() {
return port;
}
Expand All @@ -210,6 +204,14 @@ public void setPort(Integer port) {
this.port = port;
}

public Boolean getEnabled() {
return enabled;
}

public void setEnabled(Boolean enabled) {
this.enabled = enabled;
}

public String getType() {
return type;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ public class DescribeNLBListenersRequest extends Request {

/** 设置监听器的偏移量 */
@UCloudParam("Offset")
private String offset;
private Integer offset;

public String getRegion() {
return region;
Expand Down Expand Up @@ -89,11 +89,11 @@ public void setLimit(Integer limit) {
this.limit = limit;
}

public String getOffset() {
public Integer getOffset() {
return offset;
}

public void setOffset(String offset) {
public void setOffset(Integer offset) {
this.offset = offset;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ public static class Listener extends Response {
@SerializedName("StickinessTimeout")
private Integer stickinessTimeout;

/** 传递源 IP 方法。限定取值:"" / "None" / "Toa",空字符串和 None 代表关闭。 */
/** 传递源 IP 方法。限定取值:"" / "None" / "Toa"/"ProxyProto",空字符串和 None 代表关闭。 */
@SerializedName("ForwardSrcIPMethod")
private String forwardSrcIPMethod;

Expand All @@ -196,6 +196,10 @@ public static class Listener extends Response {
@SerializedName("State")
private String state;

/** 是否开启删除保护 */
@SerializedName("DeletionProtection")
private Boolean deletionProtection;

public String getListenerId() {
return listenerId;
}
Expand Down Expand Up @@ -291,6 +295,14 @@ public String getState() {
public void setState(String state) {
this.state = state;
}

public Boolean getDeletionProtection() {
return deletionProtection;
}

public void setDeletionProtection(Boolean deletionProtection) {
this.deletionProtection = deletionProtection;
}
}

public static class Target extends Response {
Expand Down
Loading
Loading