Merge branch '0.3.9'

openturing · Nov 1, 2024 · 1534b55 · 1534b55
2 parents 6024e5a + 7ac49ab
commit 1534b55
Show file tree

Hide file tree

Showing 64 changed files with 1,211 additions and 2,344 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -15,9 +15,12 @@ on:
       types: [ opened, synchronize, reopened ]
 jobs:
   build:
-
     runs-on: ubuntu-latest
-
+    services:
+      solr:
+        image: viglet/turing-solr:0.3.7
+        ports:
+          - 8983:8983
     steps:
       - uses: actions/checkout@v3
         with:

diff --git a/pom.xml b/pom.xml
@@ -14,7 +14,7 @@
         <revision>0.3.9</revision>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <spring-boot.version>3.3.4</spring-boot.version>
+        <spring-boot.version>3.3.5</spring-boot.version>
         <sonar.organization>viglet-turing</sonar.organization>
         <sonar.host.url>https://sonarcloud.io</sonar.host.url>
     </properties>
@@ -182,7 +182,7 @@
             <dependency>
                 <groupId>ch.qos.logback</groupId>
                 <artifactId>logback-core</artifactId>
-                <version>1.5.10</version>
+                <version>1.5.12</version>
             </dependency>
             <dependency>
                 <groupId>com.viglet.turing</groupId>
@@ -192,7 +192,7 @@
             <dependency>
                 <groupId>ch.qos.logback</groupId>
                 <artifactId>logback-classic</artifactId>
-                <version>1.5.10</version>
+                <version>1.5.12</version>
             </dependency>
             <dependency>
                 <groupId>org.json</groupId>
@@ -237,7 +237,7 @@
             <dependency>
                 <groupId>org.xerial</groupId>
                 <artifactId>sqlite-jdbc</artifactId>
-                <version>3.46.1.3</version>
+                <version>3.47.0.0</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.logging.log4j</groupId>
@@ -247,7 +247,7 @@
             <dependency>
                 <groupId>com.fasterxml.jackson.core</groupId>
                 <artifactId>jackson-databind</artifactId>
-                <version>2.17.2</version>
+                <version>2.18.0</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.httpcomponents.client5</groupId>

diff --git a/turing-aem/aem-app/pom.xml b/turing-aem/aem-app/pom.xml
@@ -13,7 +13,7 @@
     <name>Turing AEM - Connector</name>
     <description>Turing AEM Web Indexer Connector</description>
     <properties>
-        <spring-boot.version>3.3.4</spring-boot.version>
+        <spring-boot.version>3.3.5</spring-boot.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>21</java.version>
@@ -99,8 +99,6 @@
                     <version>3.13.0</version>
                     <configuration>
                         <parameters>true</parameters>
-                        <source>21</source>
-                        <target>21</target>
                     </configuration>
                 </plugin>
             </plugins>
@@ -111,6 +109,7 @@
                 <artifactId>spring-boot-maven-plugin</artifactId>
                 <version>${spring-boot.version}</version>
                 <configuration>
+                    <layout>ZIP</layout>
                     <skip>false</skip>
                     <executable>true</executable>
                 </configuration>

diff --git a/...rc/main/java/com/viglet/turing/connector/aem/persistence/model/TurAemTargetAttribute.java b/...rc/main/java/com/viglet/turing/connector/aem/persistence/model/TurAemTargetAttribute.java
@@ -53,6 +53,7 @@ public class TurAemTargetAttribute implements Serializable {
 
     private String name;
 
+    @Builder.Default
     @OneToMany(mappedBy = "turAemTargetAttribute", orphanRemoval = true, fetch = FetchType.LAZY)
     @Cascade({org.hibernate.annotations.CascadeType.ALL})
     @OnDelete(action = OnDeleteAction.CASCADE)

diff --git a/turing-aem/aem-cli-indexer/pom.xml b/turing-aem/aem-cli-indexer/pom.xml
@@ -114,7 +114,7 @@
                                     </excludes>
                                 </filter>
                             </filters>
-                            <finalName>turing-aem</finalName>
+                            <finalName>turing-aem-cli</finalName>
                             <shadedArtifactAttached>true</shadedArtifactAttached>
                             <shadedClassifierName>indexer</shadedClassifierName>
                             <transformers>

diff --git a/turing-aem/aem-cli-sample/pom.xml b/turing-aem/aem-cli-sample/pom.xml
@@ -74,11 +74,11 @@
         </plugin>
         <plugin>
           <artifactId>maven-site-plugin</artifactId>
-          <version>3.20.0</version>
+          <version>3.21.0</version>
         </plugin>
         <plugin>
           <artifactId>maven-project-info-reports-plugin</artifactId>
-          <version>3.7.0</version>
+          <version>3.8.0</version>
         </plugin>
       </plugins>
     </pluginManagement>

diff --git a/turing-aem/aem-commons/pom.xml b/turing-aem/aem-commons/pom.xml
@@ -52,7 +52,7 @@
         <dependency>
             <groupId>org.jetbrains</groupId>
             <artifactId>annotations</artifactId>
-            <version>26.0.0</version>
+            <version>26.0.1</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>

diff --git a/turing-app/pom.xml b/turing-app/pom.xml
@@ -15,7 +15,7 @@
     <url>https://github.com/openturing/turing</url>
     <packaging>jar</packaging>
     <properties>
-        <spring-boot.version>3.3.4</spring-boot.version>
+        <spring-boot.version>3.3.5</spring-boot.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <maven.compiler.source>21</maven.compiler.source>
@@ -36,30 +36,10 @@
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-core</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.apache.lucene</groupId>
-            <artifactId>lucene-core</artifactId>
-            <version>9.12.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.lucene</groupId>
-            <artifactId>lucene-queryparser</artifactId>
-            <version>9.12.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.lucene</groupId>
-            <artifactId>lucene-analysis-common</artifactId>
-            <version>9.12.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.lucene</groupId>
-            <artifactId>lucene-queries</artifactId>
-            <version>9.12.0</version>
-        </dependency>
         <dependency>
             <groupId>co.elastic.clients</groupId>
             <artifactId>elasticsearch-java</artifactId>
-            <version>8.15.2</version>
+            <version>8.15.3</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -144,7 +124,7 @@
         <dependency>
             <groupId>org.apache.activemq</groupId>
             <artifactId>artemis-jms-server</artifactId>
-            <version>2.37.0</version>
+            <version>2.38.0</version>
         </dependency>
         <dependency>
             <groupId>com.itextpdf</groupId>
@@ -188,7 +168,7 @@
         <dependency>
             <groupId>org.mariadb.jdbc</groupId>
             <artifactId>mariadb-java-client</artifactId>
-            <version>3.4.1</version>
+            <version>3.5.0</version>
         </dependency>
         <dependency>
             <groupId>org.postgresql</groupId>
@@ -217,33 +197,33 @@
         <dependency>
             <groupId>org.apache.tika</groupId>
             <artifactId>tika-core</artifactId>
-            <version>2.9.2</version>
+            <version>3.0.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tika</groupId>
             <artifactId>tika-parsers</artifactId>
-            <version>2.9.2</version>
+            <version>3.0.0</version>
             <type>pom</type>
         </dependency>
         <dependency>
             <groupId>org.apache.tika</groupId>
             <artifactId>tika-parser-pdf-module</artifactId>
-            <version>2.9.2</version>
+            <version>3.0.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tika</groupId>
             <artifactId>tika-parser-text-module</artifactId>
-            <version>2.9.2</version>
+            <version>3.0.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tika</groupId>
             <artifactId>tika-parser-ocr-module</artifactId>
-            <version>2.9.2</version>
+            <version>3.0.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tika</groupId>
             <artifactId>tika-parser-microsoft-module</artifactId>
-            <version>2.9.2</version>
+            <version>3.0.0</version>
         </dependency>
         <dependency>
             <groupId>com.levigo.jbig2</groupId>
@@ -321,7 +301,7 @@
         <dependency>
             <groupId>org.springframework.security</groupId>
             <artifactId>spring-security-test</artifactId>
-            <version>6.3.3</version>
+            <version>6.3.4</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -436,12 +416,12 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-site-plugin</artifactId>
-                <version>3.20.0</version>
+                <version>3.21.0</version>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-project-info-reports-plugin</artifactId>
-                <version>3.7.0</version>
+                <version>3.8.0</version>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>

diff --git a/turing-app/src/main/java/com/viglet/turing/api/se/TurSEInstanceAPI.java b/turing-app/src/main/java/com/viglet/turing/api/se/TurSEInstanceAPI.java
@@ -25,7 +25,6 @@
 import com.viglet.turing.commons.se.TurSEParameters;
 import com.viglet.turing.commons.sn.search.TurSNFilterQueryOperator;
 import com.viglet.turing.commons.sn.search.TurSNParamType;
-import com.viglet.turing.lucene.TurLuceneSearch;
 import com.viglet.turing.persistence.model.se.TurSEInstance;
 import com.viglet.turing.persistence.model.se.TurSEVendor;
 import com.viglet.turing.persistence.repository.se.TurSEInstanceRepository;
@@ -35,7 +34,6 @@
 import com.viglet.turing.solr.TurSolrInstanceProcess;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
-import org.apache.lucene.document.Document;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.transaction.annotation.Transactional;
@@ -50,16 +48,14 @@ public class TurSEInstanceAPI {
     private final TurSEInstanceRepository turSEInstanceRepository;
     private final TurSolrInstanceProcess turSolrInstanceProcess;
     private final TurSolr turSolr;
-    private final TurLuceneSearch turLuceneSearch;
 
     @Inject
     public TurSEInstanceAPI(TurSEInstanceRepository turSEInstanceRepository,
                             TurSolrInstanceProcess turSolrInstanceProcess,
-                            TurSolr turSolr, TurLuceneSearch turLuceneSearch) {
+                            TurSolr turSolr) {
         this.turSEInstanceRepository = turSEInstanceRepository;
         this.turSolrInstanceProcess = turSolrInstanceProcess;
         this.turSolr = turSolr;
-        this.turLuceneSearch = turLuceneSearch;
     }
 
     @Operation(summary = "Search Engine List")
@@ -68,13 +64,6 @@ public List<TurSEInstance> turSEInstanceList() {
         return this.turSEInstanceRepository.findAll(TurPersistenceUtils.orderByTitleIgnoreCase());
     }
 
-    @Operation(summary = "Lucene Search")
-    @GetMapping("/lucene/search")
-    public List<Document> turLuceneSearch(
-            @RequestParam(required = false, name = TurSNParamType.QUERY) String q) {
-        return turLuceneSearch.search(q);
-    }
-
     @Operation(summary = "Search Engine structure")
     @GetMapping("/structure")
     public TurSEInstance turNLPInstanceStructure() {

diff --git a/turing-app/src/main/java/com/viglet/turing/api/sn/bean/TurSNSiteFilterQueryBean.java b/turing-app/src/main/java/com/viglet/turing/api/sn/bean/TurSNSiteFilterQueryBean.java
@@ -31,6 +31,6 @@
 @Getter
 @Setter
 public class TurSNSiteFilterQueryBean {
-	private List<String> hiddenItems;
+	private List<String> facetsInFilterQueries;
 	private List<String> items;
 }
diff --git a/turing-app/src/main/java/com/viglet/turing/api/sn/console/TurSNSiteFieldExtAPI.java b/turing-app/src/main/java/com/viglet/turing/api/sn/console/TurSNSiteFieldExtAPI.java
@@ -198,6 +198,7 @@ private TurSNSiteFieldExt saveSNSiteFieldExt(TurSNSite turSNSite, TurSNSiteField
                 .facetType(TurSNSiteFacetFieldEnum.DEFAULT)
                 .facetItemType(TurSNSiteFacetFieldEnum.DEFAULT)
                 .facetSort(TurSNSiteFacetFieldSortEnum.COUNT)
+                .secondaryFacet(false)
                 .hl(0)
                 .multiValued(turSNSiteField.getMultiValued())
                 .facetPosition(0)
@@ -220,6 +221,7 @@ private void addTurSNSiteFieldExt(TurSNFieldType turSNFieldType, TurSNSite turSN
                 .facetType(TurSNSiteFacetFieldEnum.DEFAULT)
                 .facetItemType(TurSNSiteFacetFieldEnum.DEFAULT)
                 .facetSort(TurSNSiteFacetFieldSortEnum.COUNT)
+                .secondaryFacet(false)
                 .hl(0)
                 .multiValued(1)
                 .facetPosition(0)
@@ -250,11 +252,12 @@ public TurSNSiteFieldExt turSNSiteFieldExtUpdate(@PathVariable String ignoredSnS
             turSNSiteFieldExtEdit.setDescription(turSNSiteFieldExt.getDescription());
             turSNSiteFieldExtEdit.setType(turSNSiteFieldExt.getType());
             turSNSiteFieldExtEdit.setFacet(turSNSiteFieldExt.getFacet());
-            turSNSiteFieldExtEdit.setFacetLocales( getTurSNSiteFieldExtFacets(turSNSiteFieldExt));
+            turSNSiteFieldExtEdit.setFacetLocales(getTurSNSiteFieldExtFacets(turSNSiteFieldExt));
             turSNSiteFieldExtEdit.setFacetRange(turSNSiteFieldExt.getFacetRange());
             turSNSiteFieldExtEdit.setFacetSort(turSNSiteFieldExt.getFacetSort());
             turSNSiteFieldExtEdit.setFacetType(turSNSiteFieldExt.getFacetType());
             turSNSiteFieldExtEdit.setFacetItemType(turSNSiteFieldExt.getFacetItemType());
+            turSNSiteFieldExtEdit.setSecondaryFacet(turSNSiteFieldExt.getSecondaryFacet());
             turSNSiteFieldExtEdit.setHl(turSNSiteFieldExt.getHl());
             turSNSiteFieldExtEdit.setEnabled(turSNSiteFieldExt.getEnabled());
             turSNSiteFieldExtEdit.setMlt(turSNSiteFieldExt.getMlt());
@@ -346,8 +349,7 @@ private TurSNSiteFieldExt createSEField(String snSiteId, TurSNSiteFieldExt turSN
             turSNSiteFieldExt.setExternalId(turSNSiteField.getId());
             if (turSNSiteFieldExt.getFacet() == 1) {
                 turSNSiteFieldExt.setFacetPosition(getFacetPositionIncrement());
-            }
-            else {
+            } else {
                 turSNSiteFieldExt.setFacetPosition(0);
             }
             this.turSNSiteFieldExtRepository.save(turSNSiteFieldExt);