1 files changed, 11 insertions, 9 deletions
diff --git a/src/main/java/org/onap/aai/cacher/common/MongoConfig.java b/src/main/java/org/onap/aai/cacher/common/MongoConfig.java
index ca063a7..854437d 100644
--- a/src/main/java/org/onap/aai/cacher/common/MongoConfig.java
+++ b/src/main/java/org/onap/aai/cacher/common/MongoConfig.java
@@ -28,7 +28,10 @@ import de.flapdoodle.embed.mongo.Command;
 import de.flapdoodle.embed.mongo.MongodExecutable;
 import de.flapdoodle.embed.mongo.MongodProcess;
 import de.flapdoodle.embed.mongo.MongodStarter;
-import de.flapdoodle.embed.mongo.config.*;
+import de.flapdoodle.embed.mongo.config.Defaults;
+import de.flapdoodle.embed.mongo.config.MongoCmdOptions;
+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.config.io.ProcessOutput;
 import de.flapdoodle.embed.process.io.Processors;
@@ -50,11 +53,11 @@ public class MongoConfig {
 
     private static final EELFLogger EELF_LOGGER = EELFManager.getInstance().getLogger(MongoConfig.class);
 
-    @Value("${mongodb.host}")
+    @Value("${spring.data.mongodb.host}")
     private String MONGO_DB_HOST;
-    @Value("${mongodb.dbName}")
+    @Value("${spring.data.mongodb.database}")
     private String MONGO_DB_NAME;
-    @Value("${mongodb.port}")
+    @Value("${spring.data.mongodb.port}")
     private int MONGO_DB_PORT;
 
     private MongodProcess mongod;
@@ -93,19 +96,18 @@ public class MongoConfig {
         Logger logger = LoggerFactory.getLogger("mongo");
         int port = MONGO_DB_PORT;
 
-        IMongodConfig mongoConfigConfig = new MongodConfigBuilder()
+        MongodConfig mongoConfigConfig = MongodConfig.builder()
                 .version(Version.Main.PRODUCTION)
                 .net(new Net(port, Network.localhostIsIPv6()))
-                .cmdOptions(new MongoCmdOptionsBuilder().enableTextSearch(true).useNoPrealloc(false).build())
-                .configServer(false)
+                .cmdOptions(MongoCmdOptions.builder().enableTextSearch(true).useNoPrealloc(false).build())
+                .isConfigServer(false)
                 .build();
 
         ProcessOutput processOutput = new ProcessOutput(Processors.logTo(logger, Slf4jLevel.WARN), Processors.logTo(logger,
                 Slf4jLevel.WARN), Processors.logTo(logger, Slf4jLevel.WARN));
 
         MongodExecutable mongodExecutable = MongodStarter
-                .getInstance((new RuntimeConfigBuilder())
-                        .defaults(Command.MongoD)
+                .getInstance(Defaults.runtimeConfigFor(Command.MongoD)
                         .processOutput(processOutput)
                         .build())
                 .prepare(mongoConfigConfig);