This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch camel-4.4.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit a46f3ccd44a76690d9efea8e5d796468bdb930c6
Author: Otavio Rodolfo Piske <angusyo...@gmail.com>
AuthorDate: Thu Mar 21 14:18:00 2024 +0100
(chores) camel-test-infra-rocketmq: code cleanups
---
.../infra/rocketmq/common/RocketMQProperties.java | 4 +--
.../rocketmq/services/RocketMQBrokerContainer.java | 6 ++--
...ontainer.java => RocketMQContainerService.java} | 10 +++---
.../services/RocketMQNameserverContainer.java | 2 +-
.../infra/rocketmq/services/RocketMQService.java | 37 +++++-----------------
.../rocketmq/services/RocketMQServiceFactory.java | 4 +--
6 files changed, 21 insertions(+), 42 deletions(-)
diff --git
a/test-infra/camel-test-infra-rocketmq/src/test/java/org/apache/camel/test/infra/rocketmq/common/RocketMQProperties.java
b/test-infra/camel-test-infra-rocketmq/src/test/java/org/apache/camel/test/infra/rocketmq/common/RocketMQProperties.java
index 065d1040e5e..67ed92b2666 100644
---
a/test-infra/camel-test-infra-rocketmq/src/test/java/org/apache/camel/test/infra/rocketmq/common/RocketMQProperties.java
+++
b/test-infra/camel-test-infra-rocketmq/src/test/java/org/apache/camel/test/infra/rocketmq/common/RocketMQProperties.java
@@ -18,8 +18,8 @@ package org.apache.camel.test.infra.rocketmq.common;
public final class RocketMQProperties {
- public static final String ROCKETMQ_VERSION_PROPERTY =
"itest.rocketmq.container.image.version";
- public static final String ROCKETMQ_IMAGE_PROPERTY =
"itest.rocketmq.container.image";
+ public static final String ROCKETMQ_VERSION_PROPERTY =
"rocketmq.container.image.version";
+ public static final String ROCKETMQ_IMAGE_PROPERTY =
"rocketmq.container.image";
public static final int ROCKETMQ_NAMESRV_PORT = 9876;
public static final int ROCKETMQ_BROKER1_PORT = 10909;
public static final int ROCKETMQ_BROKER2_PORT = 10911;
diff --git
a/test-infra/camel-test-infra-rocketmq/src/test/java/org/apache/camel/test/infra/rocketmq/services/RocketMQBrokerContainer.java
b/test-infra/camel-test-infra-rocketmq/src/test/java/org/apache/camel/test/infra/rocketmq/services/RocketMQBrokerContainer.java
index a3b5f48a132..097e37af43a 100644
---
a/test-infra/camel-test-infra-rocketmq/src/test/java/org/apache/camel/test/infra/rocketmq/services/RocketMQBrokerContainer.java
+++
b/test-infra/camel-test-infra-rocketmq/src/test/java/org/apache/camel/test/infra/rocketmq/services/RocketMQBrokerContainer.java
@@ -27,7 +27,7 @@ import org.testcontainers.containers.wait.strategy.Wait;
public class RocketMQBrokerContainer extends
GenericContainer<RocketMQBrokerContainer> {
public RocketMQBrokerContainer(Network network, String confName) {
- super(RocketMQContainer.ROCKETMQ_IMAGE);
+ super(RocketMQContainerService.ROCKETMQ_IMAGE);
withNetwork(network);
withExposedPorts(RocketMQProperties.ROCKETMQ_BROKER3_PORT,
@@ -35,13 +35,13 @@ public class RocketMQBrokerContainer extends
GenericContainer<RocketMQBrokerCont
RocketMQProperties.ROCKETMQ_BROKER1_PORT);
withEnv("NAMESRV_ADDR", "nameserver:9876");
withClasspathResourceMapping(confName + "/" + confName + ".conf",
- "/opt/rocketmq-" + RocketMQContainer.ROCKETMQ_VERSION +
"/conf/broker.conf",
+ "/opt/rocketmq-" + RocketMQContainerService.ROCKETMQ_VERSION +
"/conf/broker.conf",
BindMode.READ_WRITE);
withTmpFs(Collections.singletonMap("/home/rocketmq/store", "rw"));
withTmpFs(Collections.singletonMap("/home/rocketmq/logs", "rw"));
withCommand("sh", "mqbroker",
- "-c", "/opt/rocketmq-" + RocketMQContainer.ROCKETMQ_VERSION +
"/conf/broker.conf");
+ "-c", "/opt/rocketmq-" +
RocketMQContainerService.ROCKETMQ_VERSION + "/conf/broker.conf");
waitingFor(Wait.forListeningPort());
withCreateContainerCmdModifier(cmd -> cmd.withName(confName));
diff --git
a/test-infra/camel-test-infra-rocketmq/src/test/java/org/apache/camel/test/infra/rocketmq/services/RocketMQContainer.java
b/test-infra/camel-test-infra-rocketmq/src/test/java/org/apache/camel/test/infra/rocketmq/services/RocketMQContainerService.java
similarity index 93%
rename from
test-infra/camel-test-infra-rocketmq/src/test/java/org/apache/camel/test/infra/rocketmq/services/RocketMQContainer.java
rename to
test-infra/camel-test-infra-rocketmq/src/test/java/org/apache/camel/test/infra/rocketmq/services/RocketMQContainerService.java
index d0e63eb409b..b8e2af195ec 100644
---
a/test-infra/camel-test-infra-rocketmq/src/test/java/org/apache/camel/test/infra/rocketmq/services/RocketMQContainer.java
+++
b/test-infra/camel-test-infra-rocketmq/src/test/java/org/apache/camel/test/infra/rocketmq/services/RocketMQContainerService.java
@@ -28,19 +28,19 @@ import org.slf4j.LoggerFactory;
import org.testcontainers.containers.Container;
import org.testcontainers.containers.Network;
-public class RocketMQContainer implements RocketMQService,
ContainerService<RocketMQNameserverContainer> {
- private static final Logger LOG =
LoggerFactory.getLogger(RocketMQContainer.class);
+public class RocketMQContainerService implements RocketMQService,
ContainerService<RocketMQNameserverContainer> {
+ private static final Logger LOG =
LoggerFactory.getLogger(RocketMQContainerService.class);
public static final String ROCKETMQ_VERSION =
LocalPropertyResolver.getProperty(
- RocketMQContainer.class,
+ RocketMQContainerService.class,
RocketMQProperties.ROCKETMQ_VERSION_PROPERTY);
public static final String ROCKETMQ_IMAGE =
LocalPropertyResolver.getProperty(
- RocketMQContainer.class,
+ RocketMQContainerService.class,
RocketMQProperties.ROCKETMQ_IMAGE_PROPERTY) + ":" +
ROCKETMQ_VERSION;
private final RocketMQNameserverContainer nameserverContainer;
private final RocketMQBrokerContainer brokerContainer1;
- public RocketMQContainer() {
+ public RocketMQContainerService() {
Network network = Network.newNetwork();
nameserverContainer = new RocketMQNameserverContainer(network);
diff --git
a/test-infra/camel-test-infra-rocketmq/src/test/java/org/apache/camel/test/infra/rocketmq/services/RocketMQNameserverContainer.java
b/test-infra/camel-test-infra-rocketmq/src/test/java/org/apache/camel/test/infra/rocketmq/services/RocketMQNameserverContainer.java
index fb3e57d5256..4aa228f3c09 100644
---
a/test-infra/camel-test-infra-rocketmq/src/test/java/org/apache/camel/test/infra/rocketmq/services/RocketMQNameserverContainer.java
+++
b/test-infra/camel-test-infra-rocketmq/src/test/java/org/apache/camel/test/infra/rocketmq/services/RocketMQNameserverContainer.java
@@ -25,7 +25,7 @@ import org.testcontainers.containers.wait.strategy.Wait;
public class RocketMQNameserverContainer extends
GenericContainer<RocketMQNameserverContainer> {
public RocketMQNameserverContainer(Network network) {
- super(RocketMQContainer.ROCKETMQ_IMAGE);
+ super(RocketMQContainerService.ROCKETMQ_IMAGE);
withNetwork(network);
withNetworkAliases("nameserver");
diff --git
a/test-infra/camel-test-infra-rocketmq/src/test/java/org/apache/camel/test/infra/rocketmq/services/RocketMQService.java
b/test-infra/camel-test-infra-rocketmq/src/test/java/org/apache/camel/test/infra/rocketmq/services/RocketMQService.java
index 194e1a6751e..7fc505b4523 100644
---
a/test-infra/camel-test-infra-rocketmq/src/test/java/org/apache/camel/test/infra/rocketmq/services/RocketMQService.java
+++
b/test-infra/camel-test-infra-rocketmq/src/test/java/org/apache/camel/test/infra/rocketmq/services/RocketMQService.java
@@ -19,13 +19,12 @@ package org.apache.camel.test.infra.rocketmq.services;
import java.io.IOException;
import org.apache.camel.test.infra.common.services.TestService;
-import org.junit.jupiter.api.extension.AfterTestExecutionCallback;
-import org.junit.jupiter.api.extension.BeforeTestExecutionCallback;
+import org.apache.camel.test.infra.common.services.TestServiceUtil;
+import org.junit.jupiter.api.extension.AfterAllCallback;
+import org.junit.jupiter.api.extension.BeforeAllCallback;
import org.junit.jupiter.api.extension.ExtensionContext;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-public interface RocketMQService extends TestService,
BeforeTestExecutionCallback, AfterTestExecutionCallback {
+public interface RocketMQService extends TestService, AfterAllCallback,
BeforeAllCallback {
String nameserverAddress();
default String defaultCluster() {
@@ -37,32 +36,12 @@ public interface RocketMQService extends TestService,
BeforeTestExecutionCallbac
void deleteTopic(String topic) throws IOException, InterruptedException;
@Override
- default void beforeAll(ExtensionContext extensionContext) {
- try {
- initialize();
- } catch (Exception e) {
- Logger log = LoggerFactory.getLogger(RocketMQService.class);
-
- final Object o = extensionContext.getTestInstance().get();
- log.error("Failed to initialize service {} for test {} on ({})",
this.getClass().getSimpleName(),
- extensionContext.getDisplayName(), o.getClass().getName());
-
- throw e;
- }
- }
-
- @Override
- default void beforeTestExecution(ExtensionContext extensionContext) {
- //no op
- }
-
- @Override
- default void afterAll(ExtensionContext extensionContext) {
- shutdown();
+ default void beforeAll(ExtensionContext extensionContext) throws Exception
{
+ TestServiceUtil.tryInitialize(this, extensionContext);
}
@Override
- default void afterTestExecution(ExtensionContext context) {
- //no op
+ default void afterAll(ExtensionContext extensionContext) throws Exception {
+ TestServiceUtil.tryShutdown(this, extensionContext);
}
}
diff --git
a/test-infra/camel-test-infra-rocketmq/src/test/java/org/apache/camel/test/infra/rocketmq/services/RocketMQServiceFactory.java
b/test-infra/camel-test-infra-rocketmq/src/test/java/org/apache/camel/test/infra/rocketmq/services/RocketMQServiceFactory.java
index ad962917129..7b27d95f2b6 100644
---
a/test-infra/camel-test-infra-rocketmq/src/test/java/org/apache/camel/test/infra/rocketmq/services/RocketMQServiceFactory.java
+++
b/test-infra/camel-test-infra-rocketmq/src/test/java/org/apache/camel/test/infra/rocketmq/services/RocketMQServiceFactory.java
@@ -54,7 +54,7 @@ public final class RocketMQServiceFactory {
public static RocketMQService createService() {
return builder()
- .addLocalMapping(RocketMQContainer::new)
+ .addLocalMapping(RocketMQContainerService::new)
.build();
}
@@ -68,7 +68,7 @@ public final class RocketMQServiceFactory {
static {
SimpleTestServiceBuilder<RocketMQService> instance = builder();
- instance.addLocalMapping(() -> new SingletonKRocketMQService(new
RocketMQContainer(), "rocketmq"));
+ instance.addLocalMapping(() -> new SingletonKRocketMQService(new
RocketMQContainerService(), "rocketmq"));
INSTANCE = instance.build();
}
