Skip to content

Commit 8c3d4e3

Browse files
bsmahibsmahi
authored
fix(dev): Add missing Spring AI dependency to MongoDB Atlas module
Fixes gh-122 Signed-off-by: Bs Mahi <bs.mahi@gmail.com>
1 parent 220abbc commit 8c3d4e3

7 files changed

Lines changed: 21 additions & 14 deletions

File tree

‎arconia-dev/arconia-dev-services/arconia-dev-services-mongodb-atlas/build.gradle‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ dependencies {
1010
annotationProcessor "org.springframework.boot:spring-boot-configuration-processor"
1111

1212
api project(":arconia-dev:arconia-dev-services:arconia-dev-services-core")
13+
api "org.springframework.ai:spring-ai-spring-boot-testcontainers"
1314
api "org.springframework.boot:spring-boot-testcontainers"
1415
api "org.testcontainers:mongodb"
1516

@@ -22,6 +23,12 @@ dependencies {
2223
testRuntimeOnly "org.junit.platform:junit-platform-launcher"
2324
}
2425

26+
dependencyManagement {
27+
imports {
28+
mavenBom "org.springframework.ai:spring-ai-bom:${springAiVersion}"
29+
}
30+
}
31+
2532
publishing {
2633
publications {
2734
mavenJava(MavenPublication) {

arconia-dev/arconia-dev-services/arconia-dev-services-mongodb-atlas/src/main/java/io/arconia/dev/services/mongodb/MongoDbAtlasDevServicesAutoConfiguration.java renamed to arconia-dev/arconia-dev-services/arconia-dev-services-mongodb-atlas/src/main/java/io/arconia/dev/services/mongodb/atlas/MongoDbAtlasDevServicesAutoConfiguration.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.arconia.dev.services.mongodb;
1+
package io.arconia.dev.services.mongodb.atlas;
22

33
import org.springframework.boot.autoconfigure.AutoConfiguration;
44
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
@@ -15,8 +15,8 @@
1515
import org.testcontainers.mongodb.MongoDBAtlasLocalContainer;
1616
import org.testcontainers.utility.DockerImageName;
1717

18-
import io.arconia.dev.services.mongodb.MongoDbAtlasDevServicesAutoConfiguration.ConfigurationWithRestart;
19-
import io.arconia.dev.services.mongodb.MongoDbAtlasDevServicesAutoConfiguration.ConfigurationWithoutRestart;
18+
import io.arconia.dev.services.mongodb.atlas.MongoDbAtlasDevServicesAutoConfiguration.ConfigurationWithRestart;
19+
import io.arconia.dev.services.mongodb.atlas.MongoDbAtlasDevServicesAutoConfiguration.ConfigurationWithoutRestart;
2020

2121
/**
2222
* Autoconfiguration for MongoDB Atlas Dev Services.
@@ -35,9 +35,9 @@ public static final class ConfigurationWithRestart {
3535

3636
@Bean
3737
@RestartScope
38-
@ServiceConnection
38+
@ServiceConnection("mongodb")
3939
@ConditionalOnMissingBean
40-
MongoDBAtlasLocalContainer mongoDBContainer(MongoDbAtlasDevServicesProperties properties) {
40+
MongoDBAtlasLocalContainer mongoDBAtlasLocalContainer(MongoDbAtlasDevServicesProperties properties) {
4141
return new MongoDBAtlasLocalContainer(DockerImageName.parse(properties.getImageName())
4242
.asCompatibleSubstituteFor(COMPATIBLE_IMAGE_NAME))
4343
.withEnv(properties.getEnvironment())
@@ -52,9 +52,9 @@ MongoDBAtlasLocalContainer mongoDBContainer(MongoDbAtlasDevServicesProperties pr
5252
public static final class ConfigurationWithoutRestart {
5353

5454
@Bean
55-
@ServiceConnection
55+
@ServiceConnection("mongodb")
5656
@ConditionalOnMissingBean
57-
MongoDBAtlasLocalContainer mongoDBContainerNoRestartScope(MongoDbAtlasDevServicesProperties properties) {
57+
MongoDBAtlasLocalContainer mongoDBAtlasLocalContainerNoRestartScope(MongoDbAtlasDevServicesProperties properties) {
5858
return new MongoDBAtlasLocalContainer(DockerImageName.parse(properties.getImageName())
5959
.asCompatibleSubstituteFor(COMPATIBLE_IMAGE_NAME))
6060
.withEnv(properties.getEnvironment())

arconia-dev/arconia-dev-services/arconia-dev-services-mongodb-atlas/src/main/java/io/arconia/dev/services/mongodb/MongoDbAtlasDevServicesProperties.java renamed to arconia-dev/arconia-dev-services/arconia-dev-services-mongodb-atlas/src/main/java/io/arconia/dev/services/mongodb/atlas/MongoDbAtlasDevServicesProperties.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.arconia.dev.services.mongodb;
1+
package io.arconia.dev.services.mongodb.atlas;
22

33
import java.time.Duration;
44
import java.util.HashMap;

arconia-dev/arconia-dev-services/arconia-dev-services-mongodb-atlas/src/main/java/io/arconia/dev/services/mongodb/package-info.java renamed to arconia-dev/arconia-dev-services/arconia-dev-services-mongodb-atlas/src/main/java/io/arconia/dev/services/mongodb/atlas/package-info.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
@NullMarked
2-
package io.arconia.dev.services.mongodb;
2+
package io.arconia.dev.services.mongodb.atlas;
33

44
import org.jspecify.annotations.NullMarked;

‎arconia-dev/arconia-dev-services/arconia-dev-services-mongodb-atlas/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
io.arconia.dev.services.mongodb.MongoDbAtlasDevServicesAutoConfiguration
1+
io.arconia.dev.services.mongodb.atlas.MongoDbAtlasDevServicesAutoConfiguration

arconia-dev/arconia-dev-services/arconia-dev-services-mongodb-atlas/src/test/java/io/arconia/dev/services/mongodb/MongoDbAtlasDevServicesAutoConfigurationTests.java renamed to arconia-dev/arconia-dev-services/arconia-dev-services-mongodb-atlas/src/test/java/io/arconia/dev/services/mongodb/atlas/MongoDbAtlasDevServicesAutoConfigurationTests.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.arconia.dev.services.mongodb;
1+
package io.arconia.dev.services.mongodb.atlas;
22

33
import org.junit.jupiter.api.Test;
44
import org.springframework.boot.autoconfigure.AutoConfigurations;
@@ -43,8 +43,8 @@ void containerConfigurationApplied() {
4343
contextRunner
4444
.withPropertyValues(
4545
"arconia.dev.services.mongodb-atlas.environment.KEY=value",
46-
"arconia.dev.services.mongodb.shared=never",
47-
"arconia.dev.services.mongodb.startup-timeout=90s"
46+
"arconia.dev.services.mongodb-atlas.shared=never",
47+
"arconia.dev.services.mongodb-atlas.startup-timeout=90s"
4848
)
4949
.run(context -> {
5050
assertThat(context).hasSingleBean(MongoDBAtlasLocalContainer.class);

arconia-dev/arconia-dev-services/arconia-dev-services-mongodb-atlas/src/test/java/io/arconia/dev/services/mongodb/MongoDbAtlasDevServicesPropertiesTests.java renamed to arconia-dev/arconia-dev-services/arconia-dev-services-mongodb-atlas/src/test/java/io/arconia/dev/services/mongodb/atlas/MongoDbAtlasDevServicesPropertiesTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.arconia.dev.services.mongodb;
1+
package io.arconia.dev.services.mongodb.atlas;
22

33
import java.time.Duration;
44
import java.util.Map;

0 commit comments

Comments
 (0)