Spring oppdatering for diverse apper, refaktorering vekk fra deprecat…

…ed funksjonalitet og skrevet om noen tester

#deploy-udi-stub
#deploy-tenor-search-service
#deploy-miljoer-service
#deploy-kodeverk-service

apps/kodeverk-service/src/test/java/no/nav/testnav/kodeverkservice/ApplicationContextTest.java

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

apps/levende-arbeidsforhold-ansettelse/src/test/java/no/nav/testnav/levendearbeidsforholdansettelse/LevendeArbeidsforholdAnsettelseApplicationTests.java

@@ -3,7 +3,7 @@
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.data.r2dbc.core.R2dbcEntityTemplate;
 import org.springframework.security.oauth2.jwt.ReactiveJwtDecoder;
 import org.springframework.test.context.ActiveProfiles;
@@ -14,7 +14,7 @@
 @ActiveProfiles("test")
 class LevendeArbeidsforholdAnsettelseApplicationTests {
 
-    @MockBean
+    @MockitoBean
     @SuppressWarnings("unused")
     public ReactiveJwtDecoder jwtDecoder;
 

apps/levende-arbeidsforhold-service/build.gradle

@@ -10,7 +10,7 @@ sonarqube {
 }
 
 dependencies {
-    implementation "io.confluent:kafka-avro-serializer:$versions.avro"
+    implementation "io.confluent:kafka-avro-serializer:$versions.avroSerializer"
     implementation "io.swagger.core.v3:swagger-annotations-jakarta:$versions.swagger"
 
     implementation "no.nav.testnav.libs:avro-schema"

apps/levende-arbeidsforhold-service/src/test/java/no/nav/testnav/levendearbeidsforholdservice/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.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.security.oauth2.jwt.JwtDecoder;
 import org.springframework.test.context.ActiveProfiles;
 
 @SpringBootTest
 @ActiveProfiles("test")
 class ApplicationContextTest {
 
-    @MockBean
+    @MockitoBean
     public JwtDecoder jwtDecoder;
 
     @Test

apps/miljoer-service/src/test/java/no/nav/registre/testnorge/miljoerservice/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.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.security.oauth2.jwt.JwtDecoder;
 import org.springframework.test.context.ActiveProfiles;
 
 @ActiveProfiles("test")
 @SpringBootTest
 public class ApplicationContextTest {
 
-    @MockBean
+    @MockitoBean
     public JwtDecoder jwtDecoder;
 
     @Test

apps/organisasjon-bestilling-service/src/test/java/no/nav/testnav/apps/organisasjonbestillingservice/ApplicationContextTest.java

@@ -3,15 +3,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.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.security.oauth2.jwt.JwtDecoder;
 import org.springframework.test.context.ActiveProfiles;
 
 @SpringBootTest
 @ActiveProfiles("test")
 class ApplicationContextTest {
 
-    @MockBean
+    @MockitoBean
     public JwtDecoder jwtDecoder;
 
     @Test

apps/organisasjon-faste-data-service/build.gradle

@@ -26,7 +26,7 @@ dependencies {
     implementation "org.springframework.boot:spring-boot-starter-data-jpa"
 
     implementation "jakarta.validation:jakarta.validation-api:$versions.jakartaValidation"
-    implementation "io.confluent:kafka-avro-serializer:$versions.avro"
+    implementation "io.confluent:kafka-avro-serializer:$versions.avroSerializer"
 
     implementation "org.flywaydb:flyway-core"
     implementation "org.flywaydb:flyway-database-postgresql"

apps/organisasjon-faste-data-service/src/test/java/no/nav/registre/testnorge/organisasjonfastedataservice/ApplicationContextTest.java

@@ -3,15 +3,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.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.security.oauth2.jwt.JwtDecoder;
 import org.springframework.test.context.ActiveProfiles;
 
 @SpringBootTest
 @ActiveProfiles("test")
 class ApplicationContextTest {
 
-    @MockBean
+    @MockitoBean
     public JwtDecoder jwtDecoder;
 
     @Test

apps/organisasjon-forvalter/src/test/java/no/nav/organisasjonforvalter/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.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.security.oauth2.jwt.JwtDecoder;
 import org.springframework.test.context.ActiveProfiles;
 
 @SpringBootTest
 @ActiveProfiles("test")
 class ApplicationContextTest {
 
-    @MockBean
+    @MockitoBean
     private JwtDecoder jwtDecoder;
 
     @Test

apps/organisasjon-mottak-service/build.gradle

@@ -29,7 +29,7 @@ dependencies {
     implementation "org.springframework.kafka:spring-kafka"
     implementation "org.apache.httpcomponents.core5:httpcore5:5.3"
     implementation "org.apache.kafka:kafka-clients:$versions.apacheKafka"
-    implementation "io.confluent:kafka-avro-serializer:$versions.avro"
+    implementation "io.confluent:kafka-avro-serializer:$versions.avroSerializer"
 
     implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:$versions.springdoc"
 

apps/organisasjon-mottak-service/src/test/java/no/nav/registre/testnorge/organisasjonmottak/ApplicationContextTest.java

@@ -3,7 +3,7 @@
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.security.oauth2.jwt.JwtDecoder;
 import org.springframework.test.context.ActiveProfiles;
 
@@ -13,7 +13,7 @@
 @ActiveProfiles("test")
 class ApplicationContextTest {
 
-    @MockBean
+    @MockitoBean
     @SuppressWarnings("unused")
     private JwtDecoder jwtDecoder;
 

apps/organisasjon-service/src/test/java/no/nav/registre/testnorge/organisasjonservice/ApplicationContextTest.java

@@ -3,7 +3,7 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.cloud.contract.wiremock.AutoConfigureWireMock;
 import org.springframework.security.oauth2.jwt.JwtDecoder;
 import org.springframework.test.context.TestPropertySource;
@@ -17,7 +17,7 @@
 @TestPropertySource(locations = "classpath:application-test.yml")
 public class ApplicationContextTest {
 
-    @MockBean
+    @MockitoBean
     @SuppressWarnings("unused")
     private JwtDecoder jwtDecoder;
 

apps/orgnummer-service/src/test/java/no/nav/registre/orgnrservice/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.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.security.oauth2.jwt.JwtDecoder;
 import org.springframework.test.context.ActiveProfiles;
 
 @SpringBootTest
 @ActiveProfiles("test")
 class ApplicationContextTest {
 
-    @MockBean
+    @MockitoBean
     public JwtDecoder jwtDecoder;
 
     @Test

apps/person-faste-data-service/src/test/java/no/nav/testnav/personfastedataservice/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.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.security.oauth2.jwt.ReactiveJwtDecoder;
 import org.springframework.test.context.ActiveProfiles;
 
 @SpringBootTest
 @ActiveProfiles("test")
 class ApplicationContextTest {
 
-    @MockBean
+    @MockitoBean
     public ReactiveJwtDecoder jwtDecoder;
 
     @Test

apps/person-search-service/src/test/java/no/nav/registre/testnorge/personsearchservice/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.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.security.oauth2.jwt.JwtDecoder;
 import org.springframework.test.context.ActiveProfiles;
 
 @SpringBootTest
 @ActiveProfiles("test")
 class ApplicationContextTest {
 
-    @MockBean
+    @MockitoBean
     public JwtDecoder jwtDecoder;
 
     @Test

apps/person-service/src/test/java/no/nav/testnav/apps/personservice/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.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.security.oauth2.jwt.JwtDecoder;
 import org.springframework.test.context.ActiveProfiles;
 
 @SpringBootTest
 @ActiveProfiles("test")
 class ApplicationContextTest {
 
-    @MockBean
+    @MockitoBean
     public JwtDecoder jwtDecoder;
 
     @Test

apps/profil-api/src/test/java/no/nav/registre/testnorge/profil/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.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.security.oauth2.jwt.JwtDecoder;
 import org.springframework.test.context.ActiveProfiles;
 
 @SpringBootTest
 @ActiveProfiles("test")
 class ApplicationContextTest {
 
-    @MockBean
+    @MockitoBean
     public JwtDecoder jwtDecoder;
 
     @Test

apps/sykemelding-api/src/test/java/no/nav/registre/testnorge/sykemelding/ApplicationContextTest.java

@@ -3,14 +3,14 @@
 import no.nav.testnav.libs.servletsecurity.exchange.TokenExchange;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.test.context.ActiveProfiles;
 
 @SpringBootTest
 @ActiveProfiles("test")
 class ApplicationContextTest {
 
-    @MockBean
+    @MockitoBean
     private TokenExchange tokenExchange;
 
     @Test

apps/synt-sykemelding-api/src/test/java/no/nav/testnav/apps/syntsykemeldingapi/consumer/ArbeidsforholdConsumerTest.java

@@ -13,7 +13,7 @@
 import org.mockito.ArgumentMatchers;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.cloud.contract.wiremock.AutoConfigureWireMock;
 import org.springframework.security.oauth2.jwt.JwtDecoder;
 import org.springframework.test.context.ActiveProfiles;
@@ -36,10 +36,10 @@
 @AutoConfigureWireMock(port = 0)
 public class ArbeidsforholdConsumerTest {
 
-    @MockBean
+    @MockitoBean
     private JwtDecoder jwtDecoder;
 
-    @MockBean
+    @MockitoBean
     private TokenExchange tokenService;
 
     @Autowired

apps/synt-sykemelding-api/src/test/java/no/nav/testnav/apps/syntsykemeldingapi/consumer/HelsepersonellConsumerTest.java

@@ -13,7 +13,7 @@
 import org.mockito.ArgumentMatchers;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.cloud.contract.wiremock.AutoConfigureWireMock;
 import org.springframework.security.oauth2.jwt.JwtDecoder;
 import org.springframework.test.context.ActiveProfiles;
@@ -36,10 +36,10 @@
 @AutoConfigureWireMock(port = 0)
 public class HelsepersonellConsumerTest {
 
-    @MockBean
+    @MockitoBean
     private JwtDecoder jwtDecoder;
 
-    @MockBean
+    @MockitoBean
     private TokenExchange tokenService;
 
     @Autowired

apps/synt-sykemelding-api/src/test/java/no/nav/testnav/apps/syntsykemeldingapi/consumer/OrganisasjonConsumerTest.java

@@ -13,7 +13,7 @@
 import org.mockito.ArgumentMatchers;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.cloud.contract.wiremock.AutoConfigureWireMock;
 import org.springframework.security.oauth2.jwt.JwtDecoder;
 import org.springframework.test.context.ActiveProfiles;
@@ -36,10 +36,10 @@
 @AutoConfigureWireMock(port = 0)
 public class OrganisasjonConsumerTest {
 
-    @MockBean
+    @MockitoBean
     private JwtDecoder jwtDecoder;
 
-    @MockBean
+    @MockitoBean
     private TokenExchange tokenService;
 
     @Autowired

apps/synt-sykemelding-api/src/test/java/no/nav/testnav/apps/syntsykemeldingapi/consumer/PdlProxyConsumerTest.java

@@ -13,7 +13,7 @@
 import org.mockito.ArgumentMatchers;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.cloud.contract.wiremock.AutoConfigureWireMock;
 import org.springframework.security.oauth2.jwt.JwtDecoder;
 import org.springframework.test.context.ActiveProfiles;
@@ -36,10 +36,10 @@
 @AutoConfigureWireMock(port = 0)
 public class PdlProxyConsumerTest {
 
-    @MockBean
+    @MockitoBean
     private JwtDecoder jwtDecoder;
 
-    @MockBean
+    @MockitoBean
     private TokenExchange tokenService;
 
     @Autowired