- Partial revert of rev. c65128b after investigation, w/some config c…

…leanup.
navikt · Dec 11, 2024 · a4e278a · a4e278a
1 parent 7aaef7d
commit a4e278a
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/elastic/ElasticBestilling.java b/apps/dolly-backend/src/main/java/no/nav/dolly/elastic/ElasticBestilling.java
@@ -39,7 +39,7 @@
 
 import static java.util.Objects.isNull;
 
-@Document(indexName = "${open.search.index}")
+@Document(indexName = "#{@environment.getProperty('open.search.index')}")
 @Data
 @Builder
 @NoArgsConstructor

diff --git a/apps/dolly-backend/src/test/resources/application-test.yaml b/apps/dolly-backend/src/test/resources/application-test.yaml
@@ -3,7 +3,6 @@ TOKEN_X_ISSUER: dummy
 
 APP_NAME: dolly
 APP_VERSION: ${application.version}
-environment: localhost
 
 jira:
   host: http://localhost:${wiremock.server.port:0}/jira
@@ -13,7 +12,7 @@ jira:
 open:
   search:
     total-fields: 150
-    index: dummy
+    index: test
 
 consumers:
   kodeverk-api:

diff --git a/...estnav/apps/oppsummeringsdokumentservice/repository/model/OppsummeringsdokumentModel.java b/...estnav/apps/oppsummeringsdokumentservice/repository/model/OppsummeringsdokumentModel.java
@@ -19,7 +19,7 @@
 
 @Setter
 @Getter
-@Document(indexName = "${open.search.index}")
+@Document(indexName = "#{@environment.getProperty('open.search.index')}")
 public class OppsummeringsdokumentModel implements Persistable<String> {
 
     @Id
-Original file line number
+Diff line change
@@ Expand Up / @@ -19,7 +19,7 @@ @@
     @Setter
     @Getter
-    @Document(indexName = "${open.search.index}")
+    @Document(indexName = "#{@environment.getProperty('open.search.index')}")
     public class OppsummeringsdokumentModel implements Persistable<String> {
         @Id
@@ Expand Down @@