From cfbdbe1001aa330905eb15c0c60c0b27d80fcc54 Mon Sep 17 00:00:00 2001
From: osser-sam <46674082+osser-sam@users.noreply.github.com>
Date: Wed, 3 Feb 2021 01:16:00 +0530
Subject: [PATCH] JAVA-4012: fix failing test (#10455)

---
 .../zoneddatetime/config/MongoConfig.java     | 22 -------------------
 .../src/main/resources/mongoConfig.xml        |  4 ++--
 2 files changed, 2 insertions(+), 24 deletions(-)

diff --git a/persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/zoneddatetime/config/MongoConfig.java b/persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/zoneddatetime/config/MongoConfig.java
index 3cfefa099c..4eb3872e34 100644
--- a/persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/zoneddatetime/config/MongoConfig.java
+++ b/persistence-modules/spring-boot-persistence-mongodb/src/main/java/com/baeldung/zoneddatetime/config/MongoConfig.java
@@ -1,11 +1,8 @@
 package com.baeldung.zoneddatetime.config;
 
 import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
 import java.util.List;
 
-import org.springframework.context.annotation.Configuration;
 import org.springframework.core.convert.converter.Converter;
 import org.springframework.data.mongodb.config.AbstractMongoClientConfiguration;
 import org.springframework.data.mongodb.core.convert.MongoCustomConversions;
@@ -13,12 +10,7 @@ import org.springframework.data.mongodb.repository.config.EnableMongoRepositorie
 
 import com.baeldung.zoneddatetime.converter.ZonedDateTimeReadConverter;
 import com.baeldung.zoneddatetime.converter.ZonedDateTimeWriteConverter;
-import com.mongodb.ConnectionString;
-import com.mongodb.MongoClientSettings;
-import com.mongodb.client.MongoClient;
-import com.mongodb.client.MongoClients;
 
-@Configuration
 @EnableMongoRepositories(basePackages = { "com.baeldung" })
 public class MongoConfig extends AbstractMongoClientConfiguration {
 
@@ -29,20 +21,6 @@ public class MongoConfig extends AbstractMongoClientConfiguration {
         return "test";
     }
 
-    @Override
-    public MongoClient mongoClient() {
-        final ConnectionString connectionString = new ConnectionString("mongodb://localhost:27017/test");
-        final MongoClientSettings mongoClientSettings = MongoClientSettings.builder()
-            .applyConnectionString(connectionString)
-            .build();
-        return MongoClients.create(mongoClientSettings);
-    }
-
-    @Override
-    public Collection<String> getMappingBasePackages() {
-        return Collections.singleton("com.baeldung");
-    }
-
     @Override
     public MongoCustomConversions customConversions() {
         converters.add(new ZonedDateTimeReadConverter());
diff --git a/persistence-modules/spring-boot-persistence-mongodb/src/main/resources/mongoConfig.xml b/persistence-modules/spring-boot-persistence-mongodb/src/main/resources/mongoConfig.xml
index c5b9068de3..7a10ef6a69 100644
--- a/persistence-modules/spring-boot-persistence-mongodb/src/main/resources/mongoConfig.xml
+++ b/persistence-modules/spring-boot-persistence-mongodb/src/main/resources/mongoConfig.xml
@@ -24,8 +24,8 @@
         <constructor-arg ref="mongoConverter" />
     </bean>
 
-    <mongo:mapping-converter id="mongoConverter" base-package="com.baeldung.converter">
-        <mongo:custom-converters base-package="com.baeldung.converter" />
+    <mongo:mapping-converter id="mongoConverter" base-package="com.baeldung.zoneddatetime.converter">
+        <mongo:custom-converters base-package="com.baeldung.zoneddatetime.converter" />
     </mongo:mapping-converter>
 
 </beans>
\ No newline at end of file