rename noSupersededProduct -> excludeSupersededProducts

NASA-PDS · Aug 1, 2024 · cc758fe · cc758fe
1 parent 2b773d9
commit cc758fe
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/service/src/main/java/gov/nasa/pds/api/registry/controllers/ProductsController.java b/service/src/main/java/gov/nasa/pds/api/registry/controllers/ProductsController.java
@@ -295,7 +295,7 @@ private HashMap<String, Object> getLatestLidVid(PdsProductIdentifier identifier,
     SearchRequest searchRequest = new RegistrySearchRequestBuilder(this.connectionContext)
             .matchLid(identifier)
             .fieldsFromStrings(fields)
-            .noSupersededProducts()
+            .excludeSupersededProducts()
             .build();
 
     // useless to detail here that the HashMap is parameterized <String, Object>
@@ -343,7 +343,7 @@ private PdsProductClasses resolveProductClass(PdsProductIdentifier identifier)
     SearchRequest searchRequest = new RegistrySearchRequestBuilder(this.connectionContext)
             .matchLid(identifier)
             .fieldsFromStrings(List.of(PdsProductClasses.getPropertyName()))
-            .noSupersededProducts()
+            .excludeSupersededProducts()
             .build();
 
     SearchResponse<HashMap> searchResponse = this.openSearchClient.search(searchRequest, HashMap.class);
@@ -363,7 +363,7 @@ private PdsLidVid resolveLatestLidvid(PdsProductIdentifier identifier)
     SearchRequest searchRequest = new RegistrySearchRequestBuilder(this.connectionContext)
             .matchLid(identifier.getLid())
             .fieldsFromStrings(List.of())
-            .noSupersededProducts()
+            .excludeSupersededProducts()
             .build();
 
     SearchResponse<HashMap> searchResponse = this.openSearchClient.search(searchRequest, HashMap.class);

diff --git a/service/src/main/java/gov/nasa/pds/api/registry/search/RegistrySearchRequestBuilder.java b/service/src/main/java/gov/nasa/pds/api/registry/search/RegistrySearchRequestBuilder.java
@@ -115,7 +115,7 @@ public BoolQuery.Builder getQueryBuilder() {
    * @param pageSize - the page size to use for pagination
    * @param sortFieldNames - the fields by which results are sorted (ascending), from highest to lowest priority
    * @param searchAfterFieldValues - the values corresponding to the sort fields, for pagination
-   * @param noSupersededProducts - whether to exclude superseded products from the result set
+   * @param excludeSupersededProducts - whether to exclude superseded products from the result set
    */
   public RegistrySearchRequestBuilder applyMultipleProductsDefaults(
           List<String> includeFieldNames,
@@ -124,16 +124,16 @@ public RegistrySearchRequestBuilder applyMultipleProductsDefaults(
           Integer pageSize,
           List<String> sortFieldNames,
           List<String> searchAfterFieldValues,
-          Boolean noSupersededProducts
+          Boolean excludeSupersededProducts
   ) throws UnparsableQParamException, SortSearchAfterMismatchException {
     this
       .fieldsFromStrings(includeFieldNames)
       .constrainByQueryString(queryString)
       .addKeywordsParam(keywords)
       .paginate(pageSize, sortFieldNames, searchAfterFieldValues);
 
-    if (noSupersededProducts) {
-      this.noSupersededProducts();
+    if (excludeSupersededProducts) {
+      this.excludeSupersededProducts();
     }
 
     return this;
@@ -358,7 +358,7 @@ public RegistrySearchRequestBuilder addKeywordsParam(List<String> keywords) {
    * N.B. this does *not* mean the latest version which satisfies other constraints, so application of this constraint
    * can result in no hits being returned despite valid results existing.
    */
-  public RegistrySearchRequestBuilder noSupersededProducts() {
+  public RegistrySearchRequestBuilder excludeSupersededProducts() {
 
     ExistsQuery supersededByExists = new ExistsQuery.Builder()
             .field("ops:Provenance/ops:superseded_by")