Spring/spring-boot-data-geode
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Refactor the TestcontainersCassandraConfiguration class and pass the Spring Environment object to the utility methods.

Browse Source
This commit is contained in:
John Blum
2023-05-12 18:24:37 -07:00
parent dbea481990
commit 072b6dc8da
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
spring-geode-project/spring-geode/src/test/java/example/app/crm/config/TestcontainersCassandraConfiguration.java
View File

@@ -88,7 +88,7 @@ public class TestcontainersCassandraConfiguration extends TestCassandraConfigura
@Bean("CassandraContainer") @Bean("CassandraContainer")
GenericContainer<?> cassandraContainer(Environment environment) { GenericContainer<?> cassandraContainer(Environment environment) {
GenericContainer<?> cassandraContainer = newEnvironmentOptimizedCassandraContainer(); GenericContainer<?> cassandraContainer = newEnvironmentOptimizedCassandraContainer(environment);
cassandraContainer.start(); cassandraContainer.start();
cassandraContainer.followOutput(new Slf4jLogConsumer(getLogger())); cassandraContainer.followOutput(new Slf4jLogConsumer(getLogger()));
@@ -129,7 +129,7 @@ public class TestcontainersCassandraConfiguration extends TestCassandraConfigura
return cassandraContainer; return cassandraContainer;
} }
private @NonNull GenericContainer<?> newCassandraContainer() { private @NonNull GenericContainer<?> newCassandraContainer(@NonNull Environment environment) {
return new CassandraContainer<>(CASSANDRA_DOCKER_IMAGE_NAME) return new CassandraContainer<>(CASSANDRA_DOCKER_IMAGE_NAME)
.withInitScript(CASSANDRA_SCHEMA_CQL) .withInitScript(CASSANDRA_SCHEMA_CQL)
@@ -139,13 +139,13 @@ public class TestcontainersCassandraConfiguration extends TestCassandraConfigura
} }
// Information (feedback) received from Sergei Egorov. // Information (feedback) received from Sergei Egorov.
private @NonNull GenericContainer<?> newEnvironmentOptimizedCassandraContainer() { private @NonNull GenericContainer<?> newEnvironmentOptimizedCassandraContainer(@NonNull Environment environment) {
return withCassandraEnvironmentConfiguration(newCassandraContainer() return withCassandraEnvironmentConfiguration(newCassandraContainer(environment)
.withEnv("JVM_OPTS", "-Dcassandra.skip_wait_for_gossip_to_settle=0 -Dcassandra.initial_token=0") .withEnv("JVM_OPTS", "-Dcassandra.skip_wait_for_gossip_to_settle=0 -Dcassandra.initial_token=0")
.withEnv("CASSANDRA_SNITCH", "SimpleSnitch") .withEnv("CASSANDRA_SNITCH", "SimpleSnitch")
.withEnv("HEAP_NEWSIZE", "128M") .withEnv("HEAP_NEWSIZE", "128M")
.withEnv("MAX_HEAP_SIZE", "1024M")); .withEnv("MAX_HEAP_SIZE", "1024M"), environment);
} }
private @NonNull CassandraTemplate newCassandraTemplate(@NonNull CqlSession session) { private @NonNull CassandraTemplate newCassandraTemplate(@NonNull CqlSession session) {
@@ -169,7 +169,7 @@ public class TestcontainersCassandraConfiguration extends TestCassandraConfigura
} }
private @NonNull GenericContainer<?> withCassandraEnvironmentConfiguration( private @NonNull GenericContainer<?> withCassandraEnvironmentConfiguration(
@NonNull GenericContainer<?> cassandraContainer) { @NonNull GenericContainer<?> cassandraContainer, @NonNull Environment environment) {
return isNotJenkinsEnvironment() return isNotJenkinsEnvironment()
? cassandraContainer.withEnv("TESTCONTAINERS_RYUK_DISABLED", TESTCONTAINERS_RYUK_DISABLED) ? cassandraContainer.withEnv("TESTCONTAINERS_RYUK_DISABLED", TESTCONTAINERS_RYUK_DISABLED)