Remove MongoDB dependencies from Concierge.

Signed-off-by: Yufei Cai <yufei.cai@bosch.io>
eclipse-ditto · Sep 15, 2021 · a513341 · a513341
1 parent 91d0fc4
commit a513341
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 30 deletions.
diff --git a/concierge/service/pom.xml b/concierge/service/pom.xml
@@ -46,10 +46,6 @@
             <groupId>org.eclipse.ditto</groupId>
             <artifactId>ditto-internal-utils-health</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.eclipse.ditto</groupId>
-            <artifactId>ditto-internal-utils-persistence</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.eclipse.ditto</groupId>
             <artifactId>ditto-internal-utils-cache-loaders</artifactId>

diff --git a/...rge/service/src/main/java/org/eclipse/ditto/concierge/service/common/ConciergeConfig.java b/...rge/service/src/main/java/org/eclipse/ditto/concierge/service/common/ConciergeConfig.java
@@ -16,13 +16,12 @@
 
 import org.eclipse.ditto.base.service.config.ServiceSpecificConfig;
 import org.eclipse.ditto.internal.utils.health.config.WithHealthCheckConfig;
-import org.eclipse.ditto.internal.utils.persistence.mongo.config.WithMongoDbConfig;
 
 /**
  * Provides the configuration settings of the Concierge service.
  */
 @Immutable
-public interface ConciergeConfig extends ServiceSpecificConfig, WithHealthCheckConfig, WithMongoDbConfig {
+public interface ConciergeConfig extends ServiceSpecificConfig, WithHealthCheckConfig {
 
     /**
      * Returns the config of Concierge's enforcement behaviour.

diff --git a/...ervice/src/main/java/org/eclipse/ditto/concierge/service/common/DittoConciergeConfig.java b/...ervice/src/main/java/org/eclipse/ditto/concierge/service/common/DittoConciergeConfig.java
@@ -26,8 +26,6 @@
 import org.eclipse.ditto.internal.utils.health.config.DefaultHealthCheckConfig;
 import org.eclipse.ditto.internal.utils.health.config.HealthCheckConfig;
 import org.eclipse.ditto.internal.utils.metrics.config.MetricsConfig;
-import org.eclipse.ditto.internal.utils.persistence.mongo.config.DefaultMongoDbConfig;
-import org.eclipse.ditto.internal.utils.persistence.mongo.config.MongoDbConfig;
 import org.eclipse.ditto.internal.utils.tracing.config.TracingConfig;
 
 /**
@@ -39,15 +37,13 @@ public final class DittoConciergeConfig implements ConciergeConfig, WithConfigPa
     private static final String CONFIG_PATH = "concierge";
 
     private final DittoServiceConfig serviceSpecificConfig;
-    private final DefaultMongoDbConfig mongoDbConfig;
     private final DefaultHealthCheckConfig healthCheckConfig;
     private final DefaultEnforcementConfig enforcementConfig;
     private final DefaultCachesConfig cachesConfig;
     private final DefaultThingsAggregatorConfig thingsAggregatorConfig;
 
     private DittoConciergeConfig(final ScopedConfig dittoScopedConfig) {
         serviceSpecificConfig = DittoServiceConfig.of(dittoScopedConfig, CONFIG_PATH);
-        mongoDbConfig = DefaultMongoDbConfig.of(dittoScopedConfig);
         healthCheckConfig = DefaultHealthCheckConfig.of(dittoScopedConfig);
         enforcementConfig = DefaultEnforcementConfig.of(serviceSpecificConfig);
         cachesConfig = DefaultCachesConfig.of(serviceSpecificConfig);
@@ -111,11 +107,6 @@ public TracingConfig getTracingConfig() {
         return serviceSpecificConfig.getTracingConfig();
     }
 
-    @Override
-    public MongoDbConfig getMongoDbConfig() {
-        return mongoDbConfig;
-    }
-
     @Override
     public String getConfigPath() {
         return CONFIG_PATH;
@@ -131,7 +122,6 @@ public boolean equals(@Nullable final Object o) {
         }
         final DittoConciergeConfig that = (DittoConciergeConfig) o;
         return serviceSpecificConfig.equals(that.serviceSpecificConfig) &&
-                mongoDbConfig.equals(that.mongoDbConfig) &&
                 healthCheckConfig.equals(that.healthCheckConfig) &&
                 enforcementConfig.equals(that.enforcementConfig) &&
                 cachesConfig.equals(that.cachesConfig) &&
@@ -140,15 +130,14 @@ public boolean equals(@Nullable final Object o) {
 
     @Override
     public int hashCode() {
-        return Objects.hash(serviceSpecificConfig, mongoDbConfig, healthCheckConfig, enforcementConfig, cachesConfig,
+        return Objects.hash(serviceSpecificConfig, healthCheckConfig, enforcementConfig, cachesConfig,
                 thingsAggregatorConfig);
     }
 
     @Override
     public String toString() {
         return getClass().getSimpleName() + " [" +
                 "serviceSpecificConfig=" + serviceSpecificConfig +
-                ", mongoDbConfig=" + mongoDbConfig +
                 ", healthCheckConfig=" + healthCheckConfig +
                 ", enforcementConfig=" + enforcementConfig +
                 ", cachesConfig=" + cachesConfig +

diff --git a/.../src/main/java/org/eclipse/ditto/concierge/service/starter/actors/ConciergeRootActor.java b/.../src/main/java/org/eclipse/ditto/concierge/service/starter/actors/ConciergeRootActor.java
@@ -24,7 +24,6 @@
 import org.eclipse.ditto.internal.utils.health.HealthCheckingActorOptions;
 import org.eclipse.ditto.internal.utils.health.config.HealthCheckConfig;
 import org.eclipse.ditto.internal.utils.health.config.PersistenceConfig;
-import org.eclipse.ditto.internal.utils.persistence.mongo.MongoHealthChecker;
 
 import akka.actor.ActorRef;
 import akka.actor.Props;
@@ -93,7 +92,7 @@ private ActorRef startHealthCheckingActor(final ConciergeConfig conciergeConfig)
         final HealthCheckingActorOptions healthCheckingActorOptions = hcBuilder.build();
 
         return startChildActor(DefaultHealthCheckingActorFactory.ACTOR_NAME,
-                DefaultHealthCheckingActorFactory.props(healthCheckingActorOptions, MongoHealthChecker.props())
+                DefaultHealthCheckingActorFactory.props(healthCheckingActorOptions, null)
         );
     }
 

diff --git a/concierge/service/src/main/resources/concierge.conf b/concierge/service/src/main/resources/concierge.conf
@@ -4,11 +4,6 @@ ditto {
   mapping-strategy.implementation = "org.eclipse.ditto.concierge.api.ConciergeMappingStrategies"
   mapping-strategy.implementation = ${?MAPPING_STRATEGY_IMPLEMENTATION}
 
-  mongodb {
-    database = "concierge"
-    database = ${?MONGO_DB_DATABASE}
-  }
-
   concierge {
     enforcement {
       # configuration for retrieval of policies/things during enforcement via sharding

diff --git a/concierge/service/src/test/resources/test.conf b/concierge/service/src/test/resources/test.conf
@@ -1,8 +1,4 @@
 ditto {
-  mongodb {
-    uri = "mongodb://localhost:27017/concierge"
-  }
-
   concierge {
     caches {
       ask-timeout = 10s
@@ -82,4 +78,4 @@ policy-enforcer-cache-dispatcher {
     fixed-pool-size = off
     max-pool-size-max = 32
   }
-}
+}