Merge remote-tracking branch 'origin/feat/upgrade-to-spring-3' into feat/upgrade-to-spring-3

Author: tilen1976

klass-api/src/main/java/no/ssb/klass/api/services/IndexServiceImpl.java

@@ -31,6 +31,25 @@
 @Profile("!" + ConfigurationProfiles.MOCK_SEARCH)
 public class IndexServiceImpl implements IndexService {
 
+    private static final String ANALYZER = "analyzer";
+    private static final String SEARCH_ANALYZER = "search_analyzer";
+
+    private static final String ITEM_ID = "itemid";
+    private static final String UUID = "uuid";
+    private static final String LANGUAGE = "language";
+    private static final String TYPE = "type";
+    private static final String TITLE = "title";
+    private static final String DESCRIPTION = "description";
+    private static final String COPYRIGHTED = "copyrighted";
+    private static final String PUBLISHED = "published";
+    private static final String SECTION = "section";
+    private static final String CODES = "codes";
+    private static final String FAMILY = "family";
+    private static final String CLASSIFICATION_ID = "classificationId";
+    private static final String LEGAL_BASE = "legalBase";
+    private static final String PUBLICATIONS = "publications";
+    private static final String DERIVED_FROM = "derivedFrom";
+
     private static final Logger log = LoggerFactory.getLogger(IndexServiceImpl.class);
 
     @Value("${klass.env.search.elasticsearch.index:klass}")
@@ -55,6 +74,7 @@ private IndexCoordinates getIndexCoordinates() {
 
     @PostConstruct
     private void createIndexWithStemmingAnalyzer() {
+
         try {
             var indexOps = elasticsearchOperations.indexOps(getIndexCoordinates());
 
@@ -63,11 +83,12 @@ private void createIndexWithStemmingAnalyzer() {
                 return;
             }
 
+
             Map<String, Object> settings =
                     Map.of(
                             "analysis",
                             Map.of(
-                                    "analyzer",
+                                    ANALYZER,
                                             Map.of(
                                                     OpenSearchConfig.NORWEGIAN_STEMMER_ANALYZER,
                                                     Map.of(
@@ -88,35 +109,34 @@ private void createIndexWithStemmingAnalyzer() {
                     Map.of(
                             "properties",
                             Map.of(
-                                    "title",
+                                    TITLE,
                                             Map.of(
                                                     "type", "text",
-                                                    "analyzer",
+                                                    ANALYZER,
                                                             OpenSearchConfig
                                                                     .NORWEGIAN_STEMMER_ANALYZER,
-                                                    "search_analyzer",
+                                                    SEARCH_ANALYZER,
                                                             OpenSearchConfig
                                                                     .NORWEGIAN_STEMMER_ANALYZER),
-                                    "description",
+                                    DESCRIPTION,
                                             Map.of(
-                                                    "type", "text",
-                                                    "analyzer",
+                                                    "type", "text", ANALYZER,
                                                             OpenSearchConfig
                                                                     .NORWEGIAN_STEMMER_ANALYZER,
-                                                    "search_analyzer",
+                                                    SEARCH_ANALYZER,
                                                             OpenSearchConfig
                                                                     .NORWEGIAN_STEMMER_ANALYZER),
-                                    "codes",
+                                    CODES,
                                             Map.of(
                                                     "type", "text",
-                                                    "analyzer",
+                                                    ANALYZER,
                                                             OpenSearchConfig
                                                                     .NORWEGIAN_STEMMER_ANALYZER,
-                                                    "search_analyzer",
+                                                    "",
                                                             OpenSearchConfig
                                                                     .NORWEGIAN_STEMMER_ANALYZER),
-                                    "family", Map.of("type", "keyword"),
-                                    "section", Map.of("type", "keyword")));
+                                    FAMILY, Map.of("type", "keyword"),
+                                    SECTION, Map.of("type", "keyword")));
 
             boolean created = indexOps.create(settings);
             if (created) {
@@ -212,21 +232,6 @@ private void updateElasticsearch(SoftDeletable entity, Map<String, Object> doc)
 
     /** Inner class to handle document mapping from domain entities to search documents */
     private static class DocumentMapper {
-        private static final String ITEM_ID = "itemid";
-        private static final String UUID = "uuid";
-        private static final String LANGUAGE = "language";
-        private static final String TYPE = "type";
-        private static final String TITLE = "title";
-        private static final String DESCRIPTION = "description";
-        private static final String COPYRIGHTED = "copyrighted";
-        private static final String PUBLISHED = "published";
-        private static final String SECTION = "section";
-        private static final String CODES = "codes";
-        private static final String FAMILY = "family";
-        private static final String CLASSIFICATION_ID = "classificationId";
-        private static final String LEGAL_BASE = "legalBase";
-        private static final String PUBLICATIONS = "publications";
-        private static final String DERIVED_FROM = "derivedFrom";
 
         public Map<String, Object> mapClassificationSeries(
                 ClassificationSeries classification, Language language) {

klass-api/src/test/java/no/ssb/klass/api/applicationtest/RestApiSearchIntegrationTest.java

@@ -8,7 +8,6 @@
 import no.ssb.klass.core.repository.ClassificationSeriesRepository;
 import no.ssb.klass.testutil.TestDataProvider;
 import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.opensearch.client.RestHighLevelClient;
 import org.opensearch.data.client.orhlc.OpenSearchRestTemplate;