Fixed compilation errors after having merged master branch into featu…

…re branch. Signed-off-by: Juergen Fickel <juergen.fickel@bosch-si.com>
eclipse-ditto · Jun 12, 2019 · 72546eb · 72546eb
1 parent cf2a1b9
commit 72546eb
Show file tree

Hide file tree

Showing 13 changed files with 90 additions and 119 deletions.
diff --git a/...tto/services/connectivity/messaging/persistence/ConnectionPersistenceOperationsActor.java b/...tto/services/connectivity/messaging/persistence/ConnectionPersistenceOperationsActor.java
@@ -16,6 +16,7 @@
 
 import org.eclipse.ditto.services.connectivity.messaging.ConnectionActor;
 import org.eclipse.ditto.services.utils.persistence.mongo.MongoClientWrapper;
+import org.eclipse.ditto.services.utils.persistence.mongo.config.MongoDbConfig;
 import org.eclipse.ditto.services.utils.persistence.mongo.ops.AbstractPersistenceOperationsActor;
 import org.eclipse.ditto.services.utils.persistence.mongo.ops.EntityPersistenceOperations;
 import org.eclipse.ditto.services.utils.persistence.mongo.ops.PersistenceOperationsConfiguration;
@@ -41,42 +42,37 @@ private ConnectionPersistenceOperationsActor(final ActorRef pubSubMediator,
             final MongoClientWrapper mongoClientWrapper,
             final PersistenceOperationsConfiguration persistenceOperationsConfiguration) {
 
-        super(
-                pubSubMediator,
+        super(pubSubMediator,
                 ConnectivityCommand.RESOURCE_TYPE,
                 null,
                 entitiesOps,
                 Collections.singleton(mongoClientWrapper),
-                persistenceOperationsConfiguration
-        );
+                persistenceOperationsConfiguration);
     }
 
     /**
      * Create Props of this actor.
      *
      * @param pubSubMediator Akka pub-sub mediator.
-     * @param config Configuration with info about event journal, snapshot store, suffix-builder and database.
+     * @param mongoDbConfig the MongoDB configuration settings.
+     * @param config configuration with info about event journal, snapshot store, suffix-builder and database.
      * @return a Props object.
      */
-    public static Props props(final ActorRef pubSubMediator, final Config config) {
+    public static Props props(final ActorRef pubSubMediator, final MongoDbConfig mongoDbConfig, final Config config) {
         return Props.create(ConnectionPersistenceOperationsActor.class, () -> {
             final MongoEventSourceSettings eventSourceSettings =
                     MongoEventSourceSettings.fromConfig(config, ConnectionActor.PERSISTENCE_ID_PREFIX, false,
                             ConnectionActor.JOURNAL_PLUGIN_ID, ConnectionActor.SNAPSHOT_PLUGIN_ID);
 
-            final MongoClientWrapper mongoClient = MongoClientWrapper.newInstance(config);
+            final MongoClientWrapper mongoClient = MongoClientWrapper.newInstance(mongoDbConfig);
             final MongoDatabase db = mongoClient.getDefaultDatabase();
 
             final EntityPersistenceOperations entitiesOps = MongoEntitiesPersistenceOperations.of(db, eventSourceSettings);
             final PersistenceOperationsConfiguration persistenceOperationsConfiguration =
                     PersistenceOperationsConfiguration.fromConfig(config);
 
-            return new ConnectionPersistenceOperationsActor(
-                    pubSubMediator,
-                    entitiesOps,
-                    mongoClient,
-                    persistenceOperationsConfiguration
-            );
+            return new ConnectionPersistenceOperationsActor(pubSubMediator, entitiesOps, mongoClient,
+                    persistenceOperationsConfiguration);
         });
     }
 

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
@@ -171,9 +171,9 @@ private ConnectivityRootActor(final ConnectivityConfig connectivityConfig,
                 ReconnectActor.props(getConnectionShardRegion(actorSystem, connectionSupervisorProps, clusterConfig),
                         mongoReadJournal::currentPersistenceIds));
 
-        // TODO Fix compile error
         startChildActor(ConnectionPersistenceOperationsActor.ACTOR_NAME,
-                ConnectionPersistenceOperationsActor.props(pubSubMediator, config));
+                ConnectionPersistenceOperationsActor.props(pubSubMediator, connectivityConfig.getMongoDbConfig(),
+                        actorSystem.settings().config()));
 
         final CompletionStage<ServerBinding> binding =
                 getHttpBinding(connectivityConfig.getHttpConfig(), actorSystem, materializer,

diff --git a/...o/services/connectivity/messaging/persistence/ConnectionPersistenceOperationsActorIT.java b/...o/services/connectivity/messaging/persistence/ConnectionPersistenceOperationsActorIT.java
@@ -103,7 +103,7 @@ protected Class<?> getEntityNotAccessibleClass() {
     protected ActorRef startActorUnderTest(final ActorSystem actorSystem, final ActorRef pubSubMediator,
             final Config config) {
 
-        final Props opsActorProps = ConnectionPersistenceOperationsActor.props(pubSubMediator, config);
+        final Props opsActorProps = ConnectionPersistenceOperationsActor.props(pubSubMediator, mongoDbConfig, config);
         return actorSystem.actorOf(opsActorProps, ConnectionPersistenceOperationsActor.ACTOR_NAME);
     }
 
@@ -117,8 +117,9 @@ protected ActorRef startEntityActor(final ActorSystem system, final ActorRef pub
         final TestProbe conciergeForwarderProbe = new TestProbe(system, "conciergeForwarder");
         final ConnectivityCommandInterceptor dummyInterceptor = (command) -> {};
         final ClientActorPropsFactory entityActorFactory = DefaultClientActorPropsFactory.getInstance();
-        final Props props = ConnectionSupervisorActor.props(minBackOff, maxBackOff, randomFactor, pubSubMediator,
-                conciergeForwarderProbe.ref(), entityActorFactory, dummyInterceptor);
+        final Props props =
+                ConnectionSupervisorActor.props(pubSubMediator, conciergeForwarderProbe.ref(), entityActorFactory,
+                        dummyInterceptor);
 
         return system.actorOf(props, id);
     }

diff --git a/...e/ditto/services/policies/persistence/actors/policy/PolicyPersistenceOperationsActor.java b/...e/ditto/services/policies/persistence/actors/policy/PolicyPersistenceOperationsActor.java
@@ -15,6 +15,7 @@
 import java.util.Collections;
 
 import org.eclipse.ditto.services.utils.persistence.mongo.MongoClientWrapper;
+import org.eclipse.ditto.services.utils.persistence.mongo.config.MongoDbConfig;
 import org.eclipse.ditto.services.utils.persistence.mongo.ops.AbstractPersistenceOperationsActor;
 import org.eclipse.ditto.services.utils.persistence.mongo.ops.EntityPersistenceOperations;
 import org.eclipse.ditto.services.utils.persistence.mongo.ops.NamespacePersistenceOperations;
@@ -45,44 +46,40 @@ private PolicyPersistenceOperationsActor(final ActorRef pubSubMediator,
             final MongoClientWrapper mongoClient,
             final PersistenceOperationsConfiguration persistenceOperationsConfiguration) {
 
-        super(
-                pubSubMediator,
+        super(pubSubMediator,
                 PolicyCommand.RESOURCE_TYPE,
                 namespaceOps,
                 entitiesOps,
                 Collections.singleton(mongoClient),
-                persistenceOperationsConfiguration
-        );
+                persistenceOperationsConfiguration);
     }
 
     /**
      * Create Props of this actor.
      *
      * @param pubSubMediator Akka pub-sub mediator.
+     * @param mongoDbConfig the MongoDB configuration settings.
      * @param config Configuration with info about event journal, snapshot store, suffix-builder and database.
      * @return a Props object.
      */
-    public static Props props(final ActorRef pubSubMediator, final Config config) {
+    public static Props props(final ActorRef pubSubMediator, final MongoDbConfig mongoDbConfig, final Config config) {
         return Props.create(PolicyPersistenceOperationsActor.class, () -> {
             final MongoEventSourceSettings eventSourceSettings =
                     MongoEventSourceSettings.fromConfig(config, PolicyPersistenceActor.PERSISTENCE_ID_PREFIX, true,
                             PolicyPersistenceActor.JOURNAL_PLUGIN_ID, PolicyPersistenceActor.SNAPSHOT_PLUGIN_ID);
 
-            final MongoClientWrapper mongoClient = MongoClientWrapper.newInstance(config);
+            final MongoClientWrapper mongoClient = MongoClientWrapper.newInstance(mongoDbConfig);
             final MongoDatabase db = mongoClient.getDefaultDatabase();
 
-            final NamespacePersistenceOperations namespaceOps = MongoNamespacePersistenceOperations.of(db, eventSourceSettings);
-            final EntityPersistenceOperations entitiesOps = MongoEntitiesPersistenceOperations.of(db, eventSourceSettings);
+            final NamespacePersistenceOperations namespaceOps =
+                    MongoNamespacePersistenceOperations.of(db, eventSourceSettings);
+            final EntityPersistenceOperations entitiesOps =
+                    MongoEntitiesPersistenceOperations.of(db, eventSourceSettings);
             final PersistenceOperationsConfiguration persistenceOperationsConfiguration =
                     PersistenceOperationsConfiguration.fromConfig(config);
 
-            return new PolicyPersistenceOperationsActor(
-                    pubSubMediator,
-                    namespaceOps,
-                    entitiesOps,
-                    mongoClient,
-                    persistenceOperationsConfiguration
-            );
+            return new PolicyPersistenceOperationsActor(pubSubMediator, namespaceOps, entitiesOps, mongoClient,
+                    persistenceOperationsConfiguration);
         });
     }
 

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
@@ -155,9 +155,9 @@ private PoliciesRootActor(final PoliciesConfig policiesConfig,
                 .start(PoliciesMessagingConstants.SHARD_REGION, policySupervisorProps, shardingSettings,
                         ShardRegionExtractor.of(clusterConfig.getNumberOfShards(), actorSystem));
 
-        // TODO Fix compilation error
         startChildActor(PolicyPersistenceOperationsActor.ACTOR_NAME,
-                PolicyPersistenceOperationsActor.props(pubSubMediator, config));
+                PolicyPersistenceOperationsActor.props(pubSubMediator, policiesConfig.getMongoDbConfig(),
+                        actorSystem.settings().config()));
 
         retrieveStatisticsDetailsResponseSupplier = RetrieveStatisticsDetailsResponseSupplier.of(policiesShardRegion,
                 PoliciesMessagingConstants.SHARD_REGION, log);

diff --git a/...tto/services/policies/persistence/actors/policies/PolicyPersistenceOperationsActorIT.java b/...tto/services/policies/persistence/actors/policies/PolicyPersistenceOperationsActorIT.java
@@ -34,7 +34,6 @@
 import org.junit.Test;
 
 import com.typesafe.config.Config;
-import com.typesafe.config.ConfigFactory;
 
 import akka.actor.ActorRef;
 import akka.actor.ActorSystem;
@@ -71,11 +70,6 @@ protected String getServiceName() {
         return "policies";
     }
 
-    @Override
-    protected Config getExtraConfig() {
-        return ConfigFactory.load("policy-test");
-    }
-
     @Override
     protected String getResourceType() {
         return PolicyCommand.RESOURCE_TYPE;
@@ -116,7 +110,7 @@ protected Class<?> getEntityNotAccessibleClass() {
     protected ActorRef startActorUnderTest(final ActorSystem actorSystem, final ActorRef pubSubMediator,
             final Config config) {
 
-        final Props opsActorProps = PolicyPersistenceOperationsActor.props(pubSubMediator);
+        final Props opsActorProps = PolicyPersistenceOperationsActor.props(pubSubMediator, mongoDbConfig, config);
         return actorSystem.actorOf(opsActorProps, PolicyPersistenceOperationsActor.ACTOR_NAME);
     }
 

diff --git a/...org/eclipse/ditto/services/things/persistence/actors/ThingPersistenceOperationsActor.java b/...org/eclipse/ditto/services/things/persistence/actors/ThingPersistenceOperationsActor.java
@@ -15,6 +15,7 @@
 import java.util.Collections;
 
 import org.eclipse.ditto.services.utils.persistence.mongo.MongoClientWrapper;
+import org.eclipse.ditto.services.utils.persistence.mongo.config.MongoDbConfig;
 import org.eclipse.ditto.services.utils.persistence.mongo.ops.AbstractPersistenceOperationsActor;
 import org.eclipse.ditto.services.utils.persistence.mongo.ops.NamespacePersistenceOperations;
 import org.eclipse.ditto.services.utils.persistence.mongo.ops.PersistenceOperationsConfiguration;
@@ -42,42 +43,38 @@ private ThingPersistenceOperationsActor(final ActorRef pubSubMediator,
             final MongoClientWrapper mongoClientWrapper,
             final PersistenceOperationsConfiguration persistenceOperationsConfiguration) {
 
-        super(
-                pubSubMediator,
+        super(pubSubMediator,
                 ThingCommand.RESOURCE_TYPE,
                 namespaceOps,
                 null,
                 Collections.singleton(mongoClientWrapper),
-                persistenceOperationsConfiguration
-        );
+                persistenceOperationsConfiguration);
     }
 
     /**
      * Create Props of this actor.
      *
      * @param pubSubMediator Akka pub-sub mediator.
+     * @param mongoDbConfig the MongoDB configuration settings.
      * @param config Configuration with info about event journal, snapshot store, suffix-builder and database.
      * @return a Props object.
      */
-    public static Props props(final ActorRef pubSubMediator, final Config config) {
+    public static Props props(final ActorRef pubSubMediator, final MongoDbConfig mongoDbConfig, final Config config) {
         return Props.create(ThingPersistenceOperationsActor.class, () -> {
             final MongoEventSourceSettings eventSourceSettings =
                     MongoEventSourceSettings.fromConfig(config, ThingPersistenceActor.PERSISTENCE_ID_PREFIX, true,
                             ThingPersistenceActor.JOURNAL_PLUGIN_ID, ThingPersistenceActor.SNAPSHOT_PLUGIN_ID);
 
-            final MongoClientWrapper mongoClient = MongoClientWrapper.newInstance(config);
+            final MongoClientWrapper mongoClient = MongoClientWrapper.newInstance(mongoDbConfig);
             final MongoDatabase db = mongoClient.getDefaultDatabase();
 
-            final NamespacePersistenceOperations namespaceOps = MongoNamespacePersistenceOperations.of(db, eventSourceSettings);
+            final NamespacePersistenceOperations namespaceOps =
+                    MongoNamespacePersistenceOperations.of(db, eventSourceSettings);
             final PersistenceOperationsConfiguration persistenceOperationsConfiguration =
                     PersistenceOperationsConfiguration.fromConfig(config);
 
-            return new ThingPersistenceOperationsActor(
-                    pubSubMediator,
-                    namespaceOps,
-                    mongoClient,
-                    persistenceOperationsConfiguration
-            );
+            return new ThingPersistenceOperationsActor(pubSubMediator, namespaceOps, mongoClient,
+                    persistenceOperationsConfiguration);
         });
     }
 

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
@@ -155,9 +155,9 @@ private ThingsRootActor(final ThingsConfig thingsConfig,
                         ClusterShardingSettings.create(actorSystem).withRole(CLUSTER_ROLE),
                         ShardRegionExtractor.of(clusterConfig.getNumberOfShards(), actorSystem));
 
-        // TODO Fix compilation error.
         startChildActor(ThingPersistenceOperationsActor.ACTOR_NAME,
-                ThingPersistenceOperationsActor.props(pubSubMediator, config));
+                ThingPersistenceOperationsActor.props(pubSubMediator, thingsConfig.getMongoDbConfig(),
+                        actorSystem.settings().config()));
 
         retrieveStatisticsDetailsResponseSupplier = RetrieveStatisticsDetailsResponseSupplier.of(thingsShardRegion,
                 ThingsMessagingConstants.SHARD_REGION, log);

diff --git a/...g/eclipse/ditto/services/things/persistence/actors/ThingPersistenceOperationsActorIT.java b/...g/eclipse/ditto/services/things/persistence/actors/ThingPersistenceOperationsActorIT.java
@@ -12,10 +12,6 @@
  */
 package org.eclipse.ditto.services.things.persistence.actors;
 
-import java.time.Duration;
-import java.util.Collections;
-import java.util.List;
-
 import org.eclipse.ditto.model.base.headers.DittoHeaders;
 import org.eclipse.ditto.model.things.Thing;
 import org.eclipse.ditto.services.utils.persistence.mongo.ops.eventsource.MongoEventSourceITAssertions;
@@ -29,7 +25,6 @@
 import org.junit.Test;
 
 import com.typesafe.config.Config;
-import com.typesafe.config.ConfigFactory;
 
 import akka.actor.ActorRef;
 import akka.actor.ActorSystem;
@@ -56,11 +51,6 @@ protected String getServiceName() {
         return "things";
     }
 
-    @Override
-    protected Config getExtraConfig() {
-        return ConfigFactory.load("thing-test");
-    }
-
     @Override
     protected String getResourceType() {
         return ThingCommand.RESOURCE_TYPE;
@@ -95,7 +85,7 @@ protected Class<?> getEntityNotAccessibleClass() {
     protected ActorRef startActorUnderTest(final ActorSystem actorSystem, final ActorRef pubSubMediator,
             final Config config) {
 
-        final Props opsActorProps = ThingPersistenceOperationsActor.props(pubSubMediator);
+        final Props opsActorProps = ThingPersistenceOperationsActor.props(pubSubMediator, mongoDbConfig, config);
         return actorSystem.actorOf(opsActorProps, ThingPersistenceOperationsActor.ACTOR_NAME);
     }
 

diff --git a/...in/java/org/eclipse/ditto/services/thingsearch/updater/actors/SearchUpdaterRootActor.java b/...in/java/org/eclipse/ditto/services/thingsearch/updater/actors/SearchUpdaterRootActor.java
@@ -14,19 +14,13 @@
 
 import javax.annotation.Nullable;
 
-import org.eclipse.ditto.services.thingsearch.common.config.DeleteConfig;
 import org.eclipse.ditto.services.thingsearch.common.config.SearchConfig;
 import org.eclipse.ditto.services.thingsearch.common.config.UpdaterConfig;
 import org.eclipse.ditto.services.thingsearch.common.util.RootSupervisorStrategyFactory;
 import org.eclipse.ditto.services.thingsearch.persistence.write.ThingsSearchUpdaterPersistence;
 import org.eclipse.ditto.services.thingsearch.persistence.write.impl.MongoThingsSearchUpdaterPersistence;
 import org.eclipse.ditto.services.thingsearch.persistence.write.streaming.ChangeQueueActor;
 import org.eclipse.ditto.services.thingsearch.persistence.write.streaming.SearchUpdaterStream;
-import org.eclipse.ditto.services.thingsearch.common.util.RootSupervisorStrategyFactory;
-import org.eclipse.ditto.services.thingsearch.persistence.write.ThingsSearchUpdaterPersistence;
-import org.eclipse.ditto.services.thingsearch.persistence.write.impl.MongoThingsSearchUpdaterPersistence;
-import org.eclipse.ditto.services.thingsearch.persistence.write.streaming.ChangeQueueActor;
-import org.eclipse.ditto.services.thingsearch.persistence.write.streaming.SearchUpdaterStream;
 import org.eclipse.ditto.services.utils.akka.streaming.SyncConfig;
 import org.eclipse.ditto.services.utils.akka.streaming.TimestampPersistence;
 import org.eclipse.ditto.services.utils.cluster.ClusterUtil;
@@ -137,9 +131,9 @@ private SearchUpdaterRootActor(final SearchConfig searchConfig,
         final Props manualUpdaterProps = ManualUpdater.props(dittoMongoClient.getDefaultDatabase(), thingsUpdaterActor);
         startClusterSingletonActor(ManualUpdater.ACTOR_NAME, manualUpdaterProps);
 
-        // TODO Fix compilation error.
         startChildActor(ThingsSearchPersistenceOperationsActor.ACTOR_NAME,
-                ThingsSearchPersistenceOperationsActor.props(pubSubMediator, searchUpdaterPersistence, config));
+                ThingsSearchPersistenceOperationsActor.props(pubSubMediator, searchUpdaterPersistence,
+                        actorSystem.settings().config()));
 
         startThingsStreamSupervisor(updaterConfig.getThingsSyncConfig(), pubSubMediator, materializer,
                 thingsSyncPersistence);
@@ -236,7 +230,7 @@ public SupervisorStrategy supervisorStrategy() {
     }
 
     private ActorRef startChildActor(final String actorName, final Props props) {
-        log.info("Starting child actor '{}'", actorName);
+        log.info("Starting child actor <{}>.", actorName);
         return getContext().actorOf(props, actorName);
     }
 

diff --git a/...pse/ditto/services/thingsearch/updater/actors/ThingsSearchPersistenceOperationsActor.java b/...pse/ditto/services/thingsearch/updater/actors/ThingsSearchPersistenceOperationsActor.java
@@ -37,13 +37,7 @@ private ThingsSearchPersistenceOperationsActor(final ActorRef pubSubMediator,
             final NamespacePersistenceOperations namespaceOps,
             final PersistenceOperationsConfiguration persistenceOperationsConfiguration) {
 
-        super(
-                pubSubMediator,
-                ThingSearchCommand.RESOURCE_TYPE,
-                namespaceOps,
-                null,
-                persistenceOperationsConfiguration
-        );
+        super(pubSubMediator, ThingSearchCommand.RESOURCE_TYPE, namespaceOps, null, persistenceOperationsConfiguration);
     }
 
     /**
@@ -62,11 +56,8 @@ public static Props props(final ActorRef pubSubMediator, final ThingsSearchUpdat
                     final PersistenceOperationsConfiguration persistenceOperationsConfiguration =
                             PersistenceOperationsConfiguration.fromConfig(config);
 
-                    return new ThingsSearchPersistenceOperationsActor(
-                            pubSubMediator,
-                            persistence,
-                            persistenceOperationsConfiguration
-                    );
+                    return new ThingsSearchPersistenceOperationsActor(pubSubMediator, persistence,
+                            persistenceOperationsConfiguration);
                 });
 
     }