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

Merge branch '3.1.x' into 3.2.x

Browse Source 
Closes gh-40508
This commit is contained in:
Scott Frederick
2024-04-24 15:08:50 -05:00
parent 00a25f5d89 f210d83062
commit 3e2d151c0e
2 changed files with 41 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spring-boot-project/spring-boot-testcontainers/src/main/java/org/springframework/boot/testcontainers/lifecycle/TestcontainersLifecycleBeanPostProcessor.java
View File

@@ -29,6 +29,7 @@ import org.apache.commons.logging.LogFactory;
import org.testcontainers.containers.ContainerState;
import org.testcontainers.containers.GenericContainer;
import org.testcontainers.lifecycle.Startable;
import org.testcontainers.utility.TestcontainersConfiguration;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.BeanCreationException;
@@ -55,6 +56,7 @@ import org.springframework.core.log.LogMessage;
*
* @author Phillip Webb
* @author Stephane Nicoll
* @author Scott Frederick
* @see TestcontainersLifecycleApplicationContextInitializer
*/
@Order(Ordered.LOWEST_PRECEDENCE)
@@ -183,7 +185,8 @@ class TestcontainersLifecycleBeanPostProcessor
}
private boolean isReusedContainer(Object bean) {
return (bean instanceof GenericContainer<?> container) && container.isShouldBeReused();
return (bean instanceof GenericContainer<?> container) && container.isShouldBeReused()
&& TestcontainersConfiguration.getInstance().environmentSupportsReuse();
}
enum Startables {