Skip to content

[FLINK-32522][connectors/kafka] Kafka connector should depend on commons-collections instead of inheriting from flink #38

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[FLINK-32522][connectors/kafka] Kafka connector should depend on commons-collections instead of inheriting from flink #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 8 additions & 0 deletions flink-connector-kafka/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,14 @@ under the License.
<version>${kafka.version}</version>
</dependency>

<!-- Others -->

<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-collections4</artifactId>
<version>4.4</version>
</dependency>

<!-- Tests -->

<dependency>
Expand Down
2 changes: 1 addition & 1 deletion ...fka/src/main/java/org/apache/flink/streaming/connectors/kafka/FlinkKafkaConsumerBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
import org.apache.flink.util.ExceptionUtils;
import org.apache.flink.util.SerializedValue;

import org.apache.commons.collections.map.LinkedMap;
import org.apache.commons.collections4.map.LinkedMap;
import org.apache.kafka.clients.consumer.ConsumerConfig;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand Down
6 changes: 4 additions & 2 deletions ...a/src/test/java/org/apache/flink/streaming/connectors/kafka/KafkaTestEnvironmentImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
import org.apache.flink.streaming.util.serialization.KeyedSerializationSchema;
import org.apache.flink.util.DockerImageVersions;

import org.apache.commons.collections.list.UnmodifiableList;
import org.apache.commons.collections4.list.UnmodifiableList;
import org.apache.kafka.clients.admin.AdminClient;
import org.apache.kafka.clients.admin.NewTopic;
import org.apache.kafka.clients.admin.TopicDescription;
Expand Down Expand Up @@ -250,7 +250,9 @@ public <T> KafkaSourceBuilder<T> getSourceBuilder(
@SuppressWarnings("unchecked")
public <K, V> Collection<ConsumerRecord<K, V>> getAllRecordsFromTopic(
Properties properties, String topic) {
return UnmodifiableList.decorate(KafkaUtil.drainAllRecordsFromTopic(topic, properties));
List<ConsumerRecord<byte[], byte[]>> records =
KafkaUtil.drainAllRecordsFromTopic(topic, properties);
return UnmodifiableList.unmodifiableList((List) records);
}

@Override
Expand Down
5 changes: 5 additions & 0 deletions flink-sql-connector-kafka/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ under the License.
<include>org.apache.flink:flink-connector-base</include>
<include>org.apache.flink:flink-connector-kafka</include>
<include>org.apache.kafka:*</include>
<include>org.apache.commons:commons-collections4</include>
</includes>
</artifactSet>
<filters>
Expand All @@ -91,6 +92,10 @@ under the License.
<pattern>org.apache.kafka</pattern>
<shadedPattern>org.apache.flink.kafka.shaded.org.apache.kafka</shadedPattern>
</relocation>
<relocation>
<pattern>org.apache.commons</pattern>
<shadedPattern>org.apache.flink.kafka.shaded.org.apache.commons</shadedPattern>
</relocation>
</relocations>
</configuration>
</execution>
Expand Down
1 change: 1 addition & 0 deletions flink-sql-connector-kafka/src/main/resources/META-INF/NOTICE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@ The Apache Software Foundation (http://www.apache.org/).
This project bundles the following dependencies under the Apache Software License 2.0. (http://www.apache.org/licenses/LICENSE-2.0.txt)

- org.apache.kafka:kafka-clients:3.4.0
- org.apache.commons:commons-collections4:4.4