feat : let Spring boot handle container lifecycle

rajadilipkolli · Dec 19, 2024 · 8bb92f8 · 8bb92f8
1 parent fc3cce2
commit 8bb92f8
Showing 1 changed file with 2 additions and 21 deletions.
diff --git a/...sources/src/test/java/com/example/multipledatasources/common/ContainersConfiguration.java b/...sources/src/test/java/com/example/multipledatasources/common/ContainersConfiguration.java
@@ -1,6 +1,5 @@
 package com.example.multipledatasources.common;
 
-import jakarta.annotation.PreDestroy;
 import org.springframework.boot.test.context.TestConfiguration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.test.context.DynamicPropertyRegistrar;
@@ -16,22 +15,14 @@
 @TestConfiguration(proxyBeanMethods = false)
 public class ContainersConfiguration {
 
-    private MySQLContainer<?> mySQLContainer;
-    private PostgreSQLContainer<?> postgreSQLContainer;
-
     @Bean
     MySQLContainer<?> mySQLContainer() {
-        mySQLContainer = new MySQLContainer<>(DockerImageName.parse("mysql").withTag("9.1"));
-        mySQLContainer.start();
-        return mySQLContainer;
+        return new MySQLContainer<>(DockerImageName.parse("mysql").withTag("9.1"));
     }
 
     @Bean
     PostgreSQLContainer<?> postgreSQLContainer() {
-        postgreSQLContainer =
-                new PostgreSQLContainer<>(DockerImageName.parse("postgres").withTag("17.2-alpine"));
-        postgreSQLContainer.start();
-        return postgreSQLContainer;
+        return new PostgreSQLContainer<>(DockerImageName.parse("postgres").withTag("17.2-alpine"));
     }
 
     @Bean
@@ -47,14 +38,4 @@ public DynamicPropertyRegistrar databaseProperties(
             properties.add("spring.datasource.password", postgreSQLContainer::getPassword);
         };
     }
-
-    @PreDestroy
-    public void cleanup() {
-        if (mySQLContainer != null && mySQLContainer.isRunning()) {
-            mySQLContainer.stop();
-        }
-        if (postgreSQLContainer != null && postgreSQLContainer.isRunning()) {
-            postgreSQLContainer.stop();
-        }
-    }
 }