Allow custom configuration for the SearchUpdateObserver extension

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

Hide file tree

Showing 9 changed files with 30 additions and 16 deletions.
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
@@ -15,7 +15,6 @@
 import static org.eclipse.ditto.base.model.common.ConditionChecker.checkNotNull;
 
 import com.typesafe.config.Config;
-import com.typesafe.config.ConfigFactory;
 
 import akka.actor.ActorSystem;
 

diff --git a/base/service/src/main/java/org/eclipse/ditto/base/service/RootChildActorStarter.java b/base/service/src/main/java/org/eclipse/ditto/base/service/RootChildActorStarter.java
@@ -15,7 +15,6 @@
 import static org.eclipse.ditto.base.model.common.ConditionChecker.checkNotNull;
 
 import com.typesafe.config.Config;
-import com.typesafe.config.ConfigFactory;
 
 import akka.actor.ActorContext;
 import akka.actor.ActorSystem;

diff --git a/...se/ditto/gateway/service/security/authentication/jwt/JwtAuthenticationResultProvider.java b/...se/ditto/gateway/service/security/authentication/jwt/JwtAuthenticationResultProvider.java
@@ -22,7 +22,6 @@
 import org.eclipse.ditto.jwt.model.JsonWebToken;
 
 import com.typesafe.config.Config;
-import com.typesafe.config.ConfigFactory;
 
 import akka.actor.ActorSystem;
 

diff --git a/...e/ditto/gateway/service/security/authentication/jwt/JwtAuthorizationSubjectsProvider.java b/...e/ditto/gateway/service/security/authentication/jwt/JwtAuthorizationSubjectsProvider.java
@@ -22,7 +22,6 @@
 import org.eclipse.ditto.jwt.model.JsonWebToken;
 
 import com.typesafe.config.Config;
-import com.typesafe.config.ConfigFactory;
 
 import akka.actor.ActorSystem;
 

diff --git a/...va/org/eclipse/ditto/thingsearch/service/persistence/write/streaming/EnforcementFlow.java b/...va/org/eclipse/ditto/thingsearch/service/persistence/write/streaming/EnforcementFlow.java
@@ -32,6 +32,7 @@
 import org.eclipse.ditto.internal.utils.cacheloaders.EnforcementCacheKey;
 import org.eclipse.ditto.internal.utils.cacheloaders.config.AskWithRetryConfig;
 import org.eclipse.ditto.internal.utils.config.DefaultScopedConfig;
+import org.eclipse.ditto.internal.utils.config.ScopedConfig;
 import org.eclipse.ditto.json.JsonObject;
 import org.eclipse.ditto.json.JsonRuntimeException;
 import org.eclipse.ditto.policies.enforcement.PolicyCacheLoader;
@@ -93,7 +94,8 @@ private EnforcementFlow(final ActorSystem actorSystem,
         thingsFacade = createThingsFacade(actorSystem, thingsShardRegion, askWithRetryConfig.getAskTimeout(),
                 thingCacheConfig, thingCacheDispatcher);
         this.policyEnforcerCache = policyEnforcerCache;
-        searchUpdateObserver = SearchUpdateObserver.get(actorSystem);
+        searchUpdateObserver =
+                SearchUpdateObserver.get(actorSystem, ScopedConfig.dittoExtension(actorSystem.settings().config()));
         cacheRetryDelay = thingCacheConfig.getRetryDelay();
         final SearchConfig searchConfig =
                 DittoSearchConfig.of(DefaultScopedConfig.dittoScoped(actorSystem.settings().config()));

diff --git a/.../main/java/org/eclipse/ditto/thingsearch/service/updater/actors/SearchUpdateObserver.java b/.../main/java/org/eclipse/ditto/thingsearch/service/updater/actors/SearchUpdateObserver.java
@@ -16,10 +16,13 @@
 
 import javax.annotation.Nullable;
 
+import org.eclipse.ditto.base.service.DittoExtensionIds;
 import org.eclipse.ditto.base.service.DittoExtensionPoint;
 import org.eclipse.ditto.json.JsonObject;
 import org.eclipse.ditto.thingsearch.service.persistence.write.model.Metadata;
 
+import com.typesafe.config.Config;
+
 import akka.actor.ActorSystem;
 
 /**
@@ -47,18 +50,26 @@ public interface SearchUpdateObserver extends DittoExtensionPoint {
      * @return the {@code SearchUpdateObserver} implementation.
      * @throws NullPointerException if {@code actorSystem} is {@code null}.
      */
-    static SearchUpdateObserver get(final ActorSystem actorSystem) {
+    static SearchUpdateObserver 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<SearchUpdateObserver> {
 
-        private static final String CONFIG_PATH = "ditto.search.search-update-observer.implementation";
-        private static final ExtensionId INSTANCE = new ExtensionId(SearchUpdateObserver.class);
+        private static final String CONFIG_KEY = "search-update-observer";
+        private static final String CONFIG_PATH = "ditto.extensions." + CONFIG_KEY;
+
+        private ExtensionId(final ExtensionIdConfig<SearchUpdateObserver> extensionIdConfig) {
+            super(extensionIdConfig);
+        }
 
-        private ExtensionId(final Class<SearchUpdateObserver> parentClass) {
-            super(parentClass);
+        static ExtensionIdConfig<SearchUpdateObserver> computeConfig(final Config config) {
+            return ExtensionIdConfig.of(SearchUpdateObserver.class, config, CONFIG_KEY);
         }
 
         @Override

diff --git a/thingsearch/service/src/main/resources/search.conf b/thingsearch/service/src/main/resources/search.conf
@@ -7,6 +7,10 @@ ditto {
   persistence.operations.delay-after-persistence-actor-shutdown = 5s
   persistence.operations.delay-after-persistence-actor-shutdown = ${?DELAY_AFTER_PERSISTENCE_ACTOR_SHUTDOWN}
 
+  extensions {
+    search-update-observer = org.eclipse.ditto.thingsearch.service.updater.actors.DefaultSearchUpdateObserver
+  }
+
   mongodb {
 
     database = "search"
@@ -59,9 +63,6 @@ ditto {
     search-update-mapper.implementation = org.eclipse.ditto.thingsearch.service.persistence.write.streaming.DefaultSearchUpdateMapper
     search-update-mapper.implementation = ${?SEARCH_UPDATE_MAPPER_IMPLEMENTATION}
 
-    search-update-observer.implementation = org.eclipse.ditto.thingsearch.service.updater.actors.DefaultSearchUpdateObserver
-    search-update-observer.implementation = ${?SEARCH_UPDATE_OBSERVER_IMPLEMENTATION}
-
     mongo-hints-by-namespace = ${?MONGO_HINTS_BY_NAMESPACE}
 
     index-initialization {

diff --git a/thingsearch/service/src/test/resources/actors-test.conf b/thingsearch/service/src/test/resources/actors-test.conf
@@ -1,4 +1,7 @@
 ditto {
+  extensions {
+    search-update-observer = "org.eclipse.ditto.thingsearch.service.updater.actors.DefaultSearchUpdateObserver"
+  }
   signal-enrichment.caching-signal-enrichment-facade.provider = org.eclipse.ditto.internal.models.signalenrichment.DittoCachingSignalEnrichmentFacadeProvider
   mapping-strategy.implementation = "org.eclipse.ditto.thingsearch.api.ThingSearchMappingStrategies"
 
@@ -47,7 +50,6 @@ ditto {
   search {
     query-criteria-validator.implementation = "org.eclipse.ditto.thingsearch.service.persistence.query.validation.DefaultQueryCriteriaValidator"
     search-update-mapper.implementation = "org.eclipse.ditto.thingsearch.service.persistence.write.streaming.DefaultSearchUpdateMapper"
-    search-update-observer.implementation = "org.eclipse.ditto.thingsearch.service.updater.actors.DefaultSearchUpdateObserver"
     mongo-hints-by-namespace = ${?MONGO_HINTS_BY_NAMESPACE}
 
     index-initialization {

diff --git a/thingsearch/service/src/test/resources/test.conf b/thingsearch/service/src/test/resources/test.conf
@@ -1,6 +1,9 @@
 ditto {
   signal-enrichment.caching-signal-enrichment-facade.provider = org.eclipse.ditto.internal.models.signalenrichment.DittoCachingSignalEnrichmentFacadeProvider
   mapping-strategy.implementation = "org.eclipse.ditto.thingsearch.api.ThingSearchMappingStrategies"
+  extensions {
+    search-update-observer = "org.eclipse.ditto.thingsearch.service.updater.actors.DefaultSearchUpdateObserver"
+  }
   mongodb {
     uri = "mongodb://localhost:27017/test"
     pool {
@@ -24,7 +27,6 @@ ditto {
     }
     query-criteria-validator = "org.eclipse.ditto.thingsearch.service.persistence.query.validation.DefaultQueryCriteriaValidator"
     search-update-mapper.implementation = "org.eclipse.ditto.thingsearch.service.persistence.write.streaming.DefaultSearchUpdateMapper"
-    search-update-observer.implementation = "org.eclipse.ditto.thingsearch.service.updater.actors.DefaultSearchUpdateObserver"
   }
 }