Update VectorSearchFilter builder

Author: Milder Hernandez Cagua

api-test/integration-tests/src/test/java/com/microsoft/semantickernel/tests/connectors/memory/jdbc/JDBCVectorStoreRecordCollectionTest.java

@@ -406,7 +406,7 @@ public void searchWithFilter(QueryProvider provider, String embeddingName) {
         VectorSearchOptions options = VectorSearchOptions.builder()
             .withVectorFieldName(embeddingName)
             .withLimit(3)
-            .withBasicVectorSearchFilter(
+            .withVectorSearchFilter(
                     VectorSearchFilter.builder().withEqualToFilterClause(new SQLEqualToFilterClause("rating", 4.0)).build())
             .build();
 

semantickernel-experimental/src/main/java/com/microsoft/semantickernel/connectors/data/azureaisearch/AzureAISearchVectorStoreRecordCollection.java

@@ -41,7 +41,6 @@
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
-import java.util.Map;
 import java.util.stream.Collectors;
 import javax.annotation.Nonnull;
 import reactor.core.publisher.Flux;
@@ -337,7 +336,7 @@ public Mono<List<VectorSearchResult<Record>>> searchAsync(VectorSearchQuery quer
         }
 
         String filter = AzureAISearchVectorStoreCollectionSearchMapping
-            .buildFilterString(options.getBasicVectorSearchFilter(), recordDefinition);
+            .buildFilterString(options.getVectorSearchFilter(), recordDefinition);
 
         SearchOptions searchOptions = new SearchOptions()
             .setFilter(filter)

semantickernel-experimental/src/main/java/com/microsoft/semantickernel/connectors/data/jdbc/JDBCVectorStoreQueryProvider.java

@@ -4,7 +4,6 @@
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ArrayNode;
-import com.microsoft.semantickernel.data.filter.FilterClause;
 import com.microsoft.semantickernel.data.vectorsearch.VectorOperations;
 import com.microsoft.semantickernel.data.vectorsearch.VectorSearchResult;
 import com.microsoft.semantickernel.data.vectorsearch.queries.VectorSearchQuery;
@@ -19,7 +18,6 @@
 import com.microsoft.semantickernel.data.vectorstorage.options.DeleteRecordOptions;
 import com.microsoft.semantickernel.data.vectorstorage.options.GetRecordOptions;
 import com.microsoft.semantickernel.data.vectorstorage.options.UpsertRecordOptions;
-import com.microsoft.semantickernel.services.OrderedAIServiceSelector;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -502,9 +500,9 @@ public <Record> List<VectorSearchResult<Record>> search(String collectionName,
                     .getField(options.getVectorFieldName());
 
             String filter = SQLVectorStoreRecordCollectionSearchMapping
-                .buildFilter(options.getBasicVectorSearchFilter(), recordDefinition);
+                .buildFilter(options.getVectorSearchFilter(), recordDefinition);
             List<Object> parameters = SQLVectorStoreRecordCollectionSearchMapping
-                .getFilterParameters(options.getBasicVectorSearchFilter());
+                .getFilterParameters(options.getVectorSearchFilter());
 
             List<Record> records = getRecordsWithFilter(collectionName, recordDefinition, mapper,
                 new GetRecordOptions(true), filter, parameters);

semantickernel-experimental/src/main/java/com/microsoft/semantickernel/connectors/data/postgres/PostgreSQLVectorStoreQueryProvider.java

@@ -371,10 +371,10 @@ public <Record> List<VectorSearchResult<Record>> search(String collectionName,
             }
 
             String filter = SQLVectorStoreRecordCollectionSearchMapping.buildFilter(
-                options.getBasicVectorSearchFilter(),
+                options.getVectorSearchFilter(),
                 recordDefinition);
             List<Object> parameters = SQLVectorStoreRecordCollectionSearchMapping
-                .getFilterParameters(options.getBasicVectorSearchFilter());
+                .getFilterParameters(options.getVectorSearchFilter());
 
             String filterClause = filter.isEmpty() ? "" : "WHERE " + filter;
             String searchQuery = formatQuery(

semantickernel-experimental/src/main/java/com/microsoft/semantickernel/data/vectorsearch/VectorSearchFilter.java

@@ -12,9 +12,9 @@
 public class VectorSearchFilter {
 
     /**
-     * Creates a new instance of the BasicVectorSearchFilter class.
+     * Creates a new instance of the VectorSearchFilter class.
      *
-     * @return A new instance of the BasicVectorSearchFilter class.
+     * @return A new instance of the VectorSearchFilter class.
      */
     public static VectorSearchFilter createDefault() {
         return new VectorSearchFilter();
@@ -23,11 +23,11 @@ public static VectorSearchFilter createDefault() {
     private final List<FilterClause> filterClauses;
 
     public VectorSearchFilter() {
-        this(new ArrayList<>());
+        this(Collections.emptyList());
     }
 
     /**
-     * Creates a new instance of the BasicVectorSearchFilter class.
+     * Creates a new instance of the VectorSearchFilter class.
      *
      * @param filterClauses The filter clauses.
      */

semantickernel-experimental/src/main/java/com/microsoft/semantickernel/data/vectorstorage/options/VectorSearchOptions.java

@@ -39,12 +39,12 @@ public VectorSearchOptions(VectorSearchFilter vectorSearchFilter,
     }
 
     /**
-     * Gets the basic vector search filter.
+     * Gets the vector search filter.
      *
-     * @return The basic vector search filter.
+     * @return The vector search filter.
      */
     @Nullable
-    public VectorSearchFilter getBasicVectorSearchFilter() {
+    public VectorSearchFilter getVectorSearchFilter() {
         return vectorSearchFilter;
     }
 
@@ -105,7 +105,7 @@ public Builder() {
             this.limit = DEFAULT_RESULT_LIMIT;
         }
 
-        public Builder withBasicVectorSearchFilter(
+        public Builder withVectorSearchFilter(
             VectorSearchFilter vectorSearchFilter) {
             this.vectorSearchFilter = vectorSearchFilter;
             return this;