Skip to content
Open
Show file tree
Hide file tree
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 @@ -628,7 +628,7 @@ class BeamModulePlugin implements Plugin<Project> {
def jaxb_api_version = "2.3.3"
def jsr305_version = "3.0.2"
def everit_json_version = "1.14.2"
def kafka_version = "2.4.1"
def kafka_version = "3.9.2"
def log4j2_version = "2.25.4"
def nemo_version = "0.1"
// [bomupgrader] determined by: io.grpc:grpc-netty, consistent with: google_cloud_platform_libraries_bom
Expand Down Expand Up @@ -839,8 +839,10 @@ class BeamModulePlugin implements Plugin<Project> {
jupiter_api : "org.junit.jupiter:junit-jupiter-api:$jupiter_version",
jupiter_engine : "org.junit.jupiter:junit-jupiter-engine:$jupiter_version",
jupiter_params : "org.junit.jupiter:junit-jupiter-params:$jupiter_version",
kafka : "org.apache.kafka:kafka_2.11:$kafka_version",
kafka_scala_2_12 : "org.apache.kafka:kafka_2.12:$kafka_version",
kafka_scala_2_13 : "org.apache.kafka:kafka_2.13:$kafka_version",
kafka_clients : "org.apache.kafka:kafka-clients:$kafka_version",
kafka_server : "org.apache.kafka:kafka-server:$kafka_version",
log4j : "log4j:log4j:1.2.17",
log4j_over_slf4j : "org.slf4j:log4j-over-slf4j:$slf4j_version",
log4j2_api : "org.apache.logging.log4j:log4j-api:$log4j2_version",
Expand Down
4 changes: 2 additions & 2 deletions examples/java/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ dependencies {
if (project.findProperty('testJavaVersion') == '21' || JavaVersion.current().compareTo(JavaVersion.VERSION_21) >= 0) {
// this dependency is a provided dependency for kafka-avro-serializer. It is not needed to compile with Java<=17
// but needed for compile only under Java21, specifically, required for extending from AbstractKafkaAvroDeserializer
compileOnly library.java.kafka
permitUnusedDeclared library.java.kafka
compileOnly library.java.kafka_scala_2_12
permitUnusedDeclared library.java.kafka_scala_2_12
}
implementation library.java.kafka_clients
implementation project(path: ":sdks:java:core", configuration: "shadow")
Expand Down
1 change: 1 addition & 0 deletions examples/java/common.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ configurations.sparkRunnerPreCommit {
exclude group: "org.slf4j", module: "slf4j-jdk14"
}
resolveCapabilitiesConflict(configurations.flinkRunnerPreCommit, 'org.lz4:lz4-java', 'at.yawk.lz4')
resolveCapabilitiesConflict(configurations.sparkRunnerPreCommit, 'org.lz4:lz4-java', 'at.yawk.lz4')


dependencies {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,8 @@ public void testCleanupShouldDropNonStaticTopic() throws IOException {
KafkaResourceManager tm = new KafkaResourceManager(kafkaClient, container, builder);

tm.cleanupAll();
verify(kafkaClient).deleteTopics(argThat(list -> list.size() == numTopics));
verify(kafkaClient)
.deleteTopics(argThat((Collection<String> list) -> list.size() == numTopics));
}

@Test
Expand Down
6 changes: 6 additions & 0 deletions runners/flink/1.19/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,9 @@ project.ext {

// Load the main build script which contains all build logic.
apply from: "../flink_runner.gradle"

// Flink 1.19 uses org.lz4:lz4-java instead of at.yawk.lz4:lz4-java
// Explicitly prefer at.yawk.lz4 candidates to resolve capability conflict
configurations.all {
resolveCapabilitiesConflict(it, 'org.lz4:lz4-java', 'at.yawk.lz4')
}
6 changes: 6 additions & 0 deletions runners/flink/1.19/job-server/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -29,3 +29,9 @@ project.ext {

// Load the main build script which contains all build logic.
apply from: "$basePath/flink_job_server.gradle"

// Flink 1.19 uses org.lz4:lz4-java instead of at.yawk.lz4:lz4-java
// Explicitly prefer at.yawk.lz4 candidates to resolve capability conflict
configurations.all {
resolveCapabilitiesConflict(it, 'org.lz4:lz4-java', 'at.yawk.lz4')
}
6 changes: 6 additions & 0 deletions runners/flink/1.20/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,9 @@ project.ext {

// Load the main build script which contains all build logic.
apply from: "../flink_runner.gradle"

// Flink 1.20 uses org.lz4:lz4-java instead of at.yawk.lz4:lz4-java
// Explicitly prefer at.yawk.lz4 candidates to resolve capability conflict
configurations.all {
resolveCapabilitiesConflict(it, 'org.lz4:lz4-java', 'at.yawk.lz4')
}
6 changes: 6 additions & 0 deletions runners/flink/1.20/job-server/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -29,3 +29,9 @@ project.ext {

// Load the main build script which contains all build logic.
apply from: "$basePath/flink_job_server.gradle"

// Flink 1.20 uses org.lz4:lz4-java instead of at.yawk.lz4:lz4-java
// Explicitly prefer at.yawk.lz4 candidates to resolve capability conflict
configurations.all {
resolveCapabilitiesConflict(it, 'org.lz4:lz4-java', 'at.yawk.lz4')
}
6 changes: 6 additions & 0 deletions runners/flink/2.0/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -41,3 +41,9 @@ project.ext {

// Load the main build script which contains all build logic.
apply from: "../flink_runner.gradle"

// Flink 2.0 uses org.lz4:lz4-java instead of at.yawk.lz4:lz4-java
// Explicitly prefer at.yawk.lz4 candidates to resolve capability conflict
configurations.all {
resolveCapabilitiesConflict(it, 'org.lz4:lz4-java', 'at.yawk.lz4')
}
6 changes: 6 additions & 0 deletions runners/flink/2.0/job-server/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -29,3 +29,9 @@ project.ext {

// Load the main build script which contains all build logic.
apply from: "$basePath/flink_job_server.gradle"

// Flink 2.0 uses org.lz4:lz4-java instead of at.yawk.lz4:lz4-java
// Explicitly prefer at.yawk.lz4 candidates to resolve capability conflict
configurations.all {
resolveCapabilitiesConflict(it, 'org.lz4:lz4-java', 'at.yawk.lz4')
}
7 changes: 0 additions & 7 deletions runners/flink/2.1/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,3 @@ project.ext {

// Load the main build script which contains all build logic.
apply from: "../flink_runner.gradle"

// Flink 2.1 uses at.yawk.lz4:lz4-java instead of org.lz4:lz4-java
// Explicitly prefer Flink's at.yawk.lz4 version to resolve capability conflict
configurations.all {
resolveCapabilitiesConflict(it, 'org.lz4:lz4-java', 'at.yawk.lz4')
}

7 changes: 0 additions & 7 deletions runners/flink/2.1/job-server/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,3 @@ project.ext {

// Load the main build script which contains all build logic.
apply from: "$basePath/flink_job_server.gradle"

// Flink 2.1 uses at.yawk.lz4:lz4-java instead of org.lz4:lz4-java
// Explicitly prefer Flink's at.yawk.lz4 version to resolve capability conflict
configurations.all {
resolveCapabilitiesConflict(it, 'org.lz4:lz4-java', 'at.yawk.lz4')
}

7 changes: 0 additions & 7 deletions runners/flink/2.2/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,3 @@ project.ext {

// Load the main build script which contains all build logic.
apply from: "../flink_runner.gradle"

// Flink 2.2 uses at.yawk.lz4:lz4-java instead of org.lz4:lz4-java
// Explicitly prefer Flink's at.yawk.lz4 version to resolve capability conflict
configurations.all {
resolveCapabilitiesConflict(it, 'org.lz4:lz4-java', 'at.yawk.lz4')
}

7 changes: 0 additions & 7 deletions runners/flink/2.2/job-server/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,3 @@ project.ext {

// Load the main build script which contains all build logic.
apply from: "$basePath/flink_job_server.gradle"

// Flink 2.2 uses at.yawk.lz4:lz4-java instead of org.lz4:lz4-java
// Explicitly prefer Flink's at.yawk.lz4 version to resolve capability conflict
configurations.all {
resolveCapabilitiesConflict(it, 'org.lz4:lz4-java', 'at.yawk.lz4')
}

6 changes: 6 additions & 0 deletions runners/spark/3/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -88,3 +88,9 @@ tasks.register("sparkVersionsTest") {
group = "Verification"
dependsOn sparkVersions.collect{k,v -> "sparkVersion${k}Test"}
}

// Spark 3 uses org.lz4:lz4-java instead of at.yawk.lz4:lz4-java
// Explicitly prefer at.yawk.lz4 candidates to resolve capability conflict
configurations.all {
resolveCapabilitiesConflict(it, 'org.lz4:lz4-java', 'at.yawk.lz4')
}
8 changes: 7 additions & 1 deletion runners/spark/3/job-server/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,10 @@ project.ext {
}

// Load the main build script which contains all build logic.
apply from: "$basePath/spark_job_server.gradle"
apply from: "$basePath/spark_job_server.gradle"

// Spark 3 uses org.lz4:lz4-java instead of at.yawk.lz4:lz4-java
// Explicitly prefer at.yawk.lz4 candidates to resolve capability conflict
configurations.all {
resolveCapabilitiesConflict(it, 'org.lz4:lz4-java', 'at.yawk.lz4')
}
5 changes: 5 additions & 0 deletions runners/spark/4/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -61,3 +61,8 @@ tasks.named("copyTestSourceOverrides") {
exclude "**/translation/streaming/**"
}

// Spark 4 uses org.lz4:lz4-java instead of at.yawk.lz4:lz4-java
// Explicitly prefer at.yawk.lz4 candidates to resolve capability conflict
configurations.all {
resolveCapabilitiesConflict(it, 'org.lz4:lz4-java', 'at.yawk.lz4')
}
6 changes: 6 additions & 0 deletions runners/spark/4/job-server/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -29,3 +29,9 @@ project.ext {

// Load the main build script which contains all build logic.
apply from: "$basePath/spark_job_server.gradle"

// Spark 4 uses org.lz4:lz4-java instead of at.yawk.lz4:lz4-java
// Explicitly prefer at.yawk.lz4 candidates to resolve capability conflict
configurations.all {
resolveCapabilitiesConflict(it, 'org.lz4:lz4-java', 'at.yawk.lz4')
}
5 changes: 2 additions & 3 deletions runners/spark/spark_runner.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -287,10 +287,9 @@ dependencies {
testImplementation project(path: ":sdks:java:extensions:avro", configuration: "testRuntimeMigration")
testImplementation project(":sdks:java:harness")
testImplementation library.java.avro
// kafka_2.13 artifacts were first published in 2.5.0; use a later version for Scala 2.13
def kafka_version = (spark_scala_version == '2.13') ? '2.8.0' : '2.4.1'
testImplementation "org.apache.kafka:kafka_$spark_scala_version:$kafka_version"
testImplementation (spark_scala_version == '2.13' ? library.java.kafka_scala_2_13 : library.java.kafka_scala_2_12)
testImplementation library.java.kafka_clients
testImplementation library.java.kafka_server
testImplementation library.java.junit
testImplementation library.java.mockito_core
testImplementation "org.assertj:assertj-core:3.11.1"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
import java.util.Properties;
import java.util.Random;
import kafka.server.KafkaConfig;
import kafka.server.KafkaServerStartable;
import kafka.server.KafkaServer;
import org.apache.zookeeper.server.NIOServerCnxnFactory;
import org.apache.zookeeper.server.ServerCnxnFactory;
import org.apache.zookeeper.server.ZooKeeperServer;
Expand All @@ -47,7 +47,7 @@ public class EmbeddedKafkaCluster {

private final String brokerList;

private final List<KafkaServerStartable> brokers;
private final List<KafkaServer> brokers;
private final List<File> logDirs;

private EmbeddedKafkaCluster(String zkConnection) {
Expand Down Expand Up @@ -114,15 +114,20 @@ public void startup() {
properties.setProperty("offsets.topic.replication.factor", "1");
properties.setProperty("log.flush.interval.messages", String.valueOf(1));

KafkaServerStartable broker = startBroker(properties);
KafkaServer broker = startBroker(properties);

brokers.add(broker);
logDirs.add(logDir);
}
}

private static KafkaServerStartable startBroker(Properties props) {
KafkaServerStartable server = new KafkaServerStartable(new KafkaConfig(props));
private static KafkaServer startBroker(Properties props) {
KafkaServer server =
new KafkaServer(
new KafkaConfig(props),
KafkaServer.$lessinit$greater$default$2(),
KafkaServer.$lessinit$greater$default$3(),
KafkaServer.$lessinit$greater$default$4());
Comment on lines +125 to +130

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

Using Scala compiler-generated default argument methods (like $lessinit$greater$default$2()) directly in Java is fragile and highly discouraged. These synthetic methods are internal implementation details of the Scala compiler and can change across Scala compiler versions or if the constructor parameters are reordered/modified in future Kafka releases.

Instead, pass explicit, standard Scala/Java instances such as org.apache.kafka.common.utils.Time.SYSTEM, scala.Option.empty(), and scala.collection.immutable.List$.MODULE$.empty().

Suggested change
KafkaServer server =
new KafkaServer(
new KafkaConfig(props),
KafkaServer.$lessinit$greater$default$2(),
KafkaServer.$lessinit$greater$default$3(),
KafkaServer.$lessinit$greater$default$4());
KafkaServer server =
new KafkaServer(
new KafkaConfig(props),
org.apache.kafka.common.utils.Time.SYSTEM,
scala.Option.empty(),
scala.collection.immutable.List$.MODULE$.empty());

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Using Scala compiler-generated default argument methods (like $lessinit$greater$default$2()) directly in Java is fragile and highly discouraged.

Needs citation?

Jokes aside, that last argument is supposed to be a Boolean so this is not exactly the right suggestion.
I don't feel strongly about this, Kafka itself instantiates KafkaServer as follows in main:

new KafkaServer(
  config,
  Time.SYSTEM,
  threadNamePrefix = None,
  enableForwarding = enableApiForwarding(config)
)

Other than readability I don't see a good reason not to use the generated methods to access default arguments.
If the signature were to change due to argument reordering as mentioned, then the suggested change would break at compile time whereas the generated methods would return the expected type because their definition depends on the signature definition itself.

server.startup();
return server;
}
Expand All @@ -148,7 +153,7 @@ public String getZkConnection() {

@SuppressWarnings("Slf4jDoNotLogMessageOfExceptionExplicitly")
public void shutdown() {
for (KafkaServerStartable broker : brokers) {
for (KafkaServer broker : brokers) {
try {
broker.shutdown();
} catch (Exception e) {
Expand Down
12 changes: 3 additions & 9 deletions sdks/java/io/kafka/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,7 @@ ext {
}

def kafkaVersions = [
'201': "2.0.1",
'231': "2.3.1",
'241': "2.4.1",
'251': "2.5.1",
'282': "2.8.2",
'312': "3.1.2",
'390': "3.9.0",
'392': "3.9.2",
]

kafkaVersions.each{k,v -> configurations.create("kafkaVersion$k")}
Expand All @@ -63,8 +57,8 @@ dependencies {
if (JavaVersion.current().compareTo(JavaVersion.VERSION_21) >= 0) {
// this dependency is a provided dependency for kafka-avro-serializer. It is not needed to compile with Java<=17
// but needed for compile only under Java21, specifically, required for extending from AbstractKafkaAvroDeserializer
compileOnly library.java.kafka
permitUnusedDeclared library.java.kafka
compileOnly library.java.kafka_scala_2_12
permitUnusedDeclared library.java.kafka_scala_2_12
}
testImplementation library.java.kafka_clients
testImplementation project(path: ":runners:core-java")
Expand Down
24 changes: 0 additions & 24 deletions sdks/java/io/kafka/kafka-231/build.gradle

This file was deleted.

24 changes: 0 additions & 24 deletions sdks/java/io/kafka/kafka-241/build.gradle

This file was deleted.

24 changes: 0 additions & 24 deletions sdks/java/io/kafka/kafka-251/build.gradle

This file was deleted.

24 changes: 0 additions & 24 deletions sdks/java/io/kafka/kafka-282/build.gradle

This file was deleted.

Loading
Loading