Allow custom configuration for the SignalTransformer extension

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

Hide file tree

Showing 4 changed files with 23 additions and 10 deletions.
diff --git a/...y/service/src/main/java/org/eclipse/ditto/connectivity/service/ConnectivityRootActor.java b/...y/service/src/main/java/org/eclipse/ditto/connectivity/service/ConnectivityRootActor.java
@@ -165,7 +165,8 @@ private ActorRef getHealthCheckingActor(final ConnectivityConfig connectivityCon
     }
 
     private ActorRef getCommandForwarder(final ClusterConfig clusterConfig, final ActorRef pubSubMediator) {
-        final SignalTransformer signalTransformer = SignalTransformer.get(getContext().system());
+        final ActorSystem system = getContext().system();
+        final SignalTransformer signalTransformer = SignalTransformer.get(system, system.settings().config());
         return startChildActor(EdgeCommandForwarderActor.ACTOR_NAME,
                 EdgeCommandForwarderActor.props(pubSubMediator,
                         ShardRegions.of(getContext().getSystem(), clusterConfig), signalTransformer));

diff --git a/edge/service/src/main/java/org/eclipse/ditto/edge/service/dispatching/SignalTransformer.java b/edge/service/src/main/java/org/eclipse/ditto/edge/service/dispatching/SignalTransformer.java
@@ -18,8 +18,11 @@
 import java.util.function.Function;
 
 import org.eclipse.ditto.base.model.signals.Signal;
+import org.eclipse.ditto.base.service.DittoExtensionIds;
 import org.eclipse.ditto.base.service.DittoExtensionPoint;
 
+import com.typesafe.config.Config;
+
 import akka.actor.ActorSystem;
 
 /**
@@ -34,21 +37,30 @@ public interface SignalTransformer extends Function<Signal<?>, CompletionStage<S
      * {@code ActorSystem}.
      *
      * @param actorSystem the actorSystem in which the {@code SignalTransformer} should be loaded.
+     * @param config the configuration of this extension.
      * @return the {@code SignalTransformer} implementation.
      * @throws NullPointerException if {@code actorSystem} is {@code null}.
      */
-    static SignalTransformer get(final ActorSystem actorSystem) {
+    static SignalTransformer 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<SignalTransformer> {
 
-        private static final String CONFIG_PATH = "ditto.signal-transformer";
-        private static final ExtensionId INSTANCE = new ExtensionId(SignalTransformer.class);
+        private static final String CONFIG_KEY = "signal-transformer";
+        private static final String CONFIG_PATH = "ditto.extensions." + CONFIG_KEY;
+
+        private ExtensionId(final ExtensionIdConfig<SignalTransformer> extensionIdConfig) {
+            super(extensionIdConfig);
+        }
 
-        private ExtensionId(final Class<SignalTransformer> parentClass) {
-            super(parentClass);
+        static ExtensionIdConfig<SignalTransformer> computeConfig(final Config config) {
+            return ExtensionIdConfig.of(SignalTransformer.class, config, CONFIG_KEY);
         }
 
         @Override

diff --git a/edge/service/src/main/resources/ditto-edge-service.conf b/edge/service/src/main/resources/ditto-edge-service.conf
@@ -1,9 +1,8 @@
 ditto {
   extensions {
     edge-command-forwarder-extension = org.eclipse.ditto.edge.service.dispatching.NoOpEdgeCommandForwarderExtension
+    signal-transformer = org.eclipse.ditto.edge.service.dispatching.DefaultNamespaceAppender
   }
-  signal-transformer = org.eclipse.ditto.edge.service.dispatching.DefaultNamespaceAppender
-  signal-transformer = ${?DITTO_SIGNAL_TRANSFORMER}
 
   ask-with-retry {
     # maximum duration to wait for answers from entity shard regions

diff --git a/...way/service/src/main/java/org/eclipse/ditto/gateway/service/starter/GatewayRootActor.java b/...way/service/src/main/java/org/eclipse/ditto/gateway/service/starter/GatewayRootActor.java
@@ -117,7 +117,8 @@ private GatewayRootActor(final GatewayConfig gatewayConfig, final ActorRef pubSu
         final HttpConfig httpConfig = gatewayConfig.getHttpConfig();
 
         final ShardRegions shardRegions = ShardRegions.of(actorSystem, clusterConfig);
-        final SignalTransformer signalTransformer = SignalTransformer.get(context().system());
+        final SignalTransformer signalTransformer =
+                SignalTransformer.get(actorSystem, ScopedConfig.dittoExtension(actorSystem.settings().config()));
         final var edgeCommandForwarder = startChildActor(EdgeCommandForwarderActor.ACTOR_NAME,
                 EdgeCommandForwarderActor.props(pubSubMediator, shardRegions, signalTransformer));
         final var proxyActor = startProxyActor(actorSystem, pubSubMediator, edgeCommandForwarder);