Skip to content

Commit d493b9c

Browse files
snnuwangsnnuwang
authored
Merge pull request huaweicloud#142 from snnuwang/master
支持跨账号授权&升级过期jar包
2 parents 9774ced + c994b06 commit d493b9c

File tree

8 files changed

+109
-38
lines changed

8 files changed

+109
-38
lines changed

‎CHANGELOG.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,3 +79,14 @@
7979
# 1.3.19
8080
- Bugfixs
8181
* jackson版本升级到2.15.2
82+
83+
# 1.3.20
84+
- Bugfixs
85+
* jackson版本升级到2.15.4
86+
* log4j升级到2.21.1
87+
* httpclient升级到4.5.14
88+
* commons-io升级到2.16.0
89+
* protobuf升级到3.25.5
90+
* snappy-java升级到1.1.10.4
91+
- Features
92+
* 支持adapter sdk跨账号授权

‎huaweicloud-sdk-java-dis-iface/pom.xml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,30 @@
11
<?xml version="1.0"?>
22
<project
3-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
4-
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
4+
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
55
<modelVersion>4.0.0</modelVersion>
66
<parent>
77
<groupId>com.huaweicloud.dis</groupId>
88
<artifactId>huaweicloud-sdk-java-dis-pom</artifactId>
9-
<version>1.3.19-SNAPSHOT</version>
9+
<version>1.3.20-SNAPSHOT</version>
1010
</parent>
1111
<groupId>com.huaweicloud.dis</groupId>
1212
<artifactId>huaweicloud-sdk-java-dis-iface</artifactId>
13-
<version>1.3.19-SNAPSHOT</version>
13+
<version>1.3.20-SNAPSHOT</version>
1414
<name>huaweicloud-sdk-java-dis-iface</name>
1515
<url>http://maven.apache.org</url>
1616
<properties>
1717
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
18-
<jackson.databind.version>2.15.2</jackson.databind.version>
19-
<protobuf.version>3.21.9</protobuf.version>
18+
<jackson.databind.version>2.15.4</jackson.databind.version>
19+
<protobuf.version>3.25.5</protobuf.version>
2020
</properties>
2121
<dependencies>
2222
<dependency>
2323
<groupId>com.fasterxml.jackson.core</groupId>
2424
<artifactId>jackson-databind</artifactId>
2525
<version>${jackson.databind.version}</version>
2626
</dependency>
27-
27+
2828
<dependency>
2929
<groupId>com.google.protobuf</groupId>
3030
<artifactId>protobuf-java</artifactId>

‎huaweicloud-sdk-java-dis-iface/src/main/java/com/huaweicloud/dis/iface/coordinator/request/JoinGroupRequest.java

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ public class JoinGroupRequest {
1717

1818
private List<String> interestedStream;
1919

20+
private List<String> interestedStreamIdList;
21+
2022
private String streamPattern;
2123

2224
/**
@@ -84,4 +86,12 @@ public Long getRebalanceTimeoutMs() {
8486
public void setRebalanceTimeoutMs(Long rebalanceTimeoutMs) {
8587
this.rebalanceTimeoutMs = rebalanceTimeoutMs;
8688
}
89+
90+
public List<String> getInterestedStreamIdList() {
91+
return interestedStreamIdList;
92+
}
93+
94+
public void setInterestedStreamIdList(List<String> interestedStreamIdList) {
95+
this.interestedStreamIdList = interestedStreamIdList;
96+
}
8797
}

‎huaweicloud-sdk-java-dis-iface/src/main/java/com/huaweicloud/dis/iface/data/request/CommitCheckpointRequest.java

Lines changed: 29 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@
1616

1717
package com.huaweicloud.dis.iface.data.request;
1818

19-
import java.util.List;
20-
2119
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
2220
import com.fasterxml.jackson.annotation.JsonInclude;
2321
import com.fasterxml.jackson.annotation.JsonProperty;
@@ -75,12 +73,20 @@ public class CommitCheckpointRequest
7573

7674
/**
7775
* <p>
78-
* 当前 Consumer Group 的版本号。
76+
* 版本号。
7977
* </p>
8078
*/
8179
@JsonProperty("generation_id")
8280
private Long generationId;
8381

82+
/**
83+
* <p>
84+
* 流ID。
85+
* </p>
86+
*/
87+
@JsonProperty("stream_id")
88+
private String streamId;
89+
8490
public String getAppName()
8591
{
8692
return appName;
@@ -157,12 +163,26 @@ public void setGenerationId(Long generationId) {
157163
this.generationId = generationId;
158164
}
159165

160-
@Override
161-
public String toString()
162-
{
163-
return "CommitCheckpointRequest [appName=" + appName + ", checkpointType=" + checkpointType + ", streamName="
164-
+ streamName + ", partitionId=" + partitionId + ", sequenceNumber=" + sequenceNumber + ", metadata="
165-
+ metadata + ", clientId=" + clientId + ", generationId=" + generationId + "]";
166+
public String getStreamId() {
167+
return streamId;
168+
}
169+
170+
public void setStreamId(String streamId) {
171+
this.streamId = streamId;
166172
}
167173

174+
@Override
175+
public String toString() {
176+
return "CommitCheckpointRequest{" +
177+
"appName='" + appName + '\'' +
178+
", checkpointType='" + checkpointType + '\'' +
179+
", streamName='" + streamName + '\'' +
180+
", partitionId='" + partitionId + '\'' +
181+
", sequenceNumber='" + sequenceNumber + '\'' +
182+
", metadata='" + metadata + '\'' +
183+
", clientId='" + clientId + '\'' +
184+
", generationId=" + generationId +
185+
", streamId='" + streamId + '\'' +
186+
'}';
187+
}
168188
}

‎huaweicloud-sdk-java-dis-iface/src/main/java/com/huaweicloud/dis/iface/data/request/DeleteCheckpointRequest.java

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@ public class DeleteCheckpointRequest {
2020
@JsonProperty("app_name")
2121
private String appName;
2222

23+
@JsonProperty("stream_id")
24+
private String streamId;
25+
2326
public String getStreamName()
2427
{
2528
return streamName;
@@ -60,11 +63,22 @@ public void setAppName(String appName)
6063
this.appName = appName;
6164
}
6265

66+
public String getStreamId() {
67+
return streamId;
68+
}
69+
70+
public void setStreamId(String streamId) {
71+
this.streamId = streamId;
72+
}
6373

6474
@Override
65-
public String toString()
66-
{
67-
return "DeleteCheckpointParam [streamName=" + streamName + ", shardId=" + partitionId + ", checkpointType="
68-
+ checkpointType + ", appName=" + appName + "]";
75+
public String toString() {
76+
return "DeleteCheckpointRequest{" +
77+
"streamName='" + streamName + '\'' +
78+
", partitionId='" + partitionId + '\'' +
79+
", checkpointType='" + checkpointType + '\'' +
80+
", appName='" + appName + '\'' +
81+
", streamId='" + streamId + '\'' +
82+
'}';
6983
}
7084
}

‎huaweicloud-sdk-java-dis-iface/src/main/java/com/huaweicloud/dis/iface/data/request/GetCheckpointRequest.java

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,9 @@ public class GetCheckpointRequest
3939
@JsonProperty("timestamp")
4040
private Long timeStamp;
4141

42+
@JsonProperty("stream_id")
43+
private String streamId;
44+
4245
public String getStreamName()
4346
{
4447
return streamName;
@@ -89,10 +92,23 @@ public void setTimeStamp(Long timeStamp)
8992
this.timeStamp = timeStamp;
9093
}
9194

95+
public String getStreamId() {
96+
return streamId;
97+
}
98+
99+
public void setStreamId(String streamId) {
100+
this.streamId = streamId;
101+
}
102+
92103
@Override
93-
public String toString()
94-
{
95-
return "GetCheckpointParam [streamName=" + streamName + ", shardId=" + partitionId + ", checkpointType="
96-
+ checkpointType + ", appName=" + appName + ", timeStamp=" + timeStamp + "]";
104+
public String toString() {
105+
return "GetCheckpointRequest{" +
106+
"streamName='" + streamName + '\'' +
107+
", partitionId='" + partitionId + '\'' +
108+
", checkpointType='" + checkpointType + '\'' +
109+
", appName='" + appName + '\'' +
110+
", timeStamp=" + timeStamp +
111+
", streamId='" + streamId + '\'' +
112+
'}';
97113
}
98114
}

‎huaweicloud-sdk-java-dis/pom.xml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,33 @@
11
<?xml version="1.0"?>
22
<project
3-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
4-
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
4+
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
55
<modelVersion>4.0.0</modelVersion>
66
<parent>
77
<groupId>com.huaweicloud.dis</groupId>
88
<artifactId>huaweicloud-sdk-java-dis-pom</artifactId>
9-
<version>1.3.19-SNAPSHOT</version>
9+
<version>1.3.20-SNAPSHOT</version>
1010
</parent>
1111
<groupId>com.huaweicloud.dis</groupId>
1212
<artifactId>huaweicloud-sdk-java-dis</artifactId>
13-
<version>1.3.19-SNAPSHOT</version>
13+
<version>1.3.20-SNAPSHOT</version>
1414
<name>huaweicloud-sdk-java-dis</name>
1515
<url>http://maven.apache.org</url>
1616
<properties>
1717
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1818
<maven.compiler.source>1.8</maven.compiler.source>
1919
<maven.compiler.target>1.8</maven.compiler.target>
20-
<jackson.version>2.15.2</jackson.version>
20+
<jackson.version>2.15.4</jackson.version>
2121
<slf4j.version>1.7.36</slf4j.version>
2222
<httpclient.version>4.5.14</httpclient.version>
2323
<httpasyncclient.version>4.1.4</httpasyncclient.version>
24-
<log4j.version>2.20.0</log4j.version>
24+
<log4j.version>2.21.1</log4j.version>
2525
</properties>
2626
<dependencies>
2727
<dependency>
2828
<groupId>com.huaweicloud.dis</groupId>
2929
<artifactId>huaweicloud-sdk-java-dis-iface</artifactId>
30-
<version>1.3.19-SNAPSHOT</version>
30+
<version>1.3.20-SNAPSHOT</version>
3131
</dependency>
3232

3333
<!-- Jackson -->
@@ -85,21 +85,21 @@
8585
<artifactId>slf4j-api</artifactId>
8686
<version>${slf4j.version}</version>
8787
</dependency>
88-
88+
8989
<!-- sanppy-java -->
9090
<dependency>
9191
<groupId>org.xerial.snappy</groupId>
9292
<artifactId>snappy-java</artifactId>
93-
<version>1.1.8.4</version>
93+
<version>1.1.10.4</version>
9494
<type>jar</type>
9595
<scope>compile</scope>
9696
</dependency>
97-
97+
9898
<!-- common-io -->
9999
<dependency>
100100
<groupId>commons-io</groupId>
101101
<artifactId>commons-io</artifactId>
102-
<version>2.12.0</version>
102+
<version>2.16.0</version>
103103
</dependency>
104104

105105
<dependency>

‎pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<project xmlns="http://maven.apache.org/POM/4.0.0"
2-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
2+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
44
<modelVersion>4.0.0</modelVersion>
55

66
<groupId>com.huaweicloud.dis</groupId>
77
<artifactId>huaweicloud-sdk-java-dis-pom</artifactId>
8-
<version>1.3.19-SNAPSHOT</version>
8+
<version>1.3.20-SNAPSHOT</version>
99
<packaging>pom</packaging>
1010

1111
<name>huaweicloud-sdk-java-dis</name>

0 commit comments

Comments
 (0)