- Angular 20, AEM removed unused methods

Author: alegauss

turing-aem/aem-commons/src/main/java/com/viglet/turing/connector/aem/commons/TurAemCommonsUtils.java

@@ -222,11 +222,6 @@ public static Locale getLocaleFromAemObject(TurAemSourceContext turAemSourceCont
         return getLocaleByPath(turAemSourceContext, aemObject.getPath());
     }
 
-    public static Optional<TurAemObject> getAemObject(String url, TurAemSourceContext turAemSourceContext,
-                                                      boolean cached) {
-        return getInfinityJson(url, turAemSourceContext, cached).map(infinityJson -> new TurAemObject(url, infinityJson));
-    }
-
     public static Optional<JSONObject> getInfinityJson(String url, TurAemSourceContext turAemSourceContext,
                                                        boolean cached) {
         String infinityJsonUrl = String.format(url.endsWith(JSON) ? "%s%s" : "%s%s.infinity.json",

turing-aem/aem-commons/src/main/java/com/viglet/turing/connector/aem/commons/bean/TurAemContext.java

@@ -42,13 +42,6 @@ public TurAemContext(Object cmsObjectInstance,
 		this.configuration = configuration;
 	}
 
-	public TurAemContext(Object cmsObjectInstance) {
-		this.cmsObjectInstance = cmsObjectInstance;
-		this.turAemTargetAttr = null;
-		this.turAemSourceAttr = null;
-		this.configuration = null;
-	}
-
 	@Override
 	public String toString() {
 		return "TurAemContext{" +

turing-aem/aem-commons/src/main/java/com/viglet/turing/connector/aem/commons/bean/TurAemTargetAttrValue.java

@@ -34,12 +34,4 @@ public TurAemTargetAttrValue(String targetAttrName, TurMultiValue multiValue) {
 		this.targetAttrName = targetAttrName;
 		this.multiValue = multiValue;
 	}
-
-	public void addAllMultiValue(TurMultiValue multiValue) {
-		this.multiValue.addAll(multiValue);
-	}
-	@Override
-	public String toString() { 
-	    return String.format("Target attribute name: %s, multiValue: %s", targetAttrName, multiValue);
-	} 
 }

turing-aem/aem-commons/src/main/java/com/viglet/turing/connector/aem/commons/bean/TurAemTargetAttrValueMap.java

@@ -32,16 +32,6 @@ public <T> void addWithSingleValue(String attributeName, T value, boolean overri
         });
     }
 
-    public void addWithSingleValue(TurAemTargetAttrValue targetAttrValue) {
-        Optional.ofNullable(targetAttrValue).ifPresent(target -> {
-            if (this.containsKey(target.getTargetAttrName())) {
-                this.get(target.getTargetAttrName()).addAll(target.getMultiValue());
-            } else {
-                this.put(target.getTargetAttrName(), target.getMultiValue());
-            }
-        });
-    }
-
     public void merge(TurAemTargetAttrValueMap fromMap) {
         fromMap.keySet().forEach(fromKey -> {
             if (this.containsKey(fromKey)) {

turing-aem/aem-commons/src/main/java/com/viglet/turing/connector/aem/commons/config/IAemConfiguration.java

@@ -20,27 +20,16 @@
 
 import com.viglet.turing.connector.aem.commons.context.TurAemLocalePathContext;
 
-import java.net.URI;
 import java.util.Collection;
 import java.util.Locale;
 
 public interface IAemConfiguration {
     String DEFAULT_PROVIDER = "AEM";
-    String DEFAULT_TURING_URL = "http://localhost:2700";
-    String DEFAULT_CTD_MAPPING_FILE = "/CTD-Turing-Mappings.xml";
-    String DEFAULT_SN_SITE = "Sample";
-    String DEFAULT_SN_LOCALE = Locale.US.toString();
-
-    URI getTuringURL();
 
     String getProviderName();
 
-    String getMappingFile();
-
     String getCDAURLPrefix();
 
-    String getApiKey();
-
     String getOncePatternPath();
 
     String getCmsHost();
@@ -57,8 +46,6 @@ public interface IAemConfiguration {
 
     String getCmsRootPath();
 
-    TurAemSNSiteConfig getDefaultSNSiteConfig(boolean isPublishSite);
-
     Locale getDefaultLocale();
 
     Collection<TurAemLocalePathContext> getLocales();

turing-aem/aem-commons/src/main/java/com/viglet/turing/connector/aem/commons/mappers/TurAemContentDefinitionProcess.java

@@ -31,7 +31,6 @@
 
 import java.io.IOException;
 import java.nio.file.Path;
-import java.nio.file.Paths;
 import java.util.*;
 
 @Getter
@@ -43,15 +42,6 @@ public class TurAemContentDefinitionProcess {
     private Path jsonFile;
     private TurAemContentMapping turAemContentMapping;
 
-
-    public TurAemContentDefinitionProcess(IAemConfiguration config, Path workingDirectory) {
-        this.config = config;
-        this.workingDirectory = workingDirectory;
-        this.jsonFile = getContentMappingPath(workingDirectory);
-        this.turAemContentMapping = null;
-
-    }
-
     public TurAemContentDefinitionProcess(TurAemContentMapping turAemContentMapping) {
         this.config = null;
         this.workingDirectory = null;
@@ -159,21 +149,4 @@ private static Optional<TurAemContentMapping> readJsonMapping(Path path) {
             return Optional.empty();
         }
     }
-
-    private Path getContentMappingPath(Path workingDirectory) {
-        String contentMappingFile = config.getMappingFile();
-        if (workingDirectory != null) {
-            Path path = Paths.get(workingDirectory.toAbsolutePath().toString(),
-                    contentMappingFile);
-            if (path.toFile().isFile() && path.toFile().canRead()) {
-                return path;
-            } else {
-                log.error("Can not read mapping file, because not exist: {}", path.toFile().getAbsolutePath());
-            }
-        } else {
-            log.error("Can not read mapping file, because WorkDirectory is empty: {}", contentMappingFile);
-        }
-        log.error("Mapping definitions are not loaded properly from mappingsXML: {}", contentMappingFile);
-        return null;
-    }
 }

turing-aem/aem-plugin/src/main/java/com/viglet/turing/connector/plugin/aem/TurAemPluginProcess.java

@@ -118,7 +118,7 @@ public TurAemPluginProcess(TurAemPluginIndexingRepository turAemPluginIndexingRe
 
     public void run(TurAemSource turAemSource) {
         TurConnectorSource turConnectorSource = getTurConnectorSource(turAemSource);
-        config = new AemPluginHandlerConfiguration(turAemSource, turingUrl, turingApiKey);
+        config = new AemPluginHandlerConfiguration(turAemSource);
 
         turAemContentDefinitionProcess = new TurAemContentDefinitionProcess(getTurAemContentMapping(turAemSource));
         TurAemSourceContext turAemSourceContext = getTurAemSourceContext(config);
@@ -236,7 +236,7 @@ private void getNodesFromJson(TurAemSourceContext turAemSourceContext, TurConnec
     }
 
     public void indexContentId(TurAemSource turAemSource, String guid) {
-        config = new AemPluginHandlerConfiguration(turAemSource, turingUrl, turingApiKey);
+        config = new AemPluginHandlerConfiguration(turAemSource);
         turAemContentDefinitionProcess = new TurAemContentDefinitionProcess(getTurAemContentMapping(turAemSource));
         TurAemSourceContext turAemSourceContext = getTurAemSourceContext(config);
         getSiteName(turAemSourceContext);

turing-aem/aem-plugin/src/main/java/com/viglet/turing/connector/plugin/aem/api/TurAemApi.java

@@ -19,8 +19,6 @@
 package com.viglet.turing.connector.plugin.aem.api;
 
 import com.google.inject.Inject;
-import com.viglet.turing.connector.commons.plugin.TurConnectorContext;
-import com.viglet.turing.connector.commons.plugin.TurConnectorPlugin;
 import com.viglet.turing.connector.plugin.aem.TurAemPluginProcess;
 import com.viglet.turing.connector.plugin.aem.persistence.repository.TurAemPluginIndexingRepository;
 import com.viglet.turing.connector.plugin.aem.persistence.repository.TurAemSourceRepository;
@@ -39,19 +37,15 @@ public class TurAemApi {
     private final TurAemPluginIndexingRepository turAemIndexingRepository;
     private final TurAemSourceRepository turAemSourceRepository;
     private final TurAemPluginProcess turAemPluginProcess;
-    private final TurConnectorContext turConnectorContext;
-    private final TurConnectorPlugin turConnectorPlugin;
+
     @Inject
     public TurAemApi(TurAemPluginIndexingRepository turAemIndexingRepository,
                      TurAemSourceRepository turAemSourceRepository,
-                     TurAemPluginProcess turAemPluginProcess,
-                     TurConnectorContext turConnectorContext,
-                     TurConnectorPlugin turConnectorPlugin) {
+                     TurAemPluginProcess turAemPluginProcess) {
         this.turAemIndexingRepository = turAemIndexingRepository;
         this.turAemSourceRepository = turAemSourceRepository;
         this.turAemPluginProcess = turAemPluginProcess;
-        this.turConnectorContext = turConnectorContext;
-        this.turConnectorPlugin = turConnectorPlugin;
+
     }
 
     @GetMapping

turing-aem/aem-plugin/src/main/java/com/viglet/turing/connector/plugin/aem/conf/AemPluginHandlerConfiguration.java

@@ -18,24 +18,17 @@
 package com.viglet.turing.connector.plugin.aem.conf;
 
 import com.viglet.turing.connector.aem.commons.config.IAemConfiguration;
-import com.viglet.turing.connector.aem.commons.config.TurAemSNSiteConfig;
 import com.viglet.turing.connector.aem.commons.context.TurAemLocalePathContext;
 import com.viglet.turing.connector.plugin.aem.persistence.model.TurAemSource;
 import lombok.extern.slf4j.Slf4j;
 
-import java.net.URI;
 import java.util.*;
 
 @Slf4j
 public class AemPluginHandlerConfiguration implements IAemConfiguration {
     private final TurAemSource turAemSource;
-    private final URI turingURL;
-    private final String authorSNSite;
-    private final String publishSNSite;
-    private final Locale snLocale;
-    private final String mappingFile;
+     private final Locale snLocale;
     private final String cdaURLPrefix;
-    private final String apiKey;
     private final String providerName;
     private final String oncePatternPath;
     private final String cmsHost;
@@ -46,20 +39,12 @@ public class AemPluginHandlerConfiguration implements IAemConfiguration {
     private final String cmsSubType;
     private final String cmsRootPath;
 
-    public AemPluginHandlerConfiguration(TurAemSource turAemSource, String turingURL, String apiKey) {
+    public AemPluginHandlerConfiguration(TurAemSource turAemSource) {
         this.turAemSource = turAemSource;
-        this.turingURL = URI.create(turingURL);
-
-        this.apiKey = apiKey;
-        mappingFile = null;
         providerName = DEFAULT_PROVIDER;
-
-        authorSNSite = turAemSource.getAuthorSNSite();
-        publishSNSite = turAemSource.getPublishSNSite();
         snLocale = turAemSource.getDefaultLocale();
         cdaURLPrefix =   turAemSource.getUrlPrefix();
         oncePatternPath = turAemSource.getOncePattern();
-
         cmsHost =   turAemSource.getUrl();
         cmsUsername = turAemSource.getUsername();
         cmsPassword = turAemSource.getPassword();
@@ -105,16 +90,6 @@ public String getCmsRootPath() {
         return cmsRootPath;
     }
 
-    @Override
-    public URI getTuringURL() {
-        return turingURL;
-    }
-
-    @Override
-    public String getMappingFile() {
-        return mappingFile;
-    }
-
     @Override
     public String getCDAURLPrefix() {
         return cdaURLPrefix;
@@ -139,16 +114,6 @@ public Collection<TurAemLocalePathContext> getLocales() {
         return turAemLocalePathContexts;
     }
 
-    @Override
-    public TurAemSNSiteConfig getDefaultSNSiteConfig(boolean isPublishSite) {
-        return  new TurAemSNSiteConfig(isPublishSite ? publishSNSite: authorSNSite, snLocale);
-    }
-
-    @Override
-    public String getApiKey() {
-        return apiKey;
-    }
-
     @Override
     public String getProviderName() {
         return providerName;

turing-app/pom.xml

@@ -404,8 +404,8 @@
                     </execution>
                 </executions>
                 <configuration>
-                    <nodeVersion>v20.13.1</nodeVersion>
-                    <npmVersion>10.8.0</npmVersion>
+                    <nodeVersion>v20.19.1</nodeVersion>
+                    <npmVersion>10.8.2</npmVersion>
                     <workingDirectory>../turing-ui</workingDirectory>
                 </configuration>
             </plugin>