Refactor: Update application configuration and test setup; remove unu…

…sed properties and switch to MockitoBean for better test isolation #deploy-dolly-search-service

apps/dolly-search-service/src/main/resources/application.yml

@@ -4,11 +4,6 @@ spring:
   application:
     name: testnav-dolly-search-service
     description: Tjeneste for å søke etter Dolly-personer.
-  autoconfigure:
-    exclude:
-      org.springframework.boot.actuate.autoconfigure.elasticsearch.ElasticSearchReactiveHealthContributorAutoConfiguration,
-      org.springframework.boot.autoconfigure.data.elasticsearch.ReactiveElasticsearchRepositoriesAutoConfiguration,
-      org.springframework.boot.autoconfigure.data.elasticsearch.ReactiveElasticsearchRestClientAutoConfiguration
   security:
     oauth2:
       resourceserver:
@@ -34,9 +29,6 @@ consumers:
     cluster: dev-fss
 
 management:
-  health:
-    elasticsearch:
-      enabled: false
   endpoints:
     enabled-by-default: true
     web:

apps/dolly-search-service/src/test/java/no/nav/testnav/dollysearchservice/ApplicationContextTest.java

@@ -2,15 +2,15 @@
 
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.security.oauth2.jwt.JwtDecoder;
 import org.springframework.test.context.ActiveProfiles;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 
 @SpringBootTest
 @ActiveProfiles("test")
 class ApplicationContextTest {
 
-    @MockBean
+    @MockitoBean
     public JwtDecoder jwtDecoder;
 
     @Test

apps/dolly-search-service/src/test/resources/application-test.yml

@@ -1,8 +1 @@
 TOKEN_X_ISSUER: https://tokenx.dev-gcp.nav.cloud.nais.io
-
-open:
-  search:
-    uri: http://localhost:9200
-    username: dummy
-    password: dummy
-    index: local