Pull request #28: RED-3127: Upgrade log4j to 2.17.0 PORT

Merge in RED/search-service from RED-3127-se1PORT to release/1.3.x

* commit '90d58e9dc27deb7c1be91bb6bb894ad1564d6803':
  RED-3127: Upgrade log4j to 2.17.0 PORT

search-service-v1/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>platform-dependency</artifactId>
         <groupId>com.iqser.red</groupId>
-        <version>1.1.3</version>
+        <version>1.1.3.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/SearchService.java

@@ -92,9 +92,9 @@ public class SearchService {
             sectionsQueries.should(textPhraseQuery);
         }
         for (String should : query.getShoulds()) {
-            QueryBuilder textTermQuery = QueryBuilders.termQuery("sections.text", should.toLowerCase(Locale.ROOT))
+            QueryBuilder textTermQuery = QueryBuilders.matchPhraseQuery("sections.text", should.toLowerCase(Locale.ROOT))
                     .queryName(should);
-            QueryBuilder filenameTermQuery = QueryBuilders.termQuery("filename", should.toLowerCase(Locale.ROOT))
+            QueryBuilder filenameTermQuery = QueryBuilders.matchPhraseQuery("filename", should.toLowerCase(Locale.ROOT))
                     .queryName("filename." + should);
             entireQuery.should(textTermQuery);
             entireQuery.should(filenameTermQuery);
@@ -109,6 +109,9 @@ public class SearchService {
             entireQuery.should(nestedQuery);
         }
 
+
+        BoolQueryBuilder filterQuery = QueryBuilders.boolQuery();
+
         if (dossierTemplateIds != null && !dossierTemplateIds.isEmpty()) {
 
             var dossierTemplateIdQueryBuilder = QueryBuilders.boolQuery();
@@ -117,7 +120,7 @@ public class SearchService {
                 dossierTemplateIdQueryBuilder = dossierTemplateIdQueryBuilder.should(QueryBuilders.matchQuery("dossierTemplateId", dossierTemplateId));
             }
 
-            entireQuery.filter(dossierTemplateIdQueryBuilder);
+            filterQuery.must(dossierTemplateIdQueryBuilder);
         }
 
         if (dossierIds != null && !dossierIds.isEmpty()) {
@@ -128,15 +131,15 @@ public class SearchService {
                 dossierIdQueryBuilder = dossierIdQueryBuilder.should(QueryBuilders.matchQuery("dossierId", dossierId));
             }
 
-            entireQuery.filter(dossierIdQueryBuilder);
+            filterQuery.must(dossierIdQueryBuilder);
         }
 
 
         if (fileId != null) {
-            entireQuery.filter(QueryBuilders.matchQuery("fileId", fileId));
+            filterQuery.must(QueryBuilders.matchQuery("fileId", fileId));
         }
 
-        return entireQuery;
+        return QueryBuilders.boolQuery().filter(filterQuery).must(entireQuery);
     }