From b7eff723a34d22065c0bb249c009ac68664c9af8 Mon Sep 17 00:00:00 2001 From: "jianghang.loujh" Date: Mon, 16 May 2022 19:41:46 +0800 Subject: [PATCH] fixed issue #4027, CanalServerWithEmbedded.get support newList --- .../server/embedded/CanalServerWithEmbedded.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/server/src/main/java/com/alibaba/otter/canal/server/embedded/CanalServerWithEmbedded.java b/server/src/main/java/com/alibaba/otter/canal/server/embedded/CanalServerWithEmbedded.java index a6515231..9d8d563e 100644 --- a/server/src/main/java/com/alibaba/otter/canal/server/embedded/CanalServerWithEmbedded.java +++ b/server/src/main/java/com/alibaba/otter/canal/server/embedded/CanalServerWithEmbedded.java @@ -7,6 +7,7 @@ import java.util.List; import java.util.Map; import java.util.ServiceLoader; import java.util.concurrent.TimeUnit; +import java.util.stream.Collectors; import org.apache.commons.lang.StringUtils; import org.slf4j.Logger; @@ -266,9 +267,10 @@ public class CanalServerWithEmbedded extends AbstractCanalLifeCycle implements C boolean raw = isRaw(canalInstance.getEventStore()); List entrys = null; if (raw) { - entrys = Lists.transform(events.getEvents(), Event::getRawEntry); + // new list + entrys = events.getEvents().stream().map(Event::getRawEntry).collect(Collectors.toList()); } else { - entrys = Lists.transform(events.getEvents(), Event::getEntry); + entrys = events.getEvents().stream().map(Event::getEntry).collect(Collectors.toList()); } if (logger.isInfoEnabled()) { logger.info("get successfully, clientId:{} batchSize:{} real size is {} and result is [batchId:{} , position:{}]", @@ -348,9 +350,10 @@ public class CanalServerWithEmbedded extends AbstractCanalLifeCycle implements C boolean raw = isRaw(canalInstance.getEventStore()); List entrys = null; if (raw) { - entrys = Lists.transform(events.getEvents(), Event::getRawEntry); + // new list + entrys = events.getEvents().stream().map(Event::getRawEntry).collect(Collectors.toList()); } else { - entrys = Lists.transform(events.getEvents(), Event::getEntry); + entrys = events.getEvents().stream().map(Event::getEntry).collect(Collectors.toList()); } if (logger.isInfoEnabled()) { logger.info("getWithoutAck successfully, clientId:{} batchSize:{} real size is {} and result is [batchId:{} , position:{}]",