From 59a5d9852611b9c3eb4be505813805562936586c Mon Sep 17 00:00:00 2001 From: John Blum Date: Fri, 12 May 2023 13:49:09 -0700 Subject: [PATCH] Add logging to, and enable logging using SLF4J for, TestcontainersCassandraConfiguration. --- .../TestcontainersCassandraConfiguration.java | 29 ++++++++++++++++++- .../src/test/resources/logback.xml | 2 ++ 2 files changed, 30 insertions(+), 1 deletion(-) diff --git a/spring-geode-project/spring-geode/src/test/java/example/app/crm/config/TestcontainersCassandraConfiguration.java b/spring-geode-project/spring-geode/src/test/java/example/app/crm/config/TestcontainersCassandraConfiguration.java index dbbb0243..a3ead0df 100644 --- a/spring-geode-project/spring-geode/src/test/java/example/app/crm/config/TestcontainersCassandraConfiguration.java +++ b/spring-geode-project/spring-geode/src/test/java/example/app/crm/config/TestcontainersCassandraConfiguration.java @@ -19,6 +19,7 @@ import static org.assertj.core.api.Assertions.assertThat; import java.net.InetSocketAddress; import java.util.Arrays; +import java.util.Map; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.boot.autoconfigure.cassandra.CassandraProperties; @@ -33,6 +34,8 @@ import org.springframework.lang.NonNull; import com.datastax.oss.driver.api.core.CqlSession; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.testcontainers.containers.CassandraContainer; import org.testcontainers.containers.GenericContainer; import org.testcontainers.utility.DockerImageName; @@ -68,6 +71,8 @@ public class TestcontainersCassandraConfiguration extends TestCassandraConfigura private static final String TESTCONTAINERS_RYUK_DISABLED = "true"; private static final String TESTCONTAINERS_RYUK_ENABLED = "false"; + private final Logger logger = LoggerFactory.getLogger(getClass()); + @Bean("CassandraContainer") GenericContainer cassandraContainer(Environment environment) { @@ -75,7 +80,29 @@ public class TestcontainersCassandraConfiguration extends TestCassandraConfigura cassandraContainer.start(); - return withCassandraServer(cassandraContainer, environment); + return logContainerConfiguration(withCassandraServer(cassandraContainer, environment)); + } + + protected @NonNull Logger getLogger() { + return this.logger; + } + + protected void logInfo(String message, Object... arguments) { + + Logger logger = getLogger(); + + if (logger.isInfoEnabled()) { + logger.info(message, arguments); + } + } + + private @NonNull GenericContainer logContainerConfiguration(@NonNull GenericContainer cassandraContainer) { + + logInfo("Cassandra Testcontainer Environment Configuration:"); + + cassandraContainer.getEnvMap().forEach((key, value) -> logInfo("{} = [{}]", key, value)); + + return cassandraContainer; } private @NonNull GenericContainer newCassandraContainer() { diff --git a/spring-geode-project/spring-geode/src/test/resources/logback.xml b/spring-geode-project/spring-geode/src/test/resources/logback.xml index 0fb9e803..d0d416f5 100644 --- a/spring-geode-project/spring-geode/src/test/resources/logback.xml +++ b/spring-geode-project/spring-geode/src/test/resources/logback.xml @@ -17,6 +17,8 @@ + +