Skip to content

Commit de95a6a

Browse files
jkschneiderTeamModerne
jkschneider
and
TeamModerne
authored
refactor: Use Java standard library instead of Guava (#3708)
Co-authored-by: Moderne <team@moderne.io> Co-authored-by: Moderne <team@moderne.io>
1 parent 9e11c3c commit de95a6a

File tree

12 files changed

+33
-35
lines changed

12 files changed

+33
-35
lines changed

‎client/src/main/java/com/alibaba/otter/canal/client/kafka/KafkaOffsetCanalConnector.java‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import com.alibaba.otter.canal.protocol.FlatMessage;
77
import com.alibaba.otter.canal.protocol.Message;
88
import com.alibaba.otter.canal.protocol.exception.CanalClientException;
9-
import com.google.common.collect.Lists;
109
import org.apache.commons.lang3.StringUtils;
1110
import org.apache.kafka.clients.consumer.ConsumerRecord;
1211
import org.apache.kafka.clients.consumer.ConsumerRecords;
@@ -43,7 +42,7 @@ public KafkaOffsetCanalConnector(String servers, String topic, Integer partition
4342
public List<KafkaMessage> getListWithoutAck(Long timeout, TimeUnit unit, long offset) throws CanalClientException {
4443
waitClientRunning();
4544
if (!running) {
46-
return Lists.newArrayList();
45+
return new ArrayList<>();
4746
}
4847

4948
if (offset > -1) {
@@ -61,7 +60,7 @@ public List<KafkaMessage> getListWithoutAck(Long timeout, TimeUnit unit, long of
6160
}
6261
return messages;
6362
}
64-
return Lists.newArrayList();
63+
return new ArrayList<>();
6564
}
6665

6766
/**
@@ -76,7 +75,7 @@ public List<KafkaMessage> getListWithoutAck(Long timeout, TimeUnit unit, long of
7675
public List<KafkaFlatMessage> getFlatListWithoutAck(Long timeout, TimeUnit unit, long offset) throws CanalClientException {
7776
waitClientRunning();
7877
if (!running) {
79-
return Lists.newArrayList();
78+
return new ArrayList<>();
8079
}
8180

8281
if (offset > -1) {
@@ -96,7 +95,7 @@ public List<KafkaFlatMessage> getFlatListWithoutAck(Long timeout, TimeUnit unit,
9695

9796
return flatMessages;
9897
}
99-
return Lists.newArrayList();
98+
return new ArrayList<>();
10099
}
101100

102101
/**

‎client/src/main/java/com/alibaba/otter/canal/client/rabbitmq/RabbitMQCanalConnector.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import org.slf4j.LoggerFactory;
1414

1515
import java.io.IOException;
16+
import java.util.ArrayList;
1617
import java.util.List;
1718
import java.util.concurrent.BlockingQueue;
1819
import java.util.concurrent.LinkedBlockingQueue;
@@ -239,7 +240,7 @@ private boolean process(byte[] messageData) {
239240
if (logger.isDebugEnabled()) {
240241
logger.debug("Get Message: {}", new String(messageData));
241242
}
242-
List messageList = Lists.newArrayList();
243+
List messageList = new ArrayList<>();
243244
if (!flatMessage) {
244245
Message message = CanalMessageDeserializer.deserializer(messageData);
245246
messageList.add(message);

‎client/src/main/java/com/alibaba/otter/canal/client/rocketmq/RocketMQCanalConnector.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.alibaba.otter.canal.client.rocketmq;
22

3+
import java.util.ArrayList;
34
import java.util.List;
45
import java.util.concurrent.BlockingQueue;
56
import java.util.concurrent.LinkedBlockingQueue;
@@ -165,7 +166,7 @@ private boolean process(List<MessageExt> messageExts) {
165166
if (logger.isDebugEnabled()) {
166167
logger.debug("Get Message: {}", messageExts);
167168
}
168-
List messageList = Lists.newArrayList();
169+
List messageList = new ArrayList<>();
169170
for (MessageExt messageExt : messageExts) {
170171
byte[] data = messageExt.getBody();
171172
if (data != null) {

‎connector/core/src/main/java/com/alibaba/otter/canal/connector/core/producer/MQMessageUtils.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public class MQMessageUtils {
3636
private static Map<String, List<PartitionData>> partitionDatas = MigrateMap.makeComputingMap(CacheBuilder.newBuilder()
3737
.softValues(),
3838
pkHashConfigs -> {
39-
List<PartitionData> datas = Lists.newArrayList();
39+
List<PartitionData> datas = new ArrayList<>();
4040

4141
String[] pkHashConfigArray = StringUtils.split(StringUtils.replace(pkHashConfigs,
4242
",",
@@ -75,7 +75,7 @@ public class MQMessageUtils {
7575
private static Map<String, List<DynamicTopicData>> dynamicTopicDatas = MigrateMap.makeComputingMap(CacheBuilder.newBuilder()
7676
.softValues(),
7777
pkHashConfigs -> {
78-
List<DynamicTopicData> datas = Lists.newArrayList();
78+
List<DynamicTopicData> datas = new ArrayList<>();
7979
String[] dynamicTopicArray = StringUtils.split(StringUtils.replace(pkHashConfigs,
8080
",",
8181
";"),
@@ -102,7 +102,7 @@ public class MQMessageUtils {
102102
private static Map<String, List<TopicPartitionData>> topicPartitionDatas = MigrateMap.makeComputingMap(CacheBuilder.newBuilder()
103103
.softValues(),
104104
tPConfigs -> {
105-
List<TopicPartitionData> datas = Lists.newArrayList();
105+
List<TopicPartitionData> datas = new ArrayList<>();
106106
String[] tPArray = StringUtils.split(StringUtils.replace(tPConfigs,
107107
",",
108108
";"),
@@ -258,7 +258,7 @@ public static Message[] messagePartition(EntryRowData[] datas, long id, Integer
258258
List<Entry>[] partitionEntries = new List[partitionsNum];
259259
for (int i = 0; i < partitionsNum; i++) {
260260
// 注意一下并发
261-
partitionEntries[i] = Collections.synchronizedList(Lists.newArrayList());
261+
partitionEntries[i] = Collections.synchronizedList(new ArrayList<>());
262262
}
263263

264264
for (EntryRowData data : datas) {
@@ -681,7 +681,7 @@ public static class HashMode {
681681

682682
public boolean autoPkHash = false;
683683
public boolean tableHash = false;
684-
public List<String> pkNames = Lists.newArrayList();
684+
public List<String> pkNames = new ArrayList<>();
685685
}
686686

687687
public static class DynamicTopicData {

‎connector/rabbitmq-connector/src/main/java/com/alibaba/otter/canal/connector/rabbitmq/consumer/CanalRabbitMQConsumer.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.alibaba.otter.canal.connector.rabbitmq.consumer;
22

33
import java.io.IOException;
4+
import java.util.ArrayList;
45
import java.util.List;
56
import java.util.Properties;
67
import java.util.concurrent.BlockingQueue;
@@ -23,7 +24,6 @@
2324
import com.alibaba.otter.canal.connector.rabbitmq.producer.AliyunCredentialsProvider;
2425
import com.alibaba.otter.canal.protocol.Message;
2526
import com.alibaba.otter.canal.protocol.exception.CanalClientException;
26-
import com.google.common.collect.Lists;
2727
import com.rabbitmq.client.AMQP;
2828
import com.rabbitmq.client.Channel;
2929
import com.rabbitmq.client.Connection;
@@ -137,7 +137,7 @@ private boolean process(byte[] messageData) {
137137
if (logger.isDebugEnabled()) {
138138
logger.debug("Get Message: {}", new String(messageData));
139139
}
140-
List<CommonMessage> messageList = Lists.newArrayList();
140+
List<CommonMessage> messageList = new ArrayList<>();
141141
if (!flatMessage) {
142142
Message message = CanalMessageSerializerUtil.deserializer(messageData);
143143
messageList.addAll(MessageUtil.convert(message));

‎connector/rocketmq-connector/src/main/java/com/alibaba/otter/canal/connector/rocketmq/consumer/CanalRocketMQConsumer.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.alibaba.otter.canal.connector.rocketmq.consumer;
22

3+
import java.util.ArrayList;
34
import java.util.List;
45
import java.util.Properties;
56
import java.util.concurrent.BlockingQueue;
@@ -30,7 +31,6 @@
3031
import com.alibaba.otter.canal.connector.rocketmq.config.RocketMQConstants;
3132
import com.alibaba.otter.canal.protocol.Message;
3233
import com.alibaba.otter.canal.protocol.exception.CanalClientException;
33-
import com.google.common.collect.Lists;
3434

3535
/**
3636
* RocketMQ consumer SPI 实现
@@ -142,7 +142,7 @@ private boolean process(List<MessageExt> messageExts) {
142142
if (logger.isDebugEnabled()) {
143143
logger.debug("Get Message: {}", messageExts);
144144
}
145-
List<CommonMessage> messageList = Lists.newArrayList();
145+
List<CommonMessage> messageList = new ArrayList<>();
146146
for (MessageExt messageExt : messageExts) {
147147
byte[] data = messageExt.getBody();
148148
if (data != null) {

‎deployer/src/main/java/com/alibaba/otter/canal/deployer/monitor/ManagerInstanceConfigMonitor.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.alibaba.otter.canal.deployer.monitor;
22

3+
import java.util.ArrayList;
34
import java.util.List;
45
import java.util.Map;
56
import java.util.concurrent.Executors;
@@ -77,9 +78,9 @@ private void scan() {
7778
}
7879

7980
final List<String> is = Lists.newArrayList(StringUtils.split(instances, ','));
80-
List<String> start = Lists.newArrayList();
81-
List<String> stop = Lists.newArrayList();
82-
List<String> restart = Lists.newArrayList();
81+
List<String> start = new ArrayList<>();
82+
List<String> stop = new ArrayList<>();
83+
List<String> restart = new ArrayList<>();
8384
for (String instance : is) {
8485
if (!configs.containsKey(instance)) {
8586
PlainCanal newPlainCanal = configClient.findInstance(instance, null);

‎meta/src/main/java/com/alibaba/otter/canal/meta/FileMixedMetaManager.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ private void flushDataToFile(String destination, File dataFile) {
194194
synchronized (destination.intern()) { // 基于destination控制一下并发更新
195195
data.setDestination(destination);
196196

197-
List<FileMetaClientIdentityData> clientDatas = Lists.newArrayList();
197+
List<FileMetaClientIdentityData> clientDatas = new ArrayList<>();
198198
List<ClientIdentity> clientIdentitys = destinations.get(destination);
199199
for (ClientIdentity clientIdentity : clientIdentitys) {
200200
FileMetaClientIdentityData clientData = new FileMetaClientIdentityData();

‎meta/src/main/java/com/alibaba/otter/canal/meta/MemoryMetaManager.java‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
package com.alibaba.otter.canal.meta;
22

3-
import java.util.Collections;
4-
import java.util.List;
5-
import java.util.Map;
6-
import java.util.Set;
3+
import java.util.*;
74
import java.util.concurrent.atomic.AtomicLong;
85

96
import com.alibaba.otter.canal.common.AbstractCanalLifeCycle;
@@ -35,7 +32,7 @@ public void start() {
3532

3633
cursors = new MapMaker().makeMap();
3734

38-
destinations = MigrateMap.makeComputingMap(destination -> Lists.newArrayList());
35+
destinations = MigrateMap.makeComputingMap(destination -> new ArrayList<>());
3936
}
4037

4138
public void stop() {
@@ -186,8 +183,8 @@ public synchronized PositionRange getFirstPositionRange() {
186183

187184
public synchronized Map<Long, PositionRange> listAllPositionRange() {
188185
Set<Long> batchIdSets = batches.keySet();
189-
List<Long> batchIds = Lists.newArrayList(batchIdSets);
190-
Collections.sort(Lists.newArrayList(batchIds));
186+
List<Long> batchIds = new ArrayList<>(batchIdSets);
187+
Collections.sort(new ArrayList<>(batchIds));
191188

192189
return Maps.newHashMap(batches);
193190
}

‎parse/src/test/java/com/alibaba/otter/canal/parse/inbound/mysql/tsdb/MemoryTableMeta_DDL_Test.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import java.io.File;
44
import java.io.FileInputStream;
55
import java.net.URL;
6+
import java.util.ArrayList;
67
import java.util.List;
78

89
import org.apache.commons.io.IOUtils;
@@ -15,7 +16,6 @@
1516

1617
import com.alibaba.druid.sql.repository.Schema;
1718
import com.alibaba.otter.canal.parse.inbound.TableMeta;
18-
import com.google.common.collect.Lists;
1919

2020
/**
2121
* @author agapple 2017年8月1日 下午7:15:54
@@ -79,7 +79,7 @@ public void test_any() throws Throwable {
7979
String sql = StringUtils.join(IOUtils.readLines(new FileInputStream(create)), "\n");
8080
memoryTableMeta.apply(null, "test", sql, null);
8181

82-
List<String> tableNames = Lists.newArrayList();
82+
List<String> tableNames = new ArrayList<>();
8383
for (Schema schema : memoryTableMeta.getRepository().getSchemas()) {
8484
tableNames.addAll(schema.showTables());
8585
}
@@ -99,7 +99,7 @@ public void test_create_if_not_exist() throws Throwable {
9999
String sql = StringUtils.join(IOUtils.readLines(new FileInputStream(create)), "\n");
100100
memoryTableMeta.apply(null, "test", sql, null);
101101

102-
List<String> tableNames = Lists.newArrayList();
102+
List<String> tableNames = new ArrayList<>();
103103
for (Schema schema : memoryTableMeta.getRepository().getSchemas()) {
104104
tableNames.addAll(schema.showTables());
105105
}

0 commit comments

Comments
 (0)