Merge branch 'feature/fleming' into feature/eds-revolution

src/main/java/it/finanze/sanita/fse2/ms/gtw/rulesmanager/config/mongo/MongoDatabaseCFG.java

@@ -25,6 +25,10 @@
 import org.springframework.data.mongodb.core.convert.MappingMongoConverter;
 import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
 
+import com.mongodb.ConnectionString;
+import com.mongodb.MongoClientSettings;
+import com.mongodb.client.MongoClients;
+
 import net.javacrumbs.shedlock.core.LockProvider;
 import net.javacrumbs.shedlock.provider.mongo.MongoLockProvider;
 
@@ -45,7 +49,11 @@ public class MongoDatabaseCFG {
      */
     @Bean
     public MongoDatabaseFactory createFactory(MongoPropertiesCFG props) {
-        return new SimpleMongoClientDatabaseFactory(props.getUri());
+    	  ConnectionString connectionString = new ConnectionString(props.getUri());
+          MongoClientSettings mongoClientSettings = MongoClientSettings.builder()
+              .applyConnectionString(connectionString)
+              .build();
+          return new SimpleMongoClientDatabaseFactory(MongoClients.create(mongoClientSettings), props.getSchemaName());
     }
 
     /**

src/main/java/it/finanze/sanita/fse2/ms/gtw/rulesmanager/config/mongo/MongoPropertiesCFG.java

@@ -11,28 +11,23 @@
  */
 package it.finanze.sanita.fse2.ms.gtw.rulesmanager.config.mongo;
 
-import lombok.Data;
-import lombok.EqualsAndHashCode;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
-import java.io.Serializable;
+import lombok.Data;
 
 
 /**
- *
  *	Mongo properties configuration.
  */
 @Data
 @Component
-@EqualsAndHashCode(callSuper = false)  
-public class MongoPropertiesCFG implements Serializable {
+public class MongoPropertiesCFG {
 
-	/**
-	 *  Serial version uid
-	 */
-	private static final long serialVersionUID = -7936473659737067416L;
 
 	@Value("${data.mongodb.uri}")
 	private String uri;
+
+	@Value("${data.mongodb.schema-name}")
+	private String schemaName;
 }

src/main/resources/application-dev.properties

@@ -5,7 +5,7 @@ management.server.port=8011
 
 ### MONGODB ###
 data.mongodb.uri=mongodb://mongoadmin:secret@localhost:27888/fse
-
+data.mongodb.schema-name=FSE_GTW
 ### EDS CLIENT (REST) ###
 eds.rest.secured=false
 

src/main/resources/application.properties

@@ -47,6 +47,7 @@ kafka.enablessl=true
 
 ### MONGODB ###
 data.mongodb.uri=mongodb://${MONGO_USER}:${MONGO_PASSWORD}@<mondodb_hostname>:<mondodb_port>/<mondodb_dbname>
+data.mongodb.schema-name=${MONGO_DBNAME}
 
 ### EDS CLIENT (REST) ###
 eds.rest.kspwd=

src/test/resources/application-test.properties

@@ -1,6 +1,6 @@
 ### MONGODB ###
 data.mongodb.uri=mongodb://mongoadmin:secret@localhost:27888/fse
-
+data.mongodb.schema-name=FSE_GTW
 ### REDIS ###
 redis.hostname=localhost
 redis.port=6379