Skip to content

GH-2582: GlobalEmbedKafka compatible with native #2593

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

Merged
merged 1 commit into from
Feb 21, 2023
Merged

GH-2582: GlobalEmbedKafka compatible with native #2593

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
33 changes: 13 additions & 20 deletions ...n/java/org/springframework/kafka/test/junit/GlobalEmbeddedKafkaTestExecutionListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2022 the original author or authors.
* Copyright 2022-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -49,8 +49,6 @@
*/
public class GlobalEmbeddedKafkaTestExecutionListener implements TestExecutionListener {

private static final Log LOGGER = LogFactory.getLog(GlobalEmbeddedKafkaTestExecutionListener.class);

/**
* Property name used to enable the {@code GlobalEmbeddedKafkaTestExecutionListener}.
* The {@code GlobalEmbeddedKafkaTestExecutionListener} is registered automatically via
Expand Down Expand Up @@ -85,27 +83,22 @@ public class GlobalEmbeddedKafkaTestExecutionListener implements TestExecutionLi
public static final String BROKER_PROPERTIES_LOCATION_PROPERTY_NAME =
"spring.kafka.embedded.broker.properties.location";

private static final boolean JUNIT_PLATFORM_COMPATIBLE;

static {
boolean compat = false;
try {
TestPlan.class.getDeclaredMethod("getConfigurationParameters");
compat = true;
}
catch (NoSuchMethodException | SecurityException e) {
LOGGER.debug("JUnit Platform version must be >= 1.8 to use a global embedded kafka server");
}
JUNIT_PLATFORM_COMPATIBLE = compat;
}

private EmbeddedKafkaBroker embeddedKafkaBroker;

private Log logger;

@Override
public void testPlanExecutionStarted(TestPlan testPlan) {
if (!JUNIT_PLATFORM_COMPATIBLE) {
// We have to postpone initialization for native images because of Service Loader at build time.
this.logger = LogFactory.getLog(GlobalEmbeddedKafkaTestExecutionListener.class);
try {
TestPlan.class.getDeclaredMethod("getConfigurationParameters");
}
catch (NoSuchMethodException | SecurityException ex) {
this.logger.debug("JUnit Platform version must be >= 1.8 to use a global embedded kafka server");
return;
}

ConfigurationParameters configurationParameters = testPlan.getConfigurationParameters();
boolean enabled = configurationParameters.getBoolean(LISTENER_ENABLED_PROPERTY_NAME).orElse(false);
if (enabled) {
Expand All @@ -130,7 +123,7 @@ public void testPlanExecutionStarted(TestPlan testPlan) {
.kafkaPorts(ports);
this.embeddedKafkaBroker.afterPropertiesSet();

LOGGER.info("Started global Embedded Kafka on: " + this.embeddedKafkaBroker.getBrokersAsString());
this.logger.info("Started global Embedded Kafka on: " + this.embeddedKafkaBroker.getBrokersAsString());
}
}

Expand All @@ -156,7 +149,7 @@ private int[] ports(String ports) {
public void testPlanExecutionFinished(TestPlan testPlan) {
if (this.embeddedKafkaBroker != null) {
this.embeddedKafkaBroker.destroy();
LOGGER.info("Stopped global Embedded Kafka.");
this.logger.info("Stopped global Embedded Kafka.");
}
}

Expand Down