- App: Pagination Code Smells, TR with FQ was fixed

openturing · Feb 25, 2024 · 2667bbd · 2667bbd
1 parent 7f6a3e7
commit 2667bbd
Show file tree

Hide file tree

Showing 6 changed files with 191 additions and 247 deletions.
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
@@ -21,10 +21,13 @@
 package com.viglet.turing.api.sn.bean;
 
 import lombok.Getter;
+import lombok.RequiredArgsConstructor;
 import lombok.Setter;
+import lombok.experimental.Accessors;
 
 import java.util.List;
-
+@RequiredArgsConstructor
+@Accessors(chain = true)
 @Getter
 @Setter
 public class TurSNSiteFilterQueryBean {

diff --git a/turing-app/src/main/java/com/viglet/turing/sn/TurSNSearchProcess.java b/turing-app/src/main/java/com/viglet/turing/sn/TurSNSearchProcess.java
diff --git a/turing-app/src/main/java/com/viglet/turing/solr/TurSolr.java b/turing-app/src/main/java/com/viglet/turing/solr/TurSolr.java
@@ -383,7 +383,7 @@ private void prepareGroup(TurSEParameters turSEParameters, SolrQuery query) {
 
     }
 
-    private boolean hasGroup(TurSEParameters turSEParameters) {
+    public boolean hasGroup(TurSEParameters turSEParameters) {
         return turSEParameters.getGroup() != null && !turSEParameters.getGroup().trim().isEmpty();
     }
 
@@ -671,7 +671,7 @@ private void prepareQueryTargetingRules(TurSNSitePostParamsBean turSNSitePostPar
                 condition.add(key);
                 rules.add(turSNTargetingRules.run(TurSNTargetingRuleMethod.AND, key, value));
             });
-            query.setFilterQueries(String.format("%s OR (*:* NOT (%s))",
+            query.addFilterQuery(String.format("%s OR (*:* NOT (%s))",
                     String.join(" OR ", rules),
                     String.join(" OR ", condition)));
         }
@@ -684,15 +684,15 @@ private void prepareQueryFilterQuery(TurSEParameters turSEParameters, SolrQuery
                 List<String> filterQueriesModified = turSEParameters.getFilterQueries().stream()
                         .map(q -> queryWithoutExpression(q) ? addDoubleQuotesToValue(q) : q
                         ).toList();
-                query.setFilterQueries(
+                query.addFilterQuery(
                         String.valueOf(String.format("%s(%s)", facetTypeCondition,
                                 String.join(" OR ", filterQueriesModified))));
             } else {
                 List<String> filterQueriesModified = turSEParameters.getFilterQueries().stream()
                         .map(q -> facetTypeCondition.concat(queryWithoutExpression(q) ? addDoubleQuotesToValue(q) : q)
                         ).toList();
                 String[] filterQueryArr = new String[filterQueriesModified.size()];
-                query.setFilterQueries(filterQueriesModified.toArray(filterQueryArr));
+                query.addFilterQuery(filterQueriesModified.toArray(filterQueryArr));
             }
         }
     }

diff --git a/turing-commons/src/main/java/com/viglet/turing/commons/sn/bean/TurSNSiteLocaleBean.java b/turing-commons/src/main/java/com/viglet/turing/commons/sn/bean/TurSNSiteLocaleBean.java
@@ -17,7 +17,9 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import lombok.Getter;
+import lombok.RequiredArgsConstructor;
 import lombok.Setter;
+import lombok.experimental.Accessors;
 
 import java.util.Locale;
 
@@ -28,7 +30,8 @@
  * 
  * @since 0.3.5
  */
-
+@RequiredArgsConstructor
+@Accessors(chain = true)
 @Getter
 @Setter
 @JsonIgnoreProperties(ignoreUnknown = true)

diff --git a/turing-commons/src/main/java/com/viglet/turing/commons/sn/bean/TurSNSiteSearchBean.java b/turing-commons/src/main/java/com/viglet/turing/commons/sn/bean/TurSNSiteSearchBean.java
@@ -17,18 +17,19 @@
 
 package com.viglet.turing.commons.sn.bean;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.Setter;
 import lombok.experimental.Accessors;
 
 import java.util.List;
 
-
 @RequiredArgsConstructor
 @Accessors(chain = true)
 @Getter
 @Setter
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class TurSNSiteSearchBean {
 	private List<TurSNSiteSearchPaginationBean> pagination;
 	private TurSNSiteSearchQueryContextBean queryContext;

diff --git a/...mmons/src/main/java/com/viglet/turing/commons/sn/bean/TurSNSiteSpotlightDocumentBean.java b/...mmons/src/main/java/com/viglet/turing/commons/sn/bean/TurSNSiteSpotlightDocumentBean.java
@@ -18,14 +18,21 @@
 package com.viglet.turing.commons.sn.bean;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import lombok.Setter;
+import lombok.experimental.Accessors;
 
 /**
  * List of spotlight documents of Turing AI Semantic Navigation response.
  * 
  * @author Alexandre Oliveira
  * @since 0.3.5
  */
-
+@RequiredArgsConstructor
+@Accessors(chain = true)
+@Getter
+@Setter
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class TurSNSiteSpotlightDocumentBean {
 
@@ -43,59 +50,4 @@ public class TurSNSiteSpotlightDocumentBean {
 
 	private String link;
 
-	public String getId() {
-		return id;
-	}
-
-	public void setId(String id) {
-		this.id = id;
-	}
-
-	public int getPosition() {
-		return position;
-	}
-
-	public void setPosition(int position) {
-		this.position = position;
-	}
-
-	public String getTitle() {
-		return title;
-	}
-
-	public void setTitle(String title) {
-		this.title = title;
-	}
-
-	public String getType() {
-		return type;
-	}
-
-	public void setType(String type) {
-		this.type = type;
-	}
-
-	public String getReferenceId() {
-		return referenceId;
-	}
-
-	public void setReferenceId(String referenceId) {
-		this.referenceId = referenceId;
-	}
-
-	public String getContent() {
-		return content;
-	}
-
-	public void setContent(String content) {
-		this.content = content;
-	}
-
-	public String getLink() {
-		return link;
-	}
-
-	public void setLink(String link) {
-		this.link = link;
-	}
 }