Update search for forvaltning (#258)

* Updated search service

* Bump version

---------

Co-authored-by: Jorgen-5 <rlj@ssb.no>

Author: Jorgen-5

klass-shared/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <artifactId>klass-shared</artifactId>
-    <version>2.2.4-SNAPSHOT</version>
+    <version>2.2.4</version>
     <packaging>jar</packaging>
 
     <name>Klass Shared</name>
@@ -71,7 +71,6 @@
         <dependency>
             <groupId>org.springframework.data</groupId>
             <artifactId>spring-data-solr</artifactId>
-            <version>2.1.0.RELEASE</version>
         </dependency>
 
         <dependency>

klass-shared/src/main/java/no/ssb/klass/core/service/SearchServiceImpl.java

@@ -10,6 +10,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.solr.core.SolrTemplate;
 import org.springframework.data.solr.core.query.FacetAndHighlightQuery;
@@ -37,6 +38,8 @@
 @Service
 public class SearchServiceImpl implements SearchService {
     private static final Logger log = LoggerFactory.getLogger(SearchServiceImpl.class);
+    @Value("${klass.env.search.solr.core}")
+    protected String solrCore;
 
     private final ClassificationSeriesRepository classificationRepository;
 
@@ -51,7 +54,7 @@ public SearchServiceImpl(ClassificationSeriesRepository classificationRepository
     public FacetAndHighlightPage<SolrSearchResult> search(FacetAndHighlightQuery query) {
 
         Date start = TimeUtil.now();
-        FacetAndHighlightPage<SolrSearchResult> searchResults = solrTemplate.queryForFacetAndHighlightPage(query,
+        FacetAndHighlightPage<SolrSearchResult> searchResults = solrTemplate.queryForFacetAndHighlightPage(solrCore, query,
                 SolrSearchResult.class);
         log.info("Search for: '" + query + "' resulted in " + searchResults.getTotalElements() + " hits. Took (ms): "
                 + TimeUtil.millisecondsSince(start));
@@ -99,7 +102,7 @@ public FacetAndHighlightPage<SolrSearchResult> internalSearch(String query, Page
     }
 
     public void clearIndex() {
-        solrTemplate.delete(new SimpleQuery("*:*"));
+        solrTemplate.delete(solrCore, new SimpleQuery("*:*"));
     }
 
     @Async
@@ -146,7 +149,7 @@ public void indexSync(ClassificationSeries classification) {
             }
 
         }
-        solrTemplate.commit();
+        solrTemplate.commit(solrCore);
         log.info("Indexing: " + classification.getNameInPrimaryLanguage() + ". Took (ms): " + TimeUtil
                 .millisecondsSince(start));
     }
@@ -211,9 +214,9 @@ private void indexVariants(List<ClassificationVariant> variants, Language langua
 
     private void updateSolr(SoftDeletable entity, SolrInputDocument doc) {
         if (!entity.isDeleted()) {
-            solrTemplate.saveDocument(doc);
+            solrTemplate.saveDocument(solrCore, doc);
         } else {
-            solrTemplate.deleteById((String) doc.getField("uuid").getValue());
+            solrTemplate.deleteById(solrCore, (String) doc.getField("uuid").getValue());
         }
     }
 

klass-shared/src/main/resources/application.properties

@@ -1 +1,2 @@
 spring.jpa.properties.hibernate.ejb.interceptor=no.ssb.klass.core.util.BaseEntityInterceptor
+klass.env.search.solr.core=Klass