[#964] fix PoliciesServiceGlobalCommandRegistryTest and PoliciesRootA…

…ctorTest. Signed-off-by: Yufei Cai <yufei.cai@bosch.io>
eclipse-ditto · Feb 15, 2021 · fa4e016 · fa4e016
1 parent 60e710d
commit fa4e016
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
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
@@ -71,7 +71,7 @@ private PoliciesRootActor(final PoliciesConfig policiesConfig,
 
         // Start distributed data replicator even though it is not used for now.
         // TODO: use the DistributedSub for notification publication
-        PolicyNotificationPubSubFactory.of(actorSystem).startDistributedPub();
+        PolicyNotificationPubSubFactory.of(getContext(), actorSystem).startDistributedPub();
 
         final Props policySupervisorProps = PolicySupervisorActor.props(pubSubMediator, snapshotAdapter);
 

diff --git a/...org/eclipse/ditto/services/policies/starter/PoliciesServiceGlobalCommandRegistryTest.java b/...org/eclipse/ditto/services/policies/starter/PoliciesServiceGlobalCommandRegistryTest.java
@@ -15,6 +15,7 @@
 import org.eclipse.ditto.services.models.policies.commands.sudo.SudoRetrievePolicy;
 import org.eclipse.ditto.services.models.streaming.SudoStreamPids;
 import org.eclipse.ditto.services.utils.health.RetrieveHealth;
+import org.eclipse.ditto.services.utils.pubsub.api.PublishSignal;
 import org.eclipse.ditto.services.utils.test.GlobalCommandRegistryTestCases;
 import org.eclipse.ditto.signals.commands.cleanup.CleanupPersistence;
 import org.eclipse.ditto.signals.commands.common.Shutdown;
@@ -48,6 +49,7 @@ public PoliciesServiceGlobalCommandRegistryTest() {
                 CleanupPersistence.class,
                 RetrieveHealth.class,
                 PurgeEntities.class,
+                PublishSignal.class,
 
                 // added due to ditto-model-placeholders
                 CreateSubscription.class,

diff --git a/...ls/pubsub/src/main/java/org/eclipse/ditto/services/utils/pubsub/DittoProtocolSubImpl.java b/...ls/pubsub/src/main/java/org/eclipse/ditto/services/utils/pubsub/DittoProtocolSubImpl.java
@@ -56,7 +56,8 @@ static DittoProtocolSubImpl of(final ActorSystem system, final DistributedAcks d
                 LiveSignalPubSubFactory.of(system, distributedAcks).startDistributedSub();
         final DistributedSub twinEventSub =
                 ThingEventPubSubFactory.readSubjectsOnly(system, distributedAcks).startDistributedSub();
-        final DistributedSub policyNotificationSub = PolicyNotificationPubSubFactory.of(system).startDistributedSub();
+        final DistributedSub policyNotificationSub =
+                PolicyNotificationPubSubFactory.of(system, system).startDistributedSub();
         return new DittoProtocolSubImpl(liveSignalSub, twinEventSub, policyNotificationSub, distributedAcks);
     }
 

diff --git a/...rc/main/java/org/eclipse/ditto/services/utils/pubsub/PolicyNotificationPubSubFactory.java b/...rc/main/java/org/eclipse/ditto/services/utils/pubsub/PolicyNotificationPubSubFactory.java
@@ -15,6 +15,7 @@
 import org.eclipse.ditto.services.utils.pubsub.extractors.AckExtractor;
 import org.eclipse.ditto.signals.notifications.policies.PolicyNotification;
 
+import akka.actor.ActorRefFactory;
 import akka.actor.ActorSystem;
 
 /**
@@ -28,18 +29,19 @@ public final class PolicyNotificationPubSubFactory extends AbstractPubSubFactory
             AckExtractor.of(PolicyNotification::getEntityId, PolicyNotification::getDittoHeaders);
 
     @SuppressWarnings({"unchecked"})
-    private PolicyNotificationPubSubFactory(final ActorSystem actorSystem) {
-        super(actorSystem, actorSystem, (Class<PolicyNotification<?>>) (Object) PolicyNotification.class,
+    private PolicyNotificationPubSubFactory(final ActorRefFactory actorRefFactory, final ActorSystem actorSystem) {
+        super(actorRefFactory, actorSystem, (Class<PolicyNotification<?>>) (Object) PolicyNotification.class,
                 new PolicyNotificationTopicExtractor(), PROVIDER, ACK_EXTRACTOR, DistributedAcks.empty());
     }
 
     /**
      * Create a pubsub factory for thing events ignoring shard ID topics.
      *
+     * @param actorRefFactory the factory with which to create the sub-supervisor actor.l
      * @param system the actor system.
      * @return the thing event pub-sub factory.
      */
-    public static PolicyNotificationPubSubFactory of(final ActorSystem system) {
-        return new PolicyNotificationPubSubFactory(system);
+    public static PolicyNotificationPubSubFactory of(final ActorRefFactory actorRefFactory, final ActorSystem system) {
+        return new PolicyNotificationPubSubFactory(actorRefFactory, system);
     }
 }