Slight improvement. The antrl runtime error is gone. But still fails …

…with jetty-client 12.0.3 and/or spring-data-solr 4.3.15 and/or solr-solrj 8.5.2
statisticsnorway · Dec 21, 2023 · 32ee9c0 · 32ee9c0
1 parent 687a819
commit 32ee9c0
Show file tree

Hide file tree

Showing 9 changed files with 71 additions and 60 deletions.
diff --git a/klass-api/pom.xml b/klass-api/pom.xml
@@ -38,7 +38,13 @@
                 </exclusion>
             </exclusions>
         </dependency>
-
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+            <version>2.1.210</version>
+            <scope>test</scope>
+        </dependency>
+
         <!--Spring-->
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -119,6 +125,22 @@
             <scope>test</scope>
             <version>${project.parent.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-client</artifactId>
+            <version>12.0.3</version>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.ws.rs</groupId>
+            <artifactId>jakarta.ws.rs-api</artifactId>
+            <version>2.1.6</version>
+        </dependency>
+        <dependency>
+            <groupId>org.antlr</groupId>
+            <artifactId>antlr4-runtime</artifactId>
+            <version>4.10.1</version>
+            <scope>runtime</scope>
+        </dependency>
 
         <!--Spring TEST-->
         <dependency>

diff --git a/klass-shared/pom.xml b/klass-shared/pom.xml
@@ -34,7 +34,7 @@
         <guava-version>19.0</guava-version>
         <woodstox-version>4.4.1</woodstox-version>
         <commons-lang3-version>3.12.0</commons-lang3-version>
-        <rest-assured-version>5.4.0</rest-assured-version>
+        <rest-assured-version>5.3.2</rest-assured-version>
         <apacheds-server-jndi-version>1.5.7</apacheds-server-jndi-version>
         <asciidoctor-version>1.6.0</asciidoctor-version>
         <maven-jaxb2-plugin-version>3.1.0</maven-jaxb2-plugin-version>
@@ -46,37 +46,8 @@
         <dependency>
             <groupId>org.springframework.data</groupId>
             <artifactId>spring-data-solr</artifactId>
-            <version>2.1.0.RELEASE</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.solr</groupId>
-            <artifactId>solr-solrj</artifactId>
-            <version>5.5.5</version>
-            <!--https://github.com/FasterXML/jackson-dataformat-xml/issues/132-->
-            <exclusions>
-                <exclusion>
-                    <groupId>org.codehaus.woodstox</groupId>
-                    <artifactId>wstx-asl</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-<!--        <dependency>-->
-<!--            <groupId>org.apache.solr</groupId>-->
-<!--            <artifactId>solr-core</artifactId>-->
-<!--            <version>5.5.0</version>-->
-<!--            &lt;!&ndash;https://github.com/FasterXML/jackson-dataformat-xml/issues/132&ndash;&gt;-->
-<!--            <exclusions>-->
-<!--                <exclusion>-->
-<!--                    <groupId>org.codehaus.woodstox</groupId>-->
-<!--                    <artifactId>wstx-asl</artifactId>-->
-<!--                </exclusion>-->
-<!--            </exclusions>-->
-<!--        </dependency>-->
-
-
-
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-jpa</artifactId>
@@ -89,6 +60,7 @@
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
+            <version>2.1.210</version>
         </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
@@ -206,6 +178,11 @@
             <version>4.0.0</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>2.15.1</version>
+        </dependency>
     </dependencies>
 
     <profiles>

diff --git a/klass-shared/src/main/java/no/ssb/klass/core/model/ClassificationSeries.java b/klass-shared/src/main/java/no/ssb/klass/core/model/ClassificationSeries.java
@@ -64,7 +64,7 @@ public class ClassificationSeries extends BaseEntity implements ClassificationEn
     @Column(columnDefinition = "text", nullable = false)
     @Convert(converter = TranslatablePersistenceConverter.class)
     private Translatable description;
-    @Column(nullable = false)
+    @Column(nullable = false, columnDefinition = "integer")
     private Language primaryLanguage;
     @Column(nullable = false)
     private boolean copyrighted;

diff --git a/klass-shared/src/main/java/no/ssb/klass/core/model/User.java b/klass-shared/src/main/java/no/ssb/klass/core/model/User.java
@@ -23,7 +23,7 @@ public class User extends BaseEntity {
     private String fullname;
     @Column(nullable = false)
     private String section;
-    @Column(nullable = false)
+    @Column(nullable = false, columnDefinition = "integer")
     private Role role;
     @Column
     private String email;

diff --git a/klass-shared/src/main/java/no/ssb/klass/core/service/SearchServiceImpl.java b/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("search", 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("delete", 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.deleteByIds(solrCore, (String) doc.getField("uuid").getValue());
         }
     }
 

diff --git a/klass-solr/pom.xml b/klass-solr/pom.xml
@@ -35,7 +35,6 @@
         <dependency>
             <groupId>org.springframework.data</groupId>
             <artifactId>spring-data-solr</artifactId>
-            <version>2.1.0.RELEASE</version>
         </dependency>
 
         <dependency>
@@ -48,27 +47,34 @@
                     <groupId>org.codehaus.woodstox</groupId>
                     <artifactId>wstx-asl</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>org.eclipse.jetty</groupId>
+                    <artifactId>jetty-client</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
-        <dependency>
 
-        <groupId>org.apache.solr</groupId>
-            <artifactId>solr-dataimporthandler</artifactId>
-            <version>8.11.2</version>
-            <!--https://github.com/FasterXML/jackson-dataformat-xml/issues/132-->
+        <dependency>
+            <groupId>org.apache.solr</groupId>
+            <artifactId>solr-core</artifactId>
+            <version>${solr-version}</version>
             <exclusions>
                 <exclusion>
-                    <groupId>org.codehaus.woodstox</groupId>
-                    <artifactId>wstx-asl</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.antlr</groupId>
-                    <artifactId>antlr4-runtime</artifactId>
+                    <groupId>org.eclipse.jetty</groupId>
+                    <artifactId>jetty-client</artifactId>
                 </exclusion>
             </exclusions>
         </dependency>
-
-
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>2.15.1</version>
+        </dependency>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+            <version>3.1.0</version>
+        </dependency>
         <dependency>
             <groupId>org.hibernate.validator</groupId>
             <artifactId>hibernate-validator</artifactId>

diff --git a/klass-solr/src/main/java/no/ssb/klass/solr/config/KlassSearchConfiguration.java b/klass-solr/src/main/java/no/ssb/klass/solr/config/KlassSearchConfiguration.java
@@ -3,7 +3,6 @@
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
-import java.nio.file.Path;
 import java.util.concurrent.Executor;
 
 import org.apache.commons.io.FileUtils;
@@ -15,7 +14,6 @@
 import org.apache.solr.client.solrj.impl.HttpSolrClient;
 import org.apache.solr.client.solrj.request.RequestWriter;
 import org.apache.solr.core.CoreContainer;
-import org.apache.solr.core.SolrXmlConfig;
 import org.hibernate.validator.constraints.NotEmpty;
 import org.springframework.aop.interceptor.AsyncUncaughtExceptionHandler;
 import org.springframework.aop.interceptor.SimpleAsyncUncaughtExceptionHandler;
@@ -63,7 +61,7 @@ public SolrClient embeddedSolrServerAndClient() {
             exportResource("solr/embedded/Klass/solrconfig.xml", solrTempWorkspace + "/klass");
             exportResource("solr/embedded/Klass/stoppord.txt", solrTempWorkspace + "/klass");
             exportResource("solr/embedded/Klass/synonymer.txt", solrTempWorkspace + "/klass");
-            coreContainer = new CoreContainer(SolrXmlConfig.fromSolrHome(Path.of(solrTempWorkspace), null));
+            coreContainer = new CoreContainer(solrTempWorkspace);
             coreContainer.load();
         } catch (Exception e) {
             e.printStackTrace(System.err);
@@ -81,7 +79,7 @@ private void exportResource(String resourcePath, String targetPath) throws Excep
 
     @Bean
     public SolrTemplate solrCore2Template(SolrClient solrClient) {
-        SolrTemplate solrTemplate = new SolrTemplate(solrClient, solrCore);
+        SolrTemplate solrTemplate = new SolrTemplate(solrClient);
         return solrTemplate;
     }
 
@@ -103,7 +101,7 @@ public AsyncUncaughtExceptionHandler getAsyncUncaughtExceptionHandler() {
     protected static class SolrBackwardsCompatibleHttpClient extends HttpSolrClient {
 
         SolrBackwardsCompatibleHttpClient(String baseURL) {
-            super(baseURL);
+            super(new Builder(baseURL));
         }
 
         /* Removing collection parameter since it causes wrong query URL */

diff --git a/klass-solr/src/test/java/no/ssb/klass/solr/config/KlassSearchTestConfiguration.java b/klass-solr/src/test/java/no/ssb/klass/solr/config/KlassSearchTestConfiguration.java
@@ -33,7 +33,7 @@ public SolrClient embeddedSolrServerAndClient() throws IOException, SolrServerEx
             exportResource("solr/embedded/Klass/solrconfig.xml", solrTempWorkspace + "/klass");
             exportResource("solr/embedded/Klass/stoppord.txt", solrTempWorkspace + "/klass");
             exportResource("solr/embedded/Klass/synonymer.txt", solrTempWorkspace + "/klass");
-            coreContainer = new CoreContainer(SolrXmlConfig.fromSolrHome(Path.of(solrTempWorkspace), null));
+            coreContainer = new CoreContainer(solrTempWorkspace);
             coreContainer.load();
         } catch (Exception e) {
             e.printStackTrace(System.err);

diff --git a/pom.xml b/pom.xml
@@ -43,7 +43,7 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <findbugs-version>3.0.2</findbugs-version>
         <checkstyle-version>2.17</checkstyle-version>
-        <solr-version>5.5.5</solr-version>
+        <solr-version>8.5.2</solr-version>
         <spring.version>4.3.7.RELEASE</spring.version>
         <vaadin-spring-boot-starter-version>1.0.0</vaadin-spring-boot-starter-version>
         <vaadin-spring-ext-security-version>0.0.7.RELEASE</vaadin-spring-ext-security-version>
@@ -84,7 +84,7 @@
             <dependency>
                 <groupId>org.springframework.data</groupId>
                 <artifactId>spring-data-solr</artifactId>
-                <version>2.1.0.RELEASE</version>
+                <version>4.3.15</version>
             </dependency>
         </dependencies>
     </dependencyManagement>
@@ -139,6 +139,11 @@
                   <name>Nexus</name>
                   <url>https://nexus.ssb.no/repository/maven-public</url>
               </repository>
+              <repository>
+                  <id>maven-restlet</id>
+                  <name>Public online Restlet repository</name>
+                  <url>https://maven.restlet.talend.com</url>
+              </repository>
           </repositories>
       </profile>
   </profiles>