read SSL enabled flag from MongoConfig

Signed-off-by: Stefan Maute <stefan.maute@bosch-si.com>
eclipse-ditto · Jun 27, 2018 · 1c9d6a9 · 1c9d6a9
1 parent 23002a6
commit 1c9d6a9
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 24 deletions.
diff --git a/...src/main/java/org/eclipse/ditto/services/concierge/starter/actors/ConciergeRootActor.java b/...src/main/java/org/eclipse/ditto/services/concierge/starter/actors/ConciergeRootActor.java
@@ -36,6 +36,8 @@
 import org.eclipse.ditto.services.utils.health.routes.StatusRoute;
 import org.eclipse.ditto.services.utils.persistence.mongo.MongoClientActor;
 
+import com.typesafe.config.Config;
+
 import akka.actor.AbstractActor;
 import akka.actor.ActorInitializationException;
 import akka.actor.ActorKilledException;
@@ -185,16 +187,17 @@ private static void startClusterSingletonActor(final akka.actor.ActorContext con
     }
 
     private static ActorRef startHealthCheckingActor(final ActorContext context,
-            final AbstractConciergeConfigReader config) {
+            final AbstractConciergeConfigReader configReader) {
 
-        final HealthConfigReader healthConfig = config.health();
-        final String mongoUri = MongoConfig.getMongoUri(config.getRawConfig());
+        final Config config = configReader.getRawConfig();
+        final HealthConfigReader healthConfig = configReader.health();
+        final String mongoUri = MongoConfig.getMongoUri(config);
         final HealthCheckingActorOptions.Builder hcBuilder = HealthCheckingActorOptions
                 .getBuilder(healthConfig.enabled(), healthConfig.getInterval());
 
         final ActorRef mongoClient = startChildActor(context, MongoClientActor.ACTOR_NAME,
                 MongoClientActor.props(mongoUri, healthConfig.getPersistenceTimeout(),
-                        config.getMongoSSLEnabled()));
+                        MongoConfig.getSSLEnabled(config)));
 
         if (healthConfig.persistenceEnabled()) {
             hcBuilder.enablePersistenceCheck();

diff --git a/.../java/org/eclipse/ditto/services/concierge/util/config/AbstractConciergeConfigReader.java b/.../java/org/eclipse/ditto/services/concierge/util/config/AbstractConciergeConfigReader.java
@@ -27,7 +27,7 @@ public abstract class AbstractConciergeConfigReader extends AbstractServiceConfi
 
     private static final String PATH_THINGS_AGGREGATOR_SINGLE_RETRIEVE_THING_TIMEOUT =
             "things-aggregator.single-retrieve-thing-timeout";
-    private static final String MONGO_SSL_ENABLED = "ditto.services-utils-config.mongodb.options.ssl";
+
 
     protected AbstractConciergeConfigReader(final Config config, final String serviceName) {
         super(config, serviceName);
@@ -60,12 +60,4 @@ public Duration thingsAggregatorSingleRetrieveThingTimeout() {
         return config.getDuration(PATH_THINGS_AGGREGATOR_SINGLE_RETRIEVE_THING_TIMEOUT);
     }
 
-    /**
-     * Retrieve boolean which indicates if SSL is enabled for MongoClient connections.
-     *
-     * @return boolean if SSL is enabled or not..
-     */
-    public Boolean getMongoSSLEnabled() {
-        return config.getBoolean(MONGO_SSL_ENABLED);
-    }
 }
diff --git a/...r/src/main/java/org/eclipse/ditto/services/connectivity/actors/ConnectivityRootActor.java b/...r/src/main/java/org/eclipse/ditto/services/connectivity/actors/ConnectivityRootActor.java
@@ -40,6 +40,7 @@
 import org.eclipse.ditto.services.utils.cluster.ClusterStatusSupplier;
 import org.eclipse.ditto.services.utils.cluster.ShardRegionExtractor;
 import org.eclipse.ditto.services.utils.config.ConfigUtil;
+import org.eclipse.ditto.services.utils.config.MongoConfig;
 import org.eclipse.ditto.services.utils.health.DefaultHealthCheckingActorFactory;
 import org.eclipse.ditto.services.utils.health.HealthCheckingActorOptions;
 import org.eclipse.ditto.services.utils.health.routes.StatusRoute;
@@ -158,7 +159,7 @@ private ConnectivityRootActor(final ServiceConfigReader configReader, final Acto
         final ActorRef mongoClient = startChildActor(MongoClientActor.ACTOR_NAME, MongoClientActor
                 .props(config.getString(ConfigKeys.MONGO_URI),
                         config.getDuration(ConfigKeys.HealthCheck.PERSISTENCE_TIMEOUT),
-                        config.getBoolean(ConfigKeys.MONGO_SSL_ENABLED)));
+                        MongoConfig.getSSLEnabled(config)));
 
         final HealthCheckingActorOptions healthCheckingActorOptions = hcBuilder.build();
         final ActorRef healthCheckingActor = startChildActor(DefaultHealthCheckingActorFactory.ACTOR_NAME,

diff --git a/...nectivity/util/src/main/java/org/eclipse/ditto/services/connectivity/util/ConfigKeys.java b/...nectivity/util/src/main/java/org/eclipse/ditto/services/connectivity/util/ConfigKeys.java
@@ -25,8 +25,6 @@ public final class ConfigKeys {
      */
     public static final String MONGO_URI = "akka.contrib.persistence.mongodb.mongo.mongouri";
 
-    public static final String MONGO_SSL_ENABLED = "services-utils-config.mongodb.options.ssl";
-
     /**
      * Configuration Keys for HTTP.
      */

diff --git a/.../starter/src/main/java/org/eclipse/ditto/services/policies/starter/PoliciesRootActor.java b/.../starter/src/main/java/org/eclipse/ditto/services/policies/starter/PoliciesRootActor.java
@@ -32,6 +32,7 @@
 import org.eclipse.ditto.services.utils.cluster.ClusterStatusSupplier;
 import org.eclipse.ditto.services.utils.cluster.ShardRegionExtractor;
 import org.eclipse.ditto.services.utils.config.ConfigUtil;
+import org.eclipse.ditto.services.utils.config.MongoConfig;
 import org.eclipse.ditto.services.utils.health.DefaultHealthCheckingActorFactory;
 import org.eclipse.ditto.services.utils.health.HealthCheckingActorOptions;
 import org.eclipse.ditto.services.utils.health.routes.StatusRoute;
@@ -157,7 +158,7 @@ private PoliciesRootActor(final ServiceConfigReader configReader,
         final ActorRef mongoClient = startChildActor(MongoClientActor.ACTOR_NAME, MongoClientActor
                 .props(config.getString(ConfigKeys.MONGO_URI),
                         healthConfig.getPersistenceTimeout(),
-                        config.getBoolean(ConfigKeys.MONGO_SSL_ENABLED)));
+                        MongoConfig.getSSLEnabled(config)));
 
         final boolean healthCheckEnabled = healthConfig.enabled();
         final Duration healthCheckInterval = healthConfig.getInterval();

diff --git a/...ices/policies/util/src/main/java/org/eclipse/ditto/services/policies/util/ConfigKeys.java b/...ices/policies/util/src/main/java/org/eclipse/ditto/services/policies/util/ConfigKeys.java
@@ -21,8 +21,6 @@ public final class ConfigKeys {
      */
     public static final String MONGO_URI = "akka.contrib.persistence.mongodb.mongo.mongouri";
 
-    public static final String MONGO_SSL_ENABLED = "services-utils-config.mongodb.options.ssl";
-
     private static final String DITTO_PREFIX = "ditto.";
 
     private static final String POLICIES_PREFIX = DITTO_PREFIX + "policies.";

diff --git a/...ings/starter/src/main/java/org/eclipse/ditto/services/things/starter/ThingsRootActor.java b/...ings/starter/src/main/java/org/eclipse/ditto/services/things/starter/ThingsRootActor.java
@@ -32,6 +32,7 @@
 import org.eclipse.ditto.services.utils.cluster.ClusterStatusSupplier;
 import org.eclipse.ditto.services.utils.cluster.ShardRegionExtractor;
 import org.eclipse.ditto.services.utils.config.ConfigUtil;
+import org.eclipse.ditto.services.utils.config.MongoConfig;
 import org.eclipse.ditto.services.utils.health.DefaultHealthCheckingActorFactory;
 import org.eclipse.ditto.services.utils.health.HealthCheckingActorOptions;
 import org.eclipse.ditto.services.utils.health.routes.StatusRoute;
@@ -165,7 +166,7 @@ private ThingsRootActor(final ServiceConfigReader configReader,
 
         final ActorRef mongoClient = startChildActor(MongoClientActor.ACTOR_NAME, MongoClientActor
                 .props(config.getString(ConfigKeys.MONGO_URI), healthConfig.getPersistenceTimeout(),
-                        config.getBoolean(ConfigKeys.MONGO_SSL_ENABLED)));
+                        MongoConfig.getSSLEnabled(config)));
 
         final HealthCheckingActorOptions healthCheckingActorOptions = hcBuilder.build();
         final ActorRef healthCheckingActor = startChildActor(DefaultHealthCheckingActorFactory.ACTOR_NAME,

diff --git a/.../things/util/src/main/java/org/eclipse/ditto/services/things/starter/util/ConfigKeys.java b/.../things/util/src/main/java/org/eclipse/ditto/services/things/starter/util/ConfigKeys.java
@@ -21,8 +21,6 @@ public final class ConfigKeys {
      */
     public static final String MONGO_URI = "akka.contrib.persistence.mongodb.mongo.mongouri";
 
-    public static final String MONGO_SSL_ENABLED = "ditto.services-utils-config.mongodb.options.ssl";
-
     private static final String THINGS_PREFIX = "ditto.things.";
 
     /**

diff --git a/...h/common/src/main/java/org/eclipse/ditto/services/thingsearch/common/util/ConfigKeys.java b/...h/common/src/main/java/org/eclipse/ditto/services/thingsearch/common/util/ConfigKeys.java
@@ -30,8 +30,6 @@ public final class ConfigKeys {
     private static final String SEARCH_PREFIX = DITTO_PREFIX + SEARCH_ROLE + ".";
     private static final String SEARCH_UPDATER_PREFIX = SEARCH_PREFIX + "updater.";
 
-    public static final String MONGO_SSL_ENABLED = "services-utils-config.mongodb.options.ssl";
-
     /**
      * Prefix for mongoDB config
      */