Rename config of SearchService.

Signed-off-by: Yufei Cai <yufei.cai@bosch.io>
eclipse-ditto · Apr 13, 2022 · a3fc872 · a3fc872
1 parent 5d08fd4
commit a3fc872
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 4 deletions.
diff --git a/.../src/main/java/org/eclipse/ditto/thingsearch/service/common/config/DittoSearchConfig.java b/.../src/main/java/org/eclipse/ditto/thingsearch/service/common/config/DittoSearchConfig.java
@@ -42,7 +42,7 @@
 @Immutable
 public final class DittoSearchConfig implements SearchConfig, WithConfigPath {
 
-    private static final String CONFIG_PATH = "things-search";
+    private static final String CONFIG_PATH = "search";
 
     private final DittoServiceConfig dittoServiceConfig;
     @Nullable private final String mongoHintsByNamespace;

diff --git a/...src/main/resources/things-search-dev.conf → ...ervice/src/main/resources/search-dev.conf b/...src/main/resources/things-search-dev.conf → ...ervice/src/main/resources/search-dev.conf
diff --git a/...in/resources/things-search-extension.conf → .../src/main/resources/search-extension.conf b/...in/resources/things-search-extension.conf → .../src/main/resources/search-extension.conf
diff --git a/...ice/src/main/resources/things-search.conf → ...ch/service/src/main/resources/search.conf b/...ice/src/main/resources/things-search.conf → ...ch/service/src/main/resources/search.conf
@@ -49,7 +49,7 @@ ditto {
     caching-signal-enrichment-facade.provider =  ${?THINGS_SEARCH_CACHING_SIGNAL_ENRICHMENT_PROVIDER}
   }
 
-  things-search {
+  search {
     query-criteria-validator.implementation = ${?QUERY_CRITERIA_VALIDATOR_IMPLEMENTATION}
     search-update-mapper.implementation = ${?SEARCH_UPDATE_MAPPER_IMPLEMENTATION}
     search-update-observer.implementation = ${?SEARCH_UPDATE_OBSERVER_IMPLEMENTATION}
@@ -311,4 +311,4 @@ thing-cache-dispatcher {
   }
 }
 
-include "things-search-extension.conf"
+include "search-extension.conf"
diff --git a/...c/test/java/org/eclipse/ditto/thingsearch/service/starter/actors/SearchRootActorTest.java b/...c/test/java/org/eclipse/ditto/thingsearch/service/starter/actors/SearchRootActorTest.java
@@ -16,6 +16,7 @@
 import org.eclipse.ditto.thingsearch.service.common.config.DittoSearchConfig;
 import org.eclipse.ditto.thingsearch.service.common.config.SearchConfig;
 import org.eclipse.ditto.internal.utils.config.DefaultScopedConfig;
+import org.eclipse.ditto.thingsearch.service.starter.SearchService;
 
 import akka.actor.ActorSystem;
 import akka.actor.Props;
@@ -27,7 +28,7 @@ public final class SearchRootActorTest extends AbstractDittoRootActorTest {
 
     @Override
     protected String serviceName() {
-        return "things-search";
+        return SearchService.SERVICE_NAME;
     }
 
     @Override