Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -113,9 +113,9 @@ public class KafkaSourceJsonTypeIT {
private String testTopic;
private String testGroup;
private String headerKey1;
private byte[] headerValue1;
private String headerValue1;
private String headerKey2;
private byte[] headerValue2;
private String headerValue2;

public KafkaSource createObjectUnderTest() {
return new KafkaSource(sourceConfig, pluginMetrics, acknowledgementSetManager, pipelineDescription,
Expand All @@ -125,9 +125,9 @@ public KafkaSource createObjectUnderTest() {
@BeforeEach
public void setup() throws Throwable {
headerKey1 = RandomStringUtils.randomAlphabetic(6);
headerValue1 = RandomStringUtils.randomAlphabetic(10).getBytes(StandardCharsets.UTF_8);
headerValue1 = RandomStringUtils.randomAlphabetic(10);
headerKey2 = RandomStringUtils.randomAlphabetic(5);
headerValue2 = RandomStringUtils.randomAlphabetic(15).getBytes(StandardCharsets.UTF_8);
headerValue2 = RandomStringUtils.randomAlphabetic(15);
sourceConfig = mock(KafkaSourceConfig.class);
pluginMetrics = mock(PluginMetrics.class);
counter = mock(Counter.class);
Expand Down Expand Up @@ -235,7 +235,7 @@ public void TestJsonRecordsWithNullKey() throws Exception {
assertThat(map.get("kafka_key"), equalTo(null));
assertThat(metadata.getAttributes().get("kafka_topic"), equalTo(testTopic));
assertThat(metadata.getAttributes().get("kafka_partition"), equalTo("0"));
Map<String, byte[]> kafkaHeaders = (Map<String, byte[]>) metadata.getAttributes().get("kafka_headers");
Map<String, String> kafkaHeaders = (Map<String, String>) metadata.getAttributes().get("kafka_headers");
assertThat(kafkaHeaders.get(headerKey1), equalTo(headerValue1));
assertThat(kafkaHeaders.get(headerKey2), equalTo(headerValue2));
assertThat(metadata.getAttributes().get("kafka_timestamp"), not(equalTo(null)));
Expand Down Expand Up @@ -273,7 +273,7 @@ public void TestJsonRecordsWithNegativeAcknowledgements() throws Exception {
assertThat(map.get("status"), equalTo(true));
assertThat(metadata.getAttributes().get("kafka_topic"), equalTo(testTopic));
assertThat(metadata.getAttributes().get("kafka_partition"), equalTo("0"));
Map<String, byte[]> kafkaHeaders = (Map<String, byte[]>) metadata.getAttributes().get("kafka_headers");
Map<String, String> kafkaHeaders = (Map<String, String>) metadata.getAttributes().get("kafka_headers");
assertThat(kafkaHeaders.get(headerKey1), equalTo(headerValue1));
assertThat(kafkaHeaders.get(headerKey2), equalTo(headerValue2));
assertThat(metadata.getAttributes().get("kafka_timestamp"), not(equalTo(null)));
Expand All @@ -298,7 +298,7 @@ public void TestJsonRecordsWithNegativeAcknowledgements() throws Exception {
assertThat(map.get("status"), equalTo(true));
assertThat(metadata.getAttributes().get("kafka_topic"), equalTo(testTopic));
assertThat(metadata.getAttributes().get("kafka_partition"), equalTo("0"));
Map<String, byte[]> kafkaHeaders = (Map<String, byte[]>) metadata.getAttributes().get("kafka_headers");
Map<String, String> kafkaHeaders = (Map<String, String>) metadata.getAttributes().get("kafka_headers");
assertThat(kafkaHeaders.get(headerKey1), equalTo(headerValue1));
assertThat(kafkaHeaders.get(headerKey2), equalTo(headerValue2));
assertThat(metadata.getAttributes().get("kafka_timestamp"), not(equalTo(null)));
Expand Down Expand Up @@ -336,7 +336,7 @@ public void TestJsonRecordsWithKafkaKeyModeDiscard() throws Exception {
assertThat(map.get("status"), equalTo(true));
assertThat(metadata.getAttributes().get("kafka_topic"), equalTo(testTopic));
assertThat(metadata.getAttributes().get("kafka_partition"), equalTo("0"));
Map<String, byte[]> kafkaHeaders = (Map<String, byte[]>) metadata.getAttributes().get("kafka_headers");
Map<String, String> kafkaHeaders = (Map<String, String>) metadata.getAttributes().get("kafka_headers");
assertThat(kafkaHeaders.get(headerKey1), equalTo(headerValue1));
assertThat(kafkaHeaders.get(headerKey2), equalTo(headerValue2));
assertThat(metadata.getAttributes().get("kafka_timestamp"), not(equalTo(null)));
Expand Down Expand Up @@ -374,7 +374,7 @@ public void TestJsonRecordsWithKafkaKeyModeAsField() throws Exception {
assertThat(map.get("kafka_key"), equalTo(testKey));
assertThat(metadata.getAttributes().get("kafka_topic"), equalTo(testTopic));
assertThat(metadata.getAttributes().get("kafka_partition"), equalTo("0"));
Map<String, byte[]> kafkaHeaders = (Map<String, byte[]>) metadata.getAttributes().get("kafka_headers");
Map<String, String> kafkaHeaders = (Map<String, String>) metadata.getAttributes().get("kafka_headers");
assertThat(kafkaHeaders.get(headerKey1), equalTo(headerValue1));
assertThat(kafkaHeaders.get(headerKey2), equalTo(headerValue2));
assertThat(metadata.getAttributes().get("kafka_timestamp"), not(equalTo(null)));
Expand Down Expand Up @@ -412,7 +412,7 @@ public void TestJsonRecordsWithKafkaKeyModeAsMetadata() throws Exception {
assertThat(metadata.getAttributes().get("kafka_key"), equalTo(testKey));
assertThat(metadata.getAttributes().get("kafka_topic"), equalTo(testTopic));
assertThat(metadata.getAttributes().get("kafka_partition"), equalTo("0"));
Map<String, byte[]> kafkaHeaders = (Map<String, byte[]>) metadata.getAttributes().get("kafka_headers");
Map<String, String> kafkaHeaders = (Map<String, String>) metadata.getAttributes().get("kafka_headers");
assertThat(kafkaHeaders.get(headerKey1), equalTo(headerValue1));
assertThat(kafkaHeaders.get(headerKey2), equalTo(headerValue2));
assertThat(metadata.getAttributes().get("kafka_timestamp"), not(equalTo(null)));
Expand All @@ -433,8 +433,8 @@ public void produceJsonRecords(final String servers, final String topicName, fin
for (int i = 0; i < numRecords; i++) {
String value = "{\"name\":\"testName" + i + "\", \"id\":" + (TEST_ID + i) + ", \"status\":true}";
List<Header> headers = Arrays.asList(
new RecordHeader(headerKey1, headerValue1),
new RecordHeader(headerKey2, headerValue2)
new RecordHeader(headerKey1, headerValue1.getBytes(StandardCharsets.UTF_8)),
new RecordHeader(headerKey2, headerValue2.getBytes(StandardCharsets.UTF_8))
);
ProducerRecord<String, String> record =
new ProducerRecord<>(topicName, null, testKey, value, new RecordHeaders(headers));
Expand Down
Loading