Merge pull request #2150 from openturing/0.3.9

0.3.9
openturing · Sep 26, 2024 · 5190b9e · 5190b9e
2 parents f4ead98 + 1cb8633
commit 5190b9e
Show file tree

Hide file tree

Showing 129 changed files with 13,850 additions and 15,897 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -11,6 +11,8 @@ updates:
       interval: "weekly"
     target-branch: "0.3.9"
     open-pull-requests-limit: 15
+    ignore:
+      - dependency-name: "org.apache.nutch:nutch"
     groups:
       java:
         applies-to: version-updates
@@ -23,6 +25,8 @@ updates:
       interval: "weekly"
     target-branch: "0.3.9"
     open-pull-requests-limit: 15
+    ignore:
+      - dependency-name: "typescript"
     groups:
       angular:
         applies-to: version-updates

diff --git a/.gitignore b/.gitignore
@@ -37,11 +37,3 @@ hs_err_pid*
 
 .flattened-pom.xml
 dependency-reduced-pom.xml
-/turing-aem/aem-web-indexer/src/main/resources/customer/
-/turing-aem/aem-web-indexer/store/db/
-/turing-aem/aem-web-indexer/store/logs/
-/turing-web-crawler/wc-app/store/
-/turing-web-crawler/wc-commons/target/
-/turing-sprinklr/store/
-/turing-sprinklr/sprinklr-commons/target/
-/turing-sprinklr/sprinklr-java-sdk/target/
diff --git a/README.adoc b/README.adoc
@@ -3,7 +3,7 @@ Viglet Team <[email protected]>
 :organization: Viglet Turing
 :toclevels: 5
 :toc-title: Table of Content
-:viglet-version: 0.3.7
+:viglet-version: 0.3.9
 
 [preface]
 image:https://img.shields.io/badge/Download-Release%20{viglet-version}-blue?style=for-the-badge&logo=Java[link="https://viglet.com/turing/download/"]
@@ -33,7 +33,7 @@ To run Turing ES, just execute the following lines:
 # Turing App
 mvn -Dmaven.repo.local=D:\repo spring-boot:run -pl turing-app -Dskip.npm
 
-# New Turing ES UI using Angular 12 and Primer CSS.
+# New Turing ES UI using Angular 18 and Primer CSS.
 
 cd turing-ui
 

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.3</spring-boot.version>
+        <spring-boot.version>3.3.4</spring-boot.version>
         <sonar.organization>viglet-turing</sonar.organization>
         <sonar.host.url>https://sonarcloud.io</sonar.host.url>
     </properties>
@@ -74,15 +74,16 @@
                 <module>turing-commons</module>
                 <module>turing-spring</module>
                 <module>turing-java-sdk</module>
+                <module>turing-cms</module>
+                <module>turing-java-proxy</module>
+                <module>turing-connector</module>
                 <module>turing-filesystem</module>
                 <module>turing-db</module>
                 <module>turing-nutch</module>
-                <module>turing-cms</module>
                 <module>turing-wem</module>
                 <module>turing-aem</module>
                 <module>turing-web-crawler</module>
                 <module>turing-sprinklr</module>
-                <module>turing-java-proxy</module>
                 <module>turing-app</module>
             </modules>
         </profile>
@@ -157,7 +158,7 @@
             <dependency>
                 <groupId>commons-io</groupId>
                 <artifactId>commons-io</artifactId>
-                <version>2.16.1</version>
+                <version>2.17.0</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.commons</groupId>
@@ -202,7 +203,7 @@
             <dependency>
                 <groupId>org.apache.httpcomponents.client5</groupId>
                 <artifactId>httpclient5</artifactId>
-                <version>5.3.1</version>
+                <version>5.4</version>
             </dependency>
             <dependency>
                 <groupId>com.jayway.jsonpath</groupId>

diff --git a/system.properties b/system.properties
@@ -1 +1 @@
-java.runtime.version=17
+java.runtime.version=21
diff --git a/turing-aem/aem-web-indexer/.gitignore → turing-aem/aem-app/.gitignore b/turing-aem/aem-web-indexer/.gitignore → turing-aem/aem-app/.gitignore
@@ -37,4 +37,6 @@ out/
 
 ### VS Code ###
 .vscode/
-/src/main/java/com/viglet/turing/connector/aem/indexer/onstartup/customer/
+/store/
+/export/
+/export/
diff --git a/turing-aem/aem-web-indexer/conf/.gitignore → turing-aem/aem-app/conf/.gitignore b/turing-aem/aem-web-indexer/conf/.gitignore → turing-aem/aem-app/conf/.gitignore
diff --git a/...aem-web-indexer/conf/content-mapping.json → turing-aem/aem-app/conf/content-mapping.json b/...aem-web-indexer/conf/content-mapping.json → turing-aem/aem-app/conf/content-mapping.json
diff --git a/turing-aem/aem-web-indexer/pom.xml → turing-aem/aem-app/pom.xml b/turing-aem/aem-web-indexer/pom.xml → turing-aem/aem-app/pom.xml
@@ -8,19 +8,23 @@
         <version>${revision}</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
-    <artifactId>aem-web-indexer</artifactId>
+    <artifactId>aem-app</artifactId>
     <version>${revision}</version>
     <name>Turing AEM - Connector</name>
     <description>Turing AEM Web Indexer Connector</description>
     <properties>
-        <spring-boot.version>3.3.3</spring-boot.version>
+        <spring-boot.version>3.3.4</spring-boot.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>21</java.version>
         <maven.compiler.source>21</maven.compiler.source>
         <maven.compiler.target>21</maven.compiler.target>
     </properties>
     <dependencies>
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
@@ -68,6 +72,11 @@
             <artifactId>cms-mapping</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>com.viglet.turing</groupId>
+            <artifactId>turing-spring</artifactId>
+            <version>${project.version}</version>
+        </dependency>
     </dependencies>
     <dependencyManagement>
         <dependencies>

diff --git a/...nector/aem/indexer/TurAemApplication.java → ...ring/connector/aem/TurAemApplication.java b/...nector/aem/indexer/TurAemApplication.java → ...ring/connector/aem/TurAemApplication.java
@@ -1,4 +1,22 @@
-package com.viglet.turing.connector.aem.indexer;
+/*
+ *
+ * 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.connector.aem;
 
 import com.fasterxml.jackson.databind.Module;
 import com.fasterxml.jackson.datatype.hibernate5.jakarta.Hibernate5JakartaModule;

diff --git a/...nector/aem/indexer/TurAemIndexerTool.java → ...ring/connector/aem/TurAemIndexerTool.java b/...nector/aem/indexer/TurAemIndexerTool.java → ...ring/connector/aem/TurAemIndexerTool.java
@@ -1,4 +1,22 @@
-package com.viglet.turing.connector.aem.indexer;
+/*
+ *
+ * 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.connector.aem;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -14,13 +32,13 @@
 import com.viglet.turing.connector.aem.commons.TurAemCommonsUtils;
 import com.viglet.turing.connector.aem.commons.context.TurAemLocalePathContext;
 import com.viglet.turing.connector.aem.commons.context.TurAemSourceContext;
-import com.viglet.turing.connector.aem.indexer.persistence.model.TurAemIndexing;
-import com.viglet.turing.connector.aem.indexer.persistence.model.TurAemSource;
-import com.viglet.turing.connector.aem.indexer.persistence.model.TurAemSystem;
-import com.viglet.turing.connector.aem.indexer.persistence.repository.TurAemConfigVarRepository;
-import com.viglet.turing.connector.aem.indexer.persistence.repository.TurAemIndexingRepository;
-import com.viglet.turing.connector.aem.indexer.persistence.repository.TurAemSourceLocalePathRepository;
-import com.viglet.turing.connector.aem.indexer.persistence.repository.TurAemSystemRepository;
+import com.viglet.turing.connector.aem.persistence.model.TurAemIndexing;
+import com.viglet.turing.connector.aem.persistence.model.TurAemSource;
+import com.viglet.turing.connector.aem.persistence.model.TurAemSystem;
+import com.viglet.turing.connector.aem.persistence.repository.TurAemConfigVarRepository;
+import com.viglet.turing.connector.aem.persistence.repository.TurAemIndexingRepository;
+import com.viglet.turing.connector.aem.persistence.repository.TurAemSourceLocalePathRepository;
+import com.viglet.turing.connector.aem.persistence.repository.TurAemSystemRepository;
 import com.viglet.turing.connector.cms.beans.TurCmsTargetAttrValueMap;
 import com.viglet.turing.connector.cms.mappers.TurCmsContentDefinitionProcess;
 import com.viglet.turing.connector.cms.mappers.TurCmsModel;
@@ -110,14 +128,9 @@ public TurAemSourceContext getTurAemSourceContext(TurAemSource turAemSource) {
         return TurAemSourceContext.builder()
                 .group(turAemSource.getGroup())
                 .contentType(turAemSource.getContentType())
-                .defaultLocale(turAemSource.getDefaultLocale())
                 .rootPath(turAemSource.getRootPath())
                 .url(turAemSource.getUrl())
-                .siteName(turAemSource.getSiteName())
-                .subType(turAemSource.getSubType())
-                .turSNSite(turAemSource.getTurSNSite())
                 .oncePattern(turAemSource.getOncePattern())
-                .providerName(turAemSource.getProviderName())
                 .password(turAemSource.getPassword())
                 .urlPrefix(turAemSource.getUrlPrefix())
                 .username(turAemSource.getUsername())
@@ -131,7 +144,6 @@ public void run(TurAemSource turAemSource) {
             log.info("This is the first time, waiting next schedule.");
         } else {
             log.info("Starting indexing");
-            turCmsContentDefinitionProcess = new TurCmsContentDefinitionProcess(turAemSource.getMappingJson());
             getNodesFromJson();
             deIndexObject();
             updateSystemOnce();

diff --git a/...tor/aem/indexer/TurAemScheduledTasks.java → ...g/connector/aem/TurAemScheduledTasks.java b/...tor/aem/indexer/TurAemScheduledTasks.java → ...g/connector/aem/TurAemScheduledTasks.java
@@ -1,8 +1,26 @@
-package com.viglet.turing.connector.aem.indexer;
+/*
+ *
+ * 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.connector.aem;
 
 import com.google.inject.Inject;
 import com.viglet.turing.connector.aem.commons.TurAemCommonsUtils;
-import com.viglet.turing.connector.aem.indexer.persistence.repository.TurAemSourceRepository;
+import com.viglet.turing.connector.aem.persistence.repository.TurAemSourceRepository;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;

diff --git a/.../connector/aem/indexer/api/TurAemApi.java → ...t/turing/connector/aem/api/TurAemApi.java b/.../connector/aem/indexer/api/TurAemApi.java → ...t/turing/connector/aem/api/TurAemApi.java
@@ -1,7 +1,25 @@
-package com.viglet.turing.connector.aem.indexer.api;
+/*
+ *
+ * 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.connector.aem.api;
 
 import com.google.inject.Inject;
-import com.viglet.turing.connector.aem.indexer.persistence.repository.TurAemIndexingRepository;
+import com.viglet.turing.connector.aem.persistence.repository.TurAemIndexingRepository;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.GetMapping;

diff --git a/...ctor/aem/indexer/api/TurAemSourceApi.java → ...ng/connector/aem/api/TurAemSourceApi.java b/...ctor/aem/indexer/api/TurAemSourceApi.java → ...ng/connector/aem/api/TurAemSourceApi.java
@@ -1,9 +1,27 @@
-package com.viglet.turing.connector.aem.indexer.api;
+/*
+ *
+ * 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.connector.aem.api;
 
 import com.google.inject.Inject;
-import com.viglet.turing.connector.aem.indexer.persistence.model.TurAemSource;
-import com.viglet.turing.connector.aem.indexer.persistence.repository.TurAemSourceLocalePathRepository;
-import com.viglet.turing.connector.aem.indexer.persistence.repository.TurAemSourceRepository;
+import com.viglet.turing.connector.aem.persistence.model.TurAemSource;
+import com.viglet.turing.connector.aem.persistence.repository.TurAemSourceLocalePathRepository;
+import com.viglet.turing.connector.aem.persistence.repository.TurAemSourceRepository;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.transaction.annotation.Transactional;
@@ -59,14 +77,7 @@ public TurAemSource turAemSourceUpdate(@PathVariable String id, @RequestBody Tur
             turAemSourceEdit.setUrl(turAemSource.getUrl());
             turAemSourceEdit.setUsername(turAemSource.getUsername());
             turAemSourceEdit.setPassword(turAemSource.getPassword());
-            turAemSourceEdit.setTurSNSite(turAemSource.getTurSNSite());
-            turAemSourceEdit.setSiteName(turAemSource.getSiteName());
             turAemSourceEdit.setUrlPrefix(turAemSource.getUrlPrefix());
-            turAemSourceEdit.setContentType(turAemSource.getContentType());
-            turAemSourceEdit.setSubType(turAemSource.getSubType());
-            turAemSourceEdit.setDefaultLocale(turAemSource.getDefaultLocale());
-            turAemSourceEdit.setMappingJson(turAemSource.getMappingJson());
-            turAemSourceEdit.setProviderName(turAemSource.getProviderName());
             turAemSourceEdit.setOncePattern(turAemSource.getOncePattern());
             turAemSourceEdit.setRootPath(turAemSource.getRootPath());
             turAemSourceEdit.setLocalePaths(turAemSource.getLocalePaths()