refactor: Use Java standard library instead of Guava (alibaba#3708)

jkschneider · TeamModerne · web-flow · commit de95a6a1284d · 2021-10-09T15:33:37.000+08:00
Co-authored-by: Moderne &lt;team@moderne.io&gt;

Co-authored-by: Moderne &lt;team@moderne.io&gt;
diff --git a/client/src/main/java/com/alibaba/otter/canal/client/kafka/KafkaOffsetCanalConnector.java b/client/src/main/java/com/alibaba/otter/canal/client/kafka/KafkaOffsetCanalConnector.java
@@ -6,7 +6,6 @@
 import com.alibaba.otter.canal.protocol.FlatMessage;
 import com.alibaba.otter.canal.protocol.Message;
 import com.alibaba.otter.canal.protocol.exception.CanalClientException;
-import com.google.common.collect.Lists;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.kafka.clients.consumer.ConsumerRecord;
 import org.apache.kafka.clients.consumer.ConsumerRecords;
@@ -43,7 +42,7 @@ public KafkaOffsetCanalConnector(String servers, String topic, Integer partition
     public List<KafkaMessage> getListWithoutAck(Long timeout, TimeUnit unit, long offset) throws CanalClientException {
         waitClientRunning();
         if (!running) {
-            return Lists.newArrayList();
+            return new ArrayList<>();
         }
 
         if (offset > -1) {
@@ -61,7 +60,7 @@ public List<KafkaMessage> getListWithoutAck(Long timeout, TimeUnit unit, long of
             }
             return messages;
         }
-        return Lists.newArrayList();
+        return new ArrayList<>();
     }
 
     /**
@@ -76,7 +75,7 @@ public List<KafkaMessage> getListWithoutAck(Long timeout, TimeUnit unit, long of
     public List<KafkaFlatMessage> getFlatListWithoutAck(Long timeout, TimeUnit unit, long offset) throws CanalClientException {
         waitClientRunning();
         if (!running) {
-            return Lists.newArrayList();
+            return new ArrayList<>();
         }
 
         if (offset > -1) {
@@ -96,7 +95,7 @@ public List<KafkaFlatMessage> getFlatListWithoutAck(Long timeout, TimeUnit unit,
 
             return flatMessages;
         }
-        return Lists.newArrayList();
+        return new ArrayList<>();
     }
 
     /**
diff --git a/client/src/main/java/com/alibaba/otter/canal/client/rabbitmq/RabbitMQCanalConnector.java b/client/src/main/java/com/alibaba/otter/canal/client/rabbitmq/RabbitMQCanalConnector.java
@@ -13,6 +13,7 @@
 import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.LinkedBlockingQueue;
@@ -239,7 +240,7 @@ private boolean process(byte[] messageData) {
         if (logger.isDebugEnabled()) {
             logger.debug("Get Message: {}", new String(messageData));
         }
-        List messageList = Lists.newArrayList();
+        List messageList = new ArrayList<>();
         if (!flatMessage) {
             Message message = CanalMessageDeserializer.deserializer(messageData);
             messageList.add(message);
diff --git a/client/src/main/java/com/alibaba/otter/canal/client/rocketmq/RocketMQCanalConnector.java b/client/src/main/java/com/alibaba/otter/canal/client/rocketmq/RocketMQCanalConnector.java
@@ -1,5 +1,6 @@
 package com.alibaba.otter.canal.client.rocketmq;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.LinkedBlockingQueue;
@@ -165,7 +166,7 @@ private boolean process(List<MessageExt> messageExts) {
         if (logger.isDebugEnabled()) {
             logger.debug("Get Message: {}", messageExts);
         }
-        List messageList = Lists.newArrayList();
+        List messageList = new ArrayList<>();
         for (MessageExt messageExt : messageExts) {
             byte[] data = messageExt.getBody();
             if (data != null) {
diff --git a/connector/core/src/main/java/com/alibaba/otter/canal/connector/core/producer/MQMessageUtils.java b/connector/core/src/main/java/com/alibaba/otter/canal/connector/core/producer/MQMessageUtils.java
@@ -36,7 +36,7 @@ public class MQMessageUtils {
     private static Map<String, List<PartitionData>>    partitionDatas    = MigrateMap.makeComputingMap(CacheBuilder.newBuilder()
                                                                              .softValues(),
                                                                              pkHashConfigs -> {
-                                                                                 List<PartitionData> datas = Lists.newArrayList();
+                                                                                 List<PartitionData> datas = new ArrayList<>();
 
                                                                                  String[] pkHashConfigArray = StringUtils.split(StringUtils.replace(pkHashConfigs,
                                                                                      ",",
@@ -75,7 +75,7 @@ public class MQMessageUtils {
     private static Map<String, List<DynamicTopicData>> dynamicTopicDatas = MigrateMap.makeComputingMap(CacheBuilder.newBuilder()
                                                                              .softValues(),
                                                                               pkHashConfigs -> {
-                                                                                List<DynamicTopicData> datas = Lists.newArrayList();
+                                                                                List<DynamicTopicData> datas = new ArrayList<>();
                                                                                 String[] dynamicTopicArray = StringUtils.split(StringUtils.replace(pkHashConfigs,
                                                                                     ",",
                                                                                     ";"),
@@ -102,7 +102,7 @@ public class MQMessageUtils {
     private static Map<String, List<TopicPartitionData>> topicPartitionDatas = MigrateMap.makeComputingMap(CacheBuilder.newBuilder()
                                                                                 .softValues(),
                                                                                 tPConfigs -> {
-                                                                                    List<TopicPartitionData> datas = Lists.newArrayList();
+                                                                                    List<TopicPartitionData> datas = new ArrayList<>();
                                                                                     String[] tPArray = StringUtils.split(StringUtils.replace(tPConfigs,
                                                                                             ",",
                                                                                             ";"),
@@ -258,7 +258,7 @@ public static Message[] messagePartition(EntryRowData[] datas, long id, Integer
         List<Entry>[] partitionEntries = new List[partitionsNum];
         for (int i = 0; i < partitionsNum; i++) {
             // 注意一下并发
-            partitionEntries[i] = Collections.synchronizedList(Lists.newArrayList());
+            partitionEntries[i] = Collections.synchronizedList(new ArrayList<>());
         }
 
         for (EntryRowData data : datas) {
@@ -681,7 +681,7 @@ public static class HashMode {
 
         public boolean      autoPkHash = false;
         public boolean      tableHash  = false;
-        public List<String> pkNames    = Lists.newArrayList();
+        public List<String> pkNames    = new ArrayList<>();
     }
 
     public static class DynamicTopicData {
diff --git a/connector/rabbitmq-connector/src/main/java/com/alibaba/otter/canal/connector/rabbitmq/consumer/CanalRabbitMQConsumer.java b/connector/rabbitmq-connector/src/main/java/com/alibaba/otter/canal/connector/rabbitmq/consumer/CanalRabbitMQConsumer.java
@@ -1,6 +1,7 @@
 package com.alibaba.otter.canal.connector.rabbitmq.consumer;
 
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Properties;
 import java.util.concurrent.BlockingQueue;
@@ -23,7 +24,6 @@
 import com.alibaba.otter.canal.connector.rabbitmq.producer.AliyunCredentialsProvider;
 import com.alibaba.otter.canal.protocol.Message;
 import com.alibaba.otter.canal.protocol.exception.CanalClientException;
-import com.google.common.collect.Lists;
 import com.rabbitmq.client.AMQP;
 import com.rabbitmq.client.Channel;
 import com.rabbitmq.client.Connection;
@@ -137,7 +137,7 @@ private boolean process(byte[] messageData) {
         if (logger.isDebugEnabled()) {
             logger.debug("Get Message: {}", new String(messageData));
         }
-        List<CommonMessage> messageList = Lists.newArrayList();
+        List<CommonMessage> messageList = new ArrayList<>();
         if (!flatMessage) {
             Message message = CanalMessageSerializerUtil.deserializer(messageData);
             messageList.addAll(MessageUtil.convert(message));
diff --git a/connector/rocketmq-connector/src/main/java/com/alibaba/otter/canal/connector/rocketmq/consumer/CanalRocketMQConsumer.java b/connector/rocketmq-connector/src/main/java/com/alibaba/otter/canal/connector/rocketmq/consumer/CanalRocketMQConsumer.java
@@ -1,5 +1,6 @@
 package com.alibaba.otter.canal.connector.rocketmq.consumer;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Properties;
 import java.util.concurrent.BlockingQueue;
@@ -30,7 +31,6 @@
 import com.alibaba.otter.canal.connector.rocketmq.config.RocketMQConstants;
 import com.alibaba.otter.canal.protocol.Message;
 import com.alibaba.otter.canal.protocol.exception.CanalClientException;
-import com.google.common.collect.Lists;
 
 /**
  * RocketMQ consumer SPI 实现
@@ -142,7 +142,7 @@ private boolean process(List<MessageExt> messageExts) {
         if (logger.isDebugEnabled()) {
             logger.debug("Get Message: {}", messageExts);
         }
-        List<CommonMessage> messageList = Lists.newArrayList();
+        List<CommonMessage> messageList = new ArrayList<>();
         for (MessageExt messageExt : messageExts) {
             byte[] data = messageExt.getBody();
             if (data != null) {
diff --git a/deployer/src/main/java/com/alibaba/otter/canal/deployer/monitor/ManagerInstanceConfigMonitor.java b/deployer/src/main/java/com/alibaba/otter/canal/deployer/monitor/ManagerInstanceConfigMonitor.java
@@ -1,5 +1,6 @@
 package com.alibaba.otter.canal.deployer.monitor;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.Executors;
@@ -77,9 +78,9 @@ private void scan() {
         }
 
         final List<String> is = Lists.newArrayList(StringUtils.split(instances, ','));
-        List<String> start = Lists.newArrayList();
-        List<String> stop = Lists.newArrayList();
-        List<String> restart = Lists.newArrayList();
+        List<String> start = new ArrayList<>();
+        List<String> stop = new ArrayList<>();
+        List<String> restart = new ArrayList<>();
         for (String instance : is) {
             if (!configs.containsKey(instance)) {
                 PlainCanal newPlainCanal = configClient.findInstance(instance, null);
diff --git a/meta/src/main/java/com/alibaba/otter/canal/meta/FileMixedMetaManager.java b/meta/src/main/java/com/alibaba/otter/canal/meta/FileMixedMetaManager.java
@@ -194,7 +194,7 @@ private void flushDataToFile(String destination, File dataFile) {
             synchronized (destination.intern()) { // 基于destination控制一下并发更新
                 data.setDestination(destination);
 
-                List<FileMetaClientIdentityData> clientDatas = Lists.newArrayList();
+                List<FileMetaClientIdentityData> clientDatas = new ArrayList<>();
                 List<ClientIdentity> clientIdentitys = destinations.get(destination);
                 for (ClientIdentity clientIdentity : clientIdentitys) {
                     FileMetaClientIdentityData clientData = new FileMetaClientIdentityData();
diff --git a/meta/src/main/java/com/alibaba/otter/canal/meta/MemoryMetaManager.java b/meta/src/main/java/com/alibaba/otter/canal/meta/MemoryMetaManager.java
@@ -1,9 +1,6 @@
 package com.alibaba.otter.canal.meta;
 
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 import java.util.concurrent.atomic.AtomicLong;
 
 import com.alibaba.otter.canal.common.AbstractCanalLifeCycle;
@@ -35,7 +32,7 @@ public void start() {
 
         cursors = new MapMaker().makeMap();
 
-        destinations = MigrateMap.makeComputingMap(destination -> Lists.newArrayList());
+        destinations = MigrateMap.makeComputingMap(destination -> new ArrayList<>());
     }
 
     public void stop() {
@@ -186,8 +183,8 @@ public synchronized PositionRange getFirstPositionRange() {
 
         public synchronized Map<Long, PositionRange> listAllPositionRange() {
             Set<Long> batchIdSets = batches.keySet();
-            List<Long> batchIds = Lists.newArrayList(batchIdSets);
-            Collections.sort(Lists.newArrayList(batchIds));
+            List<Long> batchIds = new ArrayList<>(batchIdSets);
+            Collections.sort(new ArrayList<>(batchIds));
 
             return Maps.newHashMap(batches);
         }
diff --git a/parse/src/test/java/com/alibaba/otter/canal/parse/inbound/mysql/tsdb/MemoryTableMeta_DDL_Test.java b/parse/src/test/java/com/alibaba/otter/canal/parse/inbound/mysql/tsdb/MemoryTableMeta_DDL_Test.java
@@ -3,6 +3,7 @@
 import java.io.File;
 import java.io.FileInputStream;
 import java.net.URL;
+import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.commons.io.IOUtils;
@@ -15,7 +16,6 @@
 
 import com.alibaba.druid.sql.repository.Schema;
 import com.alibaba.otter.canal.parse.inbound.TableMeta;
-import com.google.common.collect.Lists;
 
 /**
  * @author agapple 2017年8月1日 下午7:15:54
@@ -79,7 +79,7 @@ public void test_any() throws Throwable {
         String sql = StringUtils.join(IOUtils.readLines(new FileInputStream(create)), "\n");
         memoryTableMeta.apply(null, "test", sql, null);
 
-        List<String> tableNames = Lists.newArrayList();
+        List<String> tableNames = new ArrayList<>();
         for (Schema schema : memoryTableMeta.getRepository().getSchemas()) {
             tableNames.addAll(schema.showTables());
         }
@@ -99,7 +99,7 @@ public void test_create_if_not_exist() throws Throwable {
         String sql = StringUtils.join(IOUtils.readLines(new FileInputStream(create)), "\n");
         memoryTableMeta.apply(null, "test", sql, null);
 
-        List<String> tableNames = Lists.newArrayList();
+        List<String> tableNames = new ArrayList<>();
         for (Schema schema : memoryTableMeta.getRepository().getSchemas()) {
             tableNames.addAll(schema.showTables());
         }
diff --git a/parse/src/test/java/com/alibaba/otter/canal/parse/inbound/mysql/tsdb/MemoryTableMeta_Random_DDL_Test.java b/parse/src/test/java/com/alibaba/otter/canal/parse/inbound/mysql/tsdb/MemoryTableMeta_Random_DDL_Test.java
@@ -3,6 +3,7 @@
 import java.io.File;
 import java.io.FileInputStream;
 import java.net.URL;
+import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.commons.io.IOUtils;
@@ -15,7 +16,6 @@
 
 import com.alibaba.druid.sql.repository.Schema;
 import com.alibaba.otter.canal.parse.inbound.TableMeta;
-import com.google.common.collect.Lists;
 
 /**
  * @author agapple 2017年8月1日 下午7:15:54
@@ -69,7 +69,7 @@ public void test_table() throws Throwable {
     }
 
     private void compareTableMeta(int num, MemoryTableMeta source, MemoryTableMeta target) {
-        List<String> tableNames = Lists.newArrayList();
+        List<String> tableNames = new ArrayList<>();
         for (Schema schema : source.getRepository().getSchemas()) {
             tableNames.addAll(schema.showTables());
         }
diff --git a/protocol/src/main/java/com/alibaba/otter/canal/protocol/FlatMessage.java b/protocol/src/main/java/com/alibaba/otter/canal/protocol/FlatMessage.java
@@ -1,11 +1,10 @@
 package com.alibaba.otter.canal.protocol;
 
 import java.io.Serializable;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import com.google.common.collect.Lists;
-
 /**
  * @author machengyuan 2018-9-13 下午10:31:14
  * @version 1.0.0
@@ -66,7 +65,7 @@ public List<String> getPkNames() {
 
     public void addPkName(String pkName) {
         if (this.pkNames == null) {
-            this.pkNames = Lists.newArrayList();
+            this.pkNames = new ArrayList<>();
         }
         this.pkNames.add(pkName);
     }

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,6 @@`
`6`	`6`	`import com.alibaba.otter.canal.protocol.FlatMessage;`
`7`	`7`	`import com.alibaba.otter.canal.protocol.Message;`
`8`	`8`	`import com.alibaba.otter.canal.protocol.exception.CanalClientException;`
`9`		`-import com.google.common.collect.Lists;`
`10`	`9`	`import org.apache.commons.lang3.StringUtils;`
`11`	`10`	`import org.apache.kafka.clients.consumer.ConsumerRecord;`
`12`	`11`	`import org.apache.kafka.clients.consumer.ConsumerRecords;`
`@@ -43,7 +42,7 @@ public KafkaOffsetCanalConnector(String servers, String topic, Integer partition`
`43`	`42`	`public List<KafkaMessage> getListWithoutAck(Long timeout, TimeUnit unit, long offset) throws CanalClientException {`
`44`	`43`	`waitClientRunning();`
`45`	`44`	`if (!running) {`
`46`		`- return Lists.newArrayList();`
	`45`	`+ return new ArrayList<>();`
`47`	`46`	`}`
`48`	`47`
`49`	`48`	`if (offset > -1) {`
`@@ -61,7 +60,7 @@ public List<KafkaMessage> getListWithoutAck(Long timeout, TimeUnit unit, long of`
`61`	`60`	`}`
`62`	`61`	`return messages;`
`63`	`62`	`}`
`64`		`- return Lists.newArrayList();`
	`63`	`+ return new ArrayList<>();`
`65`	`64`	`}`
`66`	`65`
`67`	`66`	`/**`
`@@ -76,7 +75,7 @@ public List<KafkaMessage> getListWithoutAck(Long timeout, TimeUnit unit, long of`
`76`	`75`	`public List<KafkaFlatMessage> getFlatListWithoutAck(Long timeout, TimeUnit unit, long offset) throws CanalClientException {`
`77`	`76`	`waitClientRunning();`
`78`	`77`	`if (!running) {`
`79`		`- return Lists.newArrayList();`
	`78`	`+ return new ArrayList<>();`
`80`	`79`	`}`
`81`	`80`
`82`	`81`	`if (offset > -1) {`
`@@ -96,7 +95,7 @@ public List<KafkaFlatMessage> getFlatListWithoutAck(Long timeout, TimeUnit unit,`
`96`	`95`
`97`	`96`	`return flatMessages;`
`98`	`97`	`}`
`99`		`- return Lists.newArrayList();`
	`98`	`+ return new ArrayList<>();`
`100`	`99`	`}`
`101`	`100`
`102`	`101`	`/**`