0.3.9

.github/workflows/codeql-analysis.yml

@@ -13,9 +13,9 @@ name: "CodeQL Advanced"
 
 on:
   push:
-    branches: [ "master" ]
+    branches: [ "0.3.9" ]
   pull_request:
-    branches: [ "master" ]
+    branches: [ "0.3.9" ]
   schedule:
     - cron: '28 17 * * 3'
 
@@ -74,7 +74,7 @@ jobs:
         # For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
         # queries: security-extended,security-and-quality
 
-    # If the analyze step fails for one of the languages you are analyzing with
+    # If the analysis step fails for one of the languages you are analyzing with
     # "We were unable to automatically build your code", modify the matrix above
     # to set the build mode to "manual" for that language. Then modify this step
     # to build your code.

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.5</spring-boot.version>
+        <spring-boot.version>3.4.0</spring-boot.version>
         <sonar.organization>viglet-turing</sonar.organization>
         <sonar.host.url>https://sonarcloud.io</sonar.host.url>
     </properties>
@@ -207,7 +207,7 @@
             <dependency>
                 <groupId>commons-io</groupId>
                 <artifactId>commons-io</artifactId>
-                <version>2.17.0</version>
+                <version>2.18.0</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.commons</groupId>
@@ -242,7 +242,7 @@
             <dependency>
                 <groupId>org.apache.logging.log4j</groupId>
                 <artifactId>log4j-core</artifactId>
-                <version>2.24.1</version>
+                <version>2.24.2</version>
             </dependency>
             <dependency>
                 <groupId>com.fasterxml.jackson.core</groupId>
@@ -267,7 +267,7 @@
             <dependency>
                 <groupId>org.projectlombok</groupId>
                 <artifactId>lombok</artifactId>
-                <version>1.18.34</version>
+                <version>1.18.36</version>
             </dependency>
         </dependencies>
     </dependencyManagement>

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.5</spring-boot.version>
+        <spring-boot.version>3.4.0</spring-boot.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>21</java.version>
@@ -43,7 +43,7 @@
         <dependency>
             <groupId>io.swagger.core.v3</groupId>
             <artifactId>swagger-annotations-jakarta</artifactId>
-            <version>2.2.25</version>
+            <version>2.2.26</version>
             <scope>compile</scope>
         </dependency>
         <dependency>

turing-aem/aem-cli-sample/pom.xml

@@ -20,7 +20,7 @@
     <dependency>
       <groupId>org.projectlombok</groupId>
       <artifactId>lombok</artifactId>
-      <version>1.18.34</version>
+      <version>1.18.36</version>
       <optional>true</optional>
     </dependency>
     <dependency>

turing-app/pom.xml

@@ -15,7 +15,7 @@
     <url>https://github.com/openturing/turing</url>
     <packaging>jar</packaging>
     <properties>
-        <spring-boot.version>3.3.5</spring-boot.version>
+        <spring-boot.version>3.4.0</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>
@@ -39,7 +39,7 @@
         <dependency>
             <groupId>co.elastic.clients</groupId>
             <artifactId>elasticsearch-java</artifactId>
-            <version>8.15.3</version>
+            <version>8.16.1</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -129,13 +129,13 @@
         <dependency>
             <groupId>com.itextpdf</groupId>
             <artifactId>itext-core</artifactId>
-            <version>8.0.5</version>
+            <version>9.0.0</version>
             <type>pom</type>
         </dependency>
         <dependency>
             <groupId>com.itextpdf</groupId>
             <artifactId>cleanup</artifactId>
-            <version>4.0.3</version>
+            <version>5.0.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
@@ -168,7 +168,7 @@
         <dependency>
             <groupId>org.mariadb.jdbc</groupId>
             <artifactId>mariadb-java-client</artifactId>
-            <version>3.5.0</version>
+            <version>3.5.1</version>
         </dependency>
         <dependency>
             <groupId>org.postgresql</groupId>
@@ -178,7 +178,7 @@
         <dependency>
             <groupId>org.apache.opennlp</groupId>
             <artifactId>opennlp-tools</artifactId>
-            <version>2.4.0</version>
+            <version>2.5.0</version>
         </dependency>
         <dependency>
             <groupId>commons-io</groupId>
@@ -243,7 +243,7 @@
         <dependency>
             <groupId>org.springdoc</groupId>
             <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
-            <version>2.6.0</version>
+            <version>2.7.0</version>
         </dependency>
         <dependency>
             <groupId>com.squins.google.fork.schema-org-client</groupId>
@@ -301,7 +301,7 @@
         <dependency>
             <groupId>org.springframework.security</groupId>
             <artifactId>spring-security-test</artifactId>
-            <version>6.3.4</version>
+            <version>6.4.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>

turing-app/src/main/java/com/viglet/turing/TuringES.java

@@ -34,12 +34,14 @@
 import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.context.annotation.Bean;
 import org.springframework.jms.annotation.EnableJms;
+import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.web.filter.CharacterEncodingFilter;
 
 @Slf4j
 @SpringBootApplication
 @EnableJms
 @EnableCaching
+@EnableScheduling
 @EnableEncryptableProperties
 public class TuringES {
 

turing-app/src/main/java/com/viglet/turing/api/sn/search/TurSNSiteSearchAPI.java

@@ -40,6 +40,7 @@
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.LocaleUtils;
 import org.jetbrains.annotations.NotNull;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
@@ -54,17 +55,22 @@
 @RequestMapping("/api/sn/{siteName}/search")
 @Tag(name = "Semantic Navigation Search", description = "Semantic Navigation Search API")
 public class TurSNSiteSearchAPI {
+    @Value("${turing.search.cache.enabled:false}")
+    private boolean searchCacheEnabled;
     private final TurSNSearchProcess turSNSearchProcess;
     private final TurSNSiteRepository turSNSiteRepository;
     private final TurSNSiteLocaleRepository turSNSiteLocaleRepository;
+    private final TurSNSiteSearchCachedAPI turSNSiteSearchCachedAPI;
 
     @Inject
     public TurSNSiteSearchAPI(TurSNSearchProcess turSNSearchProcess,
                               TurSNSiteRepository turSNSiteRepository,
-                              TurSNSiteLocaleRepository turSNSiteLocaleRepository) {
+                              TurSNSiteLocaleRepository turSNSiteLocaleRepository,
+                              TurSNSiteSearchCachedAPI turSNSiteSearchCachedAPI) {
         this.turSNSearchProcess = turSNSearchProcess;
         this.turSNSiteRepository = turSNSiteRepository;
         this.turSNSiteLocaleRepository = turSNSiteLocaleRepository;
+        this.turSNSiteSearchCachedAPI = turSNSiteSearchCachedAPI;
     }
 
     @GetMapping
@@ -86,15 +92,25 @@ public ResponseEntity<TurSNSiteSearchBean> turSNSiteSearchSelectGet(
             HttpServletRequest request) {
         Locale locale = LocaleUtils.toLocale(localeRequest);
         if (existsByTurSNSiteAndLanguage(siteName, locale)) {
-            return new ResponseEntity<>(turSNSearchProcess.search(new TurSNSiteSearchContext(siteName,
-                    new TurSEParameters(q, new TurSEFilterQueryParameters(filterQueriesDefault, filterQueriesAnd,
-                            filterQueriesOr, fqOperator), currentPage, sort, rows, group, autoCorrectionDisabled), locale,
-                    TurSNUtils.requestToURI(request))), HttpStatus.OK);
+            TurSEFilterQueryParameters turSEFilterQueryParameters = new TurSEFilterQueryParameters(filterQueriesDefault,
+                    filterQueriesAnd, filterQueriesOr, fqOperator);
+            TurSEParameters turSEParameters = new TurSEParameters(q, turSEFilterQueryParameters, currentPage, sort,
+                    rows, group, autoCorrectionDisabled);
+            URI uri = TurSNUtils.requestToURI(request);
+            TurSNSiteSearchContext turSNSiteSearchContext = new TurSNSiteSearchContext(siteName, turSEParameters, locale,
+                    uri);
+            if (searchCacheEnabled) {
+                String cacheKey = "%s_%s".formatted(siteName, request.getQueryString());
+                return new ResponseEntity<>(turSNSiteSearchCachedAPI.searchCached(cacheKey, turSNSiteSearchContext), HttpStatus.OK);
+            } else {
+                return new ResponseEntity<>(turSNSearchProcess.search(turSNSiteSearchContext), HttpStatus.OK);
+            }
         } else {
             return ResponseEntity.status(HttpStatus.NOT_FOUND).build();
         }
     }
 
+
     private boolean existsByTurSNSiteAndLanguage(String siteName, Locale locale) {
         return turSNSiteRepository.findByName(siteName).map(turSNSite ->
                 turSNSiteLocaleRepository.existsByTurSNSiteAndLanguage(turSNSite, locale)).orElse(false);
@@ -166,7 +182,8 @@ public ResponseEntity<List<String>> turSNSiteSearchLatestImpersonate(
         return ResponseEntity.status(HttpStatus.UNAUTHORIZED).build();
     }
 
-    private String isLatestImpersonate(Optional<TurSNSearchLatestRequestBean> turSNSearchLatestRequestBean, Principal principal) {
+    private String isLatestImpersonate(Optional<TurSNSearchLatestRequestBean> turSNSearchLatestRequestBean,
+                                       Principal principal) {
         if (turSNSearchLatestRequestBean.isPresent() && turSNSearchLatestRequestBean.get().getUserId() != null) {
             return turSNSearchLatestRequestBean.get().getUserId();
         } else {

turing-app/src/main/java/com/viglet/turing/api/sn/search/TurSNSiteSearchCachedAPI.java

@@ -0,0 +1,59 @@
+/*
+ *
+ * Copyright (C) 2016-2024 the original author or authors.
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.viglet.turing.api.sn.search;
+
+import com.viglet.turing.commons.se.TurSEFilterQueryParameters;
+import com.viglet.turing.commons.se.TurSEParameters;
+import com.viglet.turing.commons.sn.bean.TurSNSiteSearchBean;
+import com.viglet.turing.commons.sn.search.TurSNFilterQueryOperator;
+import com.viglet.turing.commons.sn.search.TurSNSiteSearchContext;
+import com.viglet.turing.sn.TurSNSearchProcess;
+import com.viglet.turing.sn.TurSNUtils;
+import jakarta.servlet.http.HttpServletRequest;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.cache.annotation.CacheEvict;
+import org.springframework.cache.annotation.Cacheable;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import java.net.URI;
+import java.util.List;
+import java.util.Locale;
+import java.util.concurrent.TimeUnit;
+
+@Slf4j
+@Component
+public class TurSNSiteSearchCachedAPI {
+    private final TurSNSearchProcess turSNSearchProcess;
+
+    public TurSNSiteSearchCachedAPI(TurSNSearchProcess turSNSearchProcess) {
+        this.turSNSearchProcess = turSNSearchProcess;
+    }
+    @CacheEvict(value = "searchAPI", allEntries = true)
+    @Scheduled(fixedRateString = "${turing.search.cache.ttl.seconds:86400000}")
+    public void cleanSearchCache() {
+        log.info("Cleaning Search API");
+    }
+
+    @Cacheable(value = "searchAPI", key = "#cacheKey")
+    public TurSNSiteSearchBean searchCached(String cacheKey,
+                                            TurSNSiteSearchContext turSNSiteSearchContext) {
+        return turSNSearchProcess.search(turSNSiteSearchContext);
+    }
+}

turing-app/src/main/java/com/viglet/turing/persistence/repository/sn/field/TurSNSiteFieldExtFacetRepository.java

@@ -22,13 +22,29 @@
 
 import com.viglet.turing.persistence.model.sn.field.TurSNSiteFieldExt;
 import com.viglet.turing.persistence.model.sn.field.TurSNSiteFieldExtFacet;
+import org.jetbrains.annotations.NotNull;
+import org.springframework.cache.annotation.CacheEvict;
+import org.springframework.cache.annotation.Cacheable;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 import java.util.Locale;
 import java.util.Set;
 
 public interface TurSNSiteFieldExtFacetRepository extends JpaRepository<TurSNSiteFieldExtFacet, String> {
 
+    String FIND_BY_TUR_SN_SITE_FIELD_EXT = "turSNSiteFieldExtFacetFindByTurSNSiteFieldExt";
+    String FIND_BY_TUR_SN_SITE_FIELD_EXT_AND_LOCALE = "turSNSiteFieldExtFacetFindByTurSNSiteFieldExtAndLocale";
+
+    @Cacheable(FIND_BY_TUR_SN_SITE_FIELD_EXT)
     Set<TurSNSiteFieldExtFacet> findByTurSNSiteFieldExt(TurSNSiteFieldExt turSNSiteFieldExt);
+
+    @Cacheable(FIND_BY_TUR_SN_SITE_FIELD_EXT_AND_LOCALE)
     Set<TurSNSiteFieldExtFacet> findByTurSNSiteFieldExtAndLocale(TurSNSiteFieldExt turSNSiteFieldExt, Locale locale);
+
+    @CacheEvict(value = {FIND_BY_TUR_SN_SITE_FIELD_EXT, FIND_BY_TUR_SN_SITE_FIELD_EXT_AND_LOCALE}, allEntries = true)
+    @NotNull
+    TurSNSiteFieldExtFacet save(@NotNull TurSNSiteFieldExtFacet turSNSiteFieldExtFacet);
+
+    @CacheEvict(value = {FIND_BY_TUR_SN_SITE_FIELD_EXT, FIND_BY_TUR_SN_SITE_FIELD_EXT_AND_LOCALE}, allEntries = true)
+    void delete(@NotNull TurSNSiteFieldExtFacet turSNSiteFieldExtFacet);
 }

turing-app/src/main/java/com/viglet/turing/persistence/repository/sn/field/TurSNSiteFieldExtRepository.java

@@ -40,13 +40,13 @@ public interface TurSNSiteFieldExtRepository extends JpaRepository<TurSNSiteFiel
 	String FIND_BY_TUR_SN_SITE = "turSNSiteFieldExtFindByTurSNSite";
 	String FIND_BY_TUR_SN_SITE_AND_ENABLED = "turSNSiteFieldExtFindByTurSNSiteAndEnabled";
 	String FIND_BY_TUR_SN_SITE_AND_FACET_AND_ENABLED = "turSNSiteFieldExtFindByTurSNSiteAndFacetAndEnabled";
-	String FIND_BY_TUR_SN_SITE_AND_SECONDARY_FACET_AND_ENABLED = "turSNSiteFieldExtFindByTurSNSiteAndSecondaryFacetAndEnabled";
 	String FIND_BY_TUR_SN_SITE_AND_FACET_AND_ENABLED_ORDER_BY_FACET_POSITION = "findByTurSNSiteAndFacetAndEnabledOrderByFacetPosition";
 	String FIND_BY_TUR_SN_SITE_AND_FACET_AND_ENABLED_AND_TYPE = "findByTurSNSiteAndFacetAndEnabledAndType";
 	String FIND_BY_TUR_SN_SITE_AND_HL_AND_ENABLED = "turSNSiteFieldExtFindByTurSNSiteAndHlAndEnabled";
 	String FIND_BY_TUR_SN_SITE_AND_MLT_AND_ENABLED = "turSNSiteFieldExtFindByTurSNSiteAndMltAndEnabled";
 	String FIND_BY_TUR_SN_SITE_AND_REQUIRED_AND_ENABLED = "turSNSiteFieldExtFindByTurSNSiteAndRequiredAndEnabled";
 	String FIND_BY_TUR_SN_SITE_AND_NLP_AND_ENABLED = "turSNSiteFieldExtFindByTurSNSiteAndNlpAndEnabled";
+	String FIND_BY_TUR_SN_SITE_AND_NAME_AND_FACET_AND_ENABLED = "turSNSiteFieldExtFindByTurSNSiteAndNameAndFacetAndEnabled";
 
 	@Cacheable(FIND_BY_TUR_SN_SITE)
 	List<TurSNSiteFieldExt> findByTurSNSite(Sort sort, TurSNSite turSNSite);
@@ -56,12 +56,13 @@ public interface TurSNSiteFieldExtRepository extends JpaRepository<TurSNSiteFiel
 
 	@Cacheable(FIND_BY_TUR_SN_SITE_AND_FACET_AND_ENABLED)
 	List<TurSNSiteFieldExt> findByTurSNSiteAndFacetAndEnabled(TurSNSite turSNSite, int facet, int enabled);
-
-	@Cacheable(FIND_BY_TUR_SN_SITE_AND_SECONDARY_FACET_AND_ENABLED)
-	List<TurSNSiteFieldExt> findByTurSNSiteAndSecondaryFacetAndEnabled(TurSNSite turSNSite, Boolean secondaryFacet, int enabled);
+	@Cacheable(FIND_BY_TUR_SN_SITE_AND_NAME_AND_FACET_AND_ENABLED)
+	List<TurSNSiteFieldExt> findByTurSNSiteAndNameAndFacetAndEnabled(TurSNSite turSNSite, String name, int facet,
+																	 int enabled);
 
 	@Cacheable(FIND_BY_TUR_SN_SITE_AND_FACET_AND_ENABLED_ORDER_BY_FACET_POSITION)
-	List<TurSNSiteFieldExt> findByTurSNSiteAndFacetAndEnabledOrderByFacetPosition(TurSNSite turSNSite, int facet, int enabled);
+	List<TurSNSiteFieldExt> findByTurSNSiteAndFacetAndEnabledOrderByFacetPosition(TurSNSite turSNSite, int facet,
+																				  int enabled);
 
 	@Cacheable(FIND_BY_TUR_SN_SITE_AND_FACET_AND_ENABLED_AND_TYPE)
 	List<TurSNSiteFieldExt> findByTurSNSiteAndFacetAndEnabledAndType(TurSNSite turSNSite, int facet, int enabled,
@@ -89,7 +90,7 @@ List<TurSNSiteFieldExt> findByTurSNSiteAndFacetAndEnabledAndType(TurSNSite turSN
 			FIND_BY_TUR_SN_SITE_AND_MLT_AND_ENABLED, FIND_BY_TUR_SN_SITE_AND_REQUIRED_AND_ENABLED,
 			FIND_BY_TUR_SN_SITE_AND_NLP_AND_ENABLED, FIND_BY_TUR_SN_SITE_AND_FACET_AND_ENABLED_AND_TYPE,
 			FIND_BY_TUR_SN_SITE_AND_FACET_AND_ENABLED_ORDER_BY_FACET_POSITION,
-			FIND_BY_TUR_SN_SITE_AND_SECONDARY_FACET_AND_ENABLED}, allEntries = true)
+			FIND_BY_TUR_SN_SITE_AND_NAME_AND_FACET_AND_ENABLED}, allEntries = true)
 	@NotNull
 	TurSNSiteFieldExt save(@NotNull TurSNSiteFieldExt turSNSiteFieldExt);
 
@@ -98,7 +99,7 @@ List<TurSNSiteFieldExt> findByTurSNSiteAndFacetAndEnabledAndType(TurSNSite turSN
 			FIND_BY_TUR_SN_SITE_AND_MLT_AND_ENABLED, FIND_BY_TUR_SN_SITE_AND_REQUIRED_AND_ENABLED,
 			FIND_BY_TUR_SN_SITE_AND_NLP_AND_ENABLED, FIND_BY_TUR_SN_SITE_AND_FACET_AND_ENABLED_AND_TYPE,
 			FIND_BY_TUR_SN_SITE_AND_FACET_AND_ENABLED_ORDER_BY_FACET_POSITION,
-			FIND_BY_TUR_SN_SITE_AND_SECONDARY_FACET_AND_ENABLED}, allEntries = true)
+			FIND_BY_TUR_SN_SITE_AND_NAME_AND_FACET_AND_ENABLED}, allEntries = true)
 	void delete(@NotNull TurSNSiteFieldExt turSNSiteFieldExt);
 
 	@Modifying
@@ -108,7 +109,7 @@ List<TurSNSiteFieldExt> findByTurSNSiteAndFacetAndEnabledAndType(TurSNSite turSN
 			FIND_BY_TUR_SN_SITE_AND_MLT_AND_ENABLED, FIND_BY_TUR_SN_SITE_AND_REQUIRED_AND_ENABLED,
 			FIND_BY_TUR_SN_SITE_AND_NLP_AND_ENABLED, FIND_BY_TUR_SN_SITE_AND_FACET_AND_ENABLED_AND_TYPE,
 			FIND_BY_TUR_SN_SITE_AND_FACET_AND_ENABLED_ORDER_BY_FACET_POSITION,
-			FIND_BY_TUR_SN_SITE_AND_SECONDARY_FACET_AND_ENABLED}, allEntries = true)
+			FIND_BY_TUR_SN_SITE_AND_NAME_AND_FACET_AND_ENABLED}, allEntries = true)
 	void delete(String turSnSiteFieldId);
 
 	@Modifying
@@ -118,6 +119,6 @@ List<TurSNSiteFieldExt> findByTurSNSiteAndFacetAndEnabledAndType(TurSNSite turSN
 			FIND_BY_TUR_SN_SITE_AND_MLT_AND_ENABLED, FIND_BY_TUR_SN_SITE_AND_REQUIRED_AND_ENABLED,
 			FIND_BY_TUR_SN_SITE_AND_NLP_AND_ENABLED, FIND_BY_TUR_SN_SITE_AND_FACET_AND_ENABLED_AND_TYPE,
 			FIND_BY_TUR_SN_SITE_AND_FACET_AND_ENABLED_ORDER_BY_FACET_POSITION,
-			FIND_BY_TUR_SN_SITE_AND_SECONDARY_FACET_AND_ENABLED}, allEntries = true)
+			FIND_BY_TUR_SN_SITE_AND_NAME_AND_FACET_AND_ENABLED}, allEntries = true)
 	void deleteByTurSNSiteAndSnType(TurSNSite turSNSite, TurSNFieldType turSNFieldType);
 }