Refaktorert person-search-service fra elasticSearch -> opensearch

#deploy-person-search-service

apps/person-search-service/build.gradle

@@ -64,16 +64,14 @@ dependencies {
     implementation 'no.nav.testnav.libs:servlet-security'
 
     implementation 'org.springframework.boot:spring-boot-starter-data-elasticsearch'
-    implementation 'org.elasticsearch:elasticsearch:8.6.2'
-
+    implementation 'org.opensearch.client:spring-data-opensearch:1.2.0'
 
     implementation 'org.springframework.boot:spring-boot-starter-security'
     implementation 'org.springframework.boot:spring-boot-starter-webflux'
     implementation 'org.springframework.boot:spring-boot-starter-oauth2-client'
     implementation 'org.springframework.boot:spring-boot-starter-web'
     implementation 'org.springframework.boot:spring-boot-starter-cache'
 
-    implementation 'org.springframework.cloud:spring-cloud-starter-bootstrap' // TODO remove legacy bootstrap config
     implementation 'org.springframework.cloud:spring-cloud-starter-vault-config'
     implementation 'org.springframework.boot:spring-boot-starter-actuator'
 

apps/person-search-service/src/main/java/no/nav/registre/testnorge/personsearchservice/consumer/ElasticSearchConsumer.java

@@ -9,9 +9,8 @@
 import no.nav.registre.testnorge.personsearchservice.model.Response;
 import no.nav.registre.testnorge.personsearchservice.model.SearchResponse;
 import no.nav.testnav.libs.servletsecurity.exchange.TokenExchange;
-import org.elasticsearch.action.search.SearchRequest;
+import org.opensearch.action.search.SearchRequest;
 import org.springframework.stereotype.Component;
-
 import org.springframework.web.reactive.function.client.WebClient;
 import reactor.core.publisher.Flux;
 

apps/person-search-service/src/main/java/no/nav/registre/testnorge/personsearchservice/service/IdentService.java

@@ -8,7 +8,7 @@
 import no.nav.registre.testnorge.personsearchservice.service.utils.QueryBuilder;
 import no.nav.testnav.libs.dto.personsearchservice.v1.IdentdataDTO;
 import org.apache.commons.lang3.StringUtils;
-import org.elasticsearch.action.search.SearchRequest;
+import org.opensearch.action.search.SearchRequest;
 import org.springframework.stereotype.Service;
 import reactor.core.publisher.Flux;
 

apps/person-search-service/src/main/java/no/nav/registre/testnorge/personsearchservice/service/PersonSearchService.java

@@ -7,7 +7,7 @@
 import no.nav.registre.testnorge.personsearchservice.domain.Person;
 import no.nav.registre.testnorge.personsearchservice.service.utils.QueryBuilder;
 import no.nav.testnav.libs.dto.personsearchservice.v1.search.PersonSearch;
-import org.elasticsearch.action.search.SearchRequest;
+import org.opensearch.action.search.SearchRequest;
 import org.springframework.stereotype.Service;
 import reactor.core.publisher.Flux;
 

apps/person-search-service/src/main/java/no/nav/registre/testnorge/personsearchservice/service/utils/AdresserUtils.java

@@ -3,21 +3,21 @@
 import lombok.experimental.UtilityClass;
 import no.nav.testnav.libs.dto.personsearchservice.v1.search.AdresserSearch;
 import no.nav.testnav.libs.dto.personsearchservice.v1.search.PersonSearch;
-import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.QueryBuilders;
+import org.opensearch.index.query.BoolQueryBuilder;
+import org.opensearch.index.query.QueryBuilders;
 
 import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;
 
 import static java.util.Objects.nonNull;
-import static no.nav.registre.testnorge.personsearchservice.service.utils.QueryUtils.YES;
-import static no.nav.registre.testnorge.personsearchservice.service.utils.QueryUtils.NO;
 import static no.nav.registre.testnorge.personsearchservice.service.utils.QueryUtils.METADATA_FIELD;
-import static no.nav.registre.testnorge.personsearchservice.service.utils.QueryUtils.nestedShouldExistQuery;
-import static no.nav.registre.testnorge.personsearchservice.service.utils.QueryUtils.nestedShouldMatchQuery;
+import static no.nav.registre.testnorge.personsearchservice.service.utils.QueryUtils.NO;
+import static no.nav.registre.testnorge.personsearchservice.service.utils.QueryUtils.YES;
 import static no.nav.registre.testnorge.personsearchservice.service.utils.QueryUtils.nestedExistsQuery;
 import static no.nav.registre.testnorge.personsearchservice.service.utils.QueryUtils.nestedMatchQuery;
+import static no.nav.registre.testnorge.personsearchservice.service.utils.QueryUtils.nestedShouldExistQuery;
+import static no.nav.registre.testnorge.personsearchservice.service.utils.QueryUtils.nestedShouldMatchQuery;
 
 @UtilityClass
 public class AdresserUtils {

apps/person-search-service/src/main/java/no/nav/registre/testnorge/personsearchservice/service/utils/AlderUtils.java

@@ -3,9 +3,9 @@
 import lombok.experimental.UtilityClass;
 import no.nav.testnav.libs.dto.personsearchservice.v1.search.PersonSearch;
 import org.apache.lucene.search.join.ScoreMode;
-import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.QueryBuilders;
-import org.elasticsearch.index.query.RangeQueryBuilder;
+import org.opensearch.index.query.BoolQueryBuilder;
+import org.opensearch.index.query.QueryBuilders;
+import org.opensearch.index.query.RangeQueryBuilder;
 
 import java.time.LocalDate;
 import java.util.Optional;

apps/person-search-service/src/main/java/no/nav/registre/testnorge/personsearchservice/service/utils/IdentifikasjonUtils.java

@@ -3,7 +3,7 @@
 import lombok.experimental.UtilityClass;
 import no.nav.testnav.libs.dto.personsearchservice.v1.search.IdentifikasjonSearch;
 import no.nav.testnav.libs.dto.personsearchservice.v1.search.PersonSearch;
-import org.elasticsearch.index.query.BoolQueryBuilder;
+import org.opensearch.index.query.BoolQueryBuilder;
 
 import java.util.Optional;
 

apps/person-search-service/src/main/java/no/nav/registre/testnorge/personsearchservice/service/utils/NasjonalitetUtils.java

@@ -4,18 +4,18 @@
 import no.nav.testnav.libs.dto.personsearchservice.v1.search.NasjonalitetSearch;
 import no.nav.testnav.libs.dto.personsearchservice.v1.search.PersonSearch;
 import org.apache.lucene.search.join.ScoreMode;
-import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.QueryBuilders;
+import org.opensearch.index.query.BoolQueryBuilder;
+import org.opensearch.index.query.QueryBuilders;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 
 import static java.util.Objects.nonNull;
-import static no.nav.registre.testnorge.personsearchservice.service.utils.QueryUtils.nestedMatchQuery;
-import static no.nav.registre.testnorge.personsearchservice.service.utils.QueryUtils.nestedExistsQuery;
-import static no.nav.registre.testnorge.personsearchservice.service.utils.QueryUtils.METADATA_FIELD;
 import static no.nav.registre.testnorge.personsearchservice.service.utils.QueryUtils.HISTORISK_PATH;
+import static no.nav.registre.testnorge.personsearchservice.service.utils.QueryUtils.METADATA_FIELD;
+import static no.nav.registre.testnorge.personsearchservice.service.utils.QueryUtils.nestedExistsQuery;
+import static no.nav.registre.testnorge.personsearchservice.service.utils.QueryUtils.nestedMatchQuery;
 
 @UtilityClass
 public class NasjonalitetUtils {

apps/person-search-service/src/main/java/no/nav/registre/testnorge/personsearchservice/service/utils/QueryBuilder.java

@@ -4,12 +4,12 @@
 import no.nav.registre.testnorge.personsearchservice.domain.IdentSearch;
 import no.nav.testnav.libs.dto.personsearchservice.v1.search.PersonSearch;
 import org.apache.lucene.search.join.ScoreMode;
-import org.elasticsearch.action.search.SearchRequest;
-import org.elasticsearch.core.TimeValue;
-import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.QueryBuilders;
-import org.elasticsearch.index.query.functionscore.RandomScoreFunctionBuilder;
-import org.elasticsearch.search.builder.SearchSourceBuilder;
+import org.opensearch.action.search.SearchRequest;
+import org.opensearch.common.unit.TimeValue;
+import org.opensearch.index.query.BoolQueryBuilder;
+import org.opensearch.index.query.QueryBuilders;
+import org.opensearch.index.query.functionscore.RandomScoreFunctionBuilder;
+import org.opensearch.search.builder.SearchSourceBuilder;
 
 import java.util.List;
 import java.util.Optional;

apps/person-search-service/src/main/java/no/nav/registre/testnorge/personsearchservice/service/utils/QueryUtils.java

@@ -2,8 +2,8 @@
 
 import lombok.experimental.UtilityClass;
 import org.apache.lucene.search.join.ScoreMode;
-import org.elasticsearch.index.query.NestedQueryBuilder;
-import org.elasticsearch.index.query.QueryBuilders;
+import org.opensearch.index.query.NestedQueryBuilder;
+import org.opensearch.index.query.QueryBuilders;
 
 import java.util.Collection;
 import java.util.List;

apps/person-search-service/src/main/java/no/nav/registre/testnorge/personsearchservice/service/utils/RelasjonerUtils.java

@@ -1,22 +1,22 @@
 package no.nav.registre.testnorge.personsearchservice.service.utils;
 
 import lombok.experimental.UtilityClass;
+import no.nav.registre.testnorge.personsearchservice.domain.PersonRolle;
 import no.nav.testnav.libs.dto.personsearchservice.v1.search.PersonSearch;
 import no.nav.testnav.libs.dto.personsearchservice.v1.search.RelasjonSearch;
-import no.nav.registre.testnorge.personsearchservice.domain.PersonRolle;
 import org.apache.lucene.search.join.ScoreMode;
-import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.QueryBuilders;
+import org.opensearch.index.query.BoolQueryBuilder;
+import org.opensearch.index.query.QueryBuilders;
 
 import java.util.Optional;
 
 import static java.util.Objects.nonNull;
-import static no.nav.registre.testnorge.personsearchservice.service.utils.QueryUtils.nestedExistsQuery;
-import static no.nav.registre.testnorge.personsearchservice.service.utils.QueryUtils.nestedMatchQuery;
-import static no.nav.registre.testnorge.personsearchservice.service.utils.QueryUtils.METADATA_FIELD;
 import static no.nav.registre.testnorge.personsearchservice.service.utils.QueryUtils.HISTORISK_PATH;
-import static no.nav.registre.testnorge.personsearchservice.service.utils.QueryUtils.YES;
+import static no.nav.registre.testnorge.personsearchservice.service.utils.QueryUtils.METADATA_FIELD;
 import static no.nav.registre.testnorge.personsearchservice.service.utils.QueryUtils.NO;
+import static no.nav.registre.testnorge.personsearchservice.service.utils.QueryUtils.YES;
+import static no.nav.registre.testnorge.personsearchservice.service.utils.QueryUtils.nestedExistsQuery;
+import static no.nav.registre.testnorge.personsearchservice.service.utils.QueryUtils.nestedMatchQuery;
 
 @UtilityClass
 public class RelasjonerUtils {

apps/person-search-service/src/main/java/no/nav/registre/testnorge/personsearchservice/service/utils/StatusUtils.java

@@ -2,12 +2,12 @@
 
 import lombok.experimental.UtilityClass;
 import no.nav.testnav.libs.dto.personsearchservice.v1.search.PersonSearch;
-import org.elasticsearch.index.query.BoolQueryBuilder;
+import org.opensearch.index.query.BoolQueryBuilder;
 
 import java.util.Optional;
 
-import static no.nav.registre.testnorge.personsearchservice.service.utils.QueryUtils.nestedMatchQuery;
 import static no.nav.registre.testnorge.personsearchservice.service.utils.QueryUtils.nestedExistsQuery;
+import static no.nav.registre.testnorge.personsearchservice.service.utils.QueryUtils.nestedMatchQuery;
 
 @UtilityClass
 public class StatusUtils {

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

@@ -20,6 +20,9 @@ spring:
           issuer-uri: https://tokenx.dev-gcp.nav.cloud.nais.io 
           jwk-set-uri: https://tokenx.dev-gcp.nav.cloud.nais.io/jwks
           accepted-audience: dev-gcp:dolly:testnav-person-search-service
+  cloud:
+    vault:
+      enabled: false
 
 springdoc:
   swagger-ui: