You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by ni...@apache.org on 2022/06/09 07:15:50 UTC
[pulsar] 04/04: Fix cherry-pick compatibility with JDK8
This is an automated email from the ASF dual-hosted git repository.
nicoloboschi pushed a commit to branch branch-2.10
in repository https://gitbox.apache.org/repos/asf/pulsar.git
commit 5df120a73980650fb6dbfd8e8048db1efcb71a98
Author: Nicolò Boschi <bo...@gmail.com>
AuthorDate: Thu Jun 9 09:15:32 2022 +0200
Fix cherry-pick compatibility with JDK8
---
.../apache/pulsar/io/kafka/connect/schema/KafkaConnectData.java | 3 ++-
.../org/apache/pulsar/io/kafka/connect/KafkaConnectSinkTest.java | 7 ++++---
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/pulsar-io/kafka-connect-adaptor/src/main/java/org/apache/pulsar/io/kafka/connect/schema/KafkaConnectData.java b/pulsar-io/kafka-connect-adaptor/src/main/java/org/apache/pulsar/io/kafka/connect/schema/KafkaConnectData.java
index 671495c6df6..d9a756f07d6 100644
--- a/pulsar-io/kafka-connect-adaptor/src/main/java/org/apache/pulsar/io/kafka/connect/schema/KafkaConnectData.java
+++ b/pulsar-io/kafka-connect-adaptor/src/main/java/org/apache/pulsar/io/kafka/connect/schema/KafkaConnectData.java
@@ -28,6 +28,7 @@ import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import java.util.stream.Collectors;
import lombok.extern.slf4j.Slf4j;
import org.apache.avro.generic.GenericData;
import org.apache.kafka.connect.data.Field;
@@ -72,7 +73,7 @@ public class KafkaConnectData {
List arr = (List) nativeObject;
return arr.stream()
.map(x -> getKafkaConnectData(x, kafkaSchema.valueSchema()))
- .toList();
+ .collect(Collectors.toList());
} else if (nativeObject.getClass().isArray()) {
return arrayToList(nativeObject, kafkaSchema.valueSchema());
}
diff --git a/pulsar-io/kafka-connect-adaptor/src/test/java/org/apache/pulsar/io/kafka/connect/KafkaConnectSinkTest.java b/pulsar-io/kafka-connect-adaptor/src/test/java/org/apache/pulsar/io/kafka/connect/KafkaConnectSinkTest.java
index 2c0ea31ac4c..d07b0f3979d 100644
--- a/pulsar-io/kafka-connect-adaptor/src/test/java/org/apache/pulsar/io/kafka/connect/KafkaConnectSinkTest.java
+++ b/pulsar-io/kafka-connect-adaptor/src/test/java/org/apache/pulsar/io/kafka/connect/KafkaConnectSinkTest.java
@@ -998,14 +998,15 @@ public class KafkaConnectSinkTest extends ProducerConsumerBase {
}
private static PulsarSchemaToKafkaSchemaTest.ComplexStruct getPojoComplexStruct() {
+ Map<String, PulsarSchemaToKafkaSchemaTest.StructWithAnnotations> map = new HashMap<>();
+ map.put("key1", getPojoStructWithAnnotations());
+ map.put("key2", getPojoStructWithAnnotations());
return new PulsarSchemaToKafkaSchemaTest.ComplexStruct()
.setStringList(Lists.newArrayList("str11", "str22"))
.setStructArr(new PulsarSchemaToKafkaSchemaTest.StructWithAnnotations[]{getPojoStructWithAnnotations()})
.setStructList(Lists.newArrayList(getPojoStructWithAnnotations()))
.setStruct(getPojoStructWithAnnotations())
- .setStructMap(Map.of("key1", getPojoStructWithAnnotations(),
- "key2", getPojoStructWithAnnotations()))
-
+ .setStructMap(map)
.setByteField((byte) 1)
.setShortField((short) 2)
.setIntField(3)