diff options
| author |   Yan Yang <yangyanyj@chinamobile.com> | 2019-04-15 02:56:59 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-04-15 02:56:59 +0000 |
| commit | f9b8345c99bdf176aa438e555f7f29003027b297 (patch) | |
| tree | 01b17a83a8481f631604d8e071905c30cd2116dc /components/datalake-handler/feeder/src/main/java/org | |
| parent | a78b0157c60d8c03b87ca996a2d262f0e662487b (diff) | |
| parent | dda9f177f0d04073d4b5a13753fdd4b652443df1 (diff) | |
Merge "Introduce global SSL flag"
Diffstat (limited to 'components/datalake-handler/feeder/src/main/java/org')
2 files changed, 16 insertions, 6 deletions
diff --git a/components/datalake-handler/feeder/src/main/java/org/onap/datalake/feeder/config/ApplicationConfiguration.java b/components/datalake-handler/feeder/src/main/java/org/onap/datalake/feeder/config/ApplicationConfiguration.java index 1136e304..6bacf136 100644 --- a/components/datalake-handler/feeder/src/main/java/org/onap/datalake/feeder/config/ApplicationConfiguration.java +++ b/components/datalake-handler/feeder/src/main/java/org/onap/datalake/feeder/config/ApplicationConfiguration.java @@ -51,5 +51,6 @@ public class ApplicationConfiguration { private int kafkaConsumerCount; private boolean async; + private boolean enableSSL; } diff --git a/components/datalake-handler/feeder/src/main/java/org/onap/datalake/feeder/service/MongodbService.java b/components/datalake-handler/feeder/src/main/java/org/onap/datalake/feeder/service/MongodbService.java index 9008fc9a..35426afb 100644 --- a/components/datalake-handler/feeder/src/main/java/org/onap/datalake/feeder/service/MongodbService.java +++ b/components/datalake-handler/feeder/src/main/java/org/onap/datalake/feeder/service/MongodbService.java @@ -32,7 +32,7 @@ import org.apache.commons.lang3.StringUtils; import org.bson.Document; import org.json.JSONObject; - +import org.onap.datalake.feeder.config.ApplicationConfiguration; import org.onap.datalake.feeder.domain.Db; import org.onap.datalake.feeder.domain.Topic; import org.slf4j.Logger; @@ -50,7 +50,7 @@ import com.mongodb.client.MongoCollection; import com.mongodb.client.MongoDatabase; /** - * Service to use MongoDB + * Service for using MongoDB * * @author Guobiao Mo * @@ -61,6 +61,9 @@ public class MongodbService { private final Logger log = LoggerFactory.getLogger(this.getClass()); @Autowired + private ApplicationConfiguration config; + + @Autowired private DbService dbService; private MongoDatabase database; @@ -89,13 +92,19 @@ public class MongodbService { Builder builder = MongoClientOptions.builder(); builder.serverSelectionTimeout(30000);//server selection timeout, in milliseconds - + //http://mongodb.github.io/mongo-java-driver/3.0/driver/reference/connecting/ssl/ - builder.sslEnabled(Boolean.TRUE.equals(mongodb.getEncrypt()));// getEncrypt() can be null + if (config.isEnableSSL()) { + builder.sslEnabled(Boolean.TRUE.equals(mongodb.getEncrypt()));// getEncrypt() can be null + } MongoClientOptions options = builder.build(); - mongoClient = new MongoClient(new ServerAddress(host, port), credential, options); - database = mongoClient.getDatabase(mongodb.getDatabase()); + if (credential == null) { + mongoClient = new MongoClient(new ServerAddress(host, port), options); + } else { + mongoClient = new MongoClient(new ServerAddress(host, port), credential, options); + } + database = mongoClient.getDatabase(databaseName); } @PreDestroy |