Allow custom configuration for the WebSocketConnectionSupervisor exte…

…nsion Signed-off-by: Yannic Klem <yannic.klem@bosch.io>
eclipse-ditto · Jul 12, 2022 · 53a90e9 · 53a90e9
1 parent 3894dc6
commit 53a90e9
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 12 deletions.
diff --git a/...ain/java/org/eclipse/ditto/gateway/service/endpoints/routes/websocket/WebSocketRoute.java b/...ain/java/org/eclipse/ditto/gateway/service/endpoints/routes/websocket/WebSocketRoute.java
@@ -192,7 +192,7 @@ private WebSocketRoute(final ActorSystem actorSystem,
         outgoingMessageSniffer = OutgoingWebSocketEventSniffer.get(actorSystem, dittoExtensionsConfig);
         final var websocketConfig = ScopedConfig.getOrEmpty(config, "ditto.gateway.streaming.websocket");
         authorizationEnforcer = StreamingAuthorizationEnforcer.get(actorSystem, websocketConfig);
-        webSocketSupervisor = WebSocketSupervisor.get(actorSystem);
+        webSocketSupervisor = WebSocketSupervisor.get(actorSystem, dittoExtensionsConfig);
         webSocketConfigProvider = WebSocketConfigProvider.get(actorSystem, dittoExtensionsConfig);
         signalEnrichmentProvider = null;
         headerTranslator = HeaderTranslator.empty();

diff --git a/...ava/org/eclipse/ditto/gateway/service/endpoints/routes/websocket/WebSocketSupervisor.java b/...ava/org/eclipse/ditto/gateway/service/endpoints/routes/websocket/WebSocketSupervisor.java
@@ -14,9 +14,12 @@
 
 import static org.eclipse.ditto.base.model.common.ConditionChecker.checkNotNull;
 
+import org.eclipse.ditto.base.service.DittoExtensionIds;
 import org.eclipse.ditto.base.service.DittoExtensionPoint;
 import org.eclipse.ditto.gateway.service.streaming.actors.StreamSupervisor;
 
+import com.typesafe.config.Config;
+
 import akka.actor.ActorSystem;
 
 /**
@@ -33,18 +36,26 @@ public interface WebSocketSupervisor extends DittoExtensionPoint, StreamSupervis
      * @throws NullPointerException if {@code actorSystem} is {@code null}.
      * @since 3.0.0
      */
-    static WebSocketSupervisor get(final ActorSystem actorSystem) {
+    static WebSocketSupervisor 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<WebSocketSupervisor> {
 
-        private static final String CONFIG_PATH = "ditto.gateway.streaming.websocket.connection-supervisor";
-        private static final ExtensionId INSTANCE = new ExtensionId(WebSocketSupervisor.class);
+        private static final String CONFIG_KEY = "websocket-connection-supervisor";
+        private static final String CONFIG_PATH = "ditto.extensions." + CONFIG_KEY;
+
+        private ExtensionId(final ExtensionIdConfig<WebSocketSupervisor> extensionIdConfig) {
+            super(extensionIdConfig);
+        }
 
-        private ExtensionId(final Class<WebSocketSupervisor> parentClass) {
-            super(parentClass);
+        static ExtensionIdConfig<WebSocketSupervisor> computeConfig(final Config config) {
+            return ExtensionIdConfig.of(WebSocketSupervisor.class, config, CONFIG_KEY);
         }
 
         @Override

diff --git a/gateway/service/src/main/resources/gateway.conf b/gateway/service/src/main/resources/gateway.conf
@@ -57,6 +57,8 @@ ditto {
     custom-api-routes-provider = org.eclipse.ditto.gateway.service.endpoints.routes.NoopCustomApiRoutesProvider
     # The supervisor for SSE connections
     sse-connection-supervisor = org.eclipse.ditto.gateway.service.endpoints.routes.sse.NoOpSseConnectionSupervisor
+    # The supervisor for WebSocket connections
+    websocket-connection-supervisor = "org.eclipse.ditto.gateway.service.endpoints.routes.websocket.NoOpWebSocketSupervisor"
   }
 
   service-name = "gateway"
@@ -164,10 +166,6 @@ ditto {
         # The provider enforcer for WebSocket connections
         streaming-authorization-enforcer = "org.eclipse.ditto.gateway.service.streaming.NoOpAuthorizationEnforcer"
 
-        # The supervisor for WebSocket connections
-        connection-supervisor = "org.eclipse.ditto.gateway.service.endpoints.routes.websocket.NoOpWebSocketSupervisor"
-        connection-supervisor = ${?GATEWAY_WEBSOCKET_CONNECTION_SUPERVISOR}
-
       }
 
       sse {

diff --git a/gateway/service/src/test/resources/test.conf b/gateway/service/src/test/resources/test.conf
@@ -147,6 +147,7 @@ ditto {
     outgoing-websocket-event-sniffer = org.eclipse.ditto.gateway.service.endpoints.routes.websocket.NoOpOutgoingWebSocketEventSniffer
     custom-api-routes-provider = org.eclipse.ditto.gateway.service.endpoints.routes.NoopCustomApiRoutesProvider
     sse-connection-supervisor = org.eclipse.ditto.gateway.service.endpoints.routes.sse.NoOpSseConnectionSupervisor
+    websocket-connection-supervisor = org.eclipse.ditto.gateway.service.endpoints.routes.websocket.NoOpWebSocketSupervisor
   }
 
   mapping-strategy.implementation = "org.eclipse.ditto.gateway.service.util.GatewayMappingStrategies"
@@ -173,7 +174,6 @@ ditto {
         publisher.backpressure-buffer-size = 200
         # The provider enforcer for WebSocket connections
         streaming-authorization-enforcer = org.eclipse.ditto.gateway.service.streaming.NoOpAuthorizationEnforcer
-        connection-supervisor = org.eclipse.ditto.gateway.service.endpoints.routes.websocket.NoOpWebSocketSupervisor
       }
     }