Align RootActorStarter with new configurable extension approach

Signed-off-by: Yannic Klem <yannic.klem@bosch.io>
eclipse-ditto · Jul 8, 2022 · a10f6c5 · a10f6c5
1 parent a0a343a
commit a10f6c5
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 14 deletions.
diff --git a/base/service/src/main/java/org/eclipse/ditto/base/service/DittoService.java b/base/service/src/main/java/org/eclipse/ditto/base/service/DittoService.java
@@ -402,7 +402,8 @@ protected void startServiceRootActors(final ActorSystem actorSystem, final C ser
             injectSystemPropertiesLimits(serviceSpecificConfig);
 
             startMainRootActor(actorSystem, getMainRootActorProps(serviceSpecificConfig, pubSubMediator));
-            RootActorStarter.get(actorSystem).execute();
+            RootActorStarter.get(actorSystem, ScopedConfig.getOrEmpty(actorSystem.settings().config(), "ditto"))
+                    .execute();
         });
     }
 

diff --git a/base/service/src/main/java/org/eclipse/ditto/base/service/RootActorStarter.java b/base/service/src/main/java/org/eclipse/ditto/base/service/RootActorStarter.java
@@ -14,6 +14,9 @@
 
 import static org.eclipse.ditto.base.model.common.ConditionChecker.checkNotNull;
 
+import com.typesafe.config.Config;
+import com.typesafe.config.ConfigFactory;
+
 import akka.actor.ActorSystem;
 
 /**
@@ -33,21 +36,33 @@ public interface RootActorStarter extends DittoExtensionPoint {
      * {@code ActorSystem}.
      *
      * @param actorSystem the actorSystem in which the {@code RootActorStarter} should be loaded.
+     * @param config the configuration of this extension.
      * @return the {@code RootActorStarter} implementation.
      * @throws NullPointerException if {@code actorSystem} is {@code null}.
      */
-    static RootActorStarter get(final ActorSystem actorSystem) {
+    static RootActorStarter get(final ActorSystem actorSystem, final Config config) {
         checkNotNull(actorSystem, "actorSystem");
-        return ExtensionId.INSTANCE.get(actorSystem);
+        checkNotNull(config, "config");
+        final var extensionIdConfig = ExtensionId.computeConfig(config);
+        return DittoExtensionIds.get(actorSystem)
+                .computeIfAbsent(extensionIdConfig, ExtensionId::new)
+                .get(actorSystem);
     }
 
     final class ExtensionId extends DittoExtensionPoint.ExtensionId<RootActorStarter> {
 
-        private static final String CONFIG_PATH = "ditto.root-actor-starter";
-        private static final ExtensionId INSTANCE = new ExtensionId(RootActorStarter.class);
+        private static final String CONFIG_KEY = "root-actor-starter";
+        private static final String CONFIG_PATH = "ditto.extensions." + CONFIG_KEY;
+
+        private ExtensionId(final ExtensionIdConfig<RootActorStarter> extensionIdConfig) {
+            super(extensionIdConfig);
+        }
 
-        private ExtensionId(final Class<RootActorStarter> parentClass) {
-            super(parentClass);
+        static ExtensionIdConfig<RootActorStarter> computeConfig(final Config config) {
+            return ExtensionIdConfig.of(
+                    RootActorStarter.class,
+                    config.hasPath(CONFIG_KEY) ? config.getConfig(CONFIG_KEY) : ConfigFactory.empty()
+            );
         }
 
         @Override

diff --git a/base/service/src/main/resources/reference.conf b/base/service/src/main/resources/reference.conf
@@ -1,3 +1,8 @@
-ditto.extensions.root-child-actor-starter = {
-  extension-class = org.eclipse.ditto.base.service.NoOpRootChildActorStarter
+ditto.extensions {
+  root-actor-starter = {
+    extension-class = org.eclipse.ditto.base.service.NoOpRootActorStarter
+  }
+  root-child-actor-starter = {
+    extension-class = org.eclipse.ditto.base.service.NoOpRootChildActorStarter
+  }
 }
diff --git a/connectivity/service/src/main/resources/connectivity.conf b/connectivity/service/src/main/resources/connectivity.conf
@@ -1,6 +1,5 @@
 ditto {
   service-name = "connectivity"
-  root-actor-starter = "org.eclipse.ditto.base.service.NoOpRootActorStarter"
 
   pre-enforcers = [
     "org.eclipse.ditto.policies.enforcement.pre.CommandWithOptionalEntityPreEnforcer",

diff --git a/gateway/service/src/main/resources/gateway.conf b/gateway/service/src/main/resources/gateway.conf
@@ -16,7 +16,6 @@ ditto {
   }
 
   service-name = "gateway"
-  root-actor-starter = "org.eclipse.ditto.base.service.NoOpRootActorStarter"
   mapping-strategy.implementation = "org.eclipse.ditto.gateway.service.util.GatewayMappingStrategies"
 
   signal-enrichment {

diff --git a/policies/service/src/main/resources/policies.conf b/policies/service/src/main/resources/policies.conf
@@ -1,7 +1,6 @@
 ditto {
   service-name = "policies"
   mapping-strategy.implementation = "org.eclipse.ditto.policies.api.PoliciesMappingStrategies"
-  root-actor-starter = "org.eclipse.ditto.base.service.NoOpRootActorStarter"
   existence-checker = "org.eclipse.ditto.policies.enforcement.pre.PolicyExistenceChecker"
 
   pre-enforcers = [

diff --git a/things/service/src/main/resources/things.conf b/things/service/src/main/resources/things.conf
@@ -1,7 +1,6 @@
 ditto {
   service-name = "things"
   mapping-strategy.implementation = "org.eclipse.ditto.things.api.ThingsMappingStrategies"
-  root-actor-starter = "org.eclipse.ditto.base.service.NoOpRootActorStarter"
   existence-checker = "org.eclipse.ditto.things.service.enforcement.ThingExistenceChecker"
 
   pre-enforcers = [

diff --git a/thingsearch/service/src/main/resources/search.conf b/thingsearch/service/src/main/resources/search.conf
@@ -1,7 +1,6 @@
 ditto {
   service-name = "search"
   mapping-strategy.implementation = "org.eclipse.ditto.thingsearch.api.ThingSearchMappingStrategies"
-  root-actor-starter = "org.eclipse.ditto.base.service.NoOpRootActorStarter"
 
   pre-enforcers = []