fix: resolved issue with embedded wiremock module autoconfiguration

PlaytikaOSS · Sep 25, 2023 · 74ba3cf · 74ba3cf
1 parent 55a74c3
commit 74ba3cf
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 4 deletions.
diff --git a/...ain/java/com/playtika/testcontainers/wiremock/EmbeddedWiremockBootstrapConfiguration.java b/...ain/java/com/playtika/testcontainers/wiremock/EmbeddedWiremockBootstrapConfiguration.java
@@ -9,7 +9,6 @@
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.core.annotation.Order;
 import org.springframework.core.env.ConfigurableEnvironment;
 import org.springframework.core.env.MapPropertySource;
 import org.testcontainers.containers.GenericContainer;
@@ -21,10 +20,8 @@
 import java.util.Optional;
 
 import static com.playtika.testcontainer.common.utils.ContainerUtils.configureCommonsAndStart;
-import static org.springframework.core.Ordered.HIGHEST_PRECEDENCE;
 
 @Slf4j
-@Order(HIGHEST_PRECEDENCE)
 @Configuration
 @ConditionalOnExpression("${embedded.containers.enabled:true}")
 @AutoConfigureAfter(DockerPresenceBootstrapConfiguration.class)

diff --git a/...a/com/playtika/testcontainers/wiremock/EmbeddedWiremockDependenciesAutoConfiguration.java b/...a/com/playtika/testcontainers/wiremock/EmbeddedWiremockDependenciesAutoConfiguration.java
@@ -0,0 +1,16 @@
+package com.playtika.testcontainers.wiremock;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
+import org.springframework.boot.autoconfigure.AutoConfigureOrder;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+
+@Slf4j
+@AutoConfiguration
+@AutoConfigureOrder
+@ConditionalOnExpression("${embedded.containers.enabled:true}")
+@ConditionalOnProperty(value = "embedded.wiremock.enabled", matchIfMissing = true)
+public class EmbeddedWiremockDependenciesAutoConfiguration {
+
+}
diff --git a/...esources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/...esources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -1 +1 @@
-com.playtika.testcontainers.wiremock.EmbeddedWiremockBootstrapConfiguration
+com.playtika.testcontainers.wiremock.EmbeddedWiremockDependenciesAutoConfiguration
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		com.playtika.testcontainers.wiremock.EmbeddedWiremockBootstrapConfiguration
		com.playtika.testcontainers.wiremock.EmbeddedWiremockDependenciesAutoConfiguration