Merge pull request #18456 from panos-kakos/JAVA-42144-F

ulisseslima · web-flow · commit 3c10b943d9df · 2025-05-01T22:24:01.000-03:00
[JAVA-42144]
diff --git a/persistence-modules/pom.xml b/persistence-modules/pom.xml
@@ -77,7 +77,7 @@
         <module>spring-boot-persistence</module>
         <module>spring-boot-persistence-h2</module>
         <module>spring-boot-persistence-h2-2</module>
-        <!-- <module>spring-boot-persistence-mongodb</module> --> <!-- JAVA-42144 -->
+        <module>spring-boot-persistence-mongodb</module>
         <!-- <module>spring-boot-persistence-mongodb-2</module> --> <!-- JAVA-42371 -->
         <module>spring-boot-persistence-mongodb-3</module>
         <!-- <module>spring-boot-persistence-mongodb-4</module> --> <!-- JAVA-42372 -->
diff --git a/persistence-modules/spring-boot-persistence-mongodb/pom.xml b/persistence-modules/spring-boot-persistence-mongodb/pom.xml
@@ -9,9 +9,9 @@
 
     <parent>
         <groupId>com.baeldung</groupId>
-        <artifactId>parent-boot-2</artifactId>
+        <artifactId>parent-boot-3</artifactId>
         <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../../parent-boot-2</relativePath>
+        <relativePath>../../parent-boot-3</relativePath>
     </parent>
 
     <dependencies>
@@ -30,9 +30,26 @@
         </dependency>
         <dependency>
             <groupId>de.flapdoodle.embed</groupId>
-            <artifactId>de.flapdoodle.embed.mongo</artifactId>
-            <scope>test</scope>
+            <artifactId>de.flapdoodle.embed.mongo.spring3x</artifactId>
+            <version>${de.flapdoodle.embed.mongo.version}</version>
         </dependency>
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <parameters>true</parameters>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <properties>
+        <de.flapdoodle.embed.mongo.version>4.20.0</de.flapdoodle.embed.mongo.version>
+        <spring-boot.repackage.skip>true</spring-boot.repackage.skip>
+    </properties>
+
 </project>
diff --git a/persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/boot/connection/via/client/SpringMongoConnectionViaClientApp.java b/persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/boot/connection/via/client/SpringMongoConnectionViaClientApp.java
@@ -7,11 +7,10 @@
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.WebApplicationType;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.autoconfigure.mongo.embedded.EmbeddedMongoAutoConfiguration;
 import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.data.mongodb.config.AbstractMongoClientConfiguration;
 
-@SpringBootApplication(exclude={EmbeddedMongoAutoConfiguration.class})
+@SpringBootApplication
 public class SpringMongoConnectionViaClientApp extends AbstractMongoClientConfiguration {
 
     public static void main(String... args) {
diff --git a/persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/boot/connection/via/properties/SpringMongoConnectionViaPropertiesApp.java b/persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/boot/connection/via/properties/SpringMongoConnectionViaPropertiesApp.java
@@ -2,11 +2,10 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.autoconfigure.mongo.embedded.EmbeddedMongoAutoConfiguration;
 import org.springframework.context.annotation.PropertySource;
 
 @PropertySource("classpath:connection.via.properties/application.properties")
-@SpringBootApplication(exclude={EmbeddedMongoAutoConfiguration.class})
+@SpringBootApplication
 public class SpringMongoConnectionViaPropertiesApp {
 
     public static void main(String... args) {
diff --git a/persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/logging/model/Book.java b/persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/logging/model/Book.java
@@ -5,15 +5,19 @@
 import org.bson.types.ObjectId;
 import org.springframework.data.mongodb.core.mapping.Document;
 import org.springframework.data.mongodb.core.mapping.MongoId;
+import org.springframework.data.mongodb.core.mapping.Field;
+
 
 @Document(collection = "book")
 public class Book {
 
     @MongoId
     private ObjectId id;
 
+    @Field("bookName")
     private String bookName;
 
+    @Field("authorName")
     private String authorName;
 
     public ObjectId getId() {
diff --git a/persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/multipledb/SpringBootMultipleDbApplication.java b/persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/multipledb/SpringBootMultipleDbApplication.java
@@ -2,9 +2,8 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.autoconfigure.mongo.embedded.EmbeddedMongoAutoConfiguration;
 
-@SpringBootApplication(exclude = EmbeddedMongoAutoConfiguration.class)
+@SpringBootApplication
 public class SpringBootMultipleDbApplication {
 
     public static void main(String... args) {
diff --git a/persistence-modules/spring-boot-persistence-mongodb/src/main/resources/application.properties b/persistence-modules/spring-boot-persistence-mongodb/src/main/resources/application.properties
@@ -11,4 +11,6 @@ spring.thymeleaf.cache=false
 spring.servlet.multipart.max-file-size=256MB
 spring.servlet.multipart.max-request-size=256MB
 spring.servlet.multipart.enabled=true
-spring.data.mongodb.uri=mongodb://localhost
+spring.data.mongodb.uri=mongodb://localhost
+
+de.flapdoodle.mongodb.embedded.version=8.0.5
diff --git a/persistence-modules/spring-boot-persistence-mongodb/src/test/java/com/baeldung/logging/GroupByAuthor.java b/persistence-modules/spring-boot-persistence-mongodb/src/test/java/com/baeldung/logging/GroupByAuthor.java
@@ -1,13 +1,15 @@
 package com.baeldung.logging;
 
-import org.springframework.data.annotation.Id;
+import org.springframework.data.mongodb.core.mapping.Field;
 
 public class GroupByAuthor {
 
-    @Id
+    @Field("_id")
     private String authorName;
     private int authCount;
 
+    public GroupByAuthor() {}
+
     public GroupByAuthor(String authorName, int authCount) {
         this.authorName = authorName;
         this.authCount = authCount;
diff --git a/persistence-modules/spring-boot-persistence-mongodb/src/test/java/com/baeldung/logging/LoggingUnitTest.java b/persistence-modules/spring-boot-persistence-mongodb/src/test/java/com/baeldung/logging/LoggingUnitTest.java
@@ -12,9 +12,9 @@
 import java.util.stream.Collectors;
 import java.util.stream.StreamSupport;
 
-import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.aggregation.Aggregation;
@@ -23,44 +23,16 @@
 import org.springframework.test.context.TestPropertySource;
 
 import com.baeldung.logging.model.Book;
-import com.mongodb.client.MongoClients;
-
-import de.flapdoodle.embed.mongo.MongodExecutable;
-import de.flapdoodle.embed.mongo.MongodStarter;
-import de.flapdoodle.embed.mongo.config.ImmutableMongodConfig;
-import de.flapdoodle.embed.mongo.config.MongodConfig;
-import de.flapdoodle.embed.mongo.config.Net;
-import de.flapdoodle.embed.mongo.distribution.Version;
-import de.flapdoodle.embed.process.runtime.Network;
 
 @SpringBootTest(classes = SpringBootLoggingApplication.class)
-@TestPropertySource(properties = {"logging.level.org.springframework.data.mongodb.core.MongoTemplate=WARN"}, value = "/embedded.properties")
+@TestPropertySource(properties = { "logging.level.org.springframework.data.mongodb.core.MongoTemplate=WARN" }, value = "/embedded.properties")
 public class LoggingUnitTest {
 
-    private static final String CONNECTION_STRING = "mongodb://%s:%d";
-
-    private MongodExecutable mongodExecutable;
-    private MongoTemplate mongoTemplate;
-
-    @AfterEach
-    void clean() {
-        mongodExecutable.stop();
-    }
+    private @Autowired MongoTemplate mongoTemplate;
 
     @BeforeEach
     void setup() throws Exception {
-        String ip = "localhost";
-        int port = Network.freeServerPort(Network.getLocalHost());
-
-        ImmutableMongodConfig mongodConfig = MongodConfig.builder()
-                .version(Version.Main.PRODUCTION)
-                .net(new Net(ip, port, Network.localhostIsIPv6()))
-                .build();
-
-        MongodStarter starter = MongodStarter.getDefaultInstance();
-        mongodExecutable = starter.prepare(mongodConfig);
-        mongodExecutable.start();
-        mongoTemplate = new MongoTemplate(MongoClients.create(String.format(CONNECTION_STRING, ip, port)), "test");
+        mongoTemplate.dropCollection("book");
     }
 
     @Test
@@ -88,7 +60,7 @@ void givenExistingDocument_whenUpdateDocument_thenFieldIsUpdatedOk() {
         mongoTemplate.updateFirst(query(where("bookName").is("Book")), update("authorName", authorNameUpdate), Book.class);
 
         assertThat(mongoTemplate.findById(book.getId(), Book.class)).extracting(Book::getAuthorName)
-                .isEqualTo(authorNameUpdate);
+            .isEqualTo(authorNameUpdate);
     }
 
     @Test
@@ -104,7 +76,7 @@ void whenInsertMultipleDocuments_thenFindAllOk() {
         mongoTemplate.insert(Arrays.asList(book, book1), Book.class);
 
         assertThat(mongoTemplate.findAll(Book.class)
-                .size()).isEqualTo(2);
+            .size()).isEqualTo(2);
     }
 
     @Test
@@ -118,7 +90,7 @@ void givenExistingDocument_whenRemoveDocument_thenDocumentIsDeleted() {
         mongoTemplate.remove(book);
 
         assertThat(mongoTemplate.findAll(Book.class)
-                .size()).isEqualTo(0);
+            .size()).isEqualTo(0);
     }
 
     @Test
@@ -138,21 +110,21 @@ void whenAggregateByField_thenGroupByCountIsOk() {
         mongoTemplate.insert(Arrays.asList(book, book1, book2), Book.class);
 
         GroupOperation groupByAuthor = group("authorName").count()
-                .as("authCount");
+            .as("authCount");
 
         Aggregation aggregation = newAggregation(groupByAuthor);
 
         AggregationResults<GroupByAuthor> aggregationResults = mongoTemplate.aggregate(aggregation, "book", GroupByAuthor.class);
 
         List<GroupByAuthor> groupByAuthorList = StreamSupport.stream(aggregationResults.spliterator(), false)
-                .collect(Collectors.toList());
+            .collect(Collectors.toList());
 
         assertThat(groupByAuthorList.stream()
-                .filter(l -> l.getAuthorName()
-                        .equals("Author"))
-                .findFirst()
-                .orElse(null)).extracting(GroupByAuthor::getAuthCount)
-                .isEqualTo(3);
+            .filter(l -> l.getAuthorName()
+                .equals("Author"))
+            .findFirst()
+            .orElse(null)).extracting(GroupByAuthor::getAuthCount)
+            .isEqualTo(3);
     }
 
 }
diff --git a/persistence-modules/spring-boot-persistence-mongodb/src/test/java/com/baeldung/mongodb/ManualEmbeddedMongoDbIntegrationTest.java b/persistence-modules/spring-boot-persistence-mongodb/src/test/java/com/baeldung/mongodb/ManualEmbeddedMongoDbIntegrationTest.java
@@ -2,55 +2,26 @@
 
 import com.mongodb.BasicDBObjectBuilder;
 import com.mongodb.DBObject;
-import com.mongodb.client.MongoClients;
-import de.flapdoodle.embed.mongo.MongodExecutable;
-import de.flapdoodle.embed.mongo.MongodStarter;
-import de.flapdoodle.embed.mongo.config.ImmutableMongodConfig;
-import de.flapdoodle.embed.mongo.config.MongodConfig;
-import de.flapdoodle.embed.mongo.config.Net;
-import de.flapdoodle.embed.mongo.distribution.Version;
-import de.flapdoodle.embed.process.runtime.Network;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.data.mongo.DataMongoTest;
 import org.springframework.data.mongodb.core.MongoTemplate;
-import org.springframework.util.SocketUtils;
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+@DataMongoTest
+@ExtendWith(SpringExtension.class)
+@DirtiesContext
 class ManualEmbeddedMongoDbIntegrationTest {
 
-    private static final String CONNECTION_STRING = "mongodb://%s:%d";
-
-    private MongodExecutable mongodExecutable;
-    private MongoTemplate mongoTemplate;
-
-    @AfterEach
-    void clean() {
-        mongodExecutable.stop();
-    }
-
-    @BeforeEach
-    void setup() throws Exception {
-        String ip = "localhost";
-        int randomPort = SocketUtils.findAvailableTcpPort();
-
-        ImmutableMongodConfig mongodConfig = MongodConfig
-            .builder()
-            .version(Version.Main.PRODUCTION)
-            .net(new Net(ip, randomPort, Network.localhostIsIPv6()))
-            .build();
-
-        MongodStarter starter = MongodStarter.getDefaultInstance();
-        mongodExecutable = starter.prepare(mongodConfig);
-        mongodExecutable.start();
-        mongoTemplate = new MongoTemplate(MongoClients.create(String.format(CONNECTION_STRING, ip, randomPort)),"test");
-    }
 
     @DisplayName("Given object When save object using MongoDB template Then object can be found")
     @Test
-    void test() throws Exception {
+    void test(@Autowired MongoTemplate mongoTemplate) throws Exception {
         // given
         DBObject objectToSave = BasicDBObjectBuilder.start()
             .add("key", "value")
diff --git a/persistence-modules/spring-boot-persistence-mongodb/src/test/resources/application.properties b/persistence-modules/spring-boot-persistence-mongodb/src/test/resources/application.properties
@@ -1 +1,2 @@
-spring.mongodb.embedded.version=4.4.9
+spring.mongodb.embedded.version=8.0.5
+de.flapdoodle.mongodb.embedded.version=8.0.5
diff --git a/persistence-modules/spring-boot-persistence-mongodb/src/test/resources/embedded.properties b/persistence-modules/spring-boot-persistence-mongodb/src/test/resources/embedded.properties
@@ -1 +1,2 @@
-spring.mongodb.embedded.version=4.4.9
+spring.mongodb.embedded.version=8.0.5
+de.flapdoodle.mongodb.embedded.version=8.0.5
