fixed

apache · Mar 8, 2023 · 905517d · 905517d
1 parent 38af697
commit 905517d
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 14 deletions.
diff --git a/.../src/test/java/org/apache/rocketmq/connect/runtime/connectorwrapper/NameServerMocker.java b/.../src/test/java/org/apache/rocketmq/connect/runtime/connectorwrapper/NameServerMocker.java
@@ -17,12 +17,12 @@
 package org.apache.rocketmq.connect.runtime.connectorwrapper;
 
 import org.apache.rocketmq.common.MixAll;
-import org.apache.rocketmq.common.protocol.route.BrokerData;
-import org.apache.rocketmq.common.protocol.route.TopicRouteData;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
+import org.apache.rocketmq.remoting.protocol.route.BrokerData;
+import org.apache.rocketmq.remoting.protocol.route.TopicRouteData;
 
 /**
  * tools class

diff --git a/...st/java/org/apache/rocketmq/connect/runtime/service/ClusterManagementServiceImplTest.java b/...st/java/org/apache/rocketmq/connect/runtime/service/ClusterManagementServiceImplTest.java
@@ -21,13 +21,13 @@
 import io.netty.channel.ChannelHandlerContext;
 import java.nio.charset.StandardCharsets;
 import java.util.List;
-import org.apache.rocketmq.common.protocol.RequestCode;
-import org.apache.rocketmq.common.protocol.header.NotifyConsumerIdsChangedRequestHeader;
 import org.apache.rocketmq.connect.runtime.config.WorkerConfig;
 import org.apache.rocketmq.connect.runtime.connectorwrapper.NameServerMocker;
 import org.apache.rocketmq.connect.runtime.connectorwrapper.ServerResponseMocker;
 import org.apache.rocketmq.remoting.RemotingClient;
 import org.apache.rocketmq.remoting.protocol.RemotingCommand;
+import org.apache.rocketmq.remoting.protocol.RequestCode;
+import org.apache.rocketmq.remoting.protocol.header.NotifyConsumerIdsChangedRequestHeader;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;

diff --git a/...est/java/org/apache/rocketmq/connect/runtime/service/ConfigManagementServiceImplTest.java b/...est/java/org/apache/rocketmq/connect/runtime/service/ConfigManagementServiceImplTest.java
@@ -29,12 +29,9 @@
 import java.util.Set;
 import java.util.UUID;
 
-import com.google.common.collect.Maps;
 import org.apache.rocketmq.client.consumer.DefaultLitePullConsumer;
-import org.apache.rocketmq.client.consumer.DefaultMQPushConsumer;
 import org.apache.rocketmq.client.producer.DefaultMQProducer;
 import org.apache.rocketmq.client.producer.SendCallback;
-import org.apache.rocketmq.common.admin.TopicOffset;
 import org.apache.rocketmq.common.message.Message;
 import org.apache.rocketmq.common.message.MessageQueue;
 import org.apache.rocketmq.connect.runtime.common.ConnAndTaskConfigs;
@@ -53,6 +50,7 @@
 import org.apache.rocketmq.connect.runtime.utils.datasync.BrokerBasedLog;
 import org.apache.rocketmq.connect.runtime.utils.datasync.DataSynchronizer;
 import org.apache.rocketmq.connect.runtime.utils.datasync.DataSynchronizerCallback;
+import org.apache.rocketmq.remoting.protocol.admin.TopicOffset;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;

diff --git a/...rc/test/java/org/apache/rocketmq/connect/runtime/service/DefaultConnectorContextTest.java b/...rc/test/java/org/apache/rocketmq/connect/runtime/service/DefaultConnectorContextTest.java
@@ -40,7 +40,6 @@
 import org.apache.rocketmq.client.impl.consumer.RebalanceImpl;
 import org.apache.rocketmq.client.impl.factory.MQClientInstance;
 import org.apache.rocketmq.client.producer.DefaultMQProducer;
-import org.apache.rocketmq.common.admin.TopicOffset;
 import org.apache.rocketmq.common.message.MessageQueue;
 import org.apache.rocketmq.connect.runtime.common.ConnectKeyValue;
 import org.apache.rocketmq.connect.runtime.config.WorkerConfig;

diff --git a/...t/java/org/apache/rocketmq/connect/runtime/service/PositionManagementServiceImplTest.java b/...t/java/org/apache/rocketmq/connect/runtime/service/PositionManagementServiceImplTest.java
@@ -19,16 +19,12 @@
 
 import com.google.common.collect.Lists;
 import io.netty.util.internal.ConcurrentSet;
-import io.openmessaging.Future;
 import io.openmessaging.connector.api.data.RecordOffset;
-import io.openmessaging.producer.SendResult;
 import org.apache.rocketmq.client.consumer.DefaultLitePullConsumer;
 import org.apache.rocketmq.client.producer.DefaultMQProducer;
 import org.apache.rocketmq.client.producer.SendCallback;
-import org.apache.rocketmq.common.admin.TopicOffset;
 import org.apache.rocketmq.common.message.Message;
 import org.apache.rocketmq.common.message.MessageQueue;
-import org.apache.rocketmq.connect.runtime.common.ConnAndTaskConfigs;
 import org.apache.rocketmq.connect.runtime.config.WorkerConfig;
 import org.apache.rocketmq.connect.runtime.converter.record.json.JsonConverter;
 import org.apache.rocketmq.connect.runtime.connectorwrapper.NameServerMocker;
@@ -40,6 +36,7 @@
 import org.apache.rocketmq.connect.runtime.utils.TestUtils;
 import org.apache.rocketmq.connect.runtime.utils.datasync.BrokerBasedLog;
 import org.apache.rocketmq.connect.runtime.utils.datasync.DataSynchronizerCallback;
+import org.apache.rocketmq.remoting.protocol.admin.TopicOffset;
 import org.assertj.core.util.Maps;
 import org.junit.After;
 import org.junit.Before;

diff --git a/...rc/test/java/org/apache/rocketmq/connect/runtime/store/PositionStorageReaderImplTest.java b/...rc/test/java/org/apache/rocketmq/connect/runtime/store/PositionStorageReaderImplTest.java
@@ -24,7 +24,6 @@
 import io.openmessaging.connector.api.data.RecordPartition;
 import org.apache.rocketmq.client.consumer.DefaultLitePullConsumer;
 import org.apache.rocketmq.client.producer.DefaultMQProducer;
-import org.apache.rocketmq.common.admin.TopicOffset;
 import org.apache.rocketmq.common.message.MessageQueue;
 import org.apache.rocketmq.connect.runtime.config.WorkerConfig;
 import org.apache.rocketmq.connect.runtime.connectorwrapper.NameServerMocker;
@@ -33,6 +32,7 @@
 import org.apache.rocketmq.connect.runtime.service.PositionManagementService;
 import org.apache.rocketmq.connect.runtime.service.local.LocalPositionManagementServiceImpl;
 import org.apache.rocketmq.connect.runtime.utils.ConnectUtil;
+import org.apache.rocketmq.remoting.protocol.admin.TopicOffset;
 import org.assertj.core.util.Maps;
 import org.junit.After;
 import org.junit.Assert;

diff --git a/.../src/test/java/org/apache/rocketmq/connect/runtime/utils/datasync/BrokerBasedLogTest.java b/.../src/test/java/org/apache/rocketmq/connect/runtime/utils/datasync/BrokerBasedLogTest.java
@@ -23,14 +23,14 @@
 import org.apache.rocketmq.client.producer.DefaultMQProducer;
 import org.apache.rocketmq.client.producer.SendCallback;
 import org.apache.rocketmq.client.producer.selector.SelectMessageQueueByHash;
-import org.apache.rocketmq.common.admin.TopicOffset;
 import org.apache.rocketmq.common.message.Message;
 import org.apache.rocketmq.common.message.MessageQueue;
 import org.apache.rocketmq.connect.runtime.config.WorkerConfig;
 import org.apache.rocketmq.connect.runtime.serialization.Serde;
 import org.apache.rocketmq.connect.runtime.serialization.Serializer;
 import org.apache.rocketmq.connect.runtime.utils.ConnectUtil;
 import org.apache.rocketmq.remoting.exception.RemotingException;
+import org.apache.rocketmq.remoting.protocol.admin.TopicOffset;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;