From a4e278a68874f15509809cae8c7dc03c3dd07d66 Mon Sep 17 00:00:00 2001
From: Cato Olsen <olsen.cato@gmail.com>
Date: Wed, 11 Dec 2024 16:55:19 +0100
Subject: [PATCH] - Partial revert of rev. c65128b4 after investigation, w/some
 config cleanup.

---
 .../src/main/java/no/nav/dolly/elastic/ElasticBestilling.java  | 2 +-
 apps/dolly-backend/src/test/resources/application-test.yaml    | 3 +--
 .../repository/model/OppsummeringsdokumentModel.java           | 2 +-
 3 files changed, 3 insertions(+), 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
index d579ce18b3f..3215136f78e 100644
--- 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
index c11f3aa2de3..01a22265e54 100644
--- 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/apps/oppsummeringsdokument-service/src/main/java/no/nav/testnav/apps/oppsummeringsdokumentservice/repository/model/OppsummeringsdokumentModel.java b/apps/oppsummeringsdokument-service/src/main/java/no/nav/testnav/apps/oppsummeringsdokumentservice/repository/model/OppsummeringsdokumentModel.java
index f4efcfa9a9a..85340381100 100644
--- a/apps/oppsummeringsdokument-service/src/main/java/no/nav/testnav/apps/oppsummeringsdokumentservice/repository/model/OppsummeringsdokumentModel.java
+++ b/apps/oppsummeringsdokument-service/src/main/java/no/nav/testnav/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