feat: support adaptation ros in grpc e2e test (#8)

* feat: support ros e2e test Signed-off-by: wangxye <[email protected]> * fix: fix the dependecy of proto Signed-off-by: wangxye <[email protected]> * fix: fix the config in e2e remoting Signed-off-by: wangxye <[email protected]> * fix: fix the setMaxRetryAttempt Signed-off-by: wangxye <[email protected]> --------- Signed-off-by: wangxye <[email protected]>
AutoMQ · Oct 31, 2023 · e507ea9 · e507ea9
1 parent 0c36095
commit e507ea9
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 22 deletions.
diff --git a/java/e2e-v4/pom.xml b/java/e2e-v4/pom.xml
@@ -76,7 +76,7 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
-            <version>2.0.0-beta1</version>
+            <version>2.0.9</version>
         </dependency>
         <dependency>
             <groupId>ch.qos.logback</groupId>
@@ -142,10 +142,12 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>3.0.0-M5</version>
+                <version>3.1.2</version>
                 <configuration>
-                    <argLine>-Xmx1024m -XX:MaxPermSize=256m</argLine>
-                    <rerunFailingTestsCount>1</rerunFailingTestsCount>
+                    <skipAfterFailureCount>1</skipAfterFailureCount>
+                    <forkCount>1</forkCount>
+                    <reuseForks>true</reuseForks>
+                    <argLine>-Xmx1024m -XX:MaxMetaspaceSize=256m</argLine>
                     <trimStackTrace>false</trimStackTrace>
                 </configuration>
             </plugin>
@@ -157,11 +159,9 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.8.0</version>
                 <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
-                    <encoding>UTF-8</encoding>
+                    <source>9</source>
+                    <target>9</target>
                 </configuration>
             </plugin>
             <plugin>

diff --git a/java/e2e/pom.xml b/java/e2e/pom.xml
@@ -120,6 +120,16 @@
             <artifactId>rocketmq-controller</artifactId>
             <version>5.1.3-automq-0-SNAPSHOT</version>
         </dependency>
+        <dependency>
+            <groupId>com.automq.rocketmq</groupId>
+            <artifactId>rocketmq-cli</artifactId>
+            <version>5.1.3-automq-0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>com.automq.rocketmq</groupId>
+            <artifactId>rocketmq-proto</artifactId>
+            <version>5.1.3-automq-0-SNAPSHOT</version>
+        </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>

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
@@ -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
@@ -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
@@ -31,8 +31,8 @@
     </modules>
 
     <properties>
-        <maven.compiler.source>8</maven.compiler.source>
-        <maven.compiler.target>8</maven.compiler.target>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <jdk.version>8</jdk.version>
@@ -43,7 +43,7 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>1.18.8</version>
+            <version>1.18.28</version>
         </dependency>
     </dependencies>