0.3.9

pom.xml

@@ -23,7 +23,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>3.11.1</version>
+                <version>3.11.2</version>
                 <configuration>
                     <!-- Default configuration for all reports -->
                     <noqualifier>all</noqualifier>
@@ -189,6 +189,11 @@
                 <artifactId>turing-java-sdk</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>com.viglet.turing</groupId>
+                <artifactId>turing-commons</artifactId>
+                <version>${project.version}</version>
+            </dependency>
             <dependency>
                 <groupId>ch.qos.logback</groupId>
                 <artifactId>logback-classic</artifactId>
@@ -237,17 +242,17 @@
             <dependency>
                 <groupId>org.xerial</groupId>
                 <artifactId>sqlite-jdbc</artifactId>
-                <version>3.47.0.0</version>
+                <version>3.47.1.0</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.logging.log4j</groupId>
                 <artifactId>log4j-core</artifactId>
-                <version>2.24.2</version>
+                <version>2.24.3</version>
             </dependency>
             <dependency>
                 <groupId>com.fasterxml.jackson.core</groupId>
                 <artifactId>jackson-databind</artifactId>
-                <version>2.18.1</version>
+                <version>2.18.2</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.httpcomponents.client5</groupId>
@@ -262,7 +267,7 @@
             <dependency>
                 <groupId>org.jsoup</groupId>
                 <artifactId>jsoup</artifactId>
-                <version>1.18.1</version>
+                <version>1.18.3</version>
             </dependency>
             <dependency>
                 <groupId>org.projectlombok</groupId>

turing-aem/aem-app/pom.xml

@@ -43,7 +43,7 @@
         <dependency>
             <groupId>io.swagger.core.v3</groupId>
             <artifactId>swagger-annotations-jakarta</artifactId>
-            <version>2.2.26</version>
+            <version>2.2.27</version>
             <scope>compile</scope>
         </dependency>
         <dependency>

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

@@ -13,7 +13,7 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <maven.compiler.source>21</maven.compiler.source>
     <maven.compiler.target>21</maven.compiler.target>
-    <jackson.version>2.18.1</jackson.version>
+    <jackson.version>2.18.2</jackson.version>
   </properties>
 
   <dependencies>

turing-aem/aem-commons/pom.xml

@@ -23,7 +23,7 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>2.18.1</version>
+            <version>2.18.2</version>
         </dependency>
         <dependency>
             <groupId>com.viglet.turing</groupId>

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

@@ -44,7 +44,6 @@
 public class TurAemAttrProcess {
     public static final String JCR_TITLE = "jcr:title";
     public static final String CQ_TAGS = "cq:tags";
-    public static final String TAG_SEPARATOR = ":";
     public static final String DEFAULT = "default";
     public static final String TEXT = "text";
     public static final String JCR = "jcr:";
@@ -233,7 +232,7 @@ public TurCmsTargetAttrValueMap process(TurCmsContext context,
                 attributeByClass(context, turAemSourceContext) :
                 attributeByCMS(context);
         turCmsTargetAttrValueMap.merge(generateNewAttributesFromCqTags(context,
-                turAemSourceContext, turSNAttributeSpecList));
+                turAemSourceContext, turSNAttributeSpecList, turCmsTargetAttrValueMap));
         return turCmsTargetAttrValueMap;
     }
 
@@ -252,29 +251,58 @@ private TurCmsTargetAttrValueMap attributeByCMS(TurCmsContext context) {
 
     private TurCmsTargetAttrValueMap generateNewAttributesFromCqTags(TurCmsContext context,
                                                                      TurAemSourceContext turAemSourceContext,
-                                                                     List<TurSNAttributeSpec> turSNAttributeSpecList) {
+                                                                     List<TurSNAttributeSpec> turSNAttributeSpecList,
+                                                                     TurCmsTargetAttrValueMap turCmsTargetAttrValueMapFromClass) {
         TurCmsTargetAttrValueMap turCmsTargetAttrValueMap = new TurCmsTargetAttrValueMap();
         String attributeName = context.getTurCmsSourceAttr().getName();
-        Object jcrProperty = getJcrProperty(context, attributeName);
         if (CQ_TAGS.equals(attributeName)) {
-            Optional.ofNullable((JSONArray) jcrProperty).ifPresent(property ->
-                    property.forEach(tag -> {
-                        String[] tagSplit = tag.toString().split(TAG_SEPARATOR);
-                        if (tagSplit.length >= 2) {
-                            Optional.ofNullable(tagSplit[0]).ifPresent(facet -> {
-                                turSNAttributeSpecList.add(setTagFacet(turAemSourceContext, facet));
-                                Optional.ofNullable(tagSplit[1]).ifPresent(value ->
-                                        turCmsTargetAttrValueMap.addWithSingleValue(facet,
-                                                addTagToAttrValueList(context, turAemSourceContext, facet, value), false)
-                                );
-                            });
-                        }
-                    })
-            );
+            String targetName = context.getTurCmsTargetAttr().getName();
+            if (turCmsTargetAttrValueMapFromClass.containsKey(targetName)) {
+                processTagsFromTargetAttr(context, turAemSourceContext, turSNAttributeSpecList,
+                        turCmsTargetAttrValueMapFromClass, targetName, turCmsTargetAttrValueMap);
+            } else {
+                processTagsFromSourceAttr(context, turAemSourceContext, turSNAttributeSpecList, attributeName,
+                        turCmsTargetAttrValueMap);
+            }
         }
         return turCmsTargetAttrValueMap;
     }
 
+    private static void processTagsFromSourceAttr(TurCmsContext context, TurAemSourceContext turAemSourceContext,
+                                                  List<TurSNAttributeSpec> turSNAttributeSpecList,
+                                                  String attributeName,
+                                                  TurCmsTargetAttrValueMap turCmsTargetAttrValueMap) {
+        Optional.ofNullable((JSONArray) getJcrProperty(context, attributeName))
+                .ifPresent(property ->
+                        property.forEach(tag ->
+                                formatTags(context, turAemSourceContext, turSNAttributeSpecList,
+                                        tag.toString(), turCmsTargetAttrValueMap))
+                );
+    }
+
+    private static void processTagsFromTargetAttr(TurCmsContext context, TurAemSourceContext turAemSourceContext,
+                                                  List<TurSNAttributeSpec> turSNAttributeSpecList,
+                                                  TurCmsTargetAttrValueMap turCmsTargetAttrValueMapFromClass,
+                                                  String targetName,
+                                                  TurCmsTargetAttrValueMap turCmsTargetAttrValueMap) {
+        turCmsTargetAttrValueMapFromClass.get(targetName).forEach(tag ->
+                formatTags(context, turAemSourceContext, turSNAttributeSpecList,
+                        tag, turCmsTargetAttrValueMap));
+    }
+
+    private static void formatTags(TurCmsContext context, TurAemSourceContext turAemSourceContext,
+                                   List<TurSNAttributeSpec> turSNAttributeSpecList, String tag,
+                                   TurCmsTargetAttrValueMap turCmsTargetAttrValueMap) {
+        TurCommonsUtils.getKeyValueFromColon(tag).ifPresent(kv ->
+                Optional.ofNullable(kv.getKey()).ifPresent(facet -> {
+                    turSNAttributeSpecList.add(setTagFacet(turAemSourceContext, facet));
+                    Optional.ofNullable(kv.getValue()).ifPresent(value ->
+                            turCmsTargetAttrValueMap.addWithSingleValue(facet,
+                                    addTagToAttrValueList(context, turAemSourceContext, facet, value), false)
+                    );
+                }));
+    }
+
     private TurCmsTargetAttrValueMap attributeByClass(TurCmsContext context, TurAemSourceContext turAemSourceContext) {
         String className = context.getTurCmsSourceAttr().getClassName();
         log.debug("ClassName : {}", className);

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

@@ -47,17 +47,19 @@ public class TurAemObject {
     private final String type;
     private final String path;
     private final String url;
-    private String model;
     private final JSONObject jcrNode;
     private JSONObject jcrContentNode = new JSONObject();
     private String title;
+    private String template;
+    private String model;
     private final Map<String, Object> attributes = new HashMap<>();
 
     public static final String CONTENT_FRAGMENT = "contentFragment";
     public static final String CQ_LAST_REPLICATION_ACTION = "cq:lastReplicationAction";
     public static final String CQ_LAST_REPLICATION_ACTION_PUBLISH = "cq:lastReplicationAction_publish";
     public static final String CQ_LAST_MODIFIED = "cq:lastModified";
     public static final String CQ_MODEL = "cq:model";
+    public static final String CQ_TEMPLATE = "cq:template";
     public static final String DATA_FOLDER = "data";
     public static final String DATE_JSON_FORMAT = "E MMM dd yyyy HH:mm:ss 'GMT'Z";
     public static final String EMPTY_VALUE = "";
@@ -71,6 +73,7 @@ public TurAemObject(String nodePath, JSONObject jcrNode) {
         try {
             if (jcrNode.has(JCR_CONTENT)) {
                 this.jcrContentNode = jcrNode.getJSONObject(JCR_CONTENT);
+                this.template = jcrContentNode.has(CQ_TEMPLATE) ? this.jcrContentNode.getString(CQ_TEMPLATE) : EMPTY_VALUE;
                 this.delivered = isActivated(CQ_LAST_REPLICATION_ACTION)
                         && isActivated(CQ_LAST_REPLICATION_ACTION_PUBLISH);
                 this.title = jcrContentNode.has(JCR_TITLE) ? this.jcrContentNode.getString(JCR_TITLE) : EMPTY_VALUE;

turing-app/pom.xml

@@ -39,7 +39,7 @@
         <dependency>
             <groupId>co.elastic.clients</groupId>
             <artifactId>elasticsearch-java</artifactId>
-            <version>8.16.1</version>
+            <version>8.17.0</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -178,7 +178,7 @@
         <dependency>
             <groupId>org.apache.opennlp</groupId>
             <artifactId>opennlp-tools</artifactId>
-            <version>2.5.0</version>
+            <version>2.5.1</version>
         </dependency>
         <dependency>
             <groupId>commons-io</groupId>

turing-app/src/main/java/com/viglet/turing/api/sn/console/TurSNSiteAPI.java

@@ -139,13 +139,15 @@ public TurSNSite turSNSiteUpdate(@PathVariable String id, @RequestBody TurSNSite
             turSNSiteEdit.setSpotlightWithResults(turSNSite.getSpotlightWithResults());
             turSNSiteEdit.setWildcardNoResults(turSNSite.getWildcardNoResults());
             turSNSiteEdit.setWildcardAlways(turSNSite.getWildcardAlways());
+            turSNSiteEdit.setExactMatchField(turSNSite.getExactMatchField());
+            turSNSiteEdit.setDefaultField(turSNSite.getDefaultField());
             turSNSiteEdit.setDefaultTitleField(turSNSite.getDefaultTitleField());
             turSNSiteEdit.setDefaultTextField(turSNSite.getDefaultTextField());
             turSNSiteEdit.setDefaultDescriptionField(turSNSite.getDefaultDescriptionField());
             turSNSiteEdit.setDefaultDateField(turSNSite.getDefaultDateField());
             turSNSiteEdit.setDefaultImageField(turSNSite.getDefaultImageField());
             turSNSiteEdit.setDefaultURLField(turSNSite.getDefaultURLField());
-
+            turSNSiteEdit.setExactMatch(turSNSite.getExactMatch());
             turSNSiteRepository.save(turSNSiteEdit);
             return turSNSiteEdit;
         }).orElse(new TurSNSite());

turing-app/src/main/java/com/viglet/turing/converse/TurConverse.java

@@ -22,14 +22,14 @@
 
 import com.google.inject.Inject;
 import com.viglet.turing.bean.converse.TurConverseAgentResponse;
+import com.viglet.turing.commons.utils.TurCommonsUtils;
 import com.viglet.turing.persistence.model.converse.chat.TurConverseChat;
 import com.viglet.turing.persistence.model.converse.chat.TurConverseChatResponse;
 import com.viglet.turing.persistence.repository.converse.chat.TurConverseChatResponseRepository;
 import jakarta.servlet.http.HttpSession;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.solr.common.SolrDocument;
 import org.apache.solr.common.SolrDocumentList;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.security.SecureRandom;
@@ -71,7 +71,7 @@ public void saveChatResponseUser(String q, TurConverseChat chat, HttpSession ses
 			String nextContext = (String) session.getAttribute(TurConverseConstants.NEXT_CONTEXT);
 			SolrDocumentList results = turConverseSE.askPhrase(chat.getAgent(), q, nextContext);
 			if (!results.isEmpty()) {
-				SolrDocument firstResult = results.get(0);
+				SolrDocument firstResult = results.getFirst();
 				String intentId = (String) firstResult.getFieldValue(TurConverseConstants.ID);
 				SimpleEntry<String, String> parameter = this.getParameterValue(q, chat, intentId);
 				if (parameter != null) {
@@ -91,11 +91,10 @@ public AbstractMap.SimpleEntry<String, String> getParameterValue(String text, Tu
 			String intentId) {
 		SolrDocumentList termDocumentList = turConverseSE.sorlGetParameterValue(text, turConverseChat, intentId);
 		if (!termDocumentList.isEmpty()) {
-			String parameter = (String) termDocumentList.get(0).getFirstValue(TurConverseConstants.PARAMETERS);
-
-			String[] parameterKV = parameter.split(":");
-
-			return new AbstractMap.SimpleEntry<>(parameterKV[0], parameterKV[1]);
+			String parameter = (String) termDocumentList.getFirst().getFirstValue(TurConverseConstants.PARAMETERS);
+			return TurCommonsUtils.getKeyValueFromColon(parameter).map(p ->
+					new SimpleEntry<>(p.getKey(), p.getValue()))
+					.orElse(null);
 
 		}
 		return null;
@@ -127,7 +126,6 @@ public void saveChatResponseBot(TurConverseChat chat, TurConverseAgentResponse t
 
 	}
 
-	@SuppressWarnings("unchecked")
 	public void getChatParameter(TurConverseChat chat, HttpSession session,
 			TurConverseAgentResponse turConverseAgentResponse) {
 
@@ -172,7 +170,7 @@ public TurConverseAgentResponse interactionNested(TurConverseChat chat, String q
 			results = turConverseSE.askPhrase(chat.getAgent(), q, nextContext);
 
 		if (!results.isEmpty()) {
-			SolrDocument firstResult = results.get(0);
+			SolrDocument firstResult = results.getFirst();
 
 			if ((boolean) firstResult.getFieldValue(TurConverseConstants.HAS_PARAMETER)) {
 				session.setAttribute(TurConverseConstants.INTENT, firstResult.getFieldValue(TurConverseConstants.ID));
@@ -192,22 +190,17 @@ public TurConverseAgentResponse interactionNested(TurConverseChat chat, String q
 		return turConverseAgentResponse;
 	}
 
-	@SuppressWarnings("unchecked")
 	private void getIntentFlow(TurConverseChat chat, HttpSession session,
 			TurConverseAgentResponse turConverseAgentResponse, SolrDocument firstResult) {
-
 		List<String> contextOutputs = (List<String>) firstResult.getFieldValue(TurConverseConstants.CONTEXT_OUTPUT);
-
 		turConverseAgentResponse.setResponse(this.getIntentResponse(chat, firstResult));
 		turConverseAgentResponse.setIntentId(firstResult.getFieldValue(TurConverseConstants.ID).toString());
 		turConverseAgentResponse.setIntentName(firstResult.getFieldValue(TurConverseConstants.NAME).toString());
-
 		if (contextOutputs != null && !contextOutputs.isEmpty()) {
-			session.setAttribute(TurConverseConstants.NEXT_CONTEXT, contextOutputs.get(0));
+			session.setAttribute(TurConverseConstants.NEXT_CONTEXT, contextOutputs.getFirst());
 		}
 	}
 
-	@SuppressWarnings("unchecked")
 	private String getIntentResponse(TurConverseChat chat, SolrDocument firstResult) {
 		List<String> responses = (List<String>) firstResult.getFieldValue(TurConverseConstants.RESPONSES);
 		int rnd = random.nextInt(responses.size());
@@ -217,12 +210,15 @@ private String getIntentResponse(TurConverseChat chat, SolrDocument firstResult)
 		StringBuilder responseModified = new StringBuilder();
 		for (String word : words) {
 			if (word.startsWith("$")) {
-				String parameterName = word.replace("\\$", "").replace(",", "").replace(";", "").replace("\\.", "");
+				String parameterName = word.replace("\\$", "")
+						.replace(",", "")
+						.replace(";", "")
+						.replace("\\.", "");
 
 				List<TurConverseChatResponse> values = turConverseChatResponseRepository
 						.findByChatAndIsUserAndParameterNameOrderByDateDesc(chat, true, parameterName);
 				if (!values.isEmpty()) {
-					word = values.get(0).getParameterValue();
+					word = values.getFirst().getParameterValue();
 				}
 			}
 			responseModified.append(word).append(" ");
@@ -243,7 +239,7 @@ private String getFallbackResponse(TurConverseChat chat) {
 		if (fallbackList.isEmpty())
 			return TurConverseConstants.FALLBACK_DEFAULT_MESSAGE;
 		else {
-			SolrDocument fallbackIntent = fallbackList.get(0);
+			SolrDocument fallbackIntent = fallbackList.getFirst();
 
 			Collection<Object> responses = fallbackIntent.getFieldValues(TurConverseConstants.RESPONSES);
 
@@ -263,7 +259,7 @@ private void getIntentWhenFinishParameters(TurConverseChat chat, HttpSession ses
 
 		SolrDocumentList results = turConverseSE.solrGetIntent(chat.getAgent(), intent);
 		if (!results.isEmpty()) {
-			SolrDocument firstResult = results.get(0);
+			SolrDocument firstResult = results.getFirst();
 			this.getIntentFlow(chat, session, turConverseAgentResponse, firstResult);
 		}
 	}

turing-app/src/main/java/com/viglet/turing/persistence/model/sn/TurSNSite.java

@@ -81,6 +81,9 @@ public class TurSNSite extends TurAuditable<String> implements Serializable {
 	@Column
 	private Integer wildcardAlways = 0;
 
+	@Column
+	private Integer exactMatch = 0;
+
 	@Column
 	private Integer facet;
 
@@ -111,6 +114,12 @@ public class TurSNSite extends TurAuditable<String> implements Serializable {
 	@Column
 	private Integer thesaurus = 0;
 
+	@Column
+	private String defaultField;
+
+	@Column
+	private String exactMatchField;
+
 	@Column
 	private String defaultTitleField;