diff --git a/java/e2e-v4/pom.xml b/java/e2e-v4/pom.xml
index 68b61b3..de079a6 100644
--- a/java/e2e-v4/pom.xml
+++ b/java/e2e-v4/pom.xml
@@ -76,7 +76,7 @@
org.slf4j
slf4j-api
- 2.0.0-beta1
+ 2.0.9
ch.qos.logback
@@ -142,10 +142,12 @@
org.apache.maven.plugins
maven-surefire-plugin
- 3.0.0-M5
+ 3.1.2
- -Xmx1024m -XX:MaxPermSize=256m
- 1
+ 1
+ 1
+ true
+ -Xmx1024m -XX:MaxMetaspaceSize=256m
false
@@ -157,11 +159,9 @@
org.apache.maven.plugins
maven-compiler-plugin
- 3.8.0
-
- 1.8
- UTF-8
+
+ 9
diff --git a/java/e2e/pom.xml b/java/e2e/pom.xml
index 833a47e..69ebd40 100644
--- a/java/e2e/pom.xml
+++ b/java/e2e/pom.xml
@@ -120,6 +120,16 @@
rocketmq-controller
5.1.3-automq-0-SNAPSHOT
+
+ com.automq.rocketmq
+ rocketmq-cli
+ 5.1.3-automq-0-SNAPSHOT
+
+
+ com.automq.rocketmq
+ rocketmq-proto
+ 5.1.3-automq-0-SNAPSHOT
+
org.projectlombok
lombok
diff --git a/java/e2e/src/main/java/org/apache/rocketmq/factory/BaseFactory.java b/java/e2e/src/main/java/org/apache/rocketmq/factory/BaseFactory.java
index 364b855..a800b0f 100644
--- a/java/e2e/src/main/java/org/apache/rocketmq/factory/BaseFactory.java
+++ b/java/e2e/src/main/java/org/apache/rocketmq/factory/BaseFactory.java
@@ -18,10 +18,11 @@
package org.apache.rocketmq.factory;
import com.automq.rocketmq.controller.metadata.GrpcControllerClient;
+import com.automq.rocketmq.cli.CliClientConfig;
import org.apache.rocketmq.client.apis.ClientServiceProvider;
public class BaseFactory {
protected static ClientServiceProvider provider = ClientServiceProvider.loadService();
- protected static GrpcControllerClient client = new GrpcControllerClient();
+ protected static GrpcControllerClient client = new GrpcControllerClient(new CliClientConfig());
}
diff --git a/java/e2e/src/main/java/org/apache/rocketmq/frame/BaseOperate.java b/java/e2e/src/main/java/org/apache/rocketmq/frame/BaseOperate.java
index dd76395..4ca76f5 100644
--- a/java/e2e/src/main/java/org/apache/rocketmq/frame/BaseOperate.java
+++ b/java/e2e/src/main/java/org/apache/rocketmq/frame/BaseOperate.java
@@ -22,7 +22,9 @@
import apache.rocketmq.controller.v1.CreateTopicRequest;
import apache.rocketmq.controller.v1.GroupType;
import apache.rocketmq.controller.v1.MessageType;
+import apache.rocketmq.controller.v1.AcceptTypes;
import com.automq.rocketmq.controller.metadata.GrpcControllerClient;
+import com.automq.rocketmq.cli.CliClientConfig;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.CompletionException;
import org.apache.rocketmq.client.apis.ClientServiceProvider;
@@ -53,7 +55,7 @@ public void run() {
log.info("Shutdown Hook is running !");
}
});
- client = new GrpcControllerClient();
+ client = new GrpcControllerClient(new CliClientConfig());
}
// //
@@ -84,7 +86,7 @@ protected static String getTopic(String messageType, String methodName) {
CreateTopicRequest request = CreateTopicRequest.newBuilder()
.setTopic(topic)
.setCount(8)
- .addAcceptMessageTypes(convertMessageType(messageType))
+ .setAcceptTypes(convertAcceptTypes(messageType))
.build();
Long topicId = client.createTopic(endPoint, request).join();
log.info("create topic: {} , topicId:{}", topic, topicId);
@@ -95,18 +97,18 @@ protected static String getTopic(String messageType, String methodName) {
return null;
}
- private static MessageType convertMessageType(String typeStr) {
+ private static AcceptTypes convertAcceptTypes(String typeStr) {
switch (typeStr) {
case "NORMAL":
- return MessageType.NORMAL;
+ return AcceptTypes.newBuilder().addTypes(MessageType.NORMAL).build();
case "FIFO":
- return MessageType.FIFO;
+ return AcceptTypes.newBuilder().addTypes(MessageType.FIFO).build();
case "DELAY":
- return MessageType.DELAY;
+ return AcceptTypes.newBuilder().addTypes(MessageType.DELAY).build();
case "TRANSACTION":
- return MessageType.TRANSACTION;
+ return AcceptTypes.newBuilder().addTypes(MessageType.TRANSACTION).build();
default:
- return MessageType.MESSAGE_TYPE_UNSPECIFIED;
+ return AcceptTypes.newBuilder().addTypes(MessageType.MESSAGE_TYPE_UNSPECIFIED).build();
}
}
@@ -146,7 +148,7 @@ protected static String getGroupId(String methodName) {
// prepare consumer group
CreateGroupRequest request = CreateGroupRequest.newBuilder()
.setName(groupId)
- .setMaxRetryAttempt(16)
+ .setMaxDeliveryAttempt(16)
.setGroupType(GroupType.GROUP_TYPE_STANDARD)
.build();
CreateGroupReply reply = createConsumerGroup(request).join();
@@ -159,7 +161,7 @@ protected static String getOrderlyGroupId(String methodName) {
String groupId = String.format("GID_%s_%s", methodName, RandomUtils.getStringWithCharacter(6));
CreateGroupRequest request = CreateGroupRequest.newBuilder()
.setName(groupId)
- .setMaxRetryAttempt(16)
+ .setMaxDeliveryAttempt(16)
.setGroupType(GroupType.GROUP_TYPE_FIFO)
.build();
CreateGroupReply reply = createConsumerGroup(request).join();
diff --git a/java/pom.xml b/java/pom.xml
index 39e8d32..05d91ec 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -31,8 +31,8 @@
- 8
- 8
+ 17
+ 17
UTF-8
8
@@ -43,7 +43,7 @@
org.projectlombok
lombok
- 1.18.8
+ 1.18.28